summaryrefslogtreecommitdiffhomepage
path: root/sites/docs
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-04-14 10:49:13 -0400
committerJeff Forcier <jeff@bitprophet.org>2014-04-14 10:49:54 -0400
commit59a696cef2639b65adbf47321171bbfea98f7df0 (patch)
treeaf35c0e1234d2f61d3f606bc2799c7d6cc27b3ac /sites/docs
parentd31373f0efac2976af80380e16136c1a7831b6a7 (diff)
parent160e2c08e0b7652a92d879c0e481ce72cddafef7 (diff)
Merge branch '295-int'
Diffstat (limited to 'sites/docs')
-rw-r--r--sites/docs/conf.py7
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',