From a5772bf3d6e0563b109dc1f2cb19743cf6a19aef Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 00:10:30 +0100
Subject: [PATCH 1/3] allow override page url and save_as values directly from
 the metadata

this is similar to the template override implemented in #404
---
 pelican/contents.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index d675a2ad..77ee70f8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -44,6 +44,8 @@ class Page(object):
 
         # set metadata as attributes
         for key, value in local_metadata.items():
+            if key in ('save_as', 'url'):
+                key = 'override_' + key
             setattr(self, key.lower(), value)
 
         # also keep track of the metadata attributes available
@@ -128,6 +130,8 @@ class Page(object):
         return self.settings[fq_key].format(**self.url_format)
 
     def get_url_setting(self, key):
+        if hasattr(self, 'override_' + key):
+            return getattr(self, 'override_' + key)
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 

From 00c7451200fd75056ebecb7cd681bda08b55d70a Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 00:14:00 +0100
Subject: [PATCH 2/3] add functional test for save_as/url override

and update functional tests output
---
 samples/content/pages/override_url_saveas.rst |  9 ++
 .../basic/a-markdown-powered-article.html     |  3 +-
 tests/output/basic/archives.html              |  3 +-
 tests/output/basic/article-1.html             |  3 +-
 tests/output/basic/article-2.html             |  3 +-
 tests/output/basic/article-3.html             |  3 +-
 .../output/basic/author/alexis-metaireau.html |  3 +-
 tests/output/basic/categories.html            |  3 +-
 tests/output/basic/category/bar.html          |  3 +-
 tests/output/basic/category/cat1.html         |  3 +-
 tests/output/basic/category/misc.html         |  3 +-
 tests/output/basic/category/yeah.html         |  3 +-
 .../basic/filename_metadata-example.html      |  3 +-
 tests/output/basic/index.html                 |  3 +-
 tests/output/basic/oh-yeah.html               |  3 +-
 tests/output/basic/override/index.html        | 53 +++++++++++
 .../pages/this-is-a-test-hidden-page.html     |  3 +-
 .../basic/pages/this-is-a-test-page.html      |  3 +-
 tests/output/basic/second-article-fr.html     |  3 +-
 tests/output/basic/second-article.html        |  3 +-
 tests/output/basic/tag/bar.html               |  3 +-
 tests/output/basic/tag/baz.html               |  3 +-
 tests/output/basic/tag/foo.html               |  3 +-
 tests/output/basic/tag/foobar.html            |  3 +-
 tests/output/basic/tag/oh.html                |  3 +-
 tests/output/basic/tag/yeah.html              |  3 +-
 .../output/basic/this-is-a-super-article.html |  3 +-
 tests/output/basic/unbelievable.html          |  3 +-
 .../custom/a-markdown-powered-article.html    |  3 +-
 tests/output/custom/archives.html             |  3 +-
 tests/output/custom/article-1.html            |  3 +-
 tests/output/custom/article-2.html            |  3 +-
 tests/output/custom/article-3.html            |  3 +-
 .../custom/author/alexis-metaireau.html       |  3 +-
 .../custom/author/alexis-metaireau2.html      |  3 +-
 .../custom/author/alexis-metaireau3.html      |  3 +-
 tests/output/custom/categories.html           |  3 +-
 tests/output/custom/category/bar.html         |  3 +-
 tests/output/custom/category/cat1.html        |  3 +-
 tests/output/custom/category/misc.html        |  3 +-
 tests/output/custom/category/yeah.html        |  3 +-
 .../output/custom/drafts/a-draft-article.html |  3 +-
 .../custom/filename_metadata-example.html     |  3 +-
 tests/output/custom/index.html                |  3 +-
 tests/output/custom/index2.html               |  3 +-
 tests/output/custom/index3.html               |  3 +-
 tests/output/custom/jinja2_template.html      |  3 +-
 tests/output/custom/oh-yeah-fr.html           |  3 +-
 tests/output/custom/oh-yeah.html              |  3 +-
 tests/output/custom/override/index.html       | 88 +++++++++++++++++++
 .../pages/this-is-a-test-hidden-page.html     |  3 +-
 .../custom/pages/this-is-a-test-page.html     |  3 +-
 tests/output/custom/second-article-fr.html    |  3 +-
 tests/output/custom/second-article.html       |  3 +-
 tests/output/custom/tag/bar.html              |  3 +-
 tests/output/custom/tag/baz.html              |  3 +-
 tests/output/custom/tag/foo.html              |  3 +-
 tests/output/custom/tag/foobar.html           |  3 +-
 tests/output/custom/tag/oh.html               |  3 +-
 tests/output/custom/tag/yeah.html             |  3 +-
 .../custom/this-is-a-super-article.html       |  3 +-
 tests/output/custom/unbelievable.html         |  3 +-
 62 files changed, 268 insertions(+), 59 deletions(-)
 create mode 100644 samples/content/pages/override_url_saveas.rst
 create mode 100644 tests/output/basic/override/index.html
 create mode 100644 tests/output/custom/override/index.html

diff --git a/samples/content/pages/override_url_saveas.rst b/samples/content/pages/override_url_saveas.rst
new file mode 100644
index 00000000..8a515f60
--- /dev/null
+++ b/samples/content/pages/override_url_saveas.rst
@@ -0,0 +1,9 @@
+Override url/save_as
+####################
+
+:date: 2012-12-07
+:url: override/
+:save_as: override/index.html
+
+Test page which overrides save_as and url so that this page will be generated
+at a custom location.
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 80a12212..9b9da171 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index cb06dfa1..dfe0ce50 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index b372d6ca..974b785a 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 1a18cb47..9f0b4887 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 6b83b062..724f53f7 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index e6f65a11..3479672b 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index f945d04a..25fba44b 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 896d9222..29e74908 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index b8ae397e..6fbfedb2 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 2d62b852..47e0d3a6 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 37dfde63..93a27507 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
index b7ae95a7..98381724 100644
--- a/tests/output/basic/filename_metadata-example.html
+++ b/tests/output/basic/filename_metadata-example.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 488d1b08..c499c85a 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index ab090b58..5186424e 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/override/index.html b/tests/output/basic/override/index.html
new file mode 100644
index 00000000..e6de769c
--- /dev/null
+++ b/tests/output/basic/override/index.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Override url/save_as</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="../">A Pelican Blog </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">Override url/save_as</h1>
+        
+        <p>Test page which overrides save_as and url so that this page will be generated
+at a custom location.</p>
+
+</section>
+        <section id="extras" class="body">
+                        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 655ae272..56214cbe 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 43e2c2d4..dd3e60fe 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index aa30292e..6826f532 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 7319c87f..84556ac1 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 06b012cb..f5efeb8a 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index f6c56d4b..c51bd77b 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 4ee92b7d..47609394 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 11f21b6d..30b33908 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index d88192a0..b873b2a9 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 8533dbdc..ca339776 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 0188c07e..f4d5a7ab 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 36a1703c..c86cbd34 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 49c0d422..be71022c 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 632387a4..aaece637 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index a07b669b..2616e332 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index fd95b709..64cf12a8 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 4bd5fd09..919e04e3 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 8bb0dd1c..9b08f340 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 59926d8c..dba92905 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau3.html b/tests/output/custom/author/alexis-metaireau3.html
index 5f2ecbb1..865ad010 100644
--- a/tests/output/custom/author/alexis-metaireau3.html
+++ b/tests/output/custom/author/alexis-metaireau3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 64da26b4..25015ab9 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 253d64ea..8f9fdefb 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 8c265d41..29d99bed 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 33acbd70..ab39c20f 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index c39e1a86..b9cb6de3 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 840b0dfc..f763aa42 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
index 8f6353cb..af05059b 100644
--- a/tests/output/custom/filename_metadata-example.html
+++ b/tests/output/custom/filename_metadata-example.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index cc905735..df3c094d 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index f0d2f948..85dc6a24 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index3.html b/tests/output/custom/index3.html
index 60f8633d..25ed3361 100644
--- a/tests/output/custom/index3.html
+++ b/tests/output/custom/index3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/jinja2_template.html b/tests/output/custom/jinja2_template.html
index 2def2d4e..31df8b21 100644
--- a/tests/output/custom/jinja2_template.html
+++ b/tests/output/custom/jinja2_template.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 0c1fdcdb..07d4abec 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index cb30a7d6..899efc1d 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/override/index.html b/tests/output/custom/override/index.html
new file mode 100644
index 00000000..84142880
--- /dev/null
+++ b/tests/output/custom/override/index.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Override url/save_as</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">Override url/save_as</h1>
+        
+        <p>Test page which overrides save_as and url so that this page will be generated
+at a custom location.</p>
+
+</section>
+        <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 5c3b1da1..5fcbe122 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 5df98726..29492171 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 95ad3bd7..8ebbb2b4 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 9c2b6de3..7a543597 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 85bc5a07..99723b47 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 3064aa34..03959e62 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index c6e99849..66d52f6f 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index b7a257e4..93d8282d 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 451b1031..dd60851e 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 151eb64c..59b591cc 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 98d22351..3cbd9e5f 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 691f28f6..2ffc143d 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>

From 802c9d1111e832eace3bc24ae6810e72d5e7c7d4 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 01:02:44 +0100
Subject: [PATCH 3/3] add docs for save_as/url override from metadata feature

---
 docs/faq.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index a8617b30..9429a44f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -92,6 +92,22 @@ want to have its own template.
 Then just make sure your theme contains the relevant template file (e.g.
 ``template_name.html``).
 
+How can I override the generated url of a specific page or article?
+===================================================================
+
+It's as simple as specifying the ``url`` and ``save_as`` special metadata to
+any pages or articles you want to override the generated url.
+Here is an example rst page::
+
+    Override url/save_as page
+    #########################
+
+    :url: override/url/
+    :save_as: override/url/index.html
+
+You're done, the page will be written to ``override/url/index.html``
+and Pelican will use url ``override/url/`` to link to this page.
+
 What if I want to disable feed generation?
 ==========================================