From 0999d4d6915574cb0377048157661e1a5e6d9ced Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Thu, 20 Jun 2013 21:58:51 +0100
Subject: [PATCH 1/2] Deliberate overriding of an existing file to tests

Deliberate overriding via `save_as` metadata should be allowed, even after the
overwrite detection feature. This commit is to add tests for deliberate
overriding. As a result, the relevant tests *should fail* after this commit.

Added a page and an article, both to override a tag, with very old dates so
it limits the amount of diff in the generated pages.

Overriding feature introduced by d0e9c52410e70e14008d2ef827ba7ac306243e72
Overwrite detection introduced by ff7410ce2ada85b486a67ae11874d60d135ff939
---
 .../basic/a-markdown-powered-article.html     |  1 +
 pelican/tests/output/basic/archives.html      |  3 ++
 pelican/tests/output/basic/article-1.html     |  1 +
 pelican/tests/output/basic/article-2.html     |  1 +
 pelican/tests/output/basic/article-3.html     |  1 +
 .../output/basic/author/alexis-metaireau.html |  1 +
 pelican/tests/output/basic/categories.html    |  1 +
 pelican/tests/output/basic/category/bar.html  |  1 +
 pelican/tests/output/basic/category/cat1.html |  1 +
 pelican/tests/output/basic/category/misc.html | 21 ++++++++
 pelican/tests/output/basic/category/yeah.html |  1 +
 .../tests/output/basic/feeds/all-en.atom.xml  |  1 +
 pelican/tests/output/basic/feeds/all.atom.xml |  1 +
 .../tests/output/basic/feeds/misc.atom.xml    |  1 +
 .../basic/filename_metadata-example.html      |  1 +
 pelican/tests/output/basic/index.html         | 21 ++++++++
 pelican/tests/output/basic/oh-yeah.html       |  1 +
 .../tests/output/basic/override/index.html    |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../basic/pages/this-is-a-test-page.html      |  1 +
 .../tests/output/basic/second-article-fr.html |  1 +
 .../tests/output/basic/second-article.html    |  1 +
 pelican/tests/output/basic/tag/bar.html       |  1 +
 pelican/tests/output/basic/tag/baz.html       | 33 +++++++------
 pelican/tests/output/basic/tag/foo.html       |  1 +
 pelican/tests/output/basic/tag/foobar.html    |  1 +
 pelican/tests/output/basic/tag/oh.html        | 31 +++---------
 pelican/tests/output/basic/tag/yeah.html      |  1 +
 .../output/basic/this-is-a-super-article.html |  1 +
 pelican/tests/output/basic/unbelievable.html  |  1 +
 .../custom/a-markdown-powered-article.html    |  1 +
 pelican/tests/output/custom/archives.html     |  3 ++
 pelican/tests/output/custom/article-1.html    |  1 +
 pelican/tests/output/custom/article-2.html    |  1 +
 pelican/tests/output/custom/article-3.html    |  1 +
 .../custom/author/alexis-metaireau.html       |  1 +
 .../custom/author/alexis-metaireau2.html      |  1 +
 .../custom/author/alexis-metaireau3.html      | 24 +++++++++
 pelican/tests/output/custom/categories.html   |  1 +
 pelican/tests/output/custom/category/bar.html |  1 +
 .../tests/output/custom/category/cat1.html    |  1 +
 .../tests/output/custom/category/misc.html    | 24 +++++++++
 .../tests/output/custom/category/yeah.html    |  1 +
 .../output/custom/drafts/a-draft-article.html |  1 +
 .../tests/output/custom/feeds/all-en.atom.xml |  1 +
 .../tests/output/custom/feeds/all.atom.xml    |  1 +
 pelican/tests/output/custom/feeds/all.rss.xml |  3 +-
 .../tests/output/custom/feeds/misc.atom.xml   |  1 +
 .../tests/output/custom/feeds/misc.rss.xml    |  3 +-
 .../custom/filename_metadata-example.html     |  1 +
 pelican/tests/output/custom/index.html        |  1 +
 pelican/tests/output/custom/index2.html       |  1 +
 pelican/tests/output/custom/index3.html       | 24 +++++++++
 .../tests/output/custom/jinja2_template.html  |  1 +
 pelican/tests/output/custom/oh-yeah-fr.html   |  1 +
 pelican/tests/output/custom/oh-yeah.html      |  1 +
 .../tests/output/custom/override/index.html   |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../custom/pages/this-is-a-test-page.html     |  1 +
 .../output/custom/second-article-fr.html      |  1 +
 .../tests/output/custom/second-article.html   |  1 +
 pelican/tests/output/custom/tag/bar.html      |  1 +
 pelican/tests/output/custom/tag/baz.html      | 49 ++++++++++++-------
 pelican/tests/output/custom/tag/foo.html      |  1 +
 pelican/tests/output/custom/tag/foobar.html   |  1 +
 pelican/tests/output/custom/tag/oh.html       | 36 +++-----------
 pelican/tests/output/custom/tag/yeah.html     |  1 +
 .../custom/this-is-a-super-article.html       |  1 +
 pelican/tests/output/custom/unbelievable.html |  1 +
 samples/content/article_tag_baz.rst           |  8 +++
 samples/content/pages/override_tag_oh.rst     |  8 +++
 71 files changed, 261 insertions(+), 86 deletions(-)
 create mode 100644 samples/content/article_tag_baz.rst
 create mode 100644 samples/content/pages/override_tag_oh.rst

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 6f854ae4..b7a90f02 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 7a10cc9d..0bc33bbc 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -45,6 +46,8 @@
     <dd><a href="/oh-yeah.html">Oh yeah !</a></dd>
     <dt>Fri 15 October 2010</dt>
     <dd><a href="/unbelievable.html">Unbelievable !</a></dd>
