diff options
| author | Blaise Laflamme <blaise@laflamme.org> | 2011-11-26 18:31:22 -0500 |
|---|---|---|
| committer | Blaise Laflamme <blaise@laflamme.org> | 2011-11-26 18:31:22 -0500 |
| commit | 7613a6441f273ccc5642e20b2ce5788d01291466 (patch) | |
| tree | 8de6ce23bf54325b8524c50336020cb509ce1b16 /docs/glossary.rst | |
| parent | 11129ca073b4926037368d9a0bf079dc422e28f7 (diff) | |
| parent | 50e89abccc9c23949fb7cdd928a865712c34aa75 (diff) | |
| download | pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.gz pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.bz2 pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index fc282b2da..c98637698 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -342,14 +342,13 @@ Glossary file. It was developed by Ian Bicking. Chameleon - `chameleon <http://chameleon.repoze.org>`_ is an attribute - language template compiler which supports both the :term:`ZPT` and - :term:`Genshi` templating specifications. It is written and - maintained by Malthe Borch. It has several extensions, such as - the ability to use bracketed (Genshi-style) ``${name}`` syntax, - even within ZPT. It is also much faster than the reference - implementations of both ZPT and Genshi. :app:`Pyramid` offers - Chameleon templating out of the box in ZPT and text flavors. + `chameleon <http://chameleon.repoze.org>`_ is an attribute language + template compiler which supports the :term:`ZPT` templating + specification. It is written and maintained by Malthe Borch. It has + several extensions, such as the ability to use bracketed (Mako-style) + ``${name}`` syntax. It is also much faster than the reference + implementation of ZPT. :app:`Pyramid` offers Chameleon templating out + of the box in ZPT and text flavors. ZPT The `Zope Page Template <http://wiki.zope.org/ZPT/FrontPage>`_ |