summaryrefslogtreecommitdiff
path: root/docs/narr/subrequest.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
commitcf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch)
treec792a3bf12b2b2615fbb306e354c85b10983d63b /docs/narr/subrequest.rst
parent1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff)
parentc5d01d4667d678782898b7d6859d60c617e30a9e (diff)
downloadpyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/subrequest.rst')
-rw-r--r--docs/narr/subrequest.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst
index 89551ab35..b5bc5ec48 100644
--- a/docs/narr/subrequest.rst
+++ b/docs/narr/subrequest.rst
@@ -142,7 +142,7 @@ generated. We can change this behavior; how to do so is described below in
our discussion of the ``use_tweens`` argument.
The :meth:`pyramid.request.Request.invoke_subrequest` API accepts two
-arguments: a positional argument ``request`` that must be provided, and and
+arguments: a positional argument ``request`` that must be provided, and
``use_tweens`` keyword argument that is optional; it defaults to ``False``.
The ``request`` object passed to the API must be an object that implements