diff options
| author | Chris McDonough <chrism@plope.com> | 2013-02-09 19:45:23 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-02-09 19:45:23 -0500 |
| commit | eb60ad1289f5f7d9ace02b0a28feda70908f9fa0 (patch) | |
| tree | b495b477d46197e5874cbd30bba4035b587b6c84 /docs/api | |
| parent | acf115391088770ae434d222179fd22a693bfe46 (diff) | |
| parent | 65cf215b75909f3b2624150c432d5355af7384da (diff) | |
| download | pyramid-eb60ad1289f5f7d9ace02b0a28feda70908f9fa0.tar.gz pyramid-eb60ad1289f5f7d9ace02b0a28feda70908f9fa0.tar.bz2 pyramid-eb60ad1289f5f7d9ace02b0a28feda70908f9fa0.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/exceptions.rst | 2 | ||||
| -rw-r--r-- | docs/api/request.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst index 1dfbf46fd..ab158f18d 100644 --- a/docs/api/exceptions.rst +++ b/docs/api/exceptions.rst @@ -5,6 +5,8 @@ .. automodule:: pyramid.exceptions + .. autoclass:: PredicateMismatch + .. autoclass:: Forbidden .. autoclass:: NotFound diff --git a/docs/api/request.rst b/docs/api/request.rst index 9f1f71b31..7b843f86e 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -245,7 +245,7 @@ influence response values from a view that uses a renderer (such as the status code, a header, the content type, etc) you would set these attributes. See :ref:`response_prefixed_attrs` for further discussion. - As of Pyramid 1.1, assignment to ``response_*`` attrs are deprecated. + As of Pyramid 1.1, assignment to ``response_*`` attrs is deprecated. Assigning to one is still supported but will cause a deprecation warning to be emitted, and eventually the feature will be removed. For new code, instead of assigning ``response_*`` attributes to the |