diff options
| author | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-23 14:42:23 +0200 |
|---|---|---|
| committer | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-23 14:42:23 +0200 |
| commit | ce87fc8d7a8a025671183fc78091e5d1f6760f5f (patch) | |
| tree | bce8764d8c708567e378d773e9352ee13a62daf6 /sites/docs | |
| parent | 550f0b99eadf8a366253046acdd944709214123f (diff) | |
| parent | 417102dbea0fbe2f7df6c690ee610b2cc2c18b19 (diff) | |
Merge branch 'paramiko:master' into gssapi-py3-support
Conflicts:
sites/www/changelog.rst
test.py
Diffstat (limited to 'sites/docs')
| -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', |