Merge pull request #2881 from stevepiercy/docs-cookiecutter-changes-only

docs cookiecutter changes only

1 files changed, 21 insertions, 1 deletions

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 9b41b4359..35d35740d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1000,6 +1000,10 @@ Glossary
      application and helps users to quickly get started writing larger
      applications.  Scaffolds are usually used via the ``pcreate`` command.
 
+     .. deprecated:: 1.8
+
+     .. seealso:: See also :term:`cookiecutter`.
+
    pyramid_exclog
      A package which logs Pyramid application exception (error) information
      to a standard Python logger.  This add-on is most useful when
@@ -1133,4 +1137,20 @@ Glossary
    Python Packaging Authority
       The `Python Packaging Authority (PyPA) <https://www.pypa.io/en/latest/>`_
       is a working group that maintains many of the relevant projects in Python
-      packaging.
\ No newline at end of file
+      packaging.
+
+   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.
+
+      Pyramid cookiecutters include:
+
+      * `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>`_
+
+      .. versionadded:: 1.8
+
+      .. seealso:: See also :term:`scaffold`.
+
+   coverage
+      A measurement of code coverage, usually expressed as a percentage of which lines of code have been executed over which lines are executable, typically run during test execution.