summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-07-26 00:26:10 +0000
committerChris McDonough <chrism@agendaless.com>2010-07-26 00:26:10 +0000
commit250c0218d0bd7dab6ea7e16c7051af71394f2a63 (patch)
treed57c38c27b72a483a3db9b1150d20553a93472d8 /docs/glossary.rst
parent2eb64f7a8bc7830667c3cb924bb5c13be3859b38 (diff)
downloadpyramid-250c0218d0bd7dab6ea7e16c7051af71394f2a63.tar.gz
pyramid-250c0218d0bd7dab6ea7e16c7051af71394f2a63.tar.bz2
pyramid-250c0218d0bd7dab6ea7e16c7051af71394f2a63.zip
merge generic_rendering branch
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index a1adec50b..ce0d57111 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -756,3 +756,8 @@ Glossary
cultural context. Often shortened to "l10" (because the word
"localization" is L, 10 letters, then N). See also:
:term:`Internationalization`.
+
+ renderer globals
+ Values injected as names into a renderer based on application
+ policy. See :ref:`adding_renderer_globals` for more
+ information.