From 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a Mon Sep 17 00:00:00 2001
From: Stephen Martin <lockwood@opperline.com>
Date: Mon, 17 Sep 2018 18:20:48 -0700
Subject: version cleanup

---
 docs/glossary.rst           | 17 ++++++-----------
 docs/narr/cookiecutters.rst | 16 ++++++++--------
 2 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'docs')

diff --git a/docs/glossary.rst b/docs/glossary.rst
index b941d46f6..ae7d4cf42 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1155,20 +1155,15 @@ Glossary
    cookiecutter
       A command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates), e.g., creating a Python package project from a Python package project template.
 
-      The unified cookiecutter ``pyramid-cookiecutter-starter`` merged features from the three previous cookiecutters which are now deprecated.
-
-      * `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
-
-
-      .. versionadded:: 1.10
+      .. versionadded:: 1.8
+          Added cookiecutter support.
 
-      * `pyramid-cookiecutter-alchemy <https://github.com/Pylons/pyramid-cookiecutter-alchemy>`_
-      * `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
-      * `pyramid-cookiecutter-zodb <https://github.com/Pylons/pyramid-cookiecutter-zodb>`_
+      .. versionchanged:: 1.10
+          Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``.
 
       .. deprecated:: 1.10
-
-      .. versionadded:: 1.8
+          ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported.
+          Use ``pyramid-cookiecutter-starter`` going forward.
 
       .. seealso:: See also :term:`scaffold`.
 
diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst
index 9b4b7eeac..9883713cb 100644
--- a/docs/narr/cookiecutters.rst
+++ b/docs/narr/cookiecutters.rst
@@ -2,10 +2,18 @@
 
 Pyramid cookiecutters
 =====================
+A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates).
+
+The Pyramid cookiecutter replaced the deprecated Pyramid scaffolds, and should be used going forward.
+
+`pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
 
 .. versionadded:: 1.8
     Added cookiecutter support.
 
+.. deprecated:: 1.8
+    Scaffolds may be removed in a future version of Pyramid.
+
 .. versionchanged:: 1.10
     Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``.
 
@@ -13,14 +21,6 @@ Pyramid cookiecutters
     ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported.
     Use ``pyramid-cookiecutter-starter`` going forward.
 
-A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates), e.g., creating a Python package project from a Python package project template.
-
-The unified cookiecutter ``pyramid-cookiecutter-starter`` merged features from the three previous cookiecutters which are now deprecated.
-
-The Pyramid cookiecutter has replaced the now deprecated Pyramid scaffolds, and should be used going forward and can be found here:
-
-* `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
-
 .. seealso::
 
     See also `Cookiecutter Installation <https://cookiecutter.readthedocs.io/en/latest/installation.html>`_ and `Cookiecutter Features <https://cookiecutter.readthedocs.io/en/latest/readme.html#features>`_. Development of cookiecutters is documented under `Learn the Basics of Cookiecutter by Creating a Cookiecutter <https://cookiecutter.readthedocs.io/en/latest/first_steps.html>`_.
-- 
cgit v1.2.3