From 49d634bd813e63c3db5e56d29376126c2646182a Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Mon, 12 Aug 2013 19:29:23 -0400
Subject: All wrapped up, pre-merge.

---
 docs/conf.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docs/conf.py')

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),
-- 
cgit v1.2.3