diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 32a863d6..d36ba32c 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 840dfa02..9aedb29d 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index c1199371..e681b991 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 62dd0368..b56d18ba 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 9fd6df0a..0d2525e7 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index ab68482d..6bf631eb 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -115,8 +115,9 @@ YEAH !</p>
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/author/bruno.html b/tests/output/basic/author/bruno.html
index 1e2dc655..f889c94e 100644
--- a/tests/output/basic/author/bruno.html
+++ b/tests/output/basic/author/bruno.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index 5ffb220d..2430cc96 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -44,11 +44,11 @@
         
 <ul>
 
-    <li><a href="category/content.html">content</a></li>
+    <li><a href="category/bar.html">bar</a></li>
 
     <li><a href="category/cat1.html">cat1</a></li>
 
-    <li><a href="category/bar.html">bar</a></li>
+    <li><a href="category/content.html">content</a></li>
 
     <li><a href="category/yeah.html">yeah</a></li>
 
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index b268dd53..77d0187b 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index e92fd0df..ba43f8f5 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li class="active"><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
index 0eec912c..9f44fa9e 100644
--- a/tests/output/basic/category/content.html
+++ b/tests/output/basic/category/content.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li class="active"><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index ccb531f1..747cad37 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 59b6223f..0b7f6899 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li class="active"><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index c9fe8270..66c51fdf 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-en.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 606e5186..2de714bb 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-fr.atom.xml" rel="self"></link><id>../.</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>.././oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href="../.oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="../.second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 3bb7d2fd..c496adf7 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 6ce45518..066ae95f 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/bar.atom.xml" rel="self"></link><id>../.</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index f66c2e73..3a4af6a6 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/cat1.atom.xml" rel="self"></link><id>../.</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
index 0cf53aa7..e35b840f 100644
--- a/tests/output/basic/feeds/content.atom.xml
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/content.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index 7fd8e9f2..5ae933f4 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/yeah.atom.xml" rel="self"></link><id>../.</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 8a2091b9..9bc1a2f9 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -249,8 +249,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 55eec103..b380252e 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 4b650e7d..dfa1d178 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 0162232c..cc282243 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 704971d2..e6244aa8 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 94043446..3dec8d70 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 4afb4bfd..bc4ffc9c 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -150,8 +150,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index b8df58e3..523e6f71 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 20cf293a..49cc3fd8 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -150,8 +150,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 0a5eeb3b..1817aa88 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 563c0f2e..3ff36f49 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 4b18b7e3..76ca35a3 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 28c98b99..92905076 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -111,6 +111,13 @@ cite {}
 
 q {}
 
+div.note {
+   float: right;
+   margin: 5px;
+   font-size: 85%;
+   max-width: 300px;
+}
+
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 	
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index cb12da2d..b2cf0392 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 4c6e6b07..6380a2a3 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>