summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/project.rst7
-rw-r--r--docs/quick_tour.rst3
-rw-r--r--docs/quick_tutorial/cookiecutters.rst3
-rw-r--r--docs/tutorials/modwsgi/index.rst3
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