summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-12 19:29:23 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-12 19:29:23 -0400
commit49d634bd813e63c3db5e56d29376126c2646182a (patch)
tree3b252edf25daf2d19368056fe338bf3550ee09ab /docs/conf.py
parent5b47ba8ce8c8bdb149b92a2b35a5e7607ca6fc00 (diff)
downloadpyramid-49d634bd813e63c3db5e56d29376126c2646182a.tar.gz
pyramid-49d634bd813e63c3db5e56d29376126c2646182a.tar.bz2
pyramid-49d634bd813e63c3db5e56d29376126c2646182a.zip
All wrapped up, pre-merge.
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index fe094a943..5870ce872 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,9 +56,22 @@ extensions = [
# Looks for objects in external projects
intersphinx_mapping = {
'tutorials': ('http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/', None),
+ 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/', None),
+ 'tm': (
+ 'http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/',
+ None,
+ ),
+ 'debugtoolbar': (
+ 'http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/', None),
'zcomponent': ('http://docs.zope.org/zope.component', None),
'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
'webob': ('http://docs.webob.org/en/latest', None),
+ 'colander': (
+ 'http://docs.pylonsproject.org/projects/colander/en/latest',
+ None),
+ 'deform': (
+ 'http://docs.pylonsproject.org/projects/deform/en/latest',
+ None),
'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
'who': ('http://docs.repoze.org/who/latest', None),
'python': ('http://docs.python.org', None),