diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
| commit | 0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch) | |
| tree | 6d9f12bc42fde9fea95d7754f2decff212acf6ee /docs/api/request.rst | |
| parent | d44d0e044555cd1287680fc8368632a64ebe979b (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2 pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.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 |