summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-05-03 23:47:27 +0000
committerChris McDonough <chrism@agendaless.com>2009-05-03 23:47:27 +0000
commit5810ad115d731cbd195813395e4ef2b032924779 (patch)
tree0cdf542ff78c49916cc600b4a52b62f976b9c4e0 /docs/glossary.rst
parent24b0256304792c9605090520d6bbc28f6a19315a (diff)
downloadpyramid-5810ad115d731cbd195813395e4ef2b032924779.tar.gz
pyramid-5810ad115d731cbd195813395e4ef2b032924779.tar.bz2
pyramid-5810ad115d731cbd195813395e4ef2b032924779.zip
Add GAE tutorial plus make CHANGES.txt renderings work.
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 35b938345..fc346252d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -226,6 +226,12 @@ Glossary
`Macro Expansion for TAL <http://wiki.zope.org/ZPT/METAL>`_, a
part of :term:`ZPT` which makes it possible to share common look
and feel between templates.
+ Genshi
+ An `XML templating language <http://pypi.python.org/pypi/Genshi/>`_
+ by Christopher Lenz.
+ Jinja2
+ A `text templating language <http://jinja.pocoo.org/2/>`_ by Armin
+ Ronacher.
Routes
A `system by Ben Bangert <http://routes.groovie.org/>`_ which
parses URLs and compares them against a number of user defined