diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
| commit | 7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce (patch) | |
| tree | 227c5b5e5a0b1ee8d8974679b58f29a162b8b2af /docs/glossary.rst | |
| parent | 7a73e56d4d86d9139fd54a9cd83a68d25bc02df7 (diff) | |
| parent | 26787cf215b9bb6ddc0cce84a777f7c2e3079842 (diff) | |
| download | pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.gz pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.bz2 pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 8ade889a3..7dc69c7c4 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -798,9 +798,8 @@ Glossary :term:`Internationalization`. renderer globals - Values injected as names into a renderer based on application - policy. See :ref:`adding_renderer_globals` for more - information. + Values injected as names into a renderer by a + :class:`pyramid.event.BeforeRender` event. response callback A user-defined callback executed by the :term:`router` at a @@ -1021,4 +1020,4 @@ Glossary add-on A Python :term:`distribution` that uses Pyramid's extensibility to plug into a Pyramid application and provide extra, - configurable services.
\ No newline at end of file + configurable services. |