aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-11-21 21:43:22 +0000
committerTom Christie2014-11-21 21:43:22 +0000
commite6ecb494bb0cec7829e3d26ae9d6af04271c6ad4 (patch)
tree190719a58462e8936eaf82ac2fdd388e19c03817
parent5b671cb515cf49bc0335bdaa7ca0759827eb844d (diff)
parent8e940a22fb292ed6b20b9e4b5da607ffca1dba2f (diff)
downloaddjango-rest-framework-e6ecb494bb0cec7829e3d26ae9d6af04271c6ad4.tar.bz2
Merge pull request #2111 from matthewwithanm/perm-docs
Clarify how permission classes are composed
-rw-r--r--docs/api-guide/settings.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 48af30a5..96d715ea 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -74,7 +74,7 @@ Default:
#### DEFAULT_PERMISSION_CLASSES
-A list or tuple of permission classes, that determines the default set of permissions checked at the start of a view.
+A list or tuple of permission classes, that determines the default set of permissions checked at the start of a view. Permission must be granted by every class in the list.
Default: