summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
commit30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch)
treeb8a2cd06ff0130fd31b702862db2e46d39cd4e71 /docs/glossary.rst
parent504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 9c0ea8598..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
@@ -1089,3 +1089,7 @@ Glossary
data in a Redis database. See
https://pypi.python.org/pypi/pyramid_redis_sessions for more information.
+ cache busting
+ A technique used when serving a cacheable static asset in order to force
+ a client to query the new version of the asset. See :ref:`cache_busting`
+ for more information.