diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 16:26:26 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 16:26:26 -0700 |
| commit | 17de4bee626a48ca33e26ee5bbb11a612eaf304e (patch) | |
| tree | b8d1a25587de3f4f4a0bfe238c1ceee549ee48bb /sites/www | |
| parent | 075f5c0338cf48e2b0280dd97b35aa6e40d94b3d (diff) | |
| parent | e941d56e8a385f4f2ef5c0e9a77e66c844b5a729 (diff) | |
Merge branch 'master' into 371-int
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/conf.py | 3 | ||||
| -rw-r--r-- | sites/www/installing.rst | 2 |
2 files changed, 1 insertions, 4 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) diff --git a/sites/www/installing.rst b/sites/www/installing.rst index a28ce6cd..729147c5 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -32,7 +32,7 @@ Release lines Users desiring stability may wish to pin themselves to a specific release line once they first start using Paramiko; to assist in this, we guarantee bugfixes -for at least the last 2-3 releases including the latest stable one. This currently means Paramiko **1.11** through **1.13**. +for the last 2-3 releases including the latest stable one. If you're unsure which version to install, we have suggestions: |