summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/glossary.rst5
-rw-r--r--docs/narr/install.rst2
-rw-r--r--docs/narr/templates.rst4
3 files changed, 8 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 87e1a2d38..49da69f7f 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -655,3 +655,8 @@ Glossary
"the best" view callable for a given circumstance: a
:term:`context` type, a :term:`view name` and a :term:`request`.
+ Google App Engine
+ `Google App Engine <http://code.google.com/appengine/>`_ (aka
+ "GAE") is a Python application hosting service offered by Google.
+ :mod:`repoze.bfg` runs on GAE.
+
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index a1cba3d7c..9d6d2740a 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -330,7 +330,7 @@ command name instead of the ``python`` command name.
One caveat exists to using :mod:`repoze.bfg` under Jython: the
:term:`Chameleon` templating engine, which is the default templating
-engine for :mod:`repoze.bfg` does not work on non-CPython platforms.
+engine for :mod:`repoze.bfg` does not work on Jython.
The ``repoze.bfg.jinja2`` distribution provides templating for
:mod:`repoze.bfg` using the :term:`Jinja2` templating system. You may
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 3cd5e8f15..ca7a43223 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -267,8 +267,8 @@ templates is available from `the Chameleon website
.. warning::
- :term:`Chameleon` only works on :term:`CPython` platforms. This
- does not include Google's App Engine nor :term:`Jython`. On these
+ :term:`Chameleon` only works on :term:`CPython` platforms and
+ :term:`Google App Engine`. On :term:`Jython` and other non-CPython
platforms, you should use ``repoze.bfg.jinja2`` instead. See
:ref:`available_template_system_bindings`.