diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:58:43 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:58:43 -0400 |
| commit | b0876fa01394186d08938430f9459012fdde3bf1 (patch) | |
| tree | 2eb38cbd35029e18051e8853a73ff5c1b2deacae /sites/www/conf.py | |
| parent | fded67e7120d79c619e541ccd3ba19898c194b5b (diff) | |
| parent | fa86d655dc8f08eb9171930c41b508e2bee08b08 (diff) | |
Merge branch 'master' into ecdsa-deterministic
Conflicts:
paramiko/ecdsakey.py
Diffstat (limited to 'sites/www/conf.py')
| -rw-r--r-- | sites/www/conf.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sites/www/conf.py b/sites/www/conf.py index 1c6c9254..bdb5929a 100644 --- a/sites/www/conf.py +++ b/sites/www/conf.py @@ -6,15 +6,10 @@ from os.path import abspath, join, dirname sys.path.append(abspath(join(dirname(__file__), '..'))) from shared_conf import * -# Local blog extension -sys.path.append(abspath('.')) -extensions.append('blog') -rss_link = 'http://paramiko.org' -rss_description = 'Paramiko project news' - # Releases changelog extension extensions.append('releases') -releases_release_uri = "https://github.com/paramiko/paramiko/tree/%s" +# Paramiko 1.x tags start with 'v'. Meh. +releases_release_uri = "https://github.com/paramiko/paramiko/tree/v%s" releases_issue_uri = "https://github.com/paramiko/paramiko/issues/%s" # Intersphinx for referencing API/usage docs @@ -25,9 +20,7 @@ target = join(dirname(__file__), '..', 'docs', '_build') if os.environ.get('READTHEDOCS') == 'True': # TODO: switch to docs.paramiko.org post go-live of sphinx API docs target = 'http://docs.paramiko.org/en/latest/' -intersphinx_mapping = { - 'docs': (target, None), -} +intersphinx_mapping['docs'] = (target, None) # Sister-site links to API docs html_theme_options['extra_nav_links'] = { |