Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 0 deletions

diff --git a/docs/glossary.rst b/docs/glossary.rst
index f42b298df..7f396dc7d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1207,3 +1207,15 @@ 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`.
+      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.
+
+   settings
+      Settings control the runtime behavior of a Pyramid application.
+      They are the aggregation of configuration file declarations, process environment values, other additions generated by Pyramid or its add-ons and :term:`tween`\s, and values produced by your own code.
+      Settings are collected at application startup.
+      They can affect all the components which make up the the application.
+      Pyramid itself, any tweens or Pyramid add-ons used, and :ref:`your own code may reference <deployment_settings>` and act on settings.