diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
| commit | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (patch) | |
| tree | f3a290b6e0a21549703050a33433dffef2acc87d /docs/conf.py | |
| parent | dacbe656d8851580234214fb655b60d24f5800fb (diff) | |
| parent | f8afd1638456fc89bc3d17858f309686b40a40a4 (diff) | |
| download | pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.gz pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.bz2 pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.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 69d00cdaa..ce1d1cce1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,6 +55,7 @@ extensions = [ # Looks for objects in external projects intersphinx_mapping = { + 'webtest': ('http://webtest.pythonpaste.org/en/latest', None), 'webob': ('http://docs.webob.org/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), 'who': ('http://docs.repoze.org/who/latest', None), @@ -65,6 +66,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. |