diff options
| author | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
| commit | 1f0106e2debcfc82e17c55385ce9a01985ae458c (patch) | |
| tree | d51720ba9314c23d0a7e9f5d7a6e9d7f238bf24b /docs/glossary.rst | |
| parent | d64fa6136d0dec6717b273362de548d8f3bf47e8 (diff) | |
| parent | d037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 (diff) | |
| download | pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.gz pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.bz2 pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 241f951d6..abc37c7f8 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -156,9 +156,9 @@ Glossary resource An object representing a node in the :term:`resource tree` of an - application. If :mod:`traversal` is used, a resource is an element in + application. If :term:`traversal` is used, a resource is an element in the resource tree traversed by the system. When traversal is used, a - resource becomes the :term:`context` of a :term:`view`. If :mod:`url + resource becomes the :term:`context` of a :term:`view`. If :term:`url dispatch` is used, a single resource is generated for each request and is used as the context resource of a view. @@ -698,7 +698,7 @@ Glossary :app:`Pyramid` runs on GAE. Venusian - `Venusian <http://docs.repoze.org/venusian>`_ is a library which + :ref:`Venusian` is a library which allows framework authors to defer decorator actions. Instead of taking actions when a function (or class) decorator is executed at import time, the action usually taken by the decorator is |