summaryrefslogtreecommitdiff
path: root/docs/whatsnew-2.0.rst
diff options
context:
space:
mode:
authorÉric Araujo <earaujo@caravan.coop>2019-12-14 13:33:46 -0500
committerÉric Araujo <earaujo@caravan.coop>2019-12-14 13:33:46 -0500
commitdb9f893fc6c54164a71c2e96321e60e9b34c6f7a (patch)
treef918ae87025ccaa2da953411c049b70726b792b7 /docs/whatsnew-2.0.rst
parent0168300b0da3c79e05ec87aa777e04674a86cebb (diff)
parent948b692469cdcaeb38f37982f0810954c545b920 (diff)
downloadpyramid-db9f893fc6c54164a71c2e96321e60e9b34c6f7a.tar.gz
pyramid-db9f893fc6c54164a71c2e96321e60e9b34c6f7a.tar.bz2
pyramid-db9f893fc6c54164a71c2e96321e60e9b34c6f7a.zip
merge upstream
Diffstat (limited to 'docs/whatsnew-2.0.rst')
-rw-r--r--docs/whatsnew-2.0.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-2.0.rst b/docs/whatsnew-2.0.rst
index 4448e0f69..b5f349166 100644
--- a/docs/whatsnew-2.0.rst
+++ b/docs/whatsnew-2.0.rst
@@ -58,7 +58,7 @@ flexibility in authorization implementations, especially those that do not
match the ACL pattern. If you were previously using
:class:`pyramid.authorization.ACLAuthorizationPolicy`, you can achieve the same
results by writing your own ``permits`` method using
-:class:`pyraid.authorization.ACLHelper`. For more details on implementing an
+:class:`pyramid.authorization.ACLHelper`. For more details on implementing an
ACL, see :ref:`assigning_acls`.
Pyramid does not provide any built-in security policies. Similiar