summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2018-11-18 23:16:20 -0600
committerKarl O. Pinc <kop@meme.com>2018-11-18 23:48:49 -0600
commit084cdc68d27299a3aaf6f9a2464dd5b99fbb9947 (patch)
treeaa3b220b53c1569434a91cbc7e36ff6bb26d01e8 /docs
parent3f01e1f615041aa0e6787e1c6ba2f9c54d139100 (diff)
downloadpyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.tar.gz
pyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.tar.bz2
pyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.zip
Note what directive takes effect when conflits are resolved with commit()
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/advconfig.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index f6a6c5b42..0d583029e 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -168,6 +168,8 @@ Using ``config.commit()``
You can manually commit a configuration by using the
:meth:`~pyramid.config.Configurator.commit` method between configuration calls.
+After a commit :term:`configuration declaration`\s which would otherwise result in a conflict may be added to a :term:`configurator` and will override previously committed directives.
+
For example, we prevent conflicts from occurring in the application we examined
previously by adding a ``commit``.
Here's the application that generates conflicts: