summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.txt3
-rw-r--r--docs/topics/auth/default.txt5
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 6c28d6e1d0..ec37b382d4 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -135,6 +135,9 @@ Minor features
``Meta`` option allows you to customize (or disable) creation of the default
add, change, and delete permissions.
+* The :func:`~django.contrib.auth.decorators.permission_required` decorator can
+ take a list of permissions as well as a single permission.
+
Backwards incompatible changes in 1.7
=====================================
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 7dff9cdca7..78bf820e89 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -528,6 +528,11 @@ The permission_required decorator
(HTTP Forbidden) view<http_forbidden_view>` instead of redirecting to the
login page.
+ .. versionchanged:: 1.7
+
+ The :func:`~django.contrib.auth.decorators.permission_required`
+ decorator can take a list of permissions as well as a single permission.
+
Applying permissions to generic views
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~