Merge branch 'master' of github.com:Pylons/pyramid

1 files changed, 13 insertions, 12 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 6eb76af9d..eff6db488 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,20 +50,21 @@ extensions = [
     'sphinx.ext.doctest',
     'repoze.sphinx.autointerface',
     'sphinx.ext.viewcode',
-#    'sphinx.ext.intersphinx'
+    'sphinx.ext.intersphinx'
     ]
 
-# Looks for objects in other Pyramid projects
-## intersphinx_mapping = {
-##     'cookbook':
-##     ('http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/', None),
-##     'handlers':
-##     ('http://docs.pylonsproject.org/projects/pyramid_handlers/dev/', None),
-##     'zcml':
-##     ('http://docs.pylonsproject.org/projects/pyramid_zcml/dev/', None),
-##     'jinja2':
-##     ('http://docs.pylonsproject.org/projects/pyramid_jinja2/dev/', None),
-##     }
+# Looks for objects in external projects
+intersphinx_mapping = {
+    'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
+    'who': ('http://docs.repoze.org/who/latest', None),
+    'python': ('http://docs.python.org', None),
+    'python3': ('http://docs.python.org/3', None),
+    'tstring':
+        ('http://docs.pylonsproject.org/projects/translationstring/en/latest',
+          None),
+    'venusian':
+        ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']