summaryrefslogtreecommitdiff
path: root/docs/narr/subrequest.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-03 17:37:21 -0400
committerChris McDonough <chrism@plope.com>2013-04-03 17:37:21 -0400
commitd64fa6136d0dec6717b273362de548d8f3bf47e8 (patch)
tree23c77ac62ab9d6c93131874f835ae3166d4af53b /docs/narr/subrequest.rst
parent2ca9bde9d2862655ddee276cd14a375e6a5adec6 (diff)
parent84e455cf7c8d9cbfe6658548a61af2ecbbc1749e (diff)
downloadpyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.gz
pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.bz2
pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/subrequest.rst')
-rw-r--r--docs/narr/subrequest.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst
index 033f045a6..93ce747ee 100644
--- a/docs/narr/subrequest.rst
+++ b/docs/narr/subrequest.rst
@@ -155,7 +155,7 @@ In the example above, the call to
exception. This is because it's using the default value for ``use_tweens``,
which is ``False``. You can pass ``use_tweens=True`` instead to ensure that
it will convert an exception to a Response if an :term:`exception view` is
-configured instead of raising the exception. This because exception views
+configured instead of raising the exception. This is because exception views
are called by the exception view :term:`tween` as described in
:ref:`exception_views` when any view raises an exception.
@@ -250,7 +250,7 @@ It's a poor idea to use the original ``request`` object as an argument to
:meth:`~pyramid.request.Request.invoke_subrequest`. You should construct a
new request instead as demonstrated in the above example, using
:meth:`pyramid.request.Request.blank`. Once you've constructed a request
-object, you'll need to massage the it to match the view callable you'd like
+object, you'll need to massage it to match the view callable you'd like
to be executed during the subrequest. This can be done by adjusting the
subrequest's URL, its headers, its request method, and other attributes. The
documentation for :class:`pyramid.request.Request` exposes the methods you