summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-05-14 22:10:42 -0400
committerChris McDonough <chrism@plope.com>2011-05-14 22:10:42 -0400
commit8b6875836067fdf51cf88bec791e75ea99632fab (patch)
tree3ae1b9d2356fb44022a35ea28101d05340d73374 /docs
parent0ee9c20accd48a4d1d887d43df4f9a7dea808ff0 (diff)
parent4f3990ef805d5ca3a3a1396d374cb89c186b5836 (diff)
downloadpyramid-8b6875836067fdf51cf88bec791e75ea99632fab.tar.gz
pyramid-8b6875836067fdf51cf88bec791e75ea99632fab.tar.bz2
pyramid-8b6875836067fdf51cf88bec791e75ea99632fab.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index f96f72ea4..e1e9e76a9 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -747,7 +747,7 @@ Glossary
application.
Lingua
- A package by Wichert Akkermann which provides :term:`Babel` message
+ A package by Wichert Akkerman which provides :term:`Babel` message
extractors for Python source files and Chameleon ZPT template files.
Message Identifier