summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2011-05-18 19:39:50 +0000
committerGabriel Hurley <gabehr@gmail.com>2011-05-18 19:39:50 +0000
commit8ecda079a88d625002c5bbc12740077a51f70da4 (patch)
tree66730bc7092e19e1c77555cfe287e7d6e30cce1c /docs
parent5dec36de15cafd1e51f33acfd12b7b07d82a192c (diff)
Correcting a typo and minor grammatical issues from [16237].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/testing.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index 36045d2fd7..07049fddb1 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -1385,7 +1385,7 @@ this use case Django provides a standard `Python context manager`_
response = self.client.get('/sekrit/')
self.assertRedirects(response, '/accounts/login/?next=/sekrit/')
- # Then override the LOGING_URL setting
+ # Then override the LOGIN_URL setting
with self.settings(LOGIN_URL='/other/login/'):
response = self.client.get('/sekrit/')
self.assertRedirects(response, '/other/login/?next=/sekrit/')
@@ -1438,10 +1438,10 @@ decorate the class::
.. note::
When overriding settings make sure to also handle the cases in which
- Django or your app's code use a cache or another feature that retain
+ Django or your app's code uses a cache or similar feature that retains
state even if the setting is changed. Django provides the
:data:`django.test.signals.setting_changed` signal to connect cleanup
- and other state resetting callbacks to.
+ and other state-resetting callbacks to.
.. _`Python context manager`: http://www.python.org/dev/peps/pep-0343/
.. _`decorator`: http://www.python.org/dev/peps/pep-0318/