6 files changed, 21 insertions, 21 deletions

diff --git a/docs/tutorials/bfg/index.rst b/docs/tutorials/bfg/index.rst
index 9f9a5238c..e68e63b0b 100644
--- a/docs/tutorials/bfg/index.rst
+++ b/docs/tutorials/bfg/index.rst
@@ -117,7 +117,7 @@ Here's how to convert a :mod:`repoze.bfg` application to a
    (if you've been using the example paths, this will be
    ``/tmp/bfgapp/setup.py``) to depend on the ``pyramid`` distribution
    instead the of ``repoze.bfg`` distribution in its
-   ``install_requires`` list.  If you used a ``paster`` template to
+   ``install_requires`` list.  If you used a scaffold to
    create the :mod:`repoze.bfg` application, you can do so by changing
    the ``requires`` line near the top of the ``setup.py`` file.  The
    original may look like this:
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index 5da7f32c7..523aef8a8 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -79,7 +79,7 @@ commands and files.
 
     The first argument to ``get_app`` is the project Paste configuration file
     name.  It's best to use the ``production.ini`` file provided by your
-    Pyramid paster template, as it contains settings appropriate for
+    scaffold, as it contains settings appropriate for
     production.  The second is the name of the section within the .ini file
     that should be loaded by ``mod_wsgi``.  The assignment to the name
     ``application`` is important: mod_wsgi requires finding such an
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index c0faf30de..66cf37e4e 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -2,7 +2,7 @@
 Basic Layout
 ============
 
-The starter files generated by the ``pyramid_zodb`` template are basic, but
+The starter files generated by the ``pyramid_zodb`` scaffold are basic, but
 they provide a good orientation for the high-level patterns common to most
 :term:`traversal` -based :app:`Pyramid` (and :term:`ZODB` based) projects.
 
@@ -79,7 +79,7 @@ hierarchically in a :term:`resource tree`.  This tree is consulted by
 tree represents the site structure, but it *also* represents the
 :term:`domain model` of the application, because each resource is a node
 stored persistently in a :term:`ZODB` database.  The ``models.py`` file is
-where the ``pyramid_zodb`` Paster template put the classes that implement our
+where the ``pyramid_zodb`` scaffold put the classes that implement our
 resource objects, each of which happens also to be a domain model object.
 
 Here is the source for ``models.py``:
@@ -110,7 +110,7 @@ Here is the source for ``models.py``:
 Views With ``views.py``
 -----------------------
 
-Our paster template generated a default ``views.py`` on our behalf.  It
+Our scaffold generated a default ``views.py`` on our behalf.  It
 contains a single view, which is used to render the page shown when you visit
 the URL ``http://localhost:6543/``.
 
@@ -153,7 +153,7 @@ Let's try to understand the components in this module:
 
 #. *Lines 5-6*.  We define a :term:`view callable` named ``my_view``, which
    we decorated in the step above.  This view callable is a *function* we
-   write generated by the ``pyramid_zodb`` template that is given a
+   write generated by the ``pyramid_zodb`` scaffold that is given a
    ``request`` and which returns a dictionary.  The ``mytemplate.pt``
    :term:`renderer` named by the asset specification in the step above will
    convert this dictionary to a :term:`response` on our behalf.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 208be68f8..f4fb4323c 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -131,8 +131,8 @@ Making a Project
 ================
 
 Your next step is to create a project.  :app:`Pyramid` supplies a
-variety of templates to generate sample projects.  For this tutorial,
-we will use the :term:`ZODB` -oriented template named ``pyramid_zodb``.
+variety of scaffolds to generate sample projects.  For this tutorial,
+we will use the :term:`ZODB` -oriented scaffold named ``pyramid_zodb``.
 
 The below instructions assume your current working directory is the
 "virtualenv" named "pyramidtut".
@@ -149,7 +149,7 @@ On Windows:
 
    c:\pyramidtut> Scripts\paster create -t pyramid_zodb tutorial
 
