diff options
| author | Chris McDonough <chrism@plope.com> | 2010-10-30 02:39:22 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-10-30 02:39:22 -0400 |
| commit | d892b08d2380ef3f61355753daeb729bfa3c4895 (patch) | |
| tree | 8fe0dd6cef25b4268ad428d1de52aaa4ea12608e /docs/glossary.rst | |
| parent | cd3d5fda6693d90690bfe844b68850017515c701 (diff) | |
| parent | 7698bd83ebc974df7855e4203d2bda0925840956 (diff) | |
| download | pyramid-d892b08d2380ef3f61355753daeb729bfa3c4895.tar.gz pyramid-d892b08d2380ef3f61355753daeb729bfa3c4895.tar.bz2 pyramid-d892b08d2380ef3f61355753daeb729bfa3c4895.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 7320f5b4c..c9d37101d 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -815,3 +815,7 @@ Glossary ``request`` (a :term:`request` object), returns a :term:`session` object. + Mako + `Mako <http://www.makotemplates.org/>`_ is a template language language + which refines the familiar ideas of componentized layout and inheritance + using Python with Python scoping and calling semantics. |