remove stray references to Paste

14 files changed, 49 insertions, 52 deletions

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index d71f9af7f..80675ce83 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -720,7 +720,7 @@ microframeworks and Django boast.
 The :mod:`zope.component`, package on which :app:`Pyramid` depends has
 transitive dependencies on several other packages (:mod:`zope.event`, and
 :mod:`zope.interface`).  :app:`Pyramid` also has its own direct dependencies,
-such as :term:`Paste`, :term:`Chameleon`, :term:`Mako` :term:`WebOb`,
+such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako` :term:`WebOb`,
 :mod:`zope.deprecation` and some of these in turn have their own transitive
 dependencies.
 
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 472e591a9..fc282b2da 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -95,7 +95,7 @@ Glossary
 
    dotted Python name
      A reference to a Python object by name using a string, in the form
-     ``path.to.modulename:attributename``.  Often used in Paste and
+     ``path.to.modulename:attributename``.  Often used in Pyramid and
      setuptools configurations.  A variant is used in dotted names within
      configurator method arguments that name objects (such as the "add_view"
      method's "view" and "context" attributes): the colon (``:``) is not
@@ -304,7 +304,7 @@ Glossary
      application.
 
    pipeline
-     The :term:`Paste` term for a single configuration of a WSGI
+     The :term:`PasteDeploy` term for a single configuration of a WSGI
      server, a WSGI application, with a set of middleware in-between.
 
    Zope
@@ -335,15 +335,11 @@ Glossary
      `WebOb <http://webob.org>`_ is a WSGI request/response
      library created by Ian Bicking.
 
-   Paste
-     `Paste <http://pythonpaste.org>`_ is a WSGI development and
-     deployment system developed by Ian Bicking.
-
    PasteDeploy
      `PasteDeploy <http://pythonpaste.org>`_ is a library used by
      :app:`Pyramid` which makes it possible to configure
      :term:`WSGI` components together declaratively within an ``.ini``
-     file.  It was developed by Ian Bicking as part of :term:`Paste`.
+     file.  It was developed by Ian Bicking.
 
    Chameleon
      `chameleon <http://chameleon.repoze.org>`_ is an attribute
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index e93266bab..3a4758c44 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -10,7 +10,7 @@ pyramid.default_locale_name = en
 pyramid.includes = pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
index 83bce1ef2..9d025715d 100644
--- a/docs/narr/MyProject/production.ini
+++ b/docs/narr/MyProject/production.ini
@@ -9,7 +9,7 @@ pyramid.debug_templates = false
 pyramid.default_locale_name = en
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index 2ac094d47..8206e0bcb 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -344,8 +344,8 @@ sequence can take several different forms.
 
 Each value in the sequence should be a :term:`dotted Python name`.
 
-Paste Configuration vs. Plain-Python Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+PasteDeploy Configuration vs. Plain-Python Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Using the following ``pyramid.tweens`` setting in the PasteDeploy ``.ini``
 file in your application:
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 55829bef0..45d65402c 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -209,7 +209,7 @@ Finally, we actually serve the application to requestors by starting up a
 WSGI server.  We happen to use the :func:`paste.httpserver.serve` WSGI server
 runner, passing it the ``app`` object (a :term:`router`) as the application
 we wish to serve.  We also pass in an argument ``host=='0.0.0.0'``, meaning
-"listen on all TCP interfaces."  By default, the Paste HTTP server listens
+"listen on all TCP interfaces."  By default, the HTTP server listens
 only on the ``127.0.0.1`` interface, which is problematic if you're running
 the server on a remote system and you wish to access it with a web browser
 from a local system.  We don't specify a TCP port number to listen on; this
diff --git a/docs/narr/helloworld.py b/docs/narr/helloworld.py
index 5f121d48d..93a403a13 100644
--- a/docs/narr/helloworld.py
+++ b/docs/narr/helloworld.py
@@ -1,4 +1,4 @@
-from paste.httpserver import serve
+from wsgiref.simple_server import make_server
 from pyramid.config import Configurator
 from pyramid.response import Response
 
@@ -10,4 +10,6 @@ if __name__ == '__main__':
    config.add_route('hello', '/hello/{name}')
    config.add_view(hello_world, route_name='hello')
    app = config.make_wsgi_app()
-   serve(app, host='0.0.0.0')
+   server = make_server('0.0.0.0', 8080)
+   server.serve_forever()
+   
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index bac86e982..c2ecba9bb 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -365,10 +365,10 @@ be performed to localize your application.  By default, the
 translation domain is the :term:`project` name of your
 :app:`Pyramid` application.
 
-To change the translation domain of the extracted messages in your
-project, edit the ``setup.cfg`` file of your application, The default
-``setup.cfg`` file of a Paster-generated :app:`Pyramid` application
-has stanzas in it that look something like the following:
+To change the translation domain of the extracted messages in your project,
+edit the ``setup.cfg`` file of your application, The default ``setup.cfg``
+file of a ``pcreate`` -generated :app:`Pyramid` application has stanzas in it
+that look something like the following:
 
 .. code-block:: ini
    :linenos:
@@ -785,7 +785,7 @@ time:
    config = Configurator(settings={'pyramid.default_locale_name':'de'})
 
 You may alternately supply a ``pyramid.default_locale_name`` via an
-application's Paster ``.ini`` file:
+application's ``.ini`` file:
 
 .. code-block:: ini
    :linenos:
