summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorStephen Martin <lockwood@opperline.com>2018-09-10 08:47:29 -0700
committerStephen Martin <lockwood@opperline.com>2018-09-10 08:47:29 -0700
commit7c4f0b53c86b2ae5a3293a5977da5718aa36faa3 (patch)
tree569ab4730907dc95f70bb03024a085e6c4695cd7 /docs/glossary.rst
parentce2cedb700ec57b75ccad54a0fd5b24a1034c309 (diff)
downloadpyramid-7c4f0b53c86b2ae5a3293a5977da5718aa36faa3.tar.gz
pyramid-7c4f0b53c86b2ae5a3293a5977da5718aa36faa3.tar.bz2
pyramid-7c4f0b53c86b2ae5a3293a5977da5718aa36faa3.zip
correct versionadded/depreciation
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 17b97dd29..25632320d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1159,6 +1159,17 @@ Glossary
* `pyramid-cookiecutter-theonecc <https://github.com/Pylons/pyramid-cookiecutter-theonecc>`_
+ The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged
+ features from the three previous cookiecutters which are now deprecated.
+
+ .. versionadded:: 1.10
+
+ * `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>`_
+
+ .. deprecated:: 1.10
+
.. versionadded:: 1.8
.. seealso:: See also :term:`scaffold`.