summaryrefslogtreecommitdiff
path: root/docs/narr/subrequest.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-01 11:42:28 -0500
committerMichael Merickel <michael@merickel.org>2013-04-01 11:42:28 -0500
commit5f3eee1d89b52458e372875bbf71efb0cc5e3fcf (patch)
tree6d6b61cc0799bc3c68da24e86691e8b985bdc821 /docs/narr/subrequest.rst
parent75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (diff)
parenta9cdf8f67a59e051233dae1a8e21e3b60037c608 (diff)
downloadpyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.gz
pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.bz2
pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.zip
Merge branch 'pull.963'
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