diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-02-03 14:10:58 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-02-03 14:10:58 -0800 |
| commit | 36abefdac05a1f764e7da0f258b5303b87384192 (patch) | |
| tree | 3e90b07b724f6a85c5414bfff2521feb52fe6778 | |
| parent | 0a90bef4f47b4b29e119d78d7293184856bad605 (diff) | |
| parent | cdf62655cbddbc68b42f58984eb60906a253cca0 (diff) | |
| download | paramiko-36abefdac05a1f764e7da0f258b5303b87384192.tar.gz | |
Merge branch '1.10' into 1.11
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | sites/shared_conf.py | 5 | ||||
| -rw-r--r-- | sites/www/conf.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 43c21e38..9fa05df9 100644 --- a/dev-requirements.txt +++ b/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 diff --git a/sites/shared_conf.py b/sites/shared_conf.py index 2b98654f..86ecdfe8 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' @@ -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'] diff --git a/sites/www/conf.py b/sites/www/conf.py index 1f11c1e2..481acdff 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' |