summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst15
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.