diff options
| author | Tim Graham <timograham@gmail.com> | 2016-09-09 11:00:21 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-09-09 11:00:58 -0400 |
| commit | 244c4c06f9fbcb5fe96511c8f22b0ee4856baf18 (patch) | |
| tree | a72563028f353e332ee7be6e46adecd176216274 /docs | |
| parent | 1f3c66fe9fd8c8e980ecda0a9917319f35ad6676 (diff) | |
[1.10.x] Normalized spelling of ETag.
Backport of ef021412d5e7eb78c89f0b7cf2ec01bcb959a837 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/middleware.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | docs/topics/conditional-view-processing.txt | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt index 2d1d0f9604..af851f64a6 100644 --- a/docs/ref/middleware.txt +++ b/docs/ref/middleware.txt @@ -462,7 +462,7 @@ Here are some hints about the ordering of various Django middleware classes: #. :class:`~django.middleware.http.ConditionalGetMiddleware` - Before ``CommonMiddleware``: uses its ``Etag`` header when + Before ``CommonMiddleware``: uses its ``ETag`` header when :setting:`USE_ETAGS` = ``True``. #. :class:`~django.contrib.sessions.middleware.SessionMiddleware` diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index d17b224355..34c4dda324 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2486,7 +2486,7 @@ to ensure your processes are running in the correct environment. Default: ``False`` -A boolean that specifies whether to output the "Etag" header. This saves +A boolean that specifies whether to output the ``ETag`` header. This saves bandwidth but slows down performance. This is used by the ``CommonMiddleware`` (see :doc:`/topics/http/middleware`) and in the``Cache Framework`` (see :doc:`/topics/cache`). diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index c9fb05f5ea..e1549eee14 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -239,7 +239,6 @@ environ escapejs esque Ess -Etag ETag ETags exe diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt index 0045efa49d..7efd8ac636 100644 --- a/docs/topics/conditional-view-processing.txt +++ b/docs/topics/conditional-view-processing.txt @@ -64,7 +64,7 @@ order, as the view function they are helping to wrap. The function passed ``last_modified_func`` should return a standard datetime value specifying the last time the resource was modified, or ``None`` if the resource doesn't exist. The function passed to the ``etag`` decorator should return a string -representing the `Etag`_ for the resource, or ``None`` if it doesn't exist. +representing the `ETag`_ for the resource, or ``None`` if it doesn't exist. Using this feature usefully is probably best explained with an example. Suppose you have this pair of models, representing a simple blog system:: |