Consistently link middleware term to the glossary

5 files changed, 14 insertions, 14 deletions

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 07c892439..e1347f3ca 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -172,8 +172,8 @@ name ``main`` as a section name:
 
 The WSGI application that is loaded will be available in the shell as the
 ``app`` global. Also, if the application that is loaded is the :app:`Pyramid`
-app with no surrounding middleware, the ``root`` object returned by the
-default :term:`root factory`, ``registry``, and ``request`` will be
+app with no surrounding :term:`middleware`, the ``root`` object returned by
+the default :term:`root factory`, ``registry``, and ``request`` will be
 available.
 
 You can also simply rely on the ``main`` default section name by omitting any
@@ -572,8 +572,8 @@ configuration implied by the ``[pipeline:main]`` section of your
 configuration file by default.  Specifying ``/path/to/my/development.ini`` is
 logically equivalent to specifying ``/path/to/my/development.ini#main``.  In
 this case, we'll be using a configuration that includes an ``app`` object
-which is wrapped in the Paste "translogger" middleware (which logs requests
-to the console).
+which is wrapped in the Paste "translogger" :term:`middleware` (which logs
+requests to the console).
 
 You can also specify a particular *section* of the PasteDeploy ``.ini`` file
 to load instead of ``main``:
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index c2c7417a7..e984dc24f 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1036,7 +1036,7 @@ upstream WSGI component that uses :app:`Pyramid` as its "app".  This is a
 feature that may be used by Pyramid framework extensions, to provide, for
 example, Pyramid-specific view timing support bookkeeping code that examines
 exceptions before they are returned to the upstream WSGI application.  Tweens
-behave a bit like :term:`WSGI` middleware but they have the benefit of
+behave a bit 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.
 
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index f9c25c69c..48164d323 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -600,10 +600,10 @@ Examples: :ref:`hello_traversal_chapter` and
 Tweens
 ~~~~~~
 
-Pyramid has a sort of internal WSGI-middleware-ish pipeline that can be
-hooked by arbitrary add-ons named "tweens".  The debug toolbar is a "tween",
-and the ``pyramid_tm`` transaction manager is also.  Tweens are more useful
-than WSGI middleware in some circumstances because they run in the context of
+Pyramid has a sort of internal WSGI-middleware-ish pipeline that can be hooked
+by arbitrary add-ons named "tweens".  The debug toolbar is a "tween", and the
+``pyramid_tm`` transaction manager is also.  Tweens are more useful than WSGI
+:term:`middleware` in some circumstances because they run in the context of
 Pyramid itself, meaning you have access to templates and other renderers, a
 "real" request object, and other niceties.
 
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst
index 3b903be4d..b3bfb8a1e 100644
--- a/docs/narr/logging.rst
+++ b/docs/narr/logging.rst
@@ -298,14 +298,14 @@ Request Logging with Paste's TransLogger
 ----------------------------------------
 
 Paste provides the `TransLogger 
-<http://pythonpaste.org/modules/translogger.html>`_ middleware for logging 
-requests using the `Apache Combined Log Format 
+<http://pythonpaste.org/modules/translogger.html>`_ :term:`middleware` for
+logging requests using the `Apache Combined Log Format
 <http://httpd.apache.org/docs/2.2/logs.html#combined>`_. TransLogger combined 
 with a FileHandler can be used to create an ``access.log`` file similar to 
 Apache's. 
 
-Like any standard middleware with a Paste entry point, TransLogger can be
-configured to wrap your application using ``.ini`` file syntax.  First,
+Like any standard :term:`middleware` with a Paste entry point, TransLogger can
+be configured to wrap your application using ``.ini`` file syntax.  First,
 rename your Pyramid ``.ini`` file's ``[app:main]`` section to
 ``[app:mypyramidapp]``, then add a ``[filter:translogger]`` section, then use
 a ``[pipeline:main]`` section file to form a WSGI pipeline with both the
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 63a08adaa..02c03c8db 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -354,7 +354,7 @@ initialization.
    cause ``DBSession.remove`` to be called in an application generated from
    any :app:`Pyramid` scaffold, because these all use the ``pyramid_tm``
    package.  The cleanup done by ``DBSession.remove`` is unnecessary when
-   ``pyramid_tm`` middleware is configured into the application.
+   ``pyramid_tm`` :term:`middleware` is configured into the application.
 
 More Details
 ++++++++++++