summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authorization.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-11 22:08:07 -0800
committerChris McDonough <chrism@plope.com>2013-01-11 22:08:07 -0800
commit067d193086f4d110730d0efa9a9e6dc70f4a154b (patch)
tree78b034809466a26e2e3813dd94ea9b7ea39b8619 /docs/tutorials/wiki2/authorization.rst
parente4e08cd39bcb7f33893ee0c7e622cbc5493c3c64 (diff)
parent064080f2496ef09eb79a0c370eb0db9dfd5c459c (diff)
downloadpyramid-067d193086f4d110730d0efa9a9e6dc70f4a154b.tar.gz
pyramid-067d193086f4d110730d0efa9a9e6dc70f4a154b.tar.bz2
pyramid-067d193086f4d110730d0efa9a9e6dc70f4a154b.zip
Merge pull request #770 from tshepang/split
sentence too long; also fix grammar, and add markup
Diffstat (limited to 'docs/tutorials/wiki2/authorization.rst')
-rw-r--r--docs/tutorials/wiki2/authorization.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index cfbc8ca75..e43519ac9 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -62,7 +62,7 @@ returns one of these values:
- If the userid *does not* exist in the system, it will
return ``None``.
-For example, ``groupfinder('editor', request )`` returns ['group:editor'],
+For example, ``groupfinder('editor', request )`` returns ``['group:editor']``,
``groupfinder('viewer', request)`` returns [], and ``groupfinder('admin', request)``
returns ``None``. We will use ``groupfinder()`` as an :term:`authentication policy`
"callback" that will provide the :term:`principal` or principals
@@ -151,10 +151,10 @@ Now add those policies to the configuration:
(Only the highlighted lines need to be added.)
-We are enabling an ``AuthTktAuthenticationPolicy``, it is based in an
-auth ticket that may be included in the request, and an
-``ACLAuthorizationPolicy`` that uses an ACL to determine the allow or deny
-outcome for a view.
+We are enabling an ``AuthTktAuthenticationPolicy``, which is based in an
+auth ticket that may be included in the request.
+We are also enabling an ``ACLAuthorizationPolicy``, which uses an ACL to
+determine the *allow* or *deny* outcome for a view.
Note that the :class:`pyramid.authentication.AuthTktAuthenticationPolicy`
constructor accepts two arguments: ``secret`` and ``callback``. ``secret`` is