summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst7
-rw-r--r--docs/narr/startup.rst2
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 7f396dc7d..89c03860b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1219,3 +1219,10 @@ Glossary
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`.
+
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index af9415cc9..0b3680bca 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -78,7 +78,7 @@ Here's a high-level time-ordered overview of what happens when you press
file and uses it to configure the Python standard library logging system for
the application. See :ref:`logging_config` for more information.
-#. The application's entry point, usually the entry point referenced on the :ref:`above mentioned <entry_point_discovery>` ``use=`` line, is the application's *constructor*.
+#. The application's entry point, usually the entry point referenced on the :ref:`above mentioned <entry_point_discovery>` ``use=`` line, is the application's :term:`constructor`.
It is passed the key/value parameters in :ref:`the application's .ini section <ini_section_discovery>`.
The constructor should return a :term:`router` instance, which is a :term:`WSGI` application.