Merge branch 'jayd3e-master'

1 files changed, 11 insertions, 12 deletions

diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst
index 4a41840eb..8602c5105 100644
--- a/docs/whatsnew-1.0.rst
+++ b/docs/whatsnew-1.0.rst
@@ -16,7 +16,7 @@ The major feature additions in Pyramid 1.0 are:
 
 - BFG conversion script
 
-- Paster template improvements
+- Scaffold improvements
 
 - Terminology changes
 
@@ -94,24 +94,24 @@ The ``bfg2pyramid`` conversion script performs a mostly automated conversion
 of an existing :mod:`repoze.bfg` application to Pyramid.  The process is
 described in :ref:`converting_a_bfg_app`.
 
-Paster Template Improvements
+Scaffold Improvements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- The paster templates now have much nicer CSS and graphics.
+- The scaffolds now have much nicer CSS and graphics.
 
-- The ``development.ini`` generated by all paster templates is now configured
+- The ``development.ini``, generated by all scaffolds, is now configured
   to use the :term:`WebError` interactive exception debugger by default.
 
-- All paster templates have been normalized: each now uses the name ``main``
+- All scaffolds have been normalized: each now uses the name ``main``
   to represent the function that returns a WSGI application, and each now has
   roughly the same shape of development.ini style.
 
-- All preexisting paster templates now use "imperative" configuration
+- All preexisting scaffolds now use "imperative" configuration
   (``starter``, ``routesalchemy``, ``alchemy``, ``zodb``) instead of ZCML
   configuration.
 
 - The ``pyramid_zodb``, ``pyramid_routesalchemy`` and ``pyramid_alchemy``
-  paster templates now use a default "commit veto" hook when configuring the
+  scaffolds now use a default "commit veto" hook when configuring the
   ``repoze.tm2`` transaction manager in ``development.ini``.  This prevents a
   transaction from being committed when the response status code is within
   the 400 or 500 ranges.  See also
@@ -151,7 +151,7 @@ Terminology Changes
 - All documentation which previously referred to "model" now refers to
   "resource".
 
-- The ``starter`` paster template now has a ``resources.py`` module instead
+- The ``starter`` scaffold now has a ``resources.py`` module instead
   of a ``models.py`` module.
 
 - Positional argument names of various APIs have been changed from
@@ -260,7 +260,7 @@ ZCML Externalized
 - Most references to ZCML in narrative chapters have been removed or
   redirected to ``pyramid_zcml`` locations.
 
-- The ``starter_zcml`` paster template has been moved to the ``pyramid_zcml``
+- The ``starter_zcml`` paster scaffold has been moved to the ``pyramid_zcml``
   package.
 
 Imperative Two-Phase Configuration
@@ -279,7 +279,7 @@ subclassing a Configurator just to add methods.  See :ref:`add_directive` for
 more info.
 
 Surrounding application configuration with ``config.begin()`` and
-``config.end()`` is no longer necessary.  All paster templates have been
+``config.end()`` is no longer necessary.  All scaffolds have been
 changed to no longer call these functions.
 
 Better Support for Global Template Variables During Rendering
@@ -508,8 +508,7 @@ Deprecations and Behavior Differences
   (``request.registry.settings``).
 
 - The decorator previously known as ``pyramid.view.bfg_view`` is now known
-  most formally as :class:`pyramid.view.view_config` in docs and paster
-  templates.
+  most formally as :class:`pyramid.view.view_config` in docs and scaffolds.
 
 - Obtaining the ``settings`` object via
   ``registry.{get|query}Utility(ISettings)`` is now deprecated.  Instead,