diff options
| author | Karl O. Pinc <kop@meme.com> | 2018-11-18 23:18:01 -0600 |
|---|---|---|
| committer | Karl O. Pinc <kop@meme.com> | 2018-11-18 23:48:49 -0600 |
| commit | 11953e10b6fb9832196b0fdab28dd53f771c3eab (patch) | |
| tree | a22e742c9ecd7798d2a09226ce008c5d30c5e857 /docs/glossary.rst | |
| parent | 084cdc68d27299a3aaf6f9a2464dd5b99fbb9947 (diff) | |
| download | pyramid-11953e10b6fb9832196b0fdab28dd53f771c3eab.tar.gz pyramid-11953e10b6fb9832196b0fdab28dd53f771c3eab.tar.bz2 pyramid-11953e10b6fb9832196b0fdab28dd53f771c3eab.zip | |
Add "commit" to the glossary
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index f42b298df..649daf79e 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1207,3 +1207,7 @@ Glossary route prefix A route prefix is a path prefix that is prepended to any routes that are configured while it is active. A route prefix can be set via :meth:`pyramid.config.Configurator.include` or :meth:`pyramid.config.Configurator.route_prefix_context`. + + commit + An operation applied to a :term:`configurator` which checks for conflicts in :term:`configuration declaration`\s, and if none are found applies all pending :term:`action`\s. + It is possible, although not necessarily recommended, to invoke :term:`commit`\s using :meth:`pyramid.config.Configurator.commit` to :ref:`manually resolve <manually_resolving_conflicts>` configuration conflicts. |