diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
| commit | 0e784d81131a369da88051e4c12dd6e4b5e3c8b1 (patch) | |
| tree | 4bec5f731196ced01797d11548dde6ca84f22c9e /sites/www/conf.py | |
| parent | f258d1e207a21d4342dbc431fcc4a4dafe893e80 (diff) | |
| parent | 720806734a05d9de0f47588d816de05646a06f0b (diff) | |
Merge branch 'master' into 184-int
Conflicts:
paramiko/config.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) |