From 1ad1dbb5987c74d8e6802221c78af96e24ca1960 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 26 Oct 2010 19:17:22 -0400 Subject: forward port of bugfix from bfg trunk --- docs/narr/security.rst | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/narr/security.rst b/docs/narr/security.rst index 25d1c2ecf..109009842 100644 --- a/docs/narr/security.rst +++ b/docs/narr/security.rst @@ -239,13 +239,16 @@ application: - The :ref:`default_permission_directive` ZCML directive. -When a default permission is registered, if a view configuration -*does* name its own permission, the default permission is ignored for -that view registration, and the view-configuration-named permission is -used. +When a default permission is registered: -.. note:: All APIs and ZCML directives related to default permissions - are new in :mod:`pyramid` 1.3. +- if a view configuration names an explicit ``permission`, the default + permission is ignored for that view registration, and the + view-configuration-named permission is used. + +- if a view configuration names an explicit permission as the string + ``__no_permission_required__``, the default permission is ignored, + and the view is registered *without* a permission (making it + available to all callers regardless of their credentials). .. index:: single: ACL -- cgit v1.2.3