diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-01-11 18:58:50 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-01-11 18:58:50 +0000 |
| commit | 9ec2d646eb23b88e4ef8119b0b46240081953daf (patch) | |
| tree | 80296b92edb8310bfb7699d165e92a1ea9e36256 /docs/glossary.rst | |
| parent | 96d63068ba033809ed73834e095f274800e4d4e8 (diff) | |
| download | pyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.tar.gz pyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.tar.bz2 pyramid-9ec2d646eb23b88e4ef8119b0b46240081953daf.zip | |
Merge of andrew-docs branch.
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 1e462db8e..ef1ad8144 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -621,3 +621,18 @@ Glossary Agendaless Consulting A consulting organization formed by Paul Everitt, Tres Seaver, and Chris McDonough. See also http://agendaless.com . + + Jython + A `Python implementation <http://www.jython.org/>` written for + the Java Virtual Machine. + + Python + The `programming language <http://python.org>` in which + :mod:`repoze.bfg` is written. + + CPython + The C implementation of the Python language. This is the + reference implementation that most people refer to as simply + "Python"; :term:`Jython`, Google's App Engine, and `PyPy + <http://codespeak.net/pypy/dist/pypy/doc/>`_ are examples of + non-C based Python implementations. |