remove all reference to the paster command-line utility

61 files changed, 231 insertions, 293 deletions

diff --git a/docs/glossary.rst b/docs/glossary.rst
index c5452401c..472e591a9 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -930,8 +930,8 @@ Glossary
 
    scaffold
      A project template that helps users get started writing a Pyramid
-     application quickly.  Scaffolds are usually used via the ``paster
-     create`` command.
+     application quickly.  Scaffolds are usually used via the ``pcreate``
+     command.
 
    pyramid_exclog
      A package which logs Pyramid application exception (error) information
diff --git a/docs/narr/MyProject/setup.py b/docs/narr/MyProject/setup.py
index 5203fc2a7..74879f65d 100644
--- a/docs/narr/MyProject/setup.py
+++ b/docs/narr/MyProject/setup.py
@@ -32,6 +32,5 @@ setup(name='MyProject',
       [paste.app_factory]
       main = myproject:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index a8459ac27..0dc41e919 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -9,7 +9,7 @@ chapter.
 
 .. index::
    pair: matching views; printing
-   single: paster pviews
+   single: pviews
 
 .. _displaying_matching_views:
 
@@ -18,9 +18,9 @@ Displaying Matching Views for a Given URL
 
 For a big application with several views, it can be hard to keep the view
 configuration details in your head, even if you defined all the views
-yourself. You can use the ``paster pviews`` command in a terminal window to
+yourself. You can use the ``pviews`` command in a terminal window to
 print a summary of matching routes and views for a given URL in your
-application. The ``paster pviews`` command accepts two arguments. The first
+application. The ``pviews`` command accepts two arguments. The first
 argument to ``pviews`` is the path to your application's ``.ini`` file and
 section name inside the ``.ini`` file which points to your application.  This
 should be of the format ``config_file#section_name``. The second argument is
@@ -32,7 +32,7 @@ Here is an example for a simple view configuration using :term:`traversal`:
 .. code-block:: text
    :linenos:
 
-   $ ../bin/paster pviews development.ini#tutorial /FrontPage
+   $ ../bin/pviews development.ini#tutorial /FrontPage
 
    URL = /FrontPage
 
@@ -56,7 +56,7 @@ A more complex configuration might generate something like this:
 .. code-block:: text
    :linenos:
 
-   $ ../bin/paster pviews development.ini#shootout /about
+   $ ../bin/pviews development.ini#shootout /about
 
    URL = /about
 
@@ -103,14 +103,13 @@ displayed first, followed by any views that are associated with that route.
 As you can see from the second matching route output, a route can be
 associated with more than one view.
 
-For a URL that doesn't match any views, ``paster pviews`` will simply print
-out a *Not found* message.
+For a URL that doesn't match any views, ``pviews`` will simply print out a
+*Not found* message.
 
 
 .. index::
    single: interactive shell
    single: IPython
-   single: paster pshell
    single: pshell
 
 .. _interactive_shell:
@@ -121,7 +120,7 @@ The Interactive Shell
 Once you've installed your program for development using ``setup.py
 develop``, you can use an interactive Python shell to execute expressions in
 a Python environment exactly like the one that will be used when your
-application runs "for real".  To do so, use the ``paster pshell`` command.
+application runs "for real".  To do so, use the ``pshell`` command.
 
 The argument to ``pshell`` follows the format ``config_file#section_name``
 where ``config_file`` is the path to your application's ``.ini`` file and
@@ -145,7 +144,7 @@ name ``MyProject`` as a section name:
 
 .. code-block:: text
 
-    chrism@thinko env26]$ bin/paster pshell starter/development.ini#MyProject
+    chrism@thinko env26]$ bin/pshell starter/development.ini#MyProject
     Python 2.6.5 (r265:79063, Apr 29 2010, 00:31:32) 
     [GCC 4.4.3] on linux2
     Type "help" for more information.
@@ -180,7 +179,7 @@ hash after the filename:
 
 .. code-block:: text
 
-    chrism@thinko env26]$ bin/paster pshell starter/development.ini
+    chrism@thinko env26]$ bin/pshell starter/development.ini
 
 Press ``Ctrl-D`` to exit the interactive shell (or ``Ctrl-Z`` on Windows).
 
@@ -243,7 +242,7 @@ exposed, and the request is configured to generate urls from the host
 
 .. code-block:: text
 
-    chrism@thinko env26]$ bin/paster pshell starter/development.ini
+    chrism@thinko env26]$ bin/pshell starter/development.ini
     Python 2.6.5 (r265:79063, Apr 29 2010, 00:31:32) 
     [GCC 4.4.3] on linux2
     Type "help" for more information.
@@ -273,22 +272,20 @@ IPython
 ~~~~~~~
 
 If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ installed in
-the interpreter you use to invoke the ``paster`` command, the ``pshell``
-command will use an IPython interactive shell instead of a standard Python
-interpreter shell.  If you don't want this to happen, even if you have
-IPython installed, you can pass the ``--disable-ipython`` flag to the
-``pshell`` command to use a standard Python interpreter shell
-unconditionally.
+the interpreter you use to invoke the ``pshell`` command, ``pshell`` will use
+an IPython interactive shell instead of a standard Python interpreter shell.
+If you don't want this to happen, even if you have IPython installed, you can
+pass the ``--disable-ipython`` flag to the ``pshell`` command to use a
+standard Python interpreter shell unconditionally.
 
 .. code-block:: text
 
-   [chrism@vitaminf shellenv]$ ../bin/paster pshell --disable-ipython \
+   [chrism@vitaminf shellenv]$ ../bin/pshell --disable-ipython \
                                 development.ini#MyProject
 
 
 .. index::
    pair: routes; printing
-   single: paster proutes
    single: proutes
 
 .. _displaying_application_routes:
@@ -296,11 +293,11 @@ unconditionally.
 Displaying All Application Routes
 ---------------------------------
 
-You can use the ``paster proutes`` command in a terminal window to print a
-summary of routes related to your application.  Much like the ``paster
-pshell`` command (see :ref:`interactive_shell`), the ``paster proutes``
-command accepts one argument with the format ``config_file#section_name``.
-The ``config_file`` is the path to your application's ``.ini`` file, and
+You can use the ``proutes`` command in a terminal window to print a summary
+of routes related to your application.  Much like the ``pshell``
+command (see :ref:`interactive_shell`), the ``proutes`` command
+accepts one argument with the format ``config_file#section_name``.  The
+``config_file`` is the path to your application's ``.ini`` file, and
 ``section_name`` is the ``app`` section name inside the ``.ini`` file which
 points to your application.  By default, the ``section_name`` is ``main`` and
 can be omitted.
@@ -310,7 +307,7 @@ For example:
 .. code-block:: text
    :linenos:
 
-   [chrism@thinko MyProject]$ ../bin/paster proutes development.ini#MyProject
+   [chrism@thinko MyProject]$ ../bin/proutes development.ini#MyProject
    Name            Pattern                        View
    ----            -------                        ----                     
    home            /                              <function my_view>
@@ -319,19 +316,18 @@ For example:
    static/         static/*subpath                <static_view object>
    catchall        /*subpath                      <function static_view>
 
-``paster proutes`` generates a table.  The table has three columns: a Name
+``proutes`` generates a table.  The table has three columns: a Name
 column, a Pattern column, and a View column.  The items listed in the
 Name column are route names, the items listed in the Pattern column are route
 patterns, and the items listed in the View column are representations of the
 view callable that will be invoked when a request matches the associated
 route pattern.  The view column may show ``None`` if no associated view
 callable could be found.  If no routes are configured within your
-application, nothing will be printed to the console when ``paster proutes``
+application, nothing will be printed to the console when ``proutes``
 is executed.
 
 .. index::
    pair: tweens; printing
-   single: paster ptweens
    single: ptweens
 
 .. _displaying_tweens:
@@ -344,17 +340,17 @@ application request handler and the WSGI application which calls it.  A user
 can get a representation of both the implicit tween ordering (the ordering
 specified by calls to :meth:`pyramid.config.Configurator.add_tween`) and the
 explicit tween ordering (specified by the ``pyramid.tweens`` configuration
-setting) orderings using the ``paster ptweens`` command.  Tween factories
+setting) orderings using the ``ptweens`` command.  Tween factories
 will show up represented by their standard Python dotted name in the
-``paster ptweens`` output.
+``ptweens`` output.
 
-For example, here's the ``paster pwteens`` command run against a system
+For example, here's the ``pwteens`` command run against a system
 configured without any explicit tweens:
 
 .. code-block:: text
    :linenos:
 
-   [chrism@thinko pyramid]$ paster ptweens development.ini 
+   [chrism@thinko pyramid]$ ptweens development.ini 
    "pyramid.tweens" config value NOT set (implicitly ordered tweens used)
 
    Implicit Tween Chain
@@ -366,13 +362,13 @@ configured without any explicit tweens:
    1           pyramid.tweens.excview_tween_factory                excview
    -           -                                                   MAIN
 
-Here's the ``paster pwteens`` command run against a system configured *with*
+Here's the ``pwteens`` command run against a system configured *with*
 explicit tweens defined in its ``development.ini`` file:
 
 .. code-block:: text
    :linenos:
 
-   [chrism@thinko pyramid]$ paster ptweens development.ini  
+   [chrism@thinko pyramid]$ ptweens development.ini  
    "pyramid.tweens" config value set (explicitly ordered tweens used)
 
    Explicit Tween Chain (used)
@@ -395,8 +391,8 @@ explicit tweens defined in its ``development.ini`` file:
    -           -                                                   MAIN
 
 Here's the application configuration section of the ``development.ini`` used
-by the above ``paster ptweens`` command which reprorts that the explicit
-tween chain is used:
+by the above ``ptweens`` command which reports that the explicit tween chain
+is used:
 
 .. code-block:: text
    :linenos:
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 7db1eca73..3c6799afb 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -727,7 +727,7 @@ A user might make use of these framework components like so:
    from pyramid.response import Response
    from pyramid.config import Configurator
    import pyramid_handlers
-   from paste.httpserver import serve
+   from wsgiref.simple_server import make_server
 
    class MyController(BaseController):
        def index(self, id):
@@ -738,7 +738,8 @@ A user might make use of these framework components like so:
        config.include(pyramid_handlers)
        config.add_handler('one', '/{id}', MyController, action='index')
        config.add_handler('two', '/{action}/{id}', MyController)
-       serve(config.make_wsgi_app())
+       server.make_server('0.0.0.0', 8080, config.make_wsgi_app())
+       server.serve_forever()
 
 The :meth:`pyramid.config.Configurator.set_view_mapper` method can be used to
 set a *default* view mapper (overriding the superdefault view mapper used by
@@ -1012,7 +1013,7 @@ Effectively, ``under`` means "closer to the main Pyramid application than",
 For example, the following call to
 :meth:`~pyramid.config.Configurator.add_tween` will attempt to place the
 tween factory represented by ``myapp.tween_factory`` directly 'above' (in
-``paster ptweens`` order) the main Pyramid request handler.
+``ptweens`` order) the main Pyramid request handler.
 
 .. code-block:: python
    :linenos:
@@ -1136,6 +1137,6 @@ time.
 Displaying Tween Ordering
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``paster ptweens`` command-line utility can be used to report the current
+The ``ptweens`` command-line utility can be used to report the current
 implict and explicit tween chains used by an application.  See
 :ref:`displaying_tweens`.
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 823c1ea13..e30a23a9a 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -202,11 +202,11 @@ turn on "debug_authorization", which lets you know why a view execution was
 allowed or denied by printing a message to the console.  These features are
 useful for those WTF moments.
 
-There are also a number of ``paster`` commands that allow you to introspect
-the configuration of your system: ``paster proutes`` shows all configured
-routes for an application in the order they'll be evaluated for matching;
-``paster pviews`` shows all configured views for any given URL.  These are
-also WTF-crushers in some circumstances.
+There are also a number of commands that you can invoke within a Pyramid
+environment that allow you to introspect the configuration of your system:
+``proutes`` shows all configured routes for an application in the order
+they'll be evaluated for matching; ``pviews`` shows all configured views for
+any given URL.  These are also WTF-crushers in some circumstances.
 
 Examples: :ref:`debug_authorization_section` and :ref:`command_line_chapter`.
 
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst
index 3e39151a3..b18fefae0 100644
--- a/docs/narr/logging.rst
+++ b/docs/narr/logging.rst
@@ -32,13 +32,13 @@ format used as the Python `logging module's Configuration file format
 <http://docs.python.org/lib/logging-config-fileformat.html>`_.  The
 application-related and logging-related sections in the configuration file
 can coexist peacefully, and the logging-related sections in the file are used
-from when you run ``paster serve``.
+from when you run ``pserve``.
 
-The ``paster serve`` command calls the `logging.fileConfig function
+The ``pserve`` command calls the `logging.fileConfig function
 <http://docs.python.org/lib/logging-config-api.html>`_ using the specified
 ini file if it contains a ``[loggers]`` section (all of the
 scaffold-generated ``.ini`` files do). ``logging.fileConfig`` reads the
-logging configuration from the ini file upon which ``paster serve`` was
+logging configuration from the ini file upon which ``pserve`` was
 invoked.
 
 Default logging configuration is provided in both the default
@@ -89,7 +89,7 @@ project.  For instance, if you do:
 .. code-block:: text
    :linenos:
 
-   paster create -t pyramid_starter MyApp
+   pcreate -s starter MyApp
 
 The logging configuration will literally be:
 
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index 39ae4f373..5c7d4c3fb 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -1,26 +1,25 @@
 .. _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
+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 Paste within Pyramid.  For detailed
 documentation, see http://pythonpaste.org.
 
@@ -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.
@@ -82,9 +81,9 @@ 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.
+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 345672204..c961b4143 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -20,15 +20,15 @@ distributed more easily than one which does not live within a package.
 a project.  Each scaffold makes different configuration assumptions about
 what type of application you're trying to construct.
 
-These scaffolds are rendered using the :term:`PasteDeploy` ``paster create``
-command.
+These scaffolds are rendered using the ``pcreate`` command that is installed
+as part of Pyramid.
 
 .. index::
    single: scaffolds
-   single: pyramid_starter scaffold
-   single: pyramid_zodb scaffold
-   single: pyramid_alchemy scaffold
-   single: pyramid_routesalchemy scaffold
+   single: starter scaffold
+   single: zodb scaffold
+   single: alchemy scaffold
+   single: routesalchemy scaffold
 
 .. _additional_paster_scaffolds:
 
@@ -44,36 +44,24 @@ each other on a number of axes:
 - the mechanism they use to map URLs to code (:term:`traversal` or :term:`URL
   dispatch`).
 
-- whether or not the ``pyramid_beaker`` library is relied upon as the
-  sessioning implementation (as opposed to no sessioning or default
-  sessioning).
-
 The included scaffolds are these:
 
-``pyramid_starter``
+``starter``
   URL mapping via :term:`traversal` and no persistence mechanism.
 
-``pyramid_zodb``
+``zodb``
   URL mapping via :term:`traversal` and persistence via :term:`ZODB`.
 
-``pyramid_routesalchemy``
+``routesalchemy``
   URL mapping via :term:`URL dispatch` and persistence via
   :term:`SQLAlchemy`
 
-``pyramid_alchemy``
+``alchemy``
   URL mapping via :term:`traversal` and persistence via
   :term:`SQLAlchemy`
 
 .. note::
 
-   At this time, each of these scaffolds uses the :term:`Chameleon`
-   templating system, which is incompatible with Jython.  To use scaffolds to
-   build applications which will run on Jython, you can try the
-   ``pyramid_jinja2_starter`` scaffold which ships as part of the
-   :term:`pyramid_jinja2` package.  You can also just use any above scaffold
-   and replace the Chameleon template it includes with a :term:`Mako`
-   analogue.
-
 Rather than use any of the above scaffolds, Pylons 1 users may feel more
 comfortable installing the :term:`Akhet` development environment, which
 provides a scaffold named ``akhet``.  This scaffold configures a Pyramid
@@ -91,85 +79,64 @@ Creating the Project
 
 In :ref:`installing_chapter`, you created a virtual Python environment via
 the ``virtualenv`` command.  To start a :app:`Pyramid` :term:`project`, use
-the ``paster`` facility installed within the virtualenv.  In
+the ``pcreate`` command installed within the virtualenv.  In
 :ref:`installing_chapter` we called the virtualenv directory ``env``; the
 following command assumes that our current working directory is that
-directory.  We'll choose the ``pyramid_starter`` scaffold for this purpose.
+directory.  We'll choose the ``starter`` scaffold for this purpose.
 
 On UNIX:
 
 .. code-block:: text
 
-   $ bin/paster create -t pyramid_starter
+   $ bin/pcreate -s starter MyProject
 
 Or on Windows:
 
 .. code-block:: text
 
-   $ Scripts\paster.exe create -t pyramid_starter
+   $ Scripts\pcreate -s starter MyProject
 
-The above command uses the ``paster create`` command to create a project with
-the ``pyramid_starter`` scaffold.  To use a different scaffold, such as
-``pyramid_routesalchemy``, you'd just change the last argument.  For example,
+The above command uses the ``pcreate`` command to create a project with the
+``starter`` scaffold.  To use a different scaffold, such as
+``routesalchemy``, you'd just change the ``-s`` argument value.  For example,
 on UNIX:
 
 .. code-block:: text
 
-   $ bin/paster create -t pyramid_routesalchemy
+   $ bin/pcreate -s routesalchemy MyProject
 
 Or on Windows:
 
 .. code-block:: text
 
-   $ Scripts\paster.exe create -t pyramid_routesalchemy
+   $ Scripts\pcreate routesalchemy MyProject
 
-``paster create`` will ask you a single question: the *name* of the project.
-You should use a string without spaces and with only letters in it.  Here's
-sample output from a run of ``paster create`` on UNIX for a project we name
+Here's sample output from a run of ``pcreate`` on UNIX for a project we name
 ``MyProject``:
 
 .. code-block:: text
 
-   $ bin/paster create -t pyramid_starter
-   Selected and implied templates:
-     pyramid#pyramid_starter  pyramid starter project
-
-   Enter project name: MyProject
-   Variables:
-     egg:      MyProject
-     package:  myproject
-     project:  MyProject
+   $ bin/pcreate -s starter MyProject
    Creating template pyramid
    Creating directory ./MyProject
    # ... more output ...
    Running /Users/chrism/projects/pyramid/bin/python setup.py egg_info
 
-.. note:: You can skip the interrogative question about a project
-   name during ``paster create`` by adding the project name to the
-   command line, e.g. ``paster create -t pyramid_starter MyProject``.
-
-.. note:: You may encounter an error when using ``paster create`` if a
-   dependent Python package is not installed. This will result in a traceback
-   ending in ``pkg_resources.DistributionNotFound: <package name>``.  Simply
-   run ``bin/easy_install`` (or ``Script\easy_install.exe`` on Windows), with
-   the missing package name from the error message to work around this issue.
-
-As a result of invoking the ``paster create`` command, a project is created
-in a directory named ``MyProject``.  That directory is a :term:`project`
+As a result of invoking the ``pcreate`` command, a project is created in a
+directory named ``MyProject``.  That directory is a :term:`project`
 directory.  The ``setup.py`` file in that directory can be used to distribute
 your application, or install your application for deployment or development.
 
-A :term:`PasteDeploy` ``.ini`` file named ``development.ini`` will be created
-in the project directory.  You will use this ``.ini`` file to configure a
-server, to run your application, and to debug your application.  It sports
-configuration that enables an interactive debugger and settings optimized for
-development.
+A ``.ini`` file named ``development.ini`` will be created in the project
+directory.  You will use this ``.ini`` file to configure a server, to run
+your application, and to debug your application.  It sports configuration
+that enables an interactive debugger and settings optimized for development.
 
-Another :term:`PasteDeploy` ``.ini`` file named ``production.ini`` will also
-be created in the project directory.  It sports configuration that disables
-any interactive debugger (to prevent inappropriate access and disclosure),
-and turns off a number of debugging settings.  You can use this file to put
-your application into production.
+Another ``.ini`` file named ``production.ini`` will also be created in the
+project directory.  It sports configuration that disables any interactive
+debugger (to prevent inappropriate access and disclosure), and turns off a
+number of debugging settings.  You can use this file to put your application
+into production.
 
 The ``MyProject`` project directory contains an additional subdirectory named
 ``myproject`` (note the case difference) representing a Python
@@ -188,7 +155,7 @@ newly created project directory and use the Python interpreter from the
 :term:`virtualenv` you created during :ref:`installing_chapter` to invoke the
 command ``python setup.py develop``
 
-The file named ``setup.py`` will be in the root of the paster-generated
+The file named ``setup.py`` will be in the root of the pcreate-generated
 project directory.  The ``python`` you're invoking should be the one that
 lives in the ``bin`` (or ``Scripts`` on Windows) directory of your virtual
 Python environment.  Your terminal's current working directory *must* be the
@@ -219,8 +186,8 @@ Elided output from a run of this command on UNIX is shown below:
 
 This will install a :term:`distribution` representing your project into the
 interpreter's library set so it can be found by ``import`` statements and by
-:term:`PasteDeploy` commands such as ``paster serve``, ``paster pshell``,
-``paster proutes`` and ``paster pviews``.
+other console scripts such as ``pserve``, ``pshell``, ``proutes`` and
+``pviews``.
 
 .. index::
    single: running tests
@@ -273,13 +240,13 @@ Here's sample output from a test run on UNIX:
    output to a stream of dots.  If you don't pass ``-q``, you'll see more
    verbose test result output (which normally isn't very useful).
 
-The tests themselves are found in the ``tests.py`` module in your ``paster
-create`` -generated project.  Within a project generated by the
-``pyramid_starter`` scaffold, a single sample test exists.
+The tests themselves are found in the ``tests.py`` module in your ``pcreate``
+generated project.  Within a project generated by the ``starter`` scaffold, a
+single sample test exists.
 
 .. index::
    single: running an application
-   single: paster serve
+   single: pserve
    single: reload
    single: startup
 
@@ -287,26 +254,26 @@ Running The Project Application
 -------------------------------
 
 Once a project is installed for development, you can run the application it
-represents using the ``paster serve`` command against the generated
-configuration file.  In our case, this file is named ``development.ini``.
+represents using the ``pserve`` command against the generated configuration
+file.  In our case, this file is named ``development.ini``.
 
 On UNIX:
 
 .. code-block:: text
 
-   $ ../bin/paster serve development.ini
+   $ ../bin/pserve development.ini
 
 On Windows:
 
 .. code-block:: text
 
-   $ ..\Scripts\paster.exe serve development.ini
+   $ ..\Scripts\pserve development.ini
 
-Here's sample output from a run of ``paster serve`` on UNIX:
+Here's sample output from a run of ``pserve`` on UNIX:
 
 .. code-block:: text
 
-   $ ../bin/paster serve development.ini
+   $ ../bin/pserve development.ini
    Starting server in PID 16601.
    serving on 0.0.0.0:6543 view at http://127.0.0.1:6543
 
@@ -314,18 +281,17 @@ By default, :app:`Pyramid` applications generated from a scaffold
 will listen on TCP port 6543.  You can shut down a server started this way by
 pressing ``Ctrl-C``.
 
-During development, it's often useful to run ``paster serve`` using its
-``--reload`` option.  When ``--reload`` is passed to ``paster serve``,
-changes to any Python module your project uses will cause the server to
-restart.  This typically makes development easier, as changes to Python code
-made within a :app:`Pyramid` application is not put into effect until the
-server restarts.
+During development, it's often useful to run ``pserve`` using its
+``--reload`` option.  When ``--reload`` is passed to ``pserve``, changes to
+any Python module your project uses will cause the server to restart.  This
+typically makes development easier, as changes to Python code made within a
+:app:`Pyramid` application is not put into effect until the server restarts.
 
 For example, on UNIX:
 
 .. code-block:: text
 
-   $ ../bin/paster serve development.ini --reload
+   $ ../bin/pserve development.ini --reload
    Starting subprocess with file monitor
    Starting server in PID 16601.
    serving on 0.0.0.0:6543 view at http://127.0.0.1:6543
@@ -341,14 +307,14 @@ configuration file settings that influence startup and runtime behavior, see
 Viewing the Application
 -----------------------
 
-Once your application is running via ``paster serve``, you may visit
+Once your application is running via ``pserve``, you may visit
 ``http://localhost:6543/`` in your browser.  You will see something in your
 browser like what is displayed in the following image:
 
 .. image:: project.png
 
-This is the page shown by default when you visit an unmodified ``paster
-create`` -generated ``pyramid_starter`` application in a browser.
+This is the page shown by default when you visit an unmodified ``pcreate``
+generated ``starter`` application in a browser.
 
 .. index::
    single: debug toolbar
@@ -403,13 +369,12 @@ Then restart the application to see that the toolbar has been turned off.
 The Project Structure
 ---------------------
 
-The ``pyramid_starter`` scaffold generated a :term:`project` (named
-``MyProject``), which contains a Python :term:`package`.  The package is
-*also* named ``myproject``, but it's lowercased; the scaffold
-generates a project which contains a package that shares its name except for
-case.
+The ``starter`` scaffold generated a :term:`project` (named ``MyProject``),
+which contains a Python :term:`package`.  The package is *also* named
+``myproject``, but it's lowercased; the scaffold generates a project which
+contains a package that shares its name except for case.
 
-All :app:`Pyramid` ``paster`` -generated projects share a similar structure.
+All :app:`Pyramid` ``pcreate`` -generated projects share a similar structure.
 The ``MyProject`` project we've generated has the following directory
 structure:
 
@@ -475,8 +440,8 @@ describe, run, and test your application.
 ~~~~~~~~~~~~~~~~~~~
 
 The ``development.ini`` file is a :term:`PasteDeploy` configuration file.
-Its purpose is to specify an application to run when you invoke ``paster
-serve``, as well as the deployment settings provided to that application.
+Its purpose is to specify an application to run when you invoke ``pserve``,
+as well as the deployment settings provided to that application.
 
 The generated ``development.ini`` file looks like so:
 
@@ -529,9 +494,9 @@ or influencing runtime behavior of a :app:`Pyramid` application.  See
 :ref:`environment_chapter` for more information about these settings.
 
 The name ``main`` in ``[app:main]`` signifies that this is the default
-application run by ``paster serve`` when it is invoked against this
-configuration file.  The name ``main`` is a convention used by PasteDeploy
-signifying that it is the default application.
+application run by ``pserve`` when it is invoked against this configuration
+file.  The name ``main`` is a convention used by PasteDeploy signifying that
+it is the default application.
 
 The ``[server:main]`` section of the configuration file configures a WSGI
 server which listens on TCP port 6543.  It is configured to listen on all
@@ -544,7 +509,7 @@ and ``# End logging configuration`` represent Python's standard library
 between these two markers are passed to the `logging module's config file
 configuration engine
 <http://docs.python.org/howto/logging.html#configuring-logging>`_ when the
-``paster serve`` or ``paster pshell`` commands are executed.  The default
+``pserve`` or ``pshell`` commands are executed.  The default
 configuration sends application logging output to the standard error output
 of your terminal.  For more information about logging configuration, see
 :ref:`logging_chapter`.
@@ -762,7 +727,7 @@ also informs Python that the directory which contains it is a *package*.
 
 #. Lines 4-12 define a function named ``main`` that returns a :app:`Pyramid`
    WSGI application.  This function is meant to be called by the
-   :term:`PasteDeploy` framework as a result of running ``paster serve``.
+   :term:`PasteDeploy` framework as a result of running ``pserve``.
 
    Within this function, application configuration is performed.
 
@@ -922,10 +887,10 @@ way you see fit.
 For example, the configuration method named
 :meth:`~pyramid.config.Configurator.add_view` requires you to pass a
 :term:`dotted Python name` or a direct object reference as the class or
-function to be used as a view.  By default, the ``pyramid_starter`` scaffold
-would have you add view functions to the ``views.py`` module in your
-package.  However, you might be more comfortable creating a ``views``
-*directory*, and adding a single file for each view.
+function to be used as a view.  By default, the ``starter`` scaffold would
+have you add view functions to the ``views.py`` module in your package.
+However, you might be more comfortable creating a ``views`` *directory*, and
+adding a single file for each view.
 
 If your project package name was ``myproject`` and you wanted to arrange all
 your views in a Python subpackage within the ``myproject`` :term:`package`
@@ -980,33 +945,32 @@ Using the Interactive Shell
 
 It is possible to use a Python interpreter prompt loaded with a similar
 configuration as would be loaded if you were running your Pyramid application
-via ``paster serve``.  This can be a useful debugging tool.  See
+via ``pserve``.  This can be a useful debugging tool.  See
 :ref:`interactive_shell` for more details.
 
 Using an Alternate WSGI Server
 ------------------------------
 
 The code generated by a :app:`Pyramid` scaffold assumes that you will be
-using the ``paster serve`` command to start your application while you do
-development.  However, ``paster serve`` is by no means the only way to start
-up and serve a :app:`Pyramid` application.  As we saw in
-:ref:`firstapp_chapter`, ``paster serve`` needn't be invoked at all to run a
-:app:`Pyramid` application.  The use of ``paster serve`` to run a
-:app:`Pyramid` application is purely conventional based on the output of its
-scaffold.
+using the ``pserve`` command to start your application while you do
+development.  However, ``pserve`` is by no means the only way to start up and
+serve a :app:`Pyramid` application.  As we saw in :ref:`firstapp_chapter`,
+``pserve`` needn't be invoked at all to run a :app:`Pyramid` application.
+The use of ``pserve`` to run a :app:`Pyramid` application is purely
+conventional based on the output of its scaffold.
 
 Any :term:`WSGI` server is capable of running a :app:`Pyramid` application.
-Some WSGI servers don't require the :term:`PasteDeploy` framework's ``paster
-serve`` command to do server process management at all.  Each :term:`WSGI`
+Some WSGI servers don't require the :term:`PasteDeploy` framework's
+``pserve`` command to do server process management at all.  Each :term:`WSGI`
 server has its own documentation about how it creates a process to run an
 application, and there are many of them, so we cannot provide the details for
 each here.  But the concepts are largely the same, whatever server you happen
 to use.
 
-One popular production alternative to a ``paster``-invoked server is
+One popular production alternative to a ``pserve``-invoked server is
 :term:`mod_wsgi`. You can also use :term:`mod_wsgi` to serve your
 :app:`Pyramid` application using the Apache web server rather than any
-"pure-Python" server that is started as a result of ``paster serve``.  See
+"pure-Python" server that is started as a result of ``pserve``.  See
 :ref:`modwsgi_tutorial` for details.  However, it is usually easier to
-*develop* an application using a ``paster serve`` -invoked webserver, as
+*develop* an application using a ``pserve`` -invoked webserver, as
 exception and debugging output will be sent to the console.
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 5a18ca851..1ad35b961 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -512,7 +512,7 @@ example:
 
 .. code-block:: text
 
-  $ PYRAMID_DEBUG_AUTHORIZATION=1 bin/paster serve myproject.ini
+  $ PYRAMID_DEBUG_AUTHORIZATION=1 bin/pserve myproject.ini
 
 When any authorization takes place during a top-level view rendering,
 a message will be logged to the console (to stderr) about what ACE in
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index c66264655..f4ebef154 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -8,12 +8,12 @@ you'll see something much like this show up on the console:
 
 .. code-block:: text
 
-  $ paster serve myproject/MyProject.ini
+  $ pserve myproject/MyProject.ini
   Starting server in PID 16601.
   serving on 0.0.0.0:6543 view at http://127.0.0.1:6543
 
 This chapter explains what happens between the time you press the "Return"
-key on your keyboard after typing ``paster serve myproject/MyProject.ini``
+key on your keyboard after typing ``pserve myproject/MyProject.ini``
 and the time the line ``serving on 0.0.0.0:6543 ...`` is output to your
 console.
 
@@ -24,22 +24,21 @@ The Startup Process
 -------------------
 
 The easiest and best-documented way to start and serve a :app:`Pyramid`
-application is to use the ``paster serve`` command against a
+application is to use the ``pserve`` command against a
 :term:`PasteDeploy` ``.ini`` file.  This uses the ``.ini`` file to infer
 settings and starts a server listening on a port.  For the purposes of this
 discussion, we'll assume that you are using this command to run your
 :app:`Pyramid` application.
 
 Here's a high-level time-ordered overview of what happens when you press
-``return`` after running ``paster serve development.ini``.
+``return`` after running ``pserve development.ini``.
 
-#. The :term:`PasteDeploy` ``paster`` command is invoked under your shell
-   with the arguments ``serve`` and ``development.ini``.  As a result, the
-   :term:`PasteDeploy` framework recognizes that it is meant to begin to run
-   and serve an application using the information contained within the
-   ``development.ini`` file.
+#. The ``pserve`` command is invoked under your shell with the argument
+   ``development.ini``.  As a result, Pyramid recognizes that it is meant to
+   begin to run and serve an application using the information contained
+   within the ``development.ini`` file.
 
-#. The PasteDeploy framework finds a section named either ``[app:main]``,
+#. The framework finds a section named either ``[app:main]``,
    ``[pipeline:main]``, or ``[composite:main]`` in the ``.ini`` file.  This
    section represents the configuration of a :term:`WSGI` application that
    will be served.  If you're using a simple application (e.g.
@@ -48,16 +47,16 @@ Here's a high-level time-ordered overview of what happens when you press
    configuration.  If, instead of a simple application, you're using a WSGI
    :term:`pipeline` (e.g. a ``[pipeline:main]`` section), the application
    named on the "last" element will refer to your :app:`Pyramid` application.
-   If instead of a simple application or a pipeline, you're using a Paste
+   If instead of a simple application or a pipeline, you're using a
    "composite" (e.g. ``[composite:main]``), refer to the documentation for
    that particular composite to understand how to make it refer to your
    :app:`Pyramid` application.  In most cases, a Pyramid application built
    from a scaffold will have a single ``[app:main]`` section in it, and this
    will be the application served.
 
-#. The PasteDeploy framework finds all :mod:`logging` related configuration
-   in the ``.ini`` file and uses it to configure the Python standard library
-   logging system for this application.
+#. The framework finds all :mod:`logging` related configuration in the
+   ``.ini`` file and uses it to configure the Python standard library logging
+   system for this application.
 
 #. The application's *constructor* (named by the entry point reference or
    dotted Python name on the ``use=`` line of the section representing your
@@ -82,7 +81,7 @@ Here's a high-level time-ordered overview of what happens when you press
    key/value pairs received by this function in ``**settings`` will be
    composed of all the key/value pairs that are present in the ``[app:main]``
    section (except for the ``use=`` setting) when this function is called by
-   the :term:`PasteDeploy` framework when you run ``paster serve``.
+   when you run ``pserve``.
 
    Our generated ``development.ini`` file looks like so:
 
@@ -110,7 +109,7 @@ Here's a high-level time-ordered overview of what happens when you press
 
    The ``settings`` dictionary contains all the options in the ``[app:main]``
    section of our .ini file except the ``use`` option (which is internal to
-   Paste) such as ``pyramid.reload_templates``,
+   PasteDeploy) such as ``pyramid.reload_templates``,
    ``pyramid.debug_authorization``, etc.
 
 #. The ``main`` function then calls various methods on the instance of the
@@ -130,12 +129,12 @@ Here's a high-level time-ordered overview of what happens when you press
 
 #. Assuming there were no errors, the ``main`` function in ``myproject``
    returns the router instance created by
-   :meth:`pyramid.config.Configurator.make_wsgi_app` back to PasteDeploy.  As
-   far as PasteDeploy is concerned, it is "just another WSGI application".
+   :meth:`pyramid.config.Configurator.make_wsgi_app` back to ``pserve``.  As
+   far as ``pserve`` is concerned, it is "just another WSGI application".
 
-#. PasteDeploy starts the WSGI *server* defined within the ``[server:main]``
-   section.  In our case, this is the ``Paste#http`` server (``use =
-   egg:Paste#http``), and it will listen on all interfaces (``host =
+#. ``pserve`` starts the WSGI *server* defined within the ``[server:main]``
+   section.  In our case, this is the ``egg:pyramid#wsgiref`` server (``use =
+   egg:pyramid#wsgiref``), and it will listen on all interfaces (``host =
    0.0.0.0``), on port number 6543 (``port = 6543``).  The server code itself
    is what prints ``serving on 0.0.0.0:6543 view at http://127.0.0.1:6543``.
    The server serves the application, and the application is running, waiting
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 052843a23..fb9dd56c2 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -625,7 +625,7 @@ variable set to ``1``, For example:
 
 .. code-block:: text
 
-  $ PYRAMID_DEBUG_TEMPLATES=1 bin/paster serve myproject.ini
+  $ PYRAMID_DEBUG_TEMPLATES=1 bin/pserve myproject.ini
 
 To use a setting in the application ``.ini`` file for the same
 purpose, set the ``pyramid.debug_templates`` key to ``true`` within
@@ -786,7 +786,7 @@ variable set to ``1``, For example:
 
 .. code-block:: text
 
-  $ PYRAMID_RELOAD_TEMPLATES=1 bin/paster serve myproject.ini
+  $ PYRAMID_RELOAD_TEMPLATES=1 bin/pserve myproject.ini
 
 To use a setting in the application ``.ini`` file for the same
 purpose, set the ``pyramid.reload_templates`` key to ``true`` within the
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 2fcbce507..9ceb20f21 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -390,7 +390,7 @@ lookup` subsystem takes over to find the most reasonable view callable for
 the matched route.  Most often, there's only one view that will match (a view
 configured with a ``route_name`` argument matching the matched route).  To
 gain a better understanding of how routes and views are associated in a real
-application, you can use the ``paster pviews`` command, as documented in
+application, you can use the ``pviews`` command, as documented in
 :ref:`displaying_matching_views`.
 
 If no route matches after all route patterns are exhausted, :app:`Pyramid`
@@ -772,7 +772,7 @@ which you started the application from.  For example:
    :linenos:
 
     [chrism@thinko pylonsbasic]$ PYRAMID_DEBUG_ROUTEMATCH=true \
-                                 bin/paster serve development.ini
+                                 bin/pserve development.ini
     Starting server in PID 13586.
     serving on 0.0.0.0:6543 view at http://127.0.0.1:6543
     2010-12-16 14:45:19,956 no route matched for url \
@@ -786,7 +786,7 @@ which you started the application from.  For example:
 See :ref:`environment_chapter` for more information about how, and where to
 set these values.
 
-You can also use the ``paster proutes`` command to see a display of all the
+You can also use the ``proutes`` command to see a display of all the
 routes configured in your application; for more information, see
 :ref:`displaying_application_routes`.
 
@@ -1012,8 +1012,8 @@ The above predicate, when added to a number of route configurations ensures
 that the year match argument is '2010' if and only if the route name is
 'ymd', 'ym', or 'y'.
 
-You can also caption the predicates by setting the ``__text__`` attribute. This
-will help you with the ``paster pviews`` command (see
+You can also caption the predicates by setting the ``__text__``
+attribute. This will help you with the ``pviews`` command (see
 :ref:`displaying_application_routes`) and the ``pyramid_debugtoolbar``.
 
 If a predicate is a class just add __text__ property in a standard manner.
diff --git a/docs/tutorials/gae/index.rst b/docs/tutorials/gae/index.rst
index 9c8e8c07e..3bd739480 100644
--- a/docs/tutorials/gae/index.rst
+++ b/docs/tutorials/gae/index.rst
@@ -64,7 +64,7 @@ system.
 
       $ cd app
       $ rm -rf pyramidapp
-      $ bin/paster create -t pyramid_starter pyramidapp
+      $ bin/pcreate -s starter pyramidapp
       $ mv pyramidapp aside
       $ mv aside/pyramidapp .
       $ rm -rf aside
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index 485eec169..fd6fd5884 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -64,7 +64,7 @@ commands and files.
     .. code-block:: text
 
        $ cd ~/modwsgi/env
-       $ bin/paster create -t pyramid_starter myapp
+       $ bin/pcreate -s starter myapp
        $ cd myapp
        $ ../bin/python setup.py install
 
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index d3f2fb455..47cac597b 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -18,7 +18,7 @@ an ``__init__.py`` file.  Even if empty, this marks a directory as a Python
 package.  Our application uses ``__init__.py`` as both a package marker, as
 well as to contain application configuration code.
 
-When you run the application using the ``paster`` command using the
+When you run the application using the ``pserve`` command using the
 ``development.ini`` generated config file, the application configuration
 points at a Setuptools *entry point* described as ``egg:tutorial``.  In our
 application, because the application's ``setup.py`` file says so, this entry
@@ -34,7 +34,7 @@ point happens to be the ``main`` function within the file named
 #. *Lines 5-7*  Define a root factory for our Pyramid application.
 
 #. *Line 12*.  We construct a :term:`Configurator` with a :term:`root
-   factory` and the settings keywords parsed by PasteDeploy.  The root
+   factory` and the settings keywords parsed by :term:`PasteDeploy`.  The root
    factory is named ``get_root``.
 
 #. *Line 13*.  Register a 'static view' which answers requests which start
@@ -167,4 +167,4 @@ application.  Our ZODB database settings are specified as the
 ``zodbconn.uri`` setting within this section.  This value, and the other
 values within this section are passed as ``**settings`` to the ``main``
 function we defined in ``__init__.py`` when the server is started via
-``paster serve``.
+``pserve``.
diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst
index 9dd53609e..ee9c13ab2 100644
--- a/docs/tutorials/wiki/definingmodels.rst
+++ b/docs/tutorials/wiki/definingmodels.rst
@@ -2,7 +2,7 @@
 Defining the Domain Model
 =========================
 
-The first change we'll make to our stock paster-generated application will be
+The first change we'll make to our stock pcreate-generated application will be
 to define two :term:`resource` constructors, one representing a wiki page,
 and another representing the wiki as a mapping of wiki page names to page
 objects.  We'll do this inside our ``models.py`` file.
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index ed3a84118..c21367559 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -37,7 +37,7 @@ Declaring Dependencies in Our ``setup.py`` File
 
 The view code in our application will depend on a package which is not a
 dependency of the original "tutorial" application.  The original "tutorial"
-application was generated by the ``paster create`` command; it doesn't know
+application was generated by the ``pcreate`` command; it doesn't know
 about our custom application requirements.  We need to add a dependency on
 the ``docutils`` package to our ``tutorial`` package's ``setup.py`` file by
 assigning this dependency to the ``install_requires`` parameter in the
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 822e0bd22..c55c310ef 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -130,9 +130,9 @@ Preparation, Windows
 Making a Project
 ================
 
-Your next step is to create a project.  :app:`Pyramid` supplies a
-variety of scaffolds to generate sample projects.  For this tutorial,
-we will use the :term:`ZODB` -oriented scaffold named ``pyramid_zodb``.
+Your next step is to create a project.  :app:`Pyramid` supplies a variety of
+scaffolds to generate sample projects.  For this tutorial, we will use the
+:term:`ZODB` -oriented scaffold named ``zodb``.
 
 The below instructions assume your current working directory is the
 "virtualenv" named "pyramidtut".
@@ -141,15 +141,15 @@ On UNIX:
 
 .. code-block:: text
 
-  $ bin/paster create -t pyramid_zodb tutorial
+  $ bin/pcreate -s zodb tutorial
 
 On Windows:
 
 .. code-block:: text
 
-   c:\pyramidtut> Scripts\paster create -t pyramid_zodb tutorial
+   c:\pyramidtut> Scripts\pcreate -s zodb tutorial
 
-.. note:: If you are using Windows, the ``pyramid_zodb`` Paster scaffold
+.. note:: If you are using Windows, the ``zodb`` scaffold
    doesn't currently deal gracefully with installation into a location
    that contains spaces in the path.  If you experience startup
    problems, try putting both the virtualenv and the project into
@@ -207,13 +207,13 @@ On UNIX:
 
 .. code-block:: text
 
-  $ ../bin/paster serve development.ini --reload
+  $ ../bin/pserve development.ini --reload
 
 On Windows:
 
 .. code-block:: text
 
-  c:\pyramidtut\tutorial> ..\Scripts\paster serve development.ini --reload
+  c:\pyramidtut\tutorial> ..\Scripts\pserve development.ini --reload
 
 Exposing Test Coverage Information
 ==================================
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index a45860ff7..0f950e260 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index 0588f63a0..f632f89d1 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index 7dd7f2fc6..284bc216e 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -40,6 +40,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
index 1241cecd4..2d6eb5ecb 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
@@ -13,9 +13,6 @@ def root_factory(request):
 
 def main(global_config, **settings):
     """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
     """
     authn_policy = AuthTktAuthenticationPolicy(secret='sosecret',
                                                callback=groupfinder)
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 87da2f84a..e296ea1a1 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index 0588f63a0..f632f89d1 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index fa641b50b..d5fd8891f 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -38,6 +38,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index a45860ff7..0f950e260 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index 0588f63a0..f632f89d1 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index fa641b50b..d5fd8891f 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -38,6 +38,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index a45860ff7..0f950e260 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index 0588f63a0..f632f89d1 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index 137b2ee42..dfecb7c5c 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -41,6 +41,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki/src/tests/tutorial/__init__.py b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
index 1241cecd4..2d6eb5ecb 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/__init__.py
@@ -13,9 +13,6 @@ def root_factory(request):
 
 def main(global_config, **settings):
     """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
     """
     authn_policy = AuthTktAuthenticationPolicy(secret='sosecret',
                                                callback=groupfinder)
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 87da2f84a..e296ea1a1 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index 0588f63a0..f632f89d1 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 756618072..866f12bef 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -40,5 +40,4 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 2d25ace00..8dc886373 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -18,7 +18,7 @@ an ``__init__.py`` file.  Even if empty, this marks a directory as a Python
 package.  We use ``__init__.py`` both as a package marker and to contain
 configuration code.
 
-The generated ``development.ini`` file is read by ``paster`` which looks for
+The generated ``development.ini`` file is read by ``pserve`` which looks for
 the application module in the ``use`` variable of the ``app:main``
 section. The *entry point* is defined in the Setuptools configuration of this
 module, specifically in the ``setup.py`` file. For this tutorial, the *entry
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 7aa2214fc..083ec0aa8 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -2,9 +2,9 @@
 Defining the Domain Model
 =========================
 
-The first change we'll make to our stock paster-generated application will be
-to define a :term:`domain model` constructor representing a wiki page.  We'll
-do this inside our ``models.py`` file.
+The first change we'll make to our stock pcreate-generated application will
+be to define a :term:`domain model` constructor representing a wiki page.
+We'll do this inside our ``models.py`` file.
 
 The source code for this tutorial stage can be browsed at
 `http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/models/
@@ -64,7 +64,7 @@ FrontPage object to our database at startup time.
    :language: python
 
 Here, we're using a slightly different binding syntax.  It is otherwise
-largely the same as the ``initialize_sql`` in the paster-generated
+largely the same as the ``initialize_sql`` in the pcreate-generated
 ``models.py``.
 
 Our ``DBSession`` assignment stays the same as the original generated
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 234f91246..21b97f7aa 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -40,7 +40,7 @@ Declaring Dependencies in Our ``setup.py`` File
 
 The view code in our application will depend on a package which is not a
 dependency of the original "tutorial" application.  The original "tutorial"
-application was generated by the ``paster create`` command; it doesn't know
+application was generated by the ``pcreate`` command; it doesn't know
 about our custom application requirements.  We need to add a dependency on
 the ``docutils`` package to our ``tutorial`` package's ``setup.py`` file by
 assigning this dependency to the ``install_requires`` parameter in the
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index bfe75d82e..f9f5c4fba 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -94,13 +94,13 @@ On UNIX:
 
 .. code-block:: text
 
-   $ bin/paster create -t pyramid_routesalchemy tutorial
+   $ bin/pcreate -s routesalchemy tutorial
 
 On Windows:
 
 .. code-block:: text
 
-   c:\pyramidtut> Scripts\paster create -t pyramid_routesalchemy tutorial
+   c:\pyramidtut> Scripts\pcreate -s routesalchemy tutorial
 
 .. note:: If you are using Windows, the ``pyramid_routesalchemy``
    scaffold may not deal gracefully with installation into a
@@ -160,13 +160,13 @@ On UNIX:
 
 .. code-block:: text
 
-   $ ../bin/paster serve development.ini --reload
+   $ ../bin/pserve development.ini --reload
 
 On Windows:
 
 .. code-block:: text
 
-   c:\pyramidtut\tutorial> ..\Scripts\paster serve development.ini --reload
+   c:\pyramidtut\tutorial> ..\Scripts\pserve development.ini --reload
 
 Exposing Test Coverage Information
 ==================================
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/authorization/production.ini b/docs/tutorials/wiki2/src/authorization/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index 785d61326..439a86923 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -43,6 +43,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 99b7cabda..3ab493912 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -42,6 +42,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 99b7cabda..3ab493912 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -42,6 +42,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/tests/production.ini b/docs/tutorials/wiki2/src/tests/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index ef7f1c215..6de8a1fbe 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -44,6 +44,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/views/production.ini b/docs/tutorials/wiki2/src/views/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index 785d61326..439a86923 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -43,6 +43,5 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 8085bbc79..b55a7a9e4 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -805,7 +805,7 @@ class Configurator(
         self.commit()
         app = Router(self.registry)
 
-        # Allow tools like "paster pshell development.ini" to find the 'last'
+        # Allow tools like "pshell development.ini" to find the 'last'
         # registry configured.
         global_registries.add(self.registry)
 
diff --git a/pyramid/config/tweens.py b/pyramid/config/tweens.py
index 3c7ee384f..048309451 100644
--- a/pyramid/config/tweens.py
+++ b/pyramid/config/tweens.py
@@ -29,7 +29,7 @@ class TweensConfiguratorMixin(object):
         registry` as well as the Pyramid rendering machinery.
 
         .. note:: You can view the tween ordering configured into a given
-                  Pyramid application by using the ``paster ptweens``
+                  Pyramid application by using the ``ptweens``
                   command.  See :ref:`displaying_tweens`.
 
         The ``tween_factory`` argument must be a :term:`dotted Python name`
@@ -61,7 +61,7 @@ class TweensConfiguratorMixin(object):
         For example, calling ``add_tween('myapp.tfactory',
         over=pyramid.tweens.MAIN)`` will attempt to place the tween factory
         represented by the dotted name ``myapp.tfactory`` directly 'above'
-        (in ``paster ptweens`` order) the main Pyramid request handler.
+        (in ``ptweens`` order) the main Pyramid request handler.
         Likewise, calling ``add_tween('myapp.tfactory',
         over=pyramid.tweens.MAIN, under='mypkg.someothertween')`` will
         attempt to place this tween factory 'above' the main handler but
diff --git a/pyramid/scaffolds/alchemy/setup.py_tmpl b/pyramid/scaffolds/alchemy/setup.py_tmpl
index 3a643c8b8..68f8e6245 100644
--- a/pyramid/scaffolds/alchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.py_tmpl
@@ -42,6 +42,5 @@ setup(name='{{project}}',
       [paste.app_factory]
       main = {{package}}:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/pyramid/scaffolds/routesalchemy/setup.py_tmpl b/pyramid/scaffolds/routesalchemy/setup.py_tmpl
index e62717742..a2cdaac60 100644
--- a/pyramid/scaffolds/routesalchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/setup.py_tmpl
@@ -42,6 +42,5 @@ setup(name='{{project}}',
       [paste.app_factory]
       main = {{package}}:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index 44bd66bd3..e63579d50 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
@@ -32,6 +32,5 @@ setup(name='{{project}}',
       [paste.app_factory]
       main = {{package}}:main
       """,
-      paster_plugins=['pyramid'],
       )
 
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py
index 9b8b975a3..c0b60b61b 100644
--- a/pyramid/scaffolds/tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -39,10 +39,10 @@ class TemplateTest(object):
             py = os.path.join(self.directory, 'bin', 'python')
             subprocess.check_call([py, 'setup.py', 'install'])
             subprocess.check_call([py, 'setup.py', 'test'])
-            paster = os.path.join(self.directory, 'bin', 'paster')
+            pserve = os.path.join(self.directory, 'bin', 'pserve')
             for ininame, hastoolbar in (('development.ini', True),
                                         ('production.ini', False)):
-                proc = subprocess.Popen([paster, 'serve', ininame])
+                proc = subprocess.Popen([pserve, ininame])
                 try:
                     time.sleep(5)
                     proc.poll()
diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index 6bcd7cbbd..812b85e83 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -38,6 +38,5 @@ setup(name='{{project}}',
       [paste.app_factory]
       main = {{package}}:main
       """,
-      paster_plugins=['pyramid'],
       )