diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2011-01-18 23:05:54 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2011-01-18 23:05:54 -0700 |
| commit | b0240d3d5a39a504d5a5155a23a6d6a431b457ef (patch) | |
| tree | b0c3b4f5dd8a0ec1c01912bfeff769d1329a9c97 /docs/narr/advconfig.rst | |
| parent | 278b302270823336d770761aaac22d854e348ea6 (diff) | |
| parent | 48bccbe4ff7351d823a471005effea1afc06bb4f (diff) | |
| download | pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.gz pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.bz2 pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.zip | |
Merge https://github.com/Pylons/pyramid
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 4b10e6194..30f76e456 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |