diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
| commit | f360d9e6d9689dfe92a950e97e7e19c414655997 (patch) | |
| tree | f0456af418ecfaf7d5a342556d2c5786b2aee979 /docs/narr/resources.rst | |
| parent | c18b16d293ee60117747f0de042e2d75361d1fd8 (diff) | |
| parent | 13173e9e1d1c5f3873e8bfed91e6f3ed561dafaf (diff) | |
| download | pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.gz pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.bz2 pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.zip | |
Merge branch 'twophase'
Conflicts:
pyramid/configuration.py
Diffstat (limited to 'docs/narr/resources.rst')
| -rw-r--r-- | docs/narr/resources.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst index d9edd954e..c87157472 100644 --- a/docs/narr/resources.rst +++ b/docs/narr/resources.rst @@ -123,7 +123,7 @@ The ``override_resource`` API ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ An individual call to -:meth:`pyramid.configuration.Configurator.override_resource` can +:meth:`pyramid.config.Configurator.override_resource` can override a single resource. For example: .. ignore-next-block @@ -179,7 +179,7 @@ will need to register two overrides. The package name in a specification may start with a dot, meaning that the package is relative to the package in which the configuration construction file resides (or the ``package`` argument to the -:class:`pyramid.configuration.Configurator` class construction). +:class:`pyramid.config.Configurator` class construction). For example: .. ignore-next-block @@ -211,7 +211,7 @@ The ``resource`` ZCML Directive ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Instead of using -:meth:`pyramid.configuration.Configurator.override_resource` during +:meth:`pyramid.config.Configurator.override_resource` during :term:`imperative configuration`, an equivalent can be used to perform all the tasks described above within :term:`ZCML`. The ZCML ``resource`` tag is a frontend to using ``override_resource``. |