diff options
| author | Michael Merickel <michael@merickel.org> | 2013-04-01 11:42:28 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-04-01 11:42:28 -0500 |
| commit | 5f3eee1d89b52458e372875bbf71efb0cc5e3fcf (patch) | |
| tree | 6d6b61cc0799bc3c68da24e86691e8b985bdc821 /docs/glossary.rst | |
| parent | 75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (diff) | |
| parent | a9cdf8f67a59e051233dae1a8e21e3b60037c608 (diff) | |
| download | pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.gz pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.bz2 pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.zip | |
Merge branch 'pull.963'
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 3a732e853..241f951d6 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -314,7 +314,7 @@ Glossary pipeline The :term:`PasteDeploy` term for a single configuration of a WSGI - server, a WSGI application, with a set of middleware in-between. + server, a WSGI application, with a set of :term:`middleware` in-between. Zope `The Z Object Publishing Framework <http://zope.org>`_, a @@ -926,7 +926,7 @@ Glossary provide, for example, Pyramid-specific view timing support, bookkeeping code that examines exceptions before they are returned to the upstream WSGI application, or a variety of other features. Tweens behave a bit - like :term:`WSGI` 'middleware' but they have the benefit of running in a + like :term:`WSGI` :term:`middleware` but they have the benefit of running in a context in which they have access to the Pyramid :term:`application registry` as well as the Pyramid rendering machinery. See :ref:`registering_tweens`. |