diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-10-05 02:38:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 02:38:30 -0700 |
| commit | 536caa6e0306be956a0bb281b6370effc476d38d (patch) | |
| tree | 1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/glossary.rst | |
| parent | f6becd23966248fb7fc4db218258be4364902f8f (diff) | |
| parent | 086198b5db7dcb86c2b4edbc5d3610dcade0332a (diff) | |
| download | pyramid-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/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index ec4cffef2..8f94eeaca 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1155,13 +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. - Pyramid cookiecutters include: + .. 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``. - .. versionadded:: 1.8 + .. deprecated:: 1.10 + ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported. + Use ``pyramid-cookiecutter-starter`` going forward. .. seealso:: See also :term:`scaffold`. |