summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
committerChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
commit905bcaaec5f71f9b2df4204ed91c1628f854e0ff (patch)
treeb4838a2baf1a1ca9d40173a76da6c40315e0fa2a /docs/api
parentf5b9e9c6708e4176231c45f5e478d56bba4b42e6 (diff)
parent3a8cee594c3e42dd23cde72310c71aa816e3a966 (diff)
downloadpyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.gz
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.bz2
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.zip
Merge branch 'master' into 1.3-branch
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/security.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/security.rst b/docs/api/security.rst
index 7086690e9..814b68e5a 100644
--- a/docs/api/security.rst
+++ b/docs/api/security.rst
@@ -72,13 +72,13 @@ Return Values
The ACE "action" (the first element in an ACE e.g. ``(Allow, Everyone,
'read')`` that means allow access. A sequence of ACEs makes up an
- ACL. It is a string, and it's actual value is "Allow".
+ ACL. It is a string, and its actual value is "Allow".
.. attribute:: Deny
The ACE "action" (the first element in an ACE e.g. ``(Deny,
'george', 'read')`` that means deny access. A sequence of ACEs
- makes up an ACL. It is a string, and it's actual value is "Deny".
+ makes up an ACL. It is a string, and its actual value is "Deny".
.. autoclass:: ACLDenied
:members: