summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-09-28 20:38:15 -0500
committerMichael Merickel <michael@merickel.org>2016-09-28 20:38:15 -0500
commit8ce5736478f035cc14cfd247e7d936dc4db1f7b5 (patch)
tree48d48dc3433e915df60d2549cebab64762fdd4fd /docs/conf.py
parente8c66a339e9f7d83bd2408952de53ef30dba0794 (diff)
parent7391d365ce68677c588cf60c1431d29a786c6e82 (diff)
downloadpyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.gz
pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.bz2
pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.zip
Merge branch 'master' into exception_only
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 518f7e784..c3a7170fc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -78,7 +78,7 @@ intersphinx_mapping = {
'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
'who': ('http://repozewho.readthedocs.org/en/latest', None),
'zcml': ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
- 'zcomponent': ('http://docs.zope.org/zope.component', None),
+ 'zcomponent': ('http://zopecomponent.readthedocs.io/en/stable/', None),
}