summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.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/narr/introduction.rst
parentf4bf6e5c6e09d8c934ccc0389824bd356b663e76 (diff)
downloadpyramid-55ce9d632f828d285360c1abee9f56042243cac9.tar.gz
pyramid-55ce9d632f828d285360c1abee9f56042243cac9.tar.bz2
pyramid-55ce9d632f828d285360c1abee9f56042243cac9.zip
clean up inappropriate discussions of ZCML
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 63c31d340..97f63fcfe 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -122,9 +122,9 @@ application developer may use completely imperative code to perform common
framework configuration tasks such as adding a view or a route. In Zope,
:term:`ZCML` is typically required for similar purposes. In :term:`Grok`, a
Zope-based web framework, :term:`decorator` objects and class-level
-declarations are used for this purpose. :app:`Pyramid` supports :term:`ZCML`
-and decorator-based :term:`declarative configuration`, but does not require
-either. See :ref:`configuration_narr` for more information.
+declarations are used for this purpose. Out of the box, Pyramid supports
+imperative and decorator-based configuration; :term:`ZCML` may be used via an
+add-on package named ``pyramid_zcml``.
Also unlike :term:`Zope` and unlike other "full-stack" frameworks such
as :term:`Django`, :app:`Pyramid` makes no assumptions about which