diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 10:48:33 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-24 10:12:15 -0700 |
| commit | a1c2a9829a620c3ace6ddc6187bf05262e10b137 (patch) | |
| tree | 18e3de5515d51fe39cdb527adf25416d7eb1b351 | |
| parent | 4fe3ad2220996354b7f096cbd2d3000caf5cfdf0 (diff) | |
| download | paramiko-a1c2a9829a620c3ace6ddc6187bf05262e10b137.tar.gz | |
Errything uses intersphinx to Python
| -rw-r--r-- | sites/docs/conf.py | 7 | ||||
| -rw-r--r-- | sites/shared_conf.py | 7 | ||||
| -rw-r--r-- | sites/www/conf.py | 4 |
3 files changed, 8 insertions, 10 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', diff --git a/sites/shared_conf.py b/sites/shared_conf.py index c265fc49..e0afe92e 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -5,7 +5,7 @@ import alabaster # Alabaster theme + mini-extension html_theme_path = [alabaster.get_path()] -extensions = ['alabaster'] +extensions = ['alabaster', 'sphinx.ext.intersphinx'] # Paths relative to invoking conf.py - not this shared file html_theme = 'alabaster' html_theme_options = { @@ -24,6 +24,11 @@ html_sidebars = { ] } +# Everything intersphinx's to Python +intersphinx_mapping = { + 'python': ('http://docs.python.org/2.6', None), +} + # Regular settings project = 'Paramiko' year = datetime.now().year diff --git a/sites/www/conf.py b/sites/www/conf.py index 1c6c9254..c7828203 100644 --- a/sites/www/conf.py +++ b/sites/www/conf.py @@ -25,9 +25,7 @@ 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), -} +intersphinx_mapping['docs'] = (target, None) # Sister-site links to API docs html_theme_options['extra_nav_links'] = { |