[1.9.x] Fixed #25169 -- Documented stacking of permission_required and login_required.

Backport of 9788625277b85596302bbf2c39cf829b7a766a4f from master

1 files changed, 11 insertions, 0 deletions

diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 386b9ca6b5..67d843a017 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -688,6 +688,17 @@ The ``permission_required`` decorator
     (HTTP Forbidden) view<http_forbidden_view>` instead of redirecting to the
     login page.
 
+    If you want to use ``raise_exception`` but also give your users a chance to
+    login first, you can add the
+    :func:`~django.contrib.auth.decorators.login_required` decorator::
+
+        from django.contrib.auth.decorators import login_required, permission_required
+
+        @permission_required('polls.can_vote', raise_exception=True)
+        @login_required
+        def my_view(request):
+            ...
+
     .. versionchanged:: 1.9
 
         In older versions, the ``permission`` parameter only worked with