diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-18 12:27:56 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-18 12:27:56 -0500 |
| commit | 8b4146009da0b612e8e001e68cd5f6f63d361c53 (patch) | |
| tree | 5de4e743b2c007c0d5202db7be883d21cfe2bc88 /docs/narr/advconfig.rst | |
| parent | 566004501e8a28c0ba8f8c882ca5ea0742e5d285 (diff) | |
| parent | c9c3c487bcaedeca97bb6463a00188b0dc01203a (diff) | |
| download | pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.gz pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.bz2 pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.zip | |
Merge branch 'zcmlless'
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index eb9b70b12..8951166f5 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -115,11 +115,8 @@ allowing the circumstance to go unreported, by default Pyramid raises a running. 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`. +configuration or configuration that results from the execution of a +:term:`scan`. Manually Resolving Conflicts ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |