diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:58:43 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:58:43 -0400 |
| commit | b0876fa01394186d08938430f9459012fdde3bf1 (patch) | |
| tree | 2eb38cbd35029e18051e8853a73ff5c1b2deacae /sites/docs/conf.py | |
| parent | fded67e7120d79c619e541ccd3ba19898c194b5b (diff) | |
| parent | fa86d655dc8f08eb9171930c41b508e2bee08b08 (diff) | |
Merge branch 'master' into ecdsa-deterministic
Conflicts:
paramiko/ecdsakey.py
Diffstat (limited to 'sites/docs/conf.py')
| -rw-r--r-- | sites/docs/conf.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py index f9355715..5674fed1 100644 --- a/sites/docs/conf.py +++ b/sites/docs/conf.py @@ -5,16 +5,11 @@ sys.path.append(os.path.abspath('../..')) from shared_conf import * # Enable autodoc, intersphinx -extensions.extend(['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']) +extensions.extend(['sphinx.ext.autodoc']) # Autodoc settings autodoc_default_flags = ['members', 'special-members'] -# Intersphinx connection to stdlib -intersphinx_mapping = { - 'python': ('http://docs.python.org/2.6', None), -} - # Sister-site links to WWW html_theme_options['extra_nav_links'] = { "Main website": 'http://www.paramiko.org', |