Merge branch 'feature.glue'

1 files changed, 28 insertions, 29 deletions

diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index 39ae4f373..cf8f96c8a 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -1,27 +1,26 @@
 .. _paste_chapter:
 
-Paste
-=====
+PasteDeploy Configuration Files
+===============================
 
 Packages generated via a :term:`scaffold` make use of a system created by Ian
-Bicking named :term:`Paste`.  Paste provides the following features:
-
-- A way to declare :term:`WSGI` application configuration in an ``.ini`` file
-  (PasteDeploy).
-
-- A :term:`WSGI` server runner (``paster serve``) which can accept
-  PasteDeploy ``.ini`` file values as input.
-
-- A mechanism for rendering scaffolds into projects (``paster create``).
-
-Paste is not a particularly integral part of Pyramid.  It's more or less used
-directly only in projects created from scaffolds.  It's possible to create a
-Pyramid application which does not use Paste at all.  We show a Pyramid
-application that doesn't use Paste in :ref:`firstapp_chapter`.  However, all
-Pyramid scaffolds use the system, to provide new developers with a
-standardized way of starting, stopping, and setting deployment values.  This
-chapter is not a replacement for documentation about Paste or PasteDeploy; it
-only contextualizes the use of Paste within Pyramid.  For detailed
+Bicking named :term:`PasteDeploy`.  PasteDeploy defines a way to declare
+:term:`WSGI` application configuration in an ``.ini`` file.
+
+Pyramid uses this configuration file format in input to its :term:`WSGI`
+server runner ``pserve``, as well as other commands such as ``pviews``,
+``pshell``, ``proutes``, and ``ptweens``.
+
+PasteDeploy is not a particularly integral part of Pyramid.  It's possible to
+create a Pyramid application which does not use PasteDeploy at all.  We show
+a Pyramid application that doesn't use PasteDeploy in
+:ref:`firstapp_chapter`.  However, all Pyramid scaffolds render PasteDeploy
+configuration files, to provide new developers with a standardized way of
+setting deployment values, and to provide new users with a standardized way
+of starting, stopping, and debugging an application.  
+
+This chapter is not a replacement for documentation about PasteDeploy; it
+only contextualizes the use of PasteDeploy within Pyramid.  For detailed
 documentation, see http://pythonpaste.org.
 
 PasteDeploy
@@ -29,7 +28,7 @@ PasteDeploy
 
 :term:`PasteDeploy` is the system that Pyramid uses to allow
 :term:`deployment settings` to be spelled using an ``.ini`` configuration
-file format.  It also allows the ``paster serve`` command to work.  Its
+file format.  It also allows the ``pserve`` command to work.  Its
 configuration format provides a convenient place to define application
 :term:`deployment settings` and WSGI server settings, and its server runner
 allows you to stop and start a Pyramid application easily.
@@ -77,14 +76,14 @@ The ``egg:`` prefix in ``egg:MyProject`` indicates that this is an entry
 point *URI* specifier, where the "scheme" is "egg".  An "egg" is created when
 you run ``setup.py install`` or ``setup.py develop`` within your project.
 
-In English, this entry point can thus be referred to as a "Paste application
-factory in the ``MyProject`` project which has the entry point named ``main``
-where the entry point refers to a ``main`` function in the ``mypackage``
-module".  Indeed, if you open up the ``__init__.py`` module generated within
-any scaffold-generated package, you'll see a ``main`` function.  This is the
-function called by :term:`PasteDeploy` when the ``paster serve`` command is
-invoked against our application.  It accepts a global configuration object
-and *returns* an instance of our application.
+In English, this entry point can thus be referred to as a "PasteDeploy
+application factory in the ``MyProject`` project which has the entry point
+named ``main`` where the entry point refers to a ``main`` function in the
+``mypackage`` module".  Indeed, if you open up the ``__init__.py`` module
+generated within any scaffold-generated package, you'll see a ``main``
+function.  This is the function called by :term:`PasteDeploy` when the
+``pserve`` command is invoked against our application.  It accepts a global
+configuration object and *returns* an instance of our application.
 
 ``[DEFAULTS]`` Section of a PasteDeploy ``.ini`` File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~