diff options
| author | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
| commit | b2e8884a94d9e869bf29ea55298ad308f16ed420 (patch) | |
| tree | e46bf79d1a8811ad273a40ce194d05836fcc7409 /docs/tutorials/wiki/design.rst | |
| parent | 7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff) | |
| parent | 40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff) | |
| download | pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2 pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/design.rst')
| -rw-r--r-- | docs/tutorials/wiki/design.rst | 7 |
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 -------- |