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.
2013-11-05 19:38:58 +01:00 · 2013-11-05 19:38:58 +01:00 · 4b2fcb09a4
commit 4b2fcb09a4
parent c8f5eb54db
73 changed files with 381 additions and 152 deletions
--- 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)
 ==================
--- 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.
--- 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'):
--- 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
--- 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
+[^footnote]: Named footnote
--- 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をまっくでインストールする方法について明確に説明します。
--- 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
--- 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:
--- 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>
--- 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>
--- 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>
--- 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>
--- 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">
--- 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">
--- 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>
--- 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>
--- 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">
--- 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>
--- 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>
--- 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">
--- 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>
--- 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>
--- 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">
--- 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>
--- 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">
--- 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">
--- 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">
--- 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">
--- 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>
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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>
--- 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>
--- 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>
--- 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>
+</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>
--- 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;
--- 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>
+</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>
--- 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>
--- 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>
+&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>
--- 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>
--- 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>
+</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>
--- 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;
--- 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>
+</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>
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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)
--- 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">
--- 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>
--- 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 %}
--- 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):