summaryrefslogtreecommitdiff
path: root/docs/narr/cookiecutters.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:38:30 -0700
committerGitHub <noreply@github.com>2018-10-05 02:38:30 -0700
commit536caa6e0306be956a0bb281b6370effc476d38d (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/narr/cookiecutters.rst
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
parent086198b5db7dcb86c2b4edbc5d3610dcade0332a (diff)
downloadpyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.gz
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.bz2
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.zip
Merge pull request #3346 from stloma/one_cc
updating docs for merging cookiecutters
Diffstat (limited to 'docs/narr/cookiecutters.rst')
-rw-r--r--docs/narr/cookiecutters.rst18
1 files changed, 13 insertions, 5 deletions
diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst
index abedb25b9..9883713cb 100644
--- a/docs/narr/cookiecutters.rst
+++ b/docs/narr/cookiecutters.rst
@@ -2,16 +2,24 @@
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.
-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.
+.. deprecated:: 1.8
+ Scaffolds may be removed in a future version of Pyramid.
-Pyramid cookiecutters have replaced the now deprecated Pyramid scaffolds, and should be used going forward. Pyramid cookiecutters released under the Pylons Project include:
+.. versionchanged:: 1.10
+ Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``.
-* `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
+ ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported.
+ Use ``pyramid-cookiecutter-starter`` going forward.
.. seealso::