It was decided that pyramid would undergo a terminology change.

'Paster templates' will now be refered to as 'scaffolds,' while
'rendered templates' will remain as 'templates.'  I have changed
the docs to reflect this change in terminology.

2 files changed, 10 insertions, 10 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.
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