summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-03-28 13:39:20 -0700
committerChris McDonough <chrism@plope.com>2013-03-28 13:39:20 -0700
commit5e06e508f3a619ba4fdf4f11cb30c84e808841e9 (patch)
tree44e349493fc4b146b2b54540c427a6db51cc9664 /docs/conf.py
parent976b6756aaf3f39550c59447ac9ed1df6fa1e470 (diff)
parentc2837c9f05304f685bde4baa4814f304d4aa67ef (diff)
downloadpyramid-5e06e508f3a619ba4fdf4f11cb30c84e808841e9.tar.gz
pyramid-5e06e508f3a619ba4fdf4f11cb30c84e808841e9.tar.bz2
pyramid-5e06e508f3a619ba4fdf4f11cb30c84e808841e9.zip
Merge pull request #955 from tshepang/toolbar
toolbar-related doc improvements
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 69d00cdaa..6662b1b43 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -65,6 +65,9 @@ intersphinx_mapping = {
None),
'venusian':
('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
+ 'toolbar':
+ ('http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
+ None),
}
# Add any paths that contain templates here, relative to this directory.