diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2014-05-11 22:30:26 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-05-11 22:30:26 -0400 |
| commit | 56d4b9be3ecb1f4dc6fd6c081d58286e323955b7 (patch) | |
| tree | 4929cbf73c8bb4f4d896f67f23afdcd4463c784e /sites/www/conf.py | |
| parent | 5552efae3b0075cca67430a0be5b352f3a256475 (diff) | |
| parent | 4e426087436d01fe00a120e5e7ce7a5e0a1e0970 (diff) | |
| download | python-paramiko-56d4b9be3ecb1f4dc6fd6c081d58286e323955b7.tar python-paramiko-56d4b9be3ecb1f4dc6fd6c081d58286e323955b7.tar.gz | |
Merge tag 'upstream/1.14.0'
Upstream version 1.14.0
Diffstat (limited to 'sites/www/conf.py')
| -rw-r--r-- | sites/www/conf.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sites/www/conf.py b/sites/www/conf.py index 481acdf..bdb5929 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 @@ -24,10 +19,8 @@ extensions.append('sphinx.ext.intersphinx') 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://paramiko-docs.readthedocs.org/en/latest/' -#intersphinx_mapping = { -# 'docs': (target, None), -#} + target = 'http://docs.paramiko.org/en/latest/' +intersphinx_mapping['docs'] = (target, None) # Sister-site links to API docs html_theme_options['extra_nav_links'] = { |