summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-05-21 15:32:01 -0400
committerChris McDonough <chrism@plope.com>2013-05-21 15:32:01 -0400
commit1f0106e2debcfc82e17c55385ce9a01985ae458c (patch)
treed51720ba9314c23d0a7e9f5d7a6e9d7f238bf24b /docs/api
parentd64fa6136d0dec6717b273362de548d8f3bf47e8 (diff)
parentd037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 (diff)
downloadpyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.gz
pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.bz2
pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/request.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 7b843f86e..b1f5918d7 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -190,16 +190,16 @@
:meth:`~pyramid.config.Configurator.set_request_property`) on the
request it's passed.
- - causes a :class:`~pyramid.event.NewRequest` event to be sent at the
+ - causes a :class:`~pyramid.events.NewRequest` event to be sent at the
beginning of request processing.
- - causes a :class:`~pyramid.event.ContextFound` event to be sent
+ - causes a :class:`~pyramid.events.ContextFound` event to be sent
when a context resource is found.
-
+
- Ensures that the user implied by the request passed has the necessary
authorization to invoke view callable before calling it.
- - causes a :class:`~pyramid.event.NewResponse` event to be sent when
+ - 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