dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2014-02-03 14:10:58 -08:00
parent 0a90bef4f4 cdf62655cb
commit 36abefdac0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-requirements.txt
View File

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

5
sites/shared_conf.py
View File

@ -5,8 +5,9 @@ import sys
import alabaster import alabaster
# Alabaster theme # Alabaster theme + mini-extension
html_theme_path = [alabaster.get_path()] html_theme_path = [alabaster.get_path()]
extensions = ['alabaster']
# Paths relative to invoking conf.py - not this shared file # Paths relative to invoking conf.py - not this shared file
html_static_path = ['../_shared_static'] html_static_path = ['../_shared_static']
html_theme = 'alabaster' html_theme = 'alabaster'
@ -32,7 +33,7 @@ html_sidebars = {
# Regular settings # Regular settings
project = u'Paramiko' project = u'Paramiko'
year = datetime.now().year year = datetime.now().year
copyright = u'2013-%d Jeff Forcier, 2003-2012 Robey Pointer' % year copyright = u'%d Jeff Forcier' % year
master_doc = 'index' master_doc = 'index'
templates_path = ['_templates'] templates_path = ['_templates']
exclude_trees = ['_build'] exclude_trees = ['_build']

2
sites/www/conf.py
View File

@ -8,7 +8,7 @@ from shared_conf import *
# Local blog extension # Local blog extension
sys.path.append(abspath('.')) sys.path.append(abspath('.'))
extensions = ['blog'] extensions.append('blog')
rss_link = 'http://paramiko.org' rss_link = 'http://paramiko.org'
rss_description = 'Paramiko project news' rss_description = 'Paramiko project news'