@@ -797,8 +797,8 @@ application's Paster ``.ini`` file:
    pyramid.debug_notfound = false
    pyramid.default_locale_name = de
 
-If this value is not supplied via the Configurator constructor or via
-a Paste config file, it will default to ``en``.
+If this value is not supplied via the Configurator constructor or via a
+config file, it will default to ``en``.
 
 If this setting is supplied within the :app:`Pyramid` application
 ``.ini`` file, it will be available as a settings key:
@@ -845,7 +845,7 @@ You can set up a system to allow a deployer to select available
 languages based on convention by using the :mod:`pyramid.settings`
 mechanism:
 
-Allow a deployer to modify your application's PasteDeploy .ini file:
+Allow a deployer to modify your application's ``.ini`` file:
 
 .. code-block:: ini
    :linenos:
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e1b5eb208..66bcea706 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -347,10 +347,9 @@ Jython; use it instead.
 What Gets Installed
 -------------------
 
-When you ``easy_install`` :app:`Pyramid`, various Zope libraries,
-various Chameleon libraries, WebOb, Paste, PasteScript, and
-PasteDeploy libraries are installed.
+When you ``easy_install`` :app:`Pyramid`, various other libraries such as
+WebOb, PasteDeploy, and others are installed.
 
-Additionally, as chronicled in :ref:`project_narr`, scaffolds will be registered,
-which make it easy to start a new :app:`Pyramid` project. 
+Additionally, as chronicled in :ref:`project_narr`, scaffolds will be
+registered, which make it easy to start a new :app:`Pyramid` project.
 
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index 5c7d4c3fb..cf8f96c8a 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -20,7 +20,7 @@ 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 Paste within Pyramid.  For detailed
+only contextualizes the use of PasteDeploy within Pyramid.  For detailed
 documentation, see http://pythonpaste.org.
 
 PasteDeploy
@@ -76,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 ``pserve`` 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index c961b4143..4f96448af 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -683,7 +683,8 @@ The ``myproject`` :term:`package` lives inside the ``MyProject``
 
 #. An ``__init__.py`` file signifies that this is a Python :term:`package`.
    It also contains code that helps users run the application, including a
-   ``main`` function which is used as a Paste entry point.
+   ``main`` function which is used as a entry point for commands such as
+   ``pserve``, ``pshell``, ``pviews``, and others.
 
 #. A ``resources.py`` module, which contains :term:`resource` code.
 
@@ -750,7 +751,7 @@ also informs Python that the directory which contains it is a *package*.
    directory of the ``mypackage`` package).
 
    Line 12 returns a :term:`WSGI` application to the caller of the function
-   (Paste).
+   (Pyramid's pserve).
 
 .. index::
    single: views.py
diff --git a/docs/narr/vhosting.rst b/docs/narr/vhosting.rst
index 8697df6a0..d37518052 100644
--- a/docs/narr/vhosting.rst
+++ b/docs/narr/vhosting.rst
@@ -25,11 +25,11 @@ can host a :app:`Pyramid` application as a "subset" of some other site
 (e.g. under ``http://example.com/mypyramidapplication/`` as opposed to
 under ``http://example.com/``).
 
-If you use a "pure Python" environment, this functionality is provided
-by Paste's `urlmap <http://pythonpaste.org/modules/urlmap.html>`_
-"composite" WSGI application.  Alternately, you can use
-:term:`mod_wsgi` to serve your application, which handles this virtual
-hosting translation for you "under the hood".
+If you use a "pure Python" environment, this functionality can be provided by
+Paste's `urlmap <http://pythonpaste.org/modules/urlmap.html>`_ "composite"
+WSGI application.  Alternately, you can use :term:`mod_wsgi` to serve your
+application, which handles this virtual hosting translation for you "under
+the hood".
 
 If you use the ``urlmap`` composite application "in front" of a
 :app:`Pyramid` application or if you use :term:`mod_wsgi` to serve
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 96aac6a80..f7707ea29 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -61,14 +61,13 @@ Using the ZCA Global API in a :app:`Pyramid` Application
 effectively making it impossible to run more than one Zope application
 in a single process.
 
-However, for ease of deployment, it's often useful to be able to run
-more than a single application per process.  For example, use of a
-:term:`Paste` "composite" allows you to run separate individual WSGI
+However, for ease of deployment, it's often useful to be able to run more
+than a single application per process.  For example, use of a
+:term:`PasteDeploy` "composite" allows you to run separate individual WSGI
 applications in the same process, each answering requests for some URL
-prefix.  This makes it possible to run, for example, a TurboGears
-application at ``/turbogears`` and a :app:`Pyramid` application at
-``/pyramid``, both served up using the same :term:`WSGI` server
-within a single Python process.
+prefix.  This makes it possible to run, for example, a TurboGears application
+at ``/turbogears`` and a :app:`Pyramid` application at ``/pyramid``, both
+served up using the same :term:`WSGI` server within a single Python process.
 
 Most production Zope applications are relatively large, making it
 impractical due to memory constraints to run more than one Zope
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index fd6fd5884..c2baa5bd8 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -77,7 +77,7 @@ commands and files.
        application = get_app(
          '/Users/chrism/modwsgi/env/myapp/production.ini', 'main')
 
-    The first argument to ``get_app`` is the project Paste configuration file
+    The first argument to ``get_app`` is the project configuration file
     name.  It's best to use the ``production.ini`` file provided by your
     scaffold, as it contains settings appropriate for
     production.  The second is the name of the section within the .ini file