diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
| commit | 47b8cf7e9b578464b533383083f7135271db0f9e (patch) | |
| tree | 724c40d50f21773b6585ab7d9731b8bf7a93a71c /docs/conf.py | |
| parent | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff) | |
| parent | dcaabcb87ca584c289efe70a604db0502838df3d (diff) | |
| download | pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.gz pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.bz2 pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py index ce1d1cce1..67e02471f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,6 +55,7 @@ extensions = [ # Looks for objects in external projects intersphinx_mapping = { + 'zcomponent': ('http://docs.zope.org/zope.component', None), 'webtest': ('http://webtest.pythonpaste.org/en/latest', None), 'webob': ('http://docs.webob.org/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), @@ -69,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. |