summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst7
-rw-r--r--docs/narr/introduction.rst5
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 81b331cc7..5b54c25c5 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -114,3 +114,10 @@ Glossary
Zope
`The Z Object Publishing Framework <http://zope.org>`_. The granddaddy
of Python web frameworks.
+ WebOb
+ `WebOb <http://pythonpaste.org/webob/>`_ is a WSGI request/response
+ library created by Ian Bicking.
+ Paste
+ `Paste <http://pythonpaste.org>`_ is a WSGI development and
+ deployment system developed by Ian Bicking.
+
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 4588b92d3..bb6054ca3 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -7,8 +7,9 @@ libraries to do much of its work. However, it is less ambitious and
less featureful than any released version of Zope's publisher.
:mod:`repoze.bfg` uses the :term:`WSGI` protocol to handle requests
-and responses, and integrates Zope, Paste, and WebOb libraries to form
-the basis for a simple web object publishing framework.
+and responses, and integrates :term:`Zope`, :term:`Paste`, and
+:term:`WebOb` libraries to form the basis for a simple web object
+publishing framework.
Similarities with Other Frameworks
----------------------------------