diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
| commit | fac6cde8743d73bfce200062da1bbf5e05a74742 (patch) | |
| tree | 7fcc75d1f8ed456660c2d954b268f27e0354974f /sites/www/conf.py | |
| parent | 0965eaa65d194244b594f7098eb5192a2bbf8484 (diff) | |
| parent | 72a73f55fae697fe3b940f378664a7c58214647f (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
Diffstat (limited to 'sites/www/conf.py')
| -rw-r--r-- | sites/www/conf.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sites/www/conf.py b/sites/www/conf.py index 481acdff..1c6c9254 100644 --- a/sites/www/conf.py +++ b/sites/www/conf.py @@ -24,10 +24,10 @@ 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'] = { |