From 9ec2d646eb23b88e4ef8119b0b46240081953daf Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 11 Jan 2010 18:58:50 +0000
Subject: Merge of andrew-docs branch.

---
 docs/glossary.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'docs/glossary.rst')

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.
-- 
cgit v1.2.3