From f9b7704ab38d82d1de0c26deb542e497ebf14df6 Mon Sep 17 00:00:00 2001
From: David Smith <39445562+smithdc1@users.noreply.github.com>
Date: Mon, 2 Aug 2021 06:51:24 +0100
Subject: [PATCH] Refs #32956 -- Corrected spelling of "gray".

---
 django/contrib/gis/gdal/raster/const.py              | 2 +-
 docs/_ext/djangodocs.py                              | 2 +-
 tests/raw_query/tests.py                             | 2 +-
 tests/template_tests/syntax_tests/test_if_changed.py | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/django/contrib/gis/gdal/raster/const.py b/django/contrib/gis/gdal/raster/const.py
index 83636cf05e..935c736ec8 100644
--- a/django/contrib/gis/gdal/raster/const.py
+++ b/django/contrib/gis/gdal/raster/const.py
@@ -47,7 +47,7 @@ GDAL_RESAMPLE_ALGORITHMS = {
 # See https://www.gdal.org/gdal_8h.html#ace76452d94514561fffa8ea1d2a5968c
 GDAL_COLOR_TYPES = {
     0: 'GCI_Undefined',  # Undefined, default value, i.e. not known
-    1: 'GCI_GrayIndex',  # Greyscale
+    1: 'GCI_GrayIndex',  # Grayscale
     2: 'GCI_PaletteIndex',  # Paletted
     3: 'GCI_RedBand',  # Red band of RGBA image
     4: 'GCI_GreenBand',  # Green band of RGBA image
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index b21cfebc9e..dfc9e12682 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -280,7 +280,7 @@ class ConsoleDirective(CodeBlock):
     required_arguments = 0
     # The 'doscon' Pygments formatter needs a prompt like this. '>' alone
     # won't do it because then it simply paints the whole command line as a
-    # grey comment with no highlighting at all.
+    # gray comment with no highlighting at all.
     WIN_PROMPT = r'...\> '
 
     def run(self):
diff --git a/tests/raw_query/tests.py b/tests/raw_query/tests.py
index 802b06a30b..fdc16823c1 100644
--- a/tests/raw_query/tests.py
+++ b/tests/raw_query/tests.py
@@ -33,7 +33,7 @@ class RawQueryTests(TestCase):
         )
         cls.b3 = Book.objects.create(
             title='Another awesome book', author=cls.a1, paperback=False,
-            opening_line='A squat grey building of only thirty-four stories.',
+            opening_line='A squat gray building of only thirty-four stories.',
         )
         cls.b4 = Book.objects.create(
             title='Some other book', author=cls.a3, paperback=True,
diff --git a/tests/template_tests/syntax_tests/test_if_changed.py b/tests/template_tests/syntax_tests/test_if_changed.py
index 5ea6b0dcf4..fd48a42389 100644
--- a/tests/template_tests/syntax_tests/test_if_changed.py
+++ b/tests/template_tests/syntax_tests/test_if_changed.py
@@ -125,11 +125,11 @@ class IfChangedTagTests(SimpleTestCase):
         self.assertEqual(output, '1-first,1-other,2-first,2-other,2-other,3-first,')
 
     @setup({'ifchanged-else02': '{% for id in ids %}{{ id }}-'
-                                '{% ifchanged id %}{% cycle "red" "blue" %}{% else %}grey{% endifchanged %}'
+                                '{% ifchanged id %}{% cycle "red" "blue" %}{% else %}gray{% endifchanged %}'
                                 ',{% endfor %}'})
     def test_ifchanged_else02(self):
         output = self.engine.render_to_string('ifchanged-else02', {'ids': [1, 1, 2, 2, 2, 3]})
-        self.assertEqual(output, '1-red,1-grey,2-blue,2-grey,2-grey,3-red,')
+        self.assertEqual(output, '1-red,1-gray,2-blue,2-gray,2-gray,3-red,')
 
     @setup({'ifchanged-else03': '{% for id in ids %}{{ id }}'
                                 '{% ifchanged id %}-{% cycle "red" "blue" %}{% else %}{% endifchanged %}'