Merge branch 'master' of github.com:Pylons/pyramid

3 files changed, 15 insertions, 5 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d03da3e62..34d904d0f 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -188,3 +188,5 @@ Contributors
 - Domen Kozar, 2012/09/11
 
 - David Gay, 2012/09/16
+
+- Robert Jackiewicz, 2012/11/12
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 96fa77a07..ea75e5fe4 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -180,11 +180,14 @@ as a forbidden view:
       config.scan()
 
 Like any other view, the forbidden view must accept at least a ``request``
-parameter, or both ``context`` and ``request``.  The ``context`` (available
-as ``request.context`` if you're using the request-only view argument
-pattern) is the context found by the router when the view invocation was
-denied.  The ``request`` is the current :term:`request` representing the
-denied action.
+parameter, or both ``context`` and ``request``.  If a forbidden view
+callable accepts both ``context`` and ``request``, the HTTP Exception is passed
+as context. The ``context`` as found by the router when view was
+denied (that you normally would expect) is available as
+``request.context``.  The ``request`` is the  current :term:`request`
+representing the denied action.
+
+
 
 Here's some sample code that implements a minimal forbidden view:
 
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index d90897d16..14db1fe15 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -486,6 +486,11 @@ Deprecations
   was designed to offer in Pylons.  It will continue to exist "forever" but
   it will not be recommended or mentioned in the docs.
 
+- Remove references to do-nothing ``pyramid.debug_templates`` setting in all
+  Pyramid-provided .ini files. This setting previously told Chameleon to render
+  better exceptions; now Chameleon always renders nice exceptions regardless of
+  the value of this setting.
+
 Known Issues
 ------------