summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-28 22:15:48 -0400
committerChris McDonough <chrism@plope.com>2011-08-28 22:15:48 -0400
commit55ce9d632f828d285360c1abee9f56042243cac9 (patch)
tree5e797c41d58f702a598f2a77273413174d0cc0e5 /docs/glossary.rst
parentf4bf6e5c6e09d8c934ccc0389824bd356b663e76 (diff)
downloadpyramid-55ce9d632f828d285360c1abee9f56042243cac9.tar.gz
pyramid-55ce9d632f828d285360c1abee9f56042243cac9.tar.bz2
pyramid-55ce9d632f828d285360c1abee9f56042243cac9.zip
clean up inappropriate discussions of ZCML
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst12
1 files changed, 3 insertions, 9 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 332006d9d..8bbd9ff7d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -859,21 +859,15 @@ Glossary
pyramid_zcml
An add-on package to :app:`Pyramid` which allows applications to be
- configured via ZCML. It is available on :term:`PyPI`. If you use
- ``pyramid_zcml``, you can use ZCML as an alternative to
- :term:`imperative configuration`.
+ configured via :term:`ZCML`. It is available on :term:`PyPI`. If you
+ use ``pyramid_zcml``, you can use ZCML as an alternative to
+ :term:`imperative configuration` or :term:`configuration decoration`.
ZCML
`Zope Configuration Markup Language
<http://www.muthukadan.net/docs/zca.html#zcml>`_, an XML dialect
used by Zope and :term:`pyramid_zcml` for configuration tasks.
- ZCML directive
- A ZCML "tag" such as ``<view>`` or ``<route>``.
-
- ZCML declaration
- The concrete use of a :term:`ZCML directive` within a ZCML file.
-
pyramid_handlers
An add-on package which allows :app:`Pyramid` users to create classes
that are analogues of Pylons 1 "controllers". See