summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-29 01:55:58 -0400
committerChris McDonough <chrism@plope.com>2012-10-29 01:55:58 -0400
commit4fa68826e6d0980c6fd40b992c111f4496d202cf (patch)
tree9cfd4192d7a9b265da16856d9002471ed4f92e7f /docs
parent220435320613530bde80dd1c4a38a3e719f4af5d (diff)
parentc7337ba1b02915824cb33803993c8ba236ed23b9 (diff)
downloadpyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.tar.gz
pyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.tar.bz2
pyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.zip
Merge branch 'master' into 1.4-branch
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/viewconfig.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 752e6ad72..6373a8d26 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -431,6 +431,18 @@ configured view.
.. versionadded:: 1.4a3
+``effective_principals``
+
+ If specified, this value should be a :term:`principal` identifier or a
+ sequence of principal identifiers. If the
+ :func:`pyramid.security.effective_principals` method indicates that every
+ principal named in the argument list is present in the current request, this
+ predicate will return True; otherwise it will return False. For example:
+ ``effective_principals=pyramid.security.Authenticated`` or
+ ``effective_principals=('fred', 'group:admins')``.
+
+ .. versionadded:: 1.4a4
+
``custom_predicates``
If ``custom_predicates`` is specified, it must be a sequence of references
to custom predicate callables. Use custom predicates when no set of