From 16c1075d335c4dbe84b0ef634b95b8a2eca1691d Mon Sep 17 00:00:00 2001
From: Bryan Marty <bryanmarty@gmail.com>
Date: Fri, 30 Oct 2015 13:26:09 -0700
Subject: [PATCH] [1.8.x] Fixed #25169 -- Documented stacking of
 permission_required and login_required.

Backport of 9788625277b85596302bbf2c39cf829b7a766a4f from master
---
 docs/topics/auth/default.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index c60e83df30..146cf8773d 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -592,6 +592,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.7
 
         The :func:`~django.contrib.auth.decorators.permission_required`