diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-03 17:37:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-03 17:37:21 -0400 |
| commit | d64fa6136d0dec6717b273362de548d8f3bf47e8 (patch) | |
| tree | 23c77ac62ab9d6c93131874f835ae3166d4af53b /docs/glossary.rst | |
| parent | 2ca9bde9d2862655ddee276cd14a375e6a5adec6 (diff) | |
| parent | 84e455cf7c8d9cbfe6658548a61af2ecbbc1749e (diff) | |
| download | pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.gz pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.bz2 pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 40c15efdc..241f951d6 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -314,7 +314,7 @@ Glossary pipeline The :term:`PasteDeploy` term for a single configuration of a WSGI - server, a WSGI application, with a set of middleware in-between. + server, a WSGI application, with a set of :term:`middleware` in-between. Zope `The Z Object Publishing Framework <http://zope.org>`_, a @@ -334,12 +334,6 @@ Glossary `Zope Object Database <http://zodb.org>`_, a persistent Python object store. - ZEO - `Zope Enterprise Objects - <http://www.zope.org/Documentation/Books/ZopeBook/2_6Edition/ZEO.stx>`_ - allows multiple simultaneous processes to access a single - :term:`ZODB` database. - WebOb `WebOb <http://webob.org>`_ is a WSGI request/response library created by Ian Bicking. @@ -907,9 +901,9 @@ Glossary The scaffold has been retired but the demo plays a similar role. Pyramid Cookbook - An additional documentation resource for Pyramid which presents topical, - practical usages of Pyramid available via - http://docs.pylonsproject.org/ . + Additional documentation for Pyramid which presents topical, + practical uses of Pyramid: + http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest. distutils The standard system for packaging and distributing Python packages. See @@ -932,18 +926,18 @@ Glossary provide, for example, Pyramid-specific view timing support, bookkeeping code that examines exceptions before they are returned to the upstream WSGI application, or a variety of other features. Tweens behave a bit - like :term:`WSGI` 'middleware' but they have the benefit of running in a + like :term:`WSGI` :term:`middleware` but they have the benefit of running in a context in which they have access to the Pyramid :term:`application registry` as well as the Pyramid rendering machinery. See :ref:`registering_tweens`. pyramid_debugtoolbar - A Pyramid add on which displays a helpful debug toolbar "on top of" HTML + A Pyramid add-on which displays a helpful debug toolbar "on top of" HTML pages rendered by your application, displaying request, routing, and database information. :mod:`pyramid_debugtoolbar` is configured into the ``development.ini`` of all applications which use a Pyramid :term:`scaffold`. For more information, see - http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ . + http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/. scaffold A project template that generates some of the major parts of a Pyramid |