summaryrefslogtreecommitdiff
path: root/docs/narr/security.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-03 01:16:44 -0500
committerChris McDonough <chrism@plope.com>2011-01-03 01:16:44 -0500
commit45461e9e7d1d7f06669a57f421aa569a8dc86e31 (patch)
treede54a89e1ce5ff6c2742e40e2808b1d1057d4fec /docs/narr/security.rst
parentf8b6d2982292fe323008ad5af394786015206922 (diff)
parent419b2260ad97cbc9816b2fe075ef3d9acdb79581 (diff)
downloadpyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.tar.gz
pyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.tar.bz2
pyramid-45461e9e7d1d7f06669a57f421aa569a8dc86e31.zip
Merge git://github.com/caseman/pyramid into caseman-master
Diffstat (limited to 'docs/narr/security.rst')
-rw-r--r--docs/narr/security.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index c5262faa2..62a4727bc 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -18,8 +18,7 @@ works at a high level:
:term:`resource location`. A context is located differently depending on
whether the application uses :term:`traversal` or :term:`URL dispatch`, but
a context is ultimately found in either case. See
- :ref:`resourcelocation_chapter` for more information about resource
- location.
+ the :ref:`urldispatch_chapter` chapter for more information.
- A :term:`view callable` is located by :term:`view lookup` using the
context as well as other attributes of the request.