- The ``alchemy`` scaffold has been removed.

- The ``routesalchemy`` scaffold has been renamed ``alchemy``.

4 files changed, 16 insertions, 21 deletions

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index fe015d72f..4c528ab58 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -28,7 +28,6 @@ as part of Pyramid.
    single: starter scaffold
    single: zodb scaffold
    single: alchemy scaffold
-   single: routesalchemy scaffold
 
 .. _additional_paster_scaffolds:
 
@@ -52,12 +51,8 @@ The included scaffolds are these:
 ``zodb``
   URL mapping via :term:`traversal` and persistence via :term:`ZODB`.
 
-``routesalchemy``
-  URL mapping via :term:`URL dispatch` and persistence via
-  :term:`SQLAlchemy`
-
 ``alchemy``
-  URL mapping via :term:`traversal` and persistence via
+  URL mapping via :term:`URL dispatch` and persistence via
   :term:`SQLAlchemy`
 
 .. note::
@@ -99,18 +94,18 @@ Or on Windows:
 
 The above command uses the ``pcreate`` command to create a project with the
 ``starter`` scaffold.  To use a different scaffold, such as
-``routesalchemy``, you'd just change the ``-s`` argument value.  For example,
+``alchemy``, you'd just change the ``-s`` argument value.  For example,
 on UNIX:
 
 .. code-block:: text
 
-   $ bin/pcreate -s routesalchemy MyProject
+   $ bin/pcreate -s alchemy MyProject
 
 Or on Windows:
 
 .. code-block:: text
 
-   $ Scripts\pcreate routesalchemy MyProject
+   $ Scripts\pcreate alchemy MyProject
 
 Here's sample output from a run of ``pcreate`` on UNIX for a project we name
 ``MyProject``:
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index acd2f04f3..db8ab1fbe 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 ``routesalchemy`` scaffold are
+The starter files generated by the ``alchemy`` scaffold are
 basic, but they provide a good orientation for the high-level patterns common
 to most :term:`url dispatch` -based :app:`Pyramid` projects.
 
@@ -98,7 +98,7 @@ register views for the routes, mapping your patterns to code:
 
 The first positional ``add_view`` argument ``tutorial.views.my_view`` is the
 dotted name to a *function* we write (generated by the
-``routesalchemy`` scaffold) that is given a ``request`` object and
+``alchemy`` scaffold) that is given a ``request`` object and
 which returns a response or a dictionary.  This view also names a
 ``renderer``, which is a template which lives in the ``templates``
 subdirectory of the package.  When the ``tutorial.views.my_view`` view
@@ -124,7 +124,7 @@ 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 ``routesalchemy`` scaffold
+``models.py`` file is where the ``alchemy`` 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 ded36f6e2..147f7f563 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -84,7 +84,7 @@ Making a Project
 
 Your next step is to create a project.  :app:`Pyramid` supplies a
 variety of scaffolds to generate sample projects.  We will use the
-``routesalchemy`` scaffold, which generates an application
+``alchemy`` scaffold, which generates an application
 that uses :term:`SQLAlchemy` and :term:`URL dispatch`.
 
 The below instructions assume your current working directory is the
@@ -94,15 +94,15 @@ On UNIX:
 
 .. code-block:: text
 
-   $ bin/pcreate -s routesalchemy tutorial
+   $ bin/pcreate -s alchemy tutorial
 
 On Windows:
 
 .. code-block:: text
 
-   c:\pyramidtut> Scripts\pcreate -s routesalchemy tutorial
+   c:\pyramidtut> Scripts\pcreate -s alchemy tutorial
 
-.. note:: If you are using Windows, the ``routesalchemy``
+.. note:: If you are using Windows, the ``alchemy``
    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
@@ -222,10 +222,10 @@ page.  You can read more about the purpose of the icon at
 :ref:`debug_toolbar`.  It allows you to get information about your
 application while you develop.
 
-Decisions the ``routesalchemy`` Scaffold Has Made For You
+Decisions the ``alchemy`` Scaffold Has Made For You
 =================================================================
 
-Creating a project using the ``routesalchemy`` scaffold makes
+Creating a project using the ``alchemy`` scaffold makes
 the following assumptions:
 
 - you are willing to use :term:`SQLAlchemy` as a database access tool
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index d0027d2f8..8fa8ea3ae 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -13,9 +13,9 @@ We write a test class for the model class ``Page`` and another test class
 for the ``initialize_sql`` function.
 
 To do so, we'll retain the ``tutorial.tests.ViewTests`` class provided as a
-result of the ``routesalchemy`` project generator.  We'll add two
-test classes: one for the ``Page`` model named ``PageModelTests``, one for the
-``initialize_sql`` function named ``InitializeSqlTests``.
+result of the ``alchemy`` scaffold.  We'll add two test classes: one for the
+``Page`` model named ``PageModelTests``, one for the ``initialize_sql``
+function named ``InitializeSqlTests``.
 
 Testing the Views
 =================