summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/topics/templates.txt2
-rw-r--r--tests/foreign_object/tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index 8382be82b4..2a28564156 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -645,7 +645,7 @@ creating an object that specifies the following attributes:
* ``'name'``: The full path to the template.
* ``'template_name'``: The relative path to the template as passed into the
- the template loading methods.
+ template loading methods.
* ``'loader_name'``: An optional string identifying the function or class used
to load the template, e.g. ``django.template.loaders.filesystem.Loader``.
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py
index b211c6e328..a33f29a38c 100644
--- a/tests/foreign_object/tests.py
+++ b/tests/foreign_object/tests.py
@@ -47,7 +47,7 @@ class MultiColumnFKTests(TestCase):
self.assertEqual((person.id, person.name), (self.bob.id, "Bob"))
def test_get_fails_on_multicolumn_mismatch(self):
- # Membership objects returns DoesNotExist error when the there is no
+ # Membership objects returns DoesNotExist error when there is no
# Person with the same id and country_id
membership = Membership.objects.create(
membership_country_id=self.usa.id, person_id=self.jane.id, group_id=self.cia.id)