summaryrefslogtreecommitdiff
path: root/docs/zcml/notfound.rst
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-10-29 11:14:41 -0700
committerBen Bangert <ben@groovie.org>2010-10-29 11:14:41 -0700
commit17e70c8db9140c0b4062f46ef5eb4527d678b793 (patch)
tree38b6b8de2a57db4debec477bc4fda27db82c4c5a /docs/zcml/notfound.rst
parentd39e99e1f6f06a02a275a8a30f154e0f292d7dff (diff)
parent5038994ea9e053b16fca74ea8fa022871e630883 (diff)
downloadpyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.tar.gz
pyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.tar.bz2
pyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/zcml/notfound.rst')
-rw-r--r--docs/zcml/notfound.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/zcml/notfound.rst b/docs/zcml/notfound.rst
index 59263db34..0e1652708 100644
--- a/docs/zcml/notfound.rst
+++ b/docs/zcml/notfound.rst
@@ -6,7 +6,7 @@
.. warning::
The ``notfound`` ZCML directive is deprecated in :mod:`pyramid`
- version 1.3. Instead, you should use the :ref:`view_directive`
+ version 1.0. Instead, you should use the :ref:`view_directive`
directive with a ``context`` that names the
:exc:`pyramid.exceptions.NotFound` class. See
:ref:`changing_the_notfound_view` form more information.
@@ -42,7 +42,7 @@ Attributes
``wrapper``
The :term:`view name` (*not* an object dotted name) of another view
- declared elsewhere in ZCML (or via the ``@bfg_view`` decorator)
+ declared elsewhere in ZCML (or via the ``@view_config`` decorator)
which will receive the response body of this view as the
``request.wrapped_body`` attribute of its own request, and the
response returned by this view as the ``request.wrapped_response``