summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-09-09 11:00:21 -0400
committerTim Graham <timograham@gmail.com>2016-09-09 11:00:21 -0400
commitef021412d5e7eb78c89f0b7cf2ec01bcb959a837 (patch)
tree1fd05bab465fcccccc2337e8325cce2a3ac89f8a /docs
parentca9c69a9682141bc102ad6751f2feecc3d0d9d21 (diff)
Normalized spelling of ETag.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/middleware.txt2
-rw-r--r--docs/ref/settings.txt2
-rw-r--r--docs/spelling_wordlist1
-rw-r--r--docs/topics/conditional-view-processing.txt2
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 8334c44216..5d8939e3ef 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -472,7 +472,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 9a60844eb8..507a812fb5 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2527,7 +2527,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 7712c4c02e..a2ecf87e98 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::