summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-05 23:23:38 -0700
committerMichael Merickel <michael@merickel.org>2013-04-05 23:23:38 -0700
commit55ab183d1184dff75e66a2c80e9cadd4aa7c4b6f (patch)
tree1b850fdb3fd206594a8c0c53c16f7b4b1fc01444 /docs/conf.py
parenta62ebd5725338d753d49ff1b6b8bf0fe95b19c92 (diff)
parent125ea45ae864a5513e6d83fdded6ceea9516b578 (diff)
downloadpyramid-55ab183d1184dff75e66a2c80e9cadd4aa7c4b6f.tar.gz
pyramid-55ab183d1184dff75e66a2c80e9cadd4aa7c4b6f.tar.bz2
pyramid-55ab183d1184dff75e66a2c80e9cadd4aa7c4b6f.zip
Merge pull request #972 from tshepang/diff
fix some cross-references
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 1ddcae08e..67e02471f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -70,6 +70,9 @@ intersphinx_mapping = {
'toolbar':
('http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
None),
+ 'zcml':
+ ('http://docs.pylonsproject.org/projects/pyramid_zcml/en/latest',
+ None),
}
# Add any paths that contain templates here, relative to this directory.