diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-27 00:57:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-27 00:57:34 -0500 |
| commit | d1432f4f3c48106252b292f19442bf591c554fa5 (patch) | |
| tree | 66cc8bcc1d7d2bde6c5836d68096a07e90a274fd /docs/narr/advconfig.rst | |
| parent | 7420d3a6983a668b0f2e7ff22be30cff81e0e2b0 (diff) | |
| download | pyramid-d1432f4f3c48106252b292f19442bf591c554fa5.tar.gz pyramid-d1432f4f3c48106252b292f19442bf591c554fa5.tar.bz2 pyramid-d1432f4f3c48106252b292f19442bf591c554fa5.zip | |
- Reconcile "extending an existing application" chapter with existence of
"advanced configuration" chapter.
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index e096ef863..f8b3ee191 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -118,6 +118,9 @@ Conflict detection happens for any kind of configuration: imperative configuration, :term:`ZCML` configuration, or configuration that results from the execution of a :term:`scan`. +.. note:: If you use, ZCML, its conflict detection algorithm is described in + :ref:`zcml_conflict_detection`. + Manually Resolving Conflicts ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -335,6 +338,9 @@ Instead, use :meth:`pyramid.config.Configuration.include`: Using ``include`` rather than calling the function directly will allow :ref:`automatic_conflict_resolution` to work. +.. note: See :ref:`the_include_tag` for a declarative alternative to + :meth:`pyramid.config.Configurator.include`. + .. _twophase_config: Two-Phase Configuration |