diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
| commit | 5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch) | |
| tree | 727028ad4eeb596c291d0f96fbc9bb520ec971fd /docs/api/request.rst | |
| parent | b210ce350a3856166376f63a32725cc1516ba294 (diff) | |
| parent | 7319ab677216063581e47a231fd70b8b55a19466 (diff) | |
| download | pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2 pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api/request.rst')
| -rw-r--r-- | docs/api/request.rst | 4 |
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 |