From 6b6d0e4c2b4e56523bd41aefd9d462858e03f443 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Sun, 9 Sep 2018 17:05:27 -0700 Subject: merging cookiecutters --- docs/glossary.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/glossary.rst') diff --git a/docs/glossary.rst b/docs/glossary.rst index b05344ae9..17b97dd29 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1155,11 +1155,9 @@ Glossary cookiecutter A command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. - Pyramid cookiecutters include: + The Pyramid cookiecutter can be found here: - * `pyramid-cookiecutter-alchemy `_ - * `pyramid-cookiecutter-starter `_ - * `pyramid-cookiecutter-zodb `_ + * `pyramid-cookiecutter-theonecc `_ .. versionadded:: 1.8 -- cgit v1.2.3 From 7c4f0b53c86b2ae5a3293a5977da5718aa36faa3 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 10 Sep 2018 08:47:29 -0700 Subject: correct versionadded/depreciation --- docs/glossary.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/glossary.rst') 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 `_ + The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged + features from the three previous cookiecutters which are now deprecated. + + .. versionadded:: 1.10 + + * `pyramid-cookiecutter-alchemy `_ + * `pyramid-cookiecutter-starter `_ + * `pyramid-cookiecutter-zodb `_ + + .. deprecated:: 1.10 + .. versionadded:: 1.8 .. seealso:: See also :term:`scaffold`. -- cgit v1.2.3 From f1f15e9f4d98de268b65166c88cf1e5bbb8c1e79 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 10 Sep 2018 16:58:46 -0700 Subject: add unified cookiecutter heading --- docs/glossary.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/glossary.rst') diff --git a/docs/glossary.rst b/docs/glossary.rst index 25632320d..3840d4841 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1155,12 +1155,10 @@ Glossary cookiecutter A command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. - The Pyramid cookiecutter can be found here: + The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged features from the three previous cookiecutters which are now deprecated. * `pyramid-cookiecutter-theonecc `_ - The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged - features from the three previous cookiecutters which are now deprecated. .. versionadded:: 1.10 -- cgit v1.2.3 From 28e688f1a41215cb6167f8e53de017ddb82b552f Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 13:49:04 -0700 Subject: name change --- docs/glossary.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/glossary.rst') diff --git a/docs/glossary.rst b/docs/glossary.rst index 3840d4841..b941d46f6 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1155,9 +1155,9 @@ Glossary cookiecutter A command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. - The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged features from the three previous cookiecutters which are now deprecated. + The unified cookiecutter ``pyramid-cookiecutter-starter`` merged features from the three previous cookiecutters which are now deprecated. - * `pyramid-cookiecutter-theonecc `_ + * `pyramid-cookiecutter-starter `_ .. versionadded:: 1.10 -- cgit v1.2.3 From 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 18:20:48 -0700 Subject: version cleanup --- docs/glossary.rst | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'docs/glossary.rst') 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 ` (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 `_ - - - .. versionadded:: 1.10 + .. versionadded:: 1.8 + Added cookiecutter support. - * `pyramid-cookiecutter-alchemy `_ - * `pyramid-cookiecutter-starter `_ - * `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`. -- cgit v1.2.3