aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/conf.py
diff options
context:
space:
mode:
authorJoar Wandborg <joar@wandborg.se>2013-01-27 22:10:47 +0100
committerJoar Wandborg <joar@wandborg.se>2013-01-27 22:10:47 +0100
commitf8107ccccc83a7b2aea3adb6f2fe55c45371c080 (patch)
treeceaf4353f6fe3151c7d1fc3006b481913bba4a09 /docs/source/conf.py
parentae9f0aec381c7f04898f0dde3af322ec876b9651 (diff)
downloadmediagoblin-f8107ccccc83a7b2aea3adb6f2fe55c45371c080.tar.lz
mediagoblin-f8107ccccc83a7b2aea3adb6f2fe55c45371c080.tar.xz
mediagoblin-f8107ccccc83a7b2aea3adb6f2fe55c45371c080.zip
*docs* intersphinx, exception monitoring
Diffstat (limited to 'docs/source/conf.py')
-rw-r--r--docs/source/conf.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8113e247..0b2bccac 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -26,7 +26,8 @@ sys.path.insert(0, os.path.abspath(os.path.join('..', '..')))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
# Add any paths that contain templates here, relative to this directory.
templates_path = ['source/_templates']