diff options
| author | Michael Merickel <michael@merickel.org> | 2016-12-23 15:08:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 15:08:50 -0600 |
| commit | a7d55e25efdd14c7cbc36f23b446babce14b238e (patch) | |
| tree | ed4b7ddd23b5a506780463ba2d51377b83afc646 /docs/tutorials/wiki/design.rst | |
| parent | 933d3494b31286f45e5c460e0881b2a3cb616c42 (diff) | |
| parent | 1117bcd9a458e2f8664cabeef84209cf7b168e30 (diff) | |
| download | pyramid-a7d55e25efdd14c7cbc36f23b446babce14b238e.tar.gz pyramid-a7d55e25efdd14c7cbc36f23b446babce14b238e.tar.bz2 pyramid-a7d55e25efdd14c7cbc36f23b446babce14b238e.zip | |
Merge pull request #2881 from stevepiercy/docs-cookiecutter-changes-only
docs cookiecutter changes only
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 -------- |