summaryrefslogtreecommitdiff
path: root/docs/narr/configuration.rst
diff options
context:
space:
mode:
authorAlexandre Bourget <alexandre.bourget@savoirfairelinux.com>2011-03-24 12:07:09 -0400
committerAlexandre Bourget <alexandre.bourget@savoirfairelinux.com>2011-03-24 12:07:09 -0400
commit95e799d074de2e81914d513b4c331df1e738c00e (patch)
treeb3039037533610d8c86d82bb28f139d8a3777013 /docs/narr/configuration.rst
parent22d3253a26767501827d86b56db3a9b79bef6c4e (diff)
parentb596e1812627c359908759d7a8d83c339f08e385 (diff)
downloadpyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2
pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip
Merge remote branch 'source/master'
Conflicts: docs/narr/hooks.rst
Diffstat (limited to 'docs/narr/configuration.rst')
-rw-r--r--docs/narr/configuration.rst12
1 files changed, 5 insertions, 7 deletions
diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index 394603946..6360dc574 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -127,7 +127,7 @@ The scanning machinery imports each module and subpackage in a package or
module recursively, looking for special attributes attached to objects
defined within a module. These special attributes are typically attached to
code via the use of a :term:`decorator`. For example, the
-:class:`pyramid.view.view_config` decorator can be attached to a function or
+:class:`~pyramid.view.view_config` decorator can be attached to a function or
instance method.
Once scanning is invoked, and :term:`configuration decoration` is found by
@@ -136,7 +136,7 @@ behalf: these calls replace the need to add imperative configuration
statements that don't live near the code being configured.
In the example above, the scanner translates the arguments to
-:class:`pyramid.view.view_config` into a call to the
+:class:`~pyramid.view.view_config` into a call to the
:meth:`pyramid.config.Configurator.add_view` method, effectively:
.. ignore-next-block
@@ -151,9 +151,7 @@ Declarative Configuration
A third mode of configuration can be employed when you create a
:app:`Pyramid` application named *declarative configuration*. This mode uses
an XML language known as :term:`ZCML` to represent configuration statements
-rather than Python. ZCML is often used when application extensibility is
-important. Most of the examples in the narrative portion of this
-documentation concentrate on imperative configuration rather than ZCML, but
-almost everything that can be configured imperatively can also be configured
-via ZCML. See :ref:`declarative_chapter` for more information about ZCML.
+rather than Python. ZCML is not built-in to Pyramid, but almost everything
+that can be configured imperatively can also be configured via ZCML if you
+install the :term:`pyramid_zcml` package.