Merge branch '1.11' into 1.12

dev-requirements.txt

@@ -6,5 +6,5 @@ epydoc>=3.0,<3.1
 invoke>=0.7.0
 invocations>=0.4.4
 sphinx>=1.1.3
-alabaster>=0.2.0
+alabaster>=0.3.0
 releases>=0.2.4

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'
@@ -32,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']

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'