summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-06-11 13:13:26 -0400
committerChris McDonough <chrism@plope.com>2013-06-11 13:13:26 -0400
commit035b86007d950d2b229e92e421369c50e99bdf9a (patch)
tree459ba63827bb238f1df74e67ec33997f72ba49bd
parent806063db53955a94ff52aa42fe38bc30a851c166 (diff)
parent08d1a6ac79777347901e4d5c819da33cd90079eb (diff)
downloadpyramid-035b86007d950d2b229e92e421369c50e99bdf9a.tar.gz
pyramid-035b86007d950d2b229e92e421369c50e99bdf9a.tar.bz2
pyramid-035b86007d950d2b229e92e421369c50e99bdf9a.zip
Merge branch 'master' of github.com:Pylons/pyramid
-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