Merge branch 'custom-append-slash-redirect' of https://github.com/dstufft/pyramid into dstufft-custom-append-slash-redirect

2 files changed, 5 insertions, 3 deletions

diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ca6a55164..fa3e734fe 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -842,7 +842,9 @@ route.  When configured, along with at least one other route in your
 application, this view will be invoked if the value of ``PATH_INFO`` does not
 already end in a slash, and if the value of ``PATH_INFO`` *plus* a slash
 matches any route's pattern.  In this case it does an HTTP redirect to the
-slash-appended ``PATH_INFO``.
+slash-appended ``PATH_INFO``. In addition you may pass anything that implements
+:class:`pyramid.interfaces.IResponse` which will then be used in place of the
+default class (:class:`pyramid.httpexceptions.HTTPFound`).
 
 Let's use an example.  If the following routes are configured in your
 application:
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 93cd0c18e..6c98b6f3a 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -197,9 +197,9 @@ Add the following import statements to the
 head of ``tutorial/tutorial/views.py``:
 
 .. literalinclude:: src/authorization/tutorial/views.py
-   :lines: 6-13,15-17
+   :lines: 6-17
    :linenos:
-   :emphasize-lines: 3,6-9,11
+   :emphasize-lines: 3,6-11
    :language: python
 
 (Only the highlighted lines, with other necessary modifications,