summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-02-10 13:29:53 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-02-10 13:29:53 +0200
commit182686ca798806a16b4d18e8bae49d5139477428 (patch)
tree51a92c97ef6e8bda6affbb9742d125a48fc5658b /docs/conf.py
parentc7a06f41d56d076dc979d800388c8befc1b8e5e5 (diff)
downloadpyramid-182686ca798806a16b4d18e8bae49d5139477428.tar.gz
pyramid-182686ca798806a16b4d18e8bae49d5139477428.tar.bz2
pyramid-182686ca798806a16b4d18e8bae49d5139477428.zip
bring back the intershinx goodness
This ensures that links to external objects are 'magically' generated. This feature was disable in commit 288072c, but it was likely not used at the time.
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 6eb76af9d..192bd7a79 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,20 +50,20 @@ 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 = {
+ 'who': ('http://docs.repoze.org/who/2.0', 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']