summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/design.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-23 03:08:17 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-23 03:08:17 -0800
commitbeb4f1a1c771b295a41c65ba17b943a943f02911 (patch)
tree276819f9a65a6349b58196ba5805c62a8c6fe63e /docs/tutorials/wiki/design.rst
parent933d3494b31286f45e5c460e0881b2a3cb616c42 (diff)
downloadpyramid-beb4f1a1c771b295a41c65ba17b943a943f02911.tar.gz
pyramid-beb4f1a1c771b295a41c65ba17b943a943f02911.tar.bz2
pyramid-beb4f1a1c771b295a41c65ba17b943a943f02911.zip
Use cookiecutter instead of scaffold and pcreate
- minor grammar and reST fixes
Diffstat (limited to 'docs/tutorials/wiki/design.rst')
-rw-r--r--docs/tutorials/wiki/design.rst7
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index f2a02176b..30d443bb8 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -43,11 +43,8 @@ editing, and viewing wiki pages, plus one view for the wiki front page.
Two templates will be used, one for viewing, and one for both adding
and editing wiki pages.
-The default templating systems in :app:`Pyramid` are
-:term:`Chameleon` and :term:`Mako`. Chameleon is a variant of
-:term:`ZPT`, which is an XML-based templating language. Mako is a
-non-XML-based templating language. Because we had to pick one,
-we chose Chameleon for this tutorial.
+As of version 1.5 :app:`Pyramid` no longer ships with templating systems. In this tutorial, we will use :term:`Chameleon`. Chameleon is a variant of :term:`ZPT`, which is an XML-based templating language.
+
Security
--------