summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/glossary.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0ff87a5ee..ae10ad272 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1212,3 +1212,9 @@ Glossary
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 plugins and :term:`tween`\s, and values produced by your own code during application initialization.
+ Settings can affect all the components which make up the the application.
+ Pyramid itself, any tweens or Pyramid plugins used, and :ref:`your own code may reference <deployment_settings>` and act on settings.