diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
| commit | 47b8cf7e9b578464b533383083f7135271db0f9e (patch) | |
| tree | 724c40d50f21773b6585ab7d9731b8bf7a93a71c /docs/glossary.rst | |
| parent | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff) | |
| parent | dcaabcb87ca584c289efe70a604db0502838df3d (diff) | |
| download | pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.gz pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.bz2 pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 241f951d6..b6bd35ffe 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. |