diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:26:52 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:27:21 -0700 |
| commit | 8b0e10df60bb8e3fac8f81959d7f3f39a8d0e000 (patch) | |
| tree | 4e0766b74d7688624f21766f2be0ff5d8e9cfae1 /sites/www/conf.py | |
| parent | b0ffd7c9c8d0941ee95e6f133cb6697bfb6a9b99 (diff) | |
| parent | 24e022bdf656f272b4dafb76df1a7739965be2f9 (diff) | |
Merge branch 'master' into 372-int
Conflicts:
paramiko/channel.py
tests/test_util.py
Diffstat (limited to 'sites/www/conf.py')
| -rw-r--r-- | sites/www/conf.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sites/www/conf.py b/sites/www/conf.py index bdb5929a..0b0fb85c 100644 --- a/sites/www/conf.py +++ b/sites/www/conf.py @@ -12,13 +12,10 @@ extensions.append('releases') 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 -extensions.append('sphinx.ext.intersphinx') # Default is 'local' building, but reference the public docs site when building # under RTD. 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) |