From 0f2fb262870d080d872bb4dd9689d2faf75545ee Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 3 Feb 2014 14:09:56 -0800
Subject: [PATCH 1/2] Update to new Alabaster version for footer/extension
 stuff

---
 dev-requirements.txt | 2 +-
 sites/shared_conf.py | 3 ++-
 sites/www/conf.py    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 2fe1e77..e9770f4 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -3,5 +3,5 @@
 invoke>=0.7.0
 invocations>=0.4.4
 sphinx>=1.1.3
-alabaster>=0.2.0
+alabaster>=0.3.0
 releases>=0.2.4
diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 2b98654..ca555ca 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -5,8 +5,9 @@ import sys
 import alabaster
 
 
-# Alabaster theme
+# Alabaster theme + mini-extension
 html_theme_path = [alabaster.get_path()]
+extensions = ['alabaster']
 # Paths relative to invoking conf.py - not this shared file
 html_static_path = ['../_shared_static']
 html_theme = 'alabaster'
diff --git a/sites/www/conf.py b/sites/www/conf.py
index 1f11c1e..481acdf 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -8,7 +8,7 @@ from shared_conf import *
 
 # Local blog extension
 sys.path.append(abspath('.'))
-extensions = ['blog']
+extensions.append('blog')
 rss_link = 'http://paramiko.org'
 rss_description = 'Paramiko project news'
 

From cdf62655cbddbc68b42f58984eb60906a253cca0 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 3 Feb 2014 14:10:23 -0800
Subject: [PATCH 2/2] Simplify www page footer.

Robey copyright remains in source code but this site is
brand new & the footer was real noisy. Eh.
---
 sites/shared_conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index ca555ca..86ecdfe 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -33,7 +33,7 @@ html_sidebars = {
 # Regular settings
 project = u'Paramiko'
 year = datetime.now().year
-copyright = u'2013-%d Jeff Forcier, 2003-2012 Robey Pointer' % year
+copyright = u'%d Jeff Forcier' % year
 master_doc = 'index'
 templates_path = ['_templates']
 exclude_trees = ['_build']