summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst19
1 files changed, 19 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index e21ae2fdc..9c6027209 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1207,3 +1207,22 @@ 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.
+
+ constructor
+ A function returning a Pyramid :term:`WSGI` application.
+ Every Pyramid application has a single constructor function named ``main``.
+ It returns a Pyramid :term:`router` generated by a :term:`configurator`, and is written by you.
+ The Pyramid constructor is the application's :term:`entry point`.
+