summaryrefslogtreecommitdiff
path: root/docs/narr/resources.rst
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
commitd44d0e044555cd1287680fc8368632a64ebe979b (patch)
tree8a70d4025a8ee19b82e2a915bc668130b405cf93 /docs/narr/resources.rst
parent47eaa189e115936a86357380accd8d472e4d9a6c (diff)
parentd59440878b67b65e57c91c7b4aa8e7cbf943a729 (diff)
downloadpyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.gz
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.bz2
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.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