summaryrefslogtreecommitdiff
path: root/docs/narr/urldispatch.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-02-05 14:42:34 -0500
committerChris McDonough <chrism@plope.com>2011-02-05 14:42:34 -0500
commit88fba8dbd201118241965d6a056ae09372b0630c (patch)
treee0c30696df5827037048eb0cdd6c0731653a1734 /docs/narr/urldispatch.rst
parentce0e371e067f3628620a7db5a50056c9a045979f (diff)
parent291995fa17ae55adfda09c4eda095fd5e8cb21d8 (diff)
downloadpyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.gz
pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.bz2
pyramid-88fba8dbd201118241965d6a056ae09372b0630c.zip
fix conflicts
Diffstat (limited to 'docs/narr/urldispatch.rst')
-rw-r--r--docs/narr/urldispatch.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ac74ed014..cab5f85fa 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -373,7 +373,7 @@ In this way, each route can use a different factory, making it possible to
supply a different :term:`context` resource object to the view related to
each particular route.
-Supplying a different resource factory each route is useful when you're
+Supplying a different resource factory for each route is useful when you're
trying to use a :app:`Pyramid` :term:`authorization policy` to provide
declarative, "context sensitive" security checks; each resource can maintain
a separate :term:`ACL`, as documented in
@@ -805,8 +805,9 @@ route patterns. For example, if you've configured a route with the ``name``
url = route_url('foo', request, a='1', b='2', c='3')
This would return something like the string ``http://example.com/1/2/3`` (at
-least if the current protocol and hostname implied ``http:/example.com``).
-See the :func:`~pyramid.url.route_url` API documentation for more information.
+least if the current protocol and hostname implied ``http://example.com``).
+See the :func:`~pyramid.url.route_url` API documentation for more
+information.
.. index::
single: redirecting to slash-appended routes