Merge branch 'jayd3e-master'

1 files changed, 4 insertions, 4 deletions

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.