+    <dt>Sun 14 March 2010</dt>
+    <dd><a href="/tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 3d55751d..114e4774 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 4ae3e2f3..ca0cfc9a 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 9b978ec0..a4553026 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index fc253c2c..15ae0dcb 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index f1541892..1834bcd4 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index f272dd2b..8e4cd688 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 4e2f0f5a..38b1fe1f 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index fce85481..f1a7b9fd 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -85,6 +86,26 @@
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="/tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="/tag/baz.html">read more</a>
+                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index b7c383fa..a894dabb 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 54c87905..9b819f84 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -27,4 +27,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3081adc6..63628281 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -28,4 +28,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index e71bd151..f2885b1d 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -4,4 +4,5 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index a9f548a5..e53e9c59 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index b10b479a..6a4fb8f3 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -218,6 +219,26 @@ YEAH !</p>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="/tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="/tag/baz.html">read more</a>
+                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index cb29ea80..940ebaed 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index ff6775cf..041b8bf6 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index e4a18249..0d681602 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index d0e11cfc..c445dbcc 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index ca4abcfc..9f759fab 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 7008b847..6f83b0af 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 80d2d212..a8de5c74 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 6c25194d..7c0bdf11 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>A Pelican Blog - baz</title>
+        <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css">
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
@@ -15,32 +15,37 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
                     <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="/tag/baz.html" rel="bookmark"
+           title="Permalink to The baz tag">The baz tag</a></h1>
+    </header>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+    <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
-        <a href="/second-article-fr.html">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 87372eb6..77203dbc 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 4812467f..c19d4569 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 47ef8946..48f5533f 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>A Pelican Blog - oh</title>
+        <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="/theme/css/main.css">
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li class="active"><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -23,30 +24,12 @@
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Oh Oh Oh</h1>
+    
+    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-                </article>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</section>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 47f8076a..d77e33f4 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index e472a8e2..30b778be 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 849b4d78..97df4b07 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index c5fca991..867f96bc 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 077c1268..cdf2e07b 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
@@ -49,6 +50,8 @@
     <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
     <dt>Fri 15 October 2010</dt>
     <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+    <dt>Sun 14 March 2010</dt>
