summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-02-28 20:37:01 -0600
committerGitHub <noreply@github.com>2017-02-28 20:37:01 -0600
commit149cb40bad9191fa71b1d6ce01f9d6e50bb1eea6 (patch)
tree6fec6317d125bc802edca26eab8c2c5037494489 /docs
parentd3cb4b5796f341da609fe3397e31be67c68b32c1 (diff)
parent56d44e441b03aae53430adfeee6bc6b11ab2a2c9 (diff)
downloadpyramid-149cb40bad9191fa71b1d6ce01f9d6e50bb1eea6.tar.gz
pyramid-149cb40bad9191fa71b1d6ce01f9d6e50bb1eea6.tar.bz2
pyramid-149cb40bad9191fa71b1d6ce01f9d6e50bb1eea6.zip
Merge pull request #2964 from mmerickel/execution-policy
add an IExecutionPolicy
Diffstat (limited to 'docs')
-rw-r--r--docs/api/config.rst1
-rw-r--r--docs/api/interfaces.rst3
-rw-r--r--docs/glossary.rst5
3 files changed, 9 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 62f138b76..c76d3d5ff 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -70,6 +70,7 @@
.. automethod:: add_subscriber_predicate
.. automethod:: add_view_predicate
.. automethod:: add_view_deriver
+ .. automethod:: set_execution_policy
.. automethod:: set_request_factory
.. automethod:: set_root_factory
.. automethod:: set_session_factory
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index 521d65d2b..a212ba7a9 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -65,6 +65,9 @@ Other Interfaces
.. autointerface:: IResponseFactory
:members:
+ .. autointerface:: IRouter
+ :members:
+
.. autointerface:: IViewMapperFactory
:members:
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0f299c169..0a46fac3b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1154,3 +1154,8 @@ Glossary
coverage
A measurement of code coverage, usually expressed as a percentage of which lines of code have been executed over which lines are executable, typically run during test execution.
+
+ execution policy
+ A policy which wraps the :term:`router` by creating the request object
+ and sending it through the request pipeline.
+ See :class:`pyramid.config.Configurator.set_execution_policy`.