diff options
| author | Chris McDonough <chrism@plope.com> | 2013-03-28 13:39:20 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-03-28 13:39:20 -0700 |
| commit | 5e06e508f3a619ba4fdf4f11cb30c84e808841e9 (patch) | |
| tree | 44e349493fc4b146b2b54540c427a6db51cc9664 /docs | |
| parent | 976b6756aaf3f39550c59447ac9ed1df6fa1e470 (diff) | |
| parent | c2837c9f05304f685bde4baa4814f304d4aa67ef (diff) | |
| download | pyramid-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')
| -rw-r--r-- | docs/conf.py | 3 | ||||
| -rw-r--r-- | docs/glossary.rst | 4 |
2 files changed, 5 insertions, 2 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. diff --git a/docs/glossary.rst b/docs/glossary.rst index 1673e2c41..3a732e853 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -932,12 +932,12 @@ Glossary :ref:`registering_tweens`. pyramid_debugtoolbar - A Pyramid add on which displays a helpful debug toolbar "on top of" HTML + A Pyramid add-on which displays a helpful debug toolbar "on top of" HTML pages rendered by your application, displaying request, routing, and database information. :mod:`pyramid_debugtoolbar` is configured into the ``development.ini`` of all applications which use a Pyramid :term:`scaffold`. For more information, see - http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ . + http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/. scaffold A project template that generates some of the major parts of a Pyramid |