Merge branch 'master' of github.com:Pylons/pyramid

Chris McDonough

2013-06-11 035b86007d950d2b229e92e421369c50e99bdf9a

Merge branch 'master' of github.com:Pylons/pyramid

 docs/narr/resources.rst

@@ -300,7 +300,7 @@
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