+    <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 80f1ceaf..8511a11d 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8511afc8..e14ff291 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 305359b9..f76e5b18 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index ded2e38d..c383bd53 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index ceb6877c..9070b4e6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index bfb02d92..15e8ac9c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -54,6 +55,29 @@
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="../author/alexis-metaireau2.html">&laquo;</a>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 76f7aaca..ab561c91 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 71ca6213..38080aed 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index e91ff166..6cd92044 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index f87abede..e950d863 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -98,6 +99,29 @@
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
     Page 1 / 1
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 1a5db423..f54e316f 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 0bfbc1d6..917cf500 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 49d45cde..49b0de79 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -27,4 +27,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 3187c2aa..a9e67acd 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -29,4 +29,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 8d07bec7..7d7890a9 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -29,4 +29,5 @@ YEAH !&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 45c996f3..029184b0 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -4,4 +4,5 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 1d295abc..ab2639cf 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -4,4 +4,5 @@
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index a9c0f5c1..83a4c43f 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 92aef088..43c2e6a8 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 2355c7a1..b37de9ae 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 8121e987..67988a51 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
@@ -54,6 +55,29 @@
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="./tag/baz.html">read more</a>
+<p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="./index2.html">&laquo;</a>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 0f0eee83..082121dd 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 2590eb3b..a2b8b6c3 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index d1c70eeb..49a79edc 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 1042dbb0..c449f087 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index d9b3851c..4a82c542 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index d6dedd9a..dbab2f13 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 0ac5c01c..c9b52338 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 289a6308..270653e0 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 2f6a1016..cdef164d 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index cf4fb3f6..e92bdc04 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>Alexis' log - baz</title>
+        <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css">
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -19,38 +19,53 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
                     <li><a href="../category/cat1.html">cat1</a></li>
                     <li><a href="../category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../tag/baz.html" rel="bookmark"
+           title="Permalink to The baz tag">The baz tag</a></h1>
+    </header>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+    <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
-        <a href="../second-article-fr.html">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "tag/baz.html";
+        var disqus_url = "../tag/baz.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+
+  </article>
+</section>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index b6c741bd..3bc93546 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index cdecccd7..aee030f5 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index d3bde1dc..efdd8724 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>Alexis' log - oh</title>
+        <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css">
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -27,35 +28,12 @@
                     <li><a href="../category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Oh Oh Oh</h1>
+    
+    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
-
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</section>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index ba6089f0..ba2da881 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d1faa0ca..5e2fe0bb 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index efd049f0..fcf4adaf 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/samples/content/article_tag_baz.rst b/samples/content/article_tag_baz.rst
new file mode 100644
index 00000000..9a33a8d3
--- /dev/null
+++ b/samples/content/article_tag_baz.rst
@@ -0,0 +1,8 @@
+The baz tag
+###########
+
+:date: 2010-03-14
+:url: tag/baz.html
+:save_as: tag/baz.html
+
+This article overrides the listening of the articles under the *baz* tag.
diff --git a/samples/content/pages/override_tag_oh.rst b/samples/content/pages/override_tag_oh.rst
new file mode 100644
index 00000000..c3160349
--- /dev/null
+++ b/samples/content/pages/override_tag_oh.rst
@@ -0,0 +1,8 @@
+Oh Oh Oh
+########
+
+:date: 2010-03-14
+:url: tag/oh.html
+:save_as: tag/oh.html
+
+This page overrides the listening of the articles under the *oh* tag.

From a495527e2bd4d0853d18ada90b45cc7d16dc0be4 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 22 Jun 2013 14:49:48 +0100
Subject: [PATCH 2/2] Delib. overriding and overwrite detect. Fixes #938

Make deliberate overriding (*) works with overwrites detection.

(*) first introduced by d0e9c52410e70e14008d2ef827ba7ac306243e72

The following are decided to be deliberate override:
 - articles using the `save_as` metadata
 - pages using the `save_as` metadata
 - template pages (always)

Pelican now exits in the following 2 cases:
 - at least 2 not deliberate writes to the same file name (behaviour introduced
   by the overwrite detection feature ff7410ce2ada85b486a67ae11874d60d135ff939)
 - at least 2 deliberate writes to the same file name (new behaviour)

Also added info logging when deliberate overrides are performed.

Switched to StandardError instead of IOError, thanks to @ametaireau and
@russkel.
---
 pelican/generators.py |  9 ++++++---
 pelican/writers.py    | 36 +++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index dea22e17..c294f3e1 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -168,7 +168,8 @@ class TemplatePagesGenerator(Generator):
             try:
                 template = self.env.get_template(source)
                 rurls = self.settings['RELATIVE_URLS']
