summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
committerMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
commit9279468d0e4d411652a735e28839bd8a5504ced6 (patch)
tree580c1efc1044325a20a242a212d647b81cde6088 /docs/glossary.rst
parent407b335ed9954c042377fd2e060c36edcd07cf60 (diff)
parent3587a53dc28b8f6411816ccd7fd8fdee0d88acb4 (diff)
downloadpyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.gz
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.bz2
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0e340491b..deb4c1c8b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -801,8 +801,9 @@ Glossary
application.
Lingua
- A package by Wichert Akkerman which provides :term:`Babel` message
- extractors for Python source files and Chameleon ZPT template files.
+ A package by Wichert Akkerman which provides the ``pot-create``
+ command to extract translateable messages from Python sources
+ and Chameleon ZPT template files.
Message Identifier
A string used as a translation lookup key during localization.
@@ -935,7 +936,7 @@ Glossary
`Akhet <http://docs.pylonsproject.org/projects/akhet/en/latest/>`_ is a
Pyramid library and demo application with a Pylons-like feel.
It's most known for its former application scaffold, which helped
- users transition from Pylons and those prefering a more Pylons-like API.
+ users transition from Pylons and those preferring a more Pylons-like API.
The scaffold has been retired but the demo plays a similar role.
Pyramid Cookbook