diff options
| author | Ben Bangert <ben@groovie.org> | 2010-10-27 12:32:49 -0700 |
|---|---|---|
| committer | Ben Bangert <ben@groovie.org> | 2010-10-27 12:32:49 -0700 |
| commit | a19db34e7ebd99e75259aa14829b5bddf5148572 (patch) | |
| tree | 8ea2bf94a12b33fe502eace734dc9f6ff2141014 /docs | |
| parent | 49905a3fbd55cee02783d1aa33a7e5e6893ac876 (diff) | |
| parent | 1ad1dbb5987c74d8e6802221c78af96e24ca1960 (diff) | |
| download | pyramid-a19db34e7ebd99e75259aa14829b5bddf5148572.tar.gz pyramid-a19db34e7ebd99e75259aa14829b5bddf5148572.tar.bz2 pyramid-a19db34e7ebd99e75259aa14829b5bddf5148572.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/security.rst | 15 |
1 files changed, 9 insertions, 6 deletions
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 |