-                writer.write_file(dest, template, self.context, rurls)
+                writer.write_file(dest, template, self.context, rurls,
+                                  override_output=True)
             finally:
                 del self.env.loader.loaders[0]
 
@@ -262,7 +263,8 @@ class ArticlesGenerator(Generator):
         """Generate the articles."""
         for article in chain(self.translations, self.articles):
             write(article.save_as, self.get_template(article.template),
-                self.context, article=article, category=article.category)
+                self.context, article=article, category=article.category,
+                override_output=hasattr(article, 'override_save_as'))
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
@@ -533,7 +535,8 @@ class PagesGenerator(Generator):
                             self.hidden_translations, self.hidden_pages):
             writer.write_file(page.save_as, self.get_template(page.template),
                     self.context, page=page,
-                    relative_urls=self.settings['RELATIVE_URLS'])
+                    relative_urls=self.settings['RELATIVE_URLS'],
+                    override_output=hasattr(page, 'override_save_as'))
 
 
 class StaticGenerator(Generator):
diff --git a/pelican/writers.py b/pelican/writers.py
index 25f49aeb..59642cd9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -24,6 +24,7 @@ class Writer(object):
         self.reminder = dict()
         self.settings = settings or {}
         self._written_files = set()
+        self._overridden_files = set()
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
@@ -49,13 +50,26 @@ class Writer(object):
             pubdate=set_date_tzinfo(item.date,
                 self.settings.get('TIMEZONE', None)))
 
-    def _open_w(self, filename, encoding):
+    def _open_w(self, filename, encoding, override=False):
         """Open a file to write some content to it.
 
-        Exit if we have already written to that file.
+        Exit if we have already written to that file, unless one (and no more
+        than one) of the writes has the override parameter set to True.
         """
-        if filename in self._written_files:
-            raise IOError('File %s is to be overwritten' % filename)
+        if filename in self._overridden_files:
+            if override:
+                raise StandardError('File %s is set to be overridden twice'
+                                    % filename)
+            else:
+                logger.info('skipping %s' % filename)
+                filename = os.devnull
+        elif filename in self._written_files:
+            if override:
+                logger.info('overwriting %s' % filename)
+            else:
+                raise StandardError('File %s is to be overwritten' % filename)
+        if override:
+            self._overridden_files.add(filename)
         self._written_files.add(filename)
         return open(filename, 'w', encoding=encoding)
 
@@ -103,7 +117,7 @@ class Writer(object):
             locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=False,
-        paginated=None, **kwargs):
+        paginated=None, override_output=False, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -112,6 +126,9 @@ class Writer(object):
         :param relative_urls: use relative urls or absolutes ones
         :param paginated: dict of article list to paginate - must have the
             same length (same list in different orders)
+        :param override_output: boolean telling if we can override previous
+            output with the same name (and if next files written with the same
+            name should be skipped to keep that one)
         :param **kwargs: additional variables to pass to the templates
         """
 
@@ -121,7 +138,7 @@ class Writer(object):
             # other stuff, just return for now
             return
 
-        def _write_file(template, localcontext, output_path, name):
+        def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
             old_locale = locale.setlocale(locale.LC_ALL)
             locale.setlocale(locale.LC_ALL, str('C'))
@@ -134,7 +151,7 @@ class Writer(object):
                 os.makedirs(os.path.dirname(path))
             except Exception:
                 pass
-            with self._open_w(path, 'utf-8') as f:
+            with self._open_w(path, 'utf-8', override=override) as f:
                 f.write(output)
             logger.info('writing {}'.format(path))
 
@@ -180,7 +197,8 @@ class Writer(object):
                              '%s_next_page' % key: next_page})
 
                 _write_file(template, paginated_localcontext, self.output_path,
-                            page.save_as)
+                            page.save_as, override_output)
         else:
             # no pagination
-            _write_file(template, localcontext, self.output_path, name)
+            _write_file(template, localcontext, self.output_path, name,
+                        override_output)