Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Pylons/pyramid
base: 976b6756aa
...
head fork: Pylons/pyramid
compare: 5e06e508f3
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Showing with 5 additions and 2 deletions.
  1. +3 −0  docs/conf.py
  2. +2 −2 docs/glossary.rst
View
3  docs/conf.py
@@ -65,6 +65,9 @@ def nothing(*arg):
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.
View
4 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

No commit comments for this range

Something went wrong with that request. Please try again.