Merge branch 'jayd3e-master'

1 files changed, 4 insertions, 4 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.