summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-11 04:35:53 -0400
committerChris McDonough <chrism@plope.com>2011-07-11 04:35:53 -0400
commit4e1199fdb3219ed7ed3635f8ed96fb0cff18abe1 (patch)
treef367d6afa2f82a6e91e41b93261e91c3d512468e /docs/glossary.rst
parente81ad8ca6355d85462508f03496fe7b088986601 (diff)
downloadpyramid-4e1199fdb3219ed7ed3635f8ed96fb0cff18abe1.tar.gz
pyramid-4e1199fdb3219ed7ed3635f8ed96fb0cff18abe1.tar.bz2
pyramid-4e1199fdb3219ed7ed3635f8ed96fb0cff18abe1.zip
simplify
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0a1c363f4..3fa2b0261 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -592,8 +592,9 @@ Glossary
declaration` required by your application.
declarative configuration
- The configuration mode in which you use :term:`ZCML` to make a set of
- :term:`configuration declaration` statements. See :term:`pyramid_zcml`.
+ The configuration mode in which you use the combination of
+ :term:`configuration decorator` decorations and a :term:`scan` to
+ configure your Pyramid application.
Not Found view
An :term:`exception view` invoked by :app:`Pyramid` when the