diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-03-14 03:04:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 03:04:32 -0700 |
| commit | 2c8555edb17db28cea6310fdf7cfb15c68ef029e (patch) | |
| tree | 496f76fe7892883b064814d1256d0865f5bca376 | |
| parent | 6c38f2b732cf2806bbd28efe77491ee0fe157855 (diff) | |
| parent | 6204d8de5484bf7fa26dd41fd32ee3fd9a1047db (diff) | |
| download | pyramid-2c8555edb17db28cea6310fdf7cfb15c68ef029e.tar.gz pyramid-2c8555edb17db28cea6310fdf7cfb15c68ef029e.tar.bz2 pyramid-2c8555edb17db28cea6310fdf7cfb15c68ef029e.zip | |
Merge pull request #2981 from stevepiercy/master
add Mako to options for pyramid-cookiecutter-starter
| -rw-r--r-- | docs/narr/project.rst | 7 | ||||
| -rw-r--r-- | docs/quick_tour.rst | 3 | ||||
| -rw-r--r-- | docs/quick_tutorial/cookiecutters.rst | 3 | ||||
| -rw-r--r-- | docs/tutorials/modwsgi/index.rst | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst index 0f7cb4edf..ce7e90793 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -43,7 +43,7 @@ Pyramid cookiecutters released under the Pylons Project differ from each other o - the mechanism they use to map URLs to code (:term:`URL dispatch` or :term:`traversal`) -- templating libraries (:term:`Jinja2` or :term:`Chameleon`) +- templating libraries (:term:`Jinja2`, :term:`Chameleon`, or :term:`Mako`) * `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_ * `pyramid-cookiecutter-alchemy <https://github.com/Pylons/pyramid-cookiecutter-alchemy>`_ @@ -52,7 +52,7 @@ Pyramid cookiecutters released under the Pylons Project differ from each other o These cookiecutters include: ``pyramid-cookiecutter-starter`` - :term:`URL dispatch` for routing and either :term:`Jinja2` or :term:`Chameleon` for templating + :term:`URL dispatch` for routing and either :term:`Jinja2`, :term:`Chameleon`, or :term:`Mako` for templating ``pyramid-cookiecutter-alchemy`` SQLite for persistent storage, :term:`SQLAlchemy` for an ORM, :term:`URL dispatch` for routing, and :term:`Jinja2` for templating. @@ -98,7 +98,8 @@ If prompted for the first item, accept the default ``yes`` by hitting return. Select template_language: 1 - jinja2 2 - chameleon - Choose from 1, 2 [1]: 1 + 3 - mako + Choose from 1, 2, 3 [1]: 1 We then run through the following commands. diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index fa9dfabad..02c3ff811 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -523,7 +523,8 @@ If prompted for the first item, accept the default ``yes`` by hitting return. Select template_language: 1 - jinja2 2 - chameleon - Choose from 1, 2 [1]: 1 + 3 - mako + Choose from 1, 2, 3 [1]: 1 We then run through the following commands. diff --git a/docs/quick_tutorial/cookiecutters.rst b/docs/quick_tutorial/cookiecutters.rst index f7251618f..edfd8cd69 100644 --- a/docs/quick_tutorial/cookiecutters.rst +++ b/docs/quick_tutorial/cookiecutters.rst @@ -41,7 +41,8 @@ Steps Select template_language: 1 - jinja2 2 - chameleon - Choose from 1, 2 [1]: 1 + 3 - mako + Choose from 1, 2, 3 [1]: 1 #. We then run through the following commands. diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst index 44e892a27..690266586 100644 --- a/docs/tutorials/modwsgi/index.rst +++ b/docs/tutorials/modwsgi/index.rst @@ -52,7 +52,8 @@ specific path information for commands and files. Select template_language: 1 - jinja2 2 - chameleon - Choose from 1, 2 [1]: 1 + 3 - mako + Choose from 1, 2, 3 [1]: 1 #. Create a :term:`virtual environment` which we'll use to install our application. It is important to use the same base Python interpreter |