diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-05 14:48:02 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-05 14:48:02 -0500 |
| commit | 62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1 (patch) | |
| tree | 971b72ff75c9a52267f3506fbaa79a6d66da4bf0 /docs/narr/security.rst | |
| parent | ce0e371e067f3628620a7db5a50056c9a045979f (diff) | |
| parent | 89585958ebd47e1fde477a48144ecd25c2b5f856 (diff) | |
| download | pyramid-62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1.tar.gz pyramid-62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1.tar.bz2 pyramid-62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1.zip | |
Merge branch 'cmbeelby-master'
Diffstat (limited to 'docs/narr/security.rst')
| -rw-r--r-- | docs/narr/security.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst index 6414c7143..6e07c9338 100644 --- a/docs/narr/security.rst +++ b/docs/narr/security.rst @@ -193,11 +193,11 @@ application: When a default permission is registered: -- if a view configuration names an explicit ``permission``, the default +- 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 +- 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). @@ -460,7 +460,7 @@ parents left. In order to allow the security machinery to perform ACL inheritance, resource objects must provide *location-awareness*. Providing *location-awareness* means two things: the root object in the resource tree must have a -``_name__`` attribute and a ``__parent__`` attribute. +``__name__`` attribute and a ``__parent__`` attribute. .. code-block:: python :linenos: |