diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
| commit | 88fba8dbd201118241965d6a056ae09372b0630c (patch) | |
| tree | e0c30696df5827037048eb0cdd6c0731653a1734 /docs/narr/security.rst | |
| parent | ce0e371e067f3628620a7db5a50056c9a045979f (diff) | |
| parent | 291995fa17ae55adfda09c4eda095fd5e8cb21d8 (diff) | |
| download | pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.gz pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.bz2 pyramid-88fba8dbd201118241965d6a056ae09372b0630c.zip | |
fix conflicts
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: |