summaryrefslogtreecommitdiff
path: root/docs/narr/advconfig.rst
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2018-11-19 08:15:12 -0600
committerKarl O. Pinc <kop@meme.com>2018-11-19 08:15:12 -0600
commit34009af1bea519367d69c69e05c1af4df957db46 (patch)
tree77ce3989bb186c30426e15b9dfb9668092f9bc47 /docs/narr/advconfig.rst
parent0435a459de25acb087881e8bf3b0e21aa8fca5fb (diff)
downloadpyramid-34009af1bea519367d69c69e05c1af4df957db46.tar.gz
pyramid-34009af1bea519367d69c69e05c1af4df957db46.tar.bz2
pyramid-34009af1bea519367d69c69e05c1af4df957db46.zip
Shorter sentences are better
Diffstat (limited to 'docs/narr/advconfig.rst')
-rw-r--r--docs/narr/advconfig.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 0d583029e..4c969487c 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -168,7 +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.
+After a commit more :term:`configuration declaration`\s may be added to a :term:`configurator`.
+New declarations will not conflict with committed declarations, they will override them.
For example, we prevent conflicts from occurring in the application we examined
previously by adding a ``commit``.