Normalized spelling of ETag.

8 files changed, 7 insertions, 8 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index a745b9cc4d..9dc4cdbade 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -22,7 +22,7 @@ DEBUG = False
 # on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
 
-# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
+# Whether to use the "ETag" header. This saves bandwidth but slows down performance.
 USE_ETAGS = False
 
 # People who get code error notifications.
diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py
index 2dc923768d..a5144421d5 100644
--- a/django/views/decorators/http.py
+++ b/django/views/decorators/http.py
@@ -58,7 +58,7 @@ def condition(etag_func=None, last_modified_func=None):
 
     The parameters are callables to compute the ETag and last modified time for
     the requested resource, respectively. The callables are passed the same
-    parameters as the view itself. The Etag function should return a string (or
+    parameters as the view itself. The ETag function should return a string (or
     None if the resource doesn't exist), while the last_modified function
     should return a datetime object (or None if the resource doesn't exist).
 
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::
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 42cae7f01d..336c9ce0a5 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -6047,7 +6047,7 @@ class InlineAdminViewOnSiteTest(TestCase):
 
 
 @override_settings(ROOT_URLCONF='admin_views.urls')
-class TestEtagWithAdminView(SimpleTestCase):
+class TestETagWithAdminView(SimpleTestCase):
     # See https://code.djangoproject.com/ticket/16003
 
     def test_admin(self):
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index b8bce5e721..b6d37148ad 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -2163,7 +2163,7 @@ class TestWithTemplateResponse(SimpleTestCase):
     Tests various headers w/ TemplateResponse.
 
     Most are probably redundant since they manipulate the same object
-    anyway but the Etag header is 'special' because it relies on the
+    anyway but the ETag header is 'special' because it relies on the
     content being complete (which is not necessarily always the case
     with a TemplateResponse)
     """