diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
| commit | faf334d94e8c7450962b6b0d18fe57cefd43f04a (patch) | |
| tree | bac12a41585561e84b914ede37bcd83a62764fb9 /docs/glossary.rst | |
| parent | 53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff) | |
| parent | 4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff) | |
| download | pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2 pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip | |
Merge branch 'master' into 1.5-branch
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. |