Skip to content

Commit ef02141

Browse files
committed
Normalized spelling of ETag.
1 parent ca9c69a commit ef02141

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

django/conf/global_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def gettext_noop(s):
2222
# on a live site.
2323
DEBUG_PROPAGATE_EXCEPTIONS = False
2424

25-
# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
25+
# Whether to use the "ETag" header. This saves bandwidth but slows down performance.
2626
USE_ETAGS = False
2727

2828
# People who get code error notifications.

django/views/decorators/http.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def condition(etag_func=None, last_modified_func=None):
5858
5959
The parameters are callables to compute the ETag and last modified time for
6060
the requested resource, respectively. The callables are passed the same
61-
parameters as the view itself. The Etag function should return a string (or
61+
parameters as the view itself. The ETag function should return a string (or
6262
None if the resource doesn't exist), while the last_modified function
6363
should return a datetime object (or None if the resource doesn't exist).
6464

docs/ref/middleware.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ Here are some hints about the ordering of various Django middleware classes:
472472

473473
#. :class:`~django.middleware.http.ConditionalGetMiddleware`
474474

475-
Before ``CommonMiddleware``: uses its ``Etag`` header when
475+
Before ``CommonMiddleware``: uses its ``ETag`` header when
476476
:setting:`USE_ETAGS` = ``True``.
477477

478478
#. :class:`~django.contrib.sessions.middleware.SessionMiddleware`

docs/ref/settings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2527,7 +2527,7 @@ to ensure your processes are running in the correct environment.
25272527

25282528
Default: ``False``
25292529

2530-
A boolean that specifies whether to output the "Etag" header. This saves
2530+
A boolean that specifies whether to output the ``ETag`` header. This saves
25312531
bandwidth but slows down performance. This is used by the ``CommonMiddleware``
25322532
(see :doc:`/topics/http/middleware`) and in the``Cache Framework``
25332533
(see :doc:`/topics/cache`).

docs/spelling_wordlist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ environ
239239
escapejs
240240
esque
241241
Ess
242-
Etag
243242
ETag
244243
ETags
245244
exe

docs/topics/conditional-view-processing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ order, as the view function they are helping to wrap. The function passed
6464
``last_modified_func`` should return a standard datetime value specifying the
6565
last time the resource was modified, or ``None`` if the resource doesn't
6666
exist. The function passed to the ``etag`` decorator should return a string
67-
representing the `Etag`_ for the resource, or ``None`` if it doesn't exist.
67+
representing the `ETag`_ for the resource, or ``None`` if it doesn't exist.
6868

6969
Using this feature usefully is probably best explained with an example.
7070
Suppose you have this pair of models, representing a simple blog system::

tests/admin_views/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6047,7 +6047,7 @@ def test_callable(self):
60476047

60486048

60496049
@override_settings(ROOT_URLCONF='admin_views.urls')
6050-
class TestEtagWithAdminView(SimpleTestCase):
6050+
class TestETagWithAdminView(SimpleTestCase):
60516051
# See https://code.djangoproject.com/ticket/16003
60526052

60536053
def test_admin(self):

tests/cache/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2163,7 +2163,7 @@ class TestWithTemplateResponse(SimpleTestCase):
21632163
Tests various headers w/ TemplateResponse.
21642164
21652165
Most are probably redundant since they manipulate the same object
2166-
anyway but the Etag header is 'special' because it relies on the
2166+
anyway but the ETag header is 'special' because it relies on the
21672167
content being complete (which is not necessarily always the case
21682168
with a TemplateResponse)
21692169
"""

0 commit comments

Comments
 (0)