diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 10:42:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 10:42:59 -0700 |
| commit | 615c30759f62c1ccb5120223f12d1415d09a3566 (patch) | |
| tree | 99bed6c92ab7f8767e3386c11f5826d059503381 /sites/docs/conf.py | |
| parent | 77b1aaccc6dcc17108da17dc609c81bdd4e9a0e5 (diff) | |
| parent | ec9f8a26d4ea77ce6e4a1afe1a9e3b29dbf002bf (diff) | |
Merge branch 'master' into 298-int
Conflicts:
setup.py
Diffstat (limited to 'sites/docs/conf.py')
| -rw-r--r-- | sites/docs/conf.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py index 619ff816..5674fed1 100644 --- a/sites/docs/conf.py +++ b/sites/docs/conf.py @@ -5,12 +5,12 @@ 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', } |