diff options
| author | Michael Merickel <michael@merickel.org> | 2016-02-22 21:36:00 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-02-22 21:36:00 -0600 |
| commit | 605a6eb8ca75caa27ea6cb445624628d99bf2c0b (patch) | |
| tree | 6df997a45a234d7ac6c0898d0a8a1cfdebfb76f0 /docs/glossary.rst | |
| parent | 252fa52ee7628253dfec7636f4e55b8124efea2a (diff) | |
| parent | aa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff) | |
| download | pyramid-605a6eb8ca75caa27ea6cb445624628d99bf2c0b.tar.gz pyramid-605a6eb8ca75caa27ea6cb445624628d99bf2c0b.tar.bz2 pyramid-605a6eb8ca75caa27ea6cb445624628d99bf2c0b.zip | |
Merge branch 'master' into feature.invoke_exception_view
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 2683ff369..bbc86db41 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -367,13 +367,13 @@ Glossary file. It was developed by Ian Bicking. Chameleon - `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. + `chameleon <https://chameleon.readthedocs.org/en/latest/>`_ 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>`_ @@ -815,11 +815,10 @@ Glossary library, used by the :app:`Pyramid` translation machinery. Babel - A `collection of tools <http://babel.edgewall.org/>`_ for - internationalizing Python applications. :app:`Pyramid` does - not depend on Babel to operate, but if Babel is installed, - additional locale functionality becomes available to your - application. + A `collection of tools <http://babel.pocoo.org/en/latest/>`_ for + internationalizing Python applications. :app:`Pyramid` does not depend on + Babel to operate, but if Babel is installed, additional locale + functionality becomes available to your application. Lingua A package by Wichert Akkerman which provides the ``pot-create`` |