diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/glossary.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 649daf79e..0ff87a5ee 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1209,5 +1209,6 @@ Glossary 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. + An operation applied to a :term:`configurator`. + A commit 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. |