From fac94fb790cc5ff826d0f2119960533136ac4d9c Mon Sep 17 00:00:00 2001
From: Christoph Groth <christoph.groth@cea.fr>
Date: Wed, 16 Dec 2015 15:59:41 +0100
Subject: [PATCH] Use the latest version in /doc for authors, cite, license

Also, remove "authors" from the navigation bar in favor of the footer (that
should be enough).

Together with the modifications to /install this fixes !5.
---
 conf.py         | 8 +++-----
 htaccess-apache | 7 +++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf.py b/conf.py
index a9518ac..ba0331c 100644
--- a/conf.py
+++ b/conf.py
@@ -131,9 +131,7 @@ NAVIGATION_LINKS = {
         "<span class='hidden-xs'>community</span>"),
         ("/contribute.html", "<i class='glyphicon glyphicon-wrench visible-xs-inline-block'></i>"
         "<span class='hidden-xs'>contribute</span>"),
-        ("/authors.html", "<i class='glyphicon glyphicon-user visible-xs-inline-block'></i>"
-        "<span class='hidden-xs'>authors</span>"),
-        ("/cite.html", "<i class='glyphicon glyphicon-edit visible-xs-inline-block'></i>"
+        ("/cite", "<i class='glyphicon glyphicon-edit visible-xs-inline-block'></i>"
         "<span class='hidden-xs'>cite</span>")
     ),
 }
@@ -661,7 +659,7 @@ LICENSE = ""
 
 # A small copyright notice for the page footer (in HTML).
 # (translatable)
-CONTENT_FOOTER = 'Contents &copy; 2013-{date}         <a href="mailto:{email}">{author}</a> {license}'
+CONTENT_FOOTER = 'Contents &copy; 2013-{date}         <a href="{url}">{author}</a> {license}'
 
 # Things that will be passed to CONTENT_FOOTER.format().  This is done
 # for translatability, as dicts are not formattable.  Nikola will
@@ -678,7 +676,7 @@ CONTENT_FOOTER_FORMATS = {
     DEFAULT_LANG: (
         (),
         {
-            "email": BLOG_EMAIL,
+            "url": "/authors",
             "author": BLOG_AUTHOR,
             "date": time.gmtime().tm_year,
             "license": LICENSE
diff --git a/htaccess-apache b/htaccess-apache
index 5fe5fa7..d2f33c2 100644
--- a/htaccess-apache
+++ b/htaccess-apache
@@ -30,6 +30,9 @@ RewriteRule ^(.*[^/])$ /$1.html [L]
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^(.*)/$  /$1 [R=301,L]
 
-Redirect 302 /contact /authors
-Redirect 302 /citing /cite
+Redirect 302 /contact /doc/latest/pre/authors
+Redirect 302 /authors /doc/latest/pre/authors
+Redirect 302 /citing /doc/latest/pre/citing
+Redirect 302 /cite /doc/latest/pre/citing
+Redirect 302 /license /doc/latest/pre/license
 Redirect 302 /download /install
-- 
GitLab