summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-12-26 15:19:50 -0800
committerSteve Piercy <web@stevepiercy.com>2015-12-26 15:19:50 -0800
commit57745fe67fb6e1ca947e784a006c922ab4b77170 (patch)
tree7b05c1f62c60c4bdc3dbaa6a5201e9707f1f8eb5 /docs
parent4251d47eb8ed6a8f0851a075ff9f7f085e6d603c (diff)
parentb7057f3dcac875d71916d6807d157ff6f3ede662 (diff)
downloadpyramid-57745fe67fb6e1ca947e784a006c922ab4b77170.tar.gz
pyramid-57745fe67fb6e1ca947e784a006c922ab4b77170.tar.bz2
pyramid-57745fe67fb6e1ca947e784a006c922ab4b77170.zip
Merge pull request #2200 from stevepiercy/master
Update glossary.rst
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index b4bb36421..60e861597 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -273,7 +273,7 @@ Glossary
(Allow, 'bob', 'read'), (Deny, 'fred', 'write')]``. If an ACL is
attached to a resource instance, and that resource is findable via the
context resource, it will be consulted any active security policy to
- determine wither a particular request can be fulfilled given the
+ determine whether a particular request can be fulfilled given the
:term:`authentication` information in the request.
authentication