-.. note:: If you are using Windows, the ``pyramid_zodb`` Paster template
+.. note:: If you are using Windows, the ``pyramid_zodb`` Paster 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
@@ -237,7 +237,7 @@ On Windows:
   c:\pyramidtut\tutorial> ..\Scripts\nosetests --cover-package=tutorial \
        --cover-erase --with-coverage
 
-Looks like the code in the ``pyramid_zodb`` template for ZODB projects is
+Looks like the code in the ``pyramid_zodb`` scaffold for ZODB projects is
 missing some test coverage, particularly in the file named
 ``models.py``.
 
@@ -247,10 +247,10 @@ Visit the Application in a Browser
 In a browser, visit `http://localhost:6543/ <http://localhost:6543>`_.
 You will see the generated application's default page.
 
-Decisions the ``pyramid_zodb`` Template Has Made For You
+Decisions the ``pyramid_zodb`` Scaffold Has Made For You
 ========================================================
 
-Creating a project using the ``pyramid_zodb`` template makes the following
+Creating a project using the ``pyramid_zodb`` scaffold makes the following
 assumptions:
 
 - you are willing to use :term:`ZODB` as persistent storage
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 4d3496788..0dbcf6684 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -2,7 +2,7 @@
 Basic Layout
 ============
 
-The starter files generated by the ``pyramid_routesalchemy`` template are
+The starter files generated by the ``pyramid_routesalchemy`` scaffold are
 basic, but they provide a good orientation for the high-level patterns common
 to most :term:`url dispatch` -based :app:`Pyramid` projects.
 
@@ -88,7 +88,7 @@ Since this route has a ``pattern`` equalling ``/`` it is the route that will
 be called when the URL ``/`` is visted, e.g. ``http://localhost:6543/``.  The
 argument named ``view`` with the value ``tutorial.views.my_view`` is the
 dotted name to a *function* we write (generated by the
-``pyramid_routesalchemy`` template) that is given a ``request`` object and
+``pyramid_routesalchemy`` scaffold) that is given a ``request`` object and
 which returns a response or a dictionary.
 
 You will use :meth:`pyramid.config.Configurator.add_route` statements in a
@@ -117,8 +117,8 @@ Content Models with ``models.py``
 In a SQLAlchemy-based application, a *model* object is an object
 composed by querying the SQL database which backs an application.
 SQLAlchemy is an "object relational mapper" (an ORM).  The
-``models.py`` file is where the ``pyramid_routesalchemy`` Paster
-template put the classes that implement our models.
+``models.py`` file is where the ``pyramid_routesalchemy`` scaffold
+put the classes that implement our models.
 
 Let's take a look. First, we need some imports to support later code.
 
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index ed81e3774..b5c73e9c5 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -83,8 +83,8 @@ Making a Project
 ================
 
 Your next step is to create a project.  :app:`Pyramid` supplies a
-variety of templates to generate sample projects.  We will use the
-``pyramid_routesalchemy`` template, which generates an application
+variety of scaffolds to generate sample projects.  We will use the
+``pyramid_routesalchemy`` scaffold, which generates an application
 that uses :term:`SQLAlchemy` and :term:`URL dispatch`.
 
 The below instructions assume your current working directory is the
@@ -103,7 +103,7 @@ On Windows:
    c:\pyramidtut> Scripts\paster create -t pyramid_routesalchemy tutorial
 
 .. note:: If you are using Windows, the ``pyramid_routesalchemy``
-   Paster template may not deal gracefully with installation into a
+   scaffold may not 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 directories that do not contain spaces in their paths.
@@ -217,10 +217,10 @@ Visit the Application in a Browser
 In a browser, visit ``http://localhost:6543/``.  You will see the
 generated application's default page.
 
-Decisions the ``pyramid_routesalchemy`` Template Has Made For You
+Decisions the ``pyramid_routesalchemy`` Scaffold Has Made For You
 =================================================================
 
-Creating a project using the ``pyramid_routesalchemy`` template makes
+Creating a project using the ``pyramid_routesalchemy`` scaffold makes
 the following assumptions:
 
 - you are willing to use :term:`SQLAlchemy` as a database access tool