summaryrefslogtreecommitdiff
path: root/docs/narr/resources.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-06-20 16:07:47 -0400
committerChris McDonough <chrism@plope.com>2013-06-20 16:07:47 -0400
commit56511b0defbc4437a1e1d3b013c504886270d01b (patch)
tree69ee1e9149329c00a830e0f677de0981735e48b9 /docs/narr/resources.rst
parent0fdb540f8e432061ec09623f0275a6b6555292ef (diff)
parent9e6c8c66aaec13e5c4868f3101b2459f56c2e0c4 (diff)
downloadpyramid-56511b0defbc4437a1e1d3b013c504886270d01b.tar.gz
pyramid-56511b0defbc4437a1e1d3b013c504886270d01b.tar.bz2
pyramid-56511b0defbc4437a1e1d3b013c504886270d01b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/resources.rst')
-rw-r--r--docs/narr/resources.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index 699a3d4ac..b1bb611e5 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -300,7 +300,7 @@ the resource by :meth:`~pyramid.request.Request.resource_url`.
The ``__resource_url__`` hook is passed two arguments: ``request`` and
``info``. ``request`` is the :term:`request` object passed to
:meth:`~pyramid.request.Request.resource_url`. ``info`` is a dictionary with
-two keys:
+the following keys:
``physical_path``
A string representing the "physical path" computed for the resource, as