summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-08-08 11:40:41 -0700
committerMichael Merickel <michael@merickel.org>2013-08-08 11:40:41 -0700
commitd324c9f1fb5eb9d9d571534a2f32338fa3d66af9 (patch)
treea8e2e6fa948c267390abf215c234fba759d6f86a /docs/api
parent3f503d0a30b487b590fc3e12834ce12d8ed0a25c (diff)
parent0240e91af1616be75305ac5b7a57099ef42210bf (diff)
downloadpyramid-d324c9f1fb5eb9d9d571534a2f32338fa3d66af9.tar.gz
pyramid-d324c9f1fb5eb9d9d571534a2f32338fa3d66af9.tar.bz2
pyramid-d324c9f1fb5eb9d9d571534a2f32338fa3d66af9.zip
Merge pull request #1064 from tisdall/master
spelling fixes
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/request.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst
index b1f5918d7..a90cb1ac0 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -156,7 +156,7 @@
.. attribute:: matched_route
If a :term:`route` has matched during this request, this attribute will
- be an obect representing the route matched by the URL pattern
+ be an object representing the route matched by the URL pattern
associated with the route. If a route has not matched during this
request, the value of this attribute will be ``None``. See
:ref:`matched_route`.
@@ -238,7 +238,7 @@
.. attribute:: response_*
In Pyramid 1.0, you could set attributes on a
- :class:`pyramid.request.Request` which influenced the behavor of
+ :class:`pyramid.request.Request` which influenced the behavior of
*rendered* responses (views which use a :term:`renderer` and which
don't directly return a response). These attributes began with
``response_``, such as ``response_headerlist``. If you needed to