diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
| commit | 7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce (patch) | |
| tree | 227c5b5e5a0b1ee8d8974679b58f29a162b8b2af /docs/narr/subrequest.rst | |
| parent | 7a73e56d4d86d9139fd54a9cd83a68d25bc02df7 (diff) | |
| parent | 26787cf215b9bb6ddc0cce84a777f7c2e3079842 (diff) | |
| download | pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.gz pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.bz2 pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/subrequest.rst')
| -rw-r--r-- | docs/narr/subrequest.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst index 6437bd0fa..4b4e99d41 100644 --- a/docs/narr/subrequest.rst +++ b/docs/narr/subrequest.rst @@ -232,12 +232,12 @@ unconditionally: - Ensures that the user implied by the request passed has the necessary authorization to invoke view callable before calling it. -- causes a :class:`~pyramid.events.NewResponse` event to be sent when the - Pyramid application returns a response. - - Calls any :term:`response callback` functions defined within the subrequest's lifetime if a response is obtained from the Pyramid application. +- causes a :class:`~pyramid.events.NewResponse` event to be sent if a response + is obtained. + - Calls any :term:`finished callback` functions defined within the subrequest's lifetime. |