Merge branch 'jayd3e-master'

2 files changed, 9 insertions, 9 deletions

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