diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
| commit | a2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch) | |
| tree | 6dac581990ba758670a8424cafe8bf31888471f7 /docs/glossary.rst | |
| parent | 29e1002a108d045e1f80be3137f2cde4e47ca642 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2 pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 6 |
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. |