summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2009-09-30 06:40:34 +0000
committerJames Bennett <ubernostrum@gmail.com>2009-09-30 06:40:34 +0000
commitca9d0136df5206a6c988e2826fa0938449363a3d (patch)
tree39493bede11168c4dc6b2027d9463a68e54acac5 /docs/topics
parent055efb25308feac83f5488b5abc8f5436434fc66 (diff)
Fixed #11961: Corrected a few typos in docs/testing.txt. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/testing.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index cec6002b7b..25d2f083fd 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -515,7 +515,7 @@ arguments at time of construction:
>>> c = Client()
>>> c.get('/customers/details/?name=fred&age=7')
- If you provide URL both an encoded GET data and a data argument,
+ If you provide a URL with both an encoded GET data and a data argument,
the data argument will take precedence.
If you set ``follow`` to ``True`` the client will follow any redirects
@@ -627,7 +627,7 @@ arguments at time of construction:
.. versionadded:: 1.1
- Makes an PUT request on the provided ``path`` and returns a
+ Makes a PUT request on the provided ``path`` and returns a
``Response`` object. Useful for testing RESTful interfaces. Acts just
like :meth:`Client.post` except with the PUT request method.
@@ -1127,11 +1127,11 @@ Django, such as your machine's mail server, if you're running one.)
During test running, each outgoing e-mail is saved in
``django.core.mail.outbox``. This is a simple list of all
-:class:`<~django.core.mail.EmailMessage>` instances that have been sent.
+:class:`~django.core.mail.EmailMessage` instances that have been sent.
It does not exist under normal execution conditions, i.e., when you're not
running unit tests. The outbox is created during test setup, along with the
-dummy :class:`<~django.core.mail.SMTPConnection>`. When the test framework is
-torn down, the standard :class:`<~django.core.mail.SMTPConnection>` class is
+dummy :class:`~django.core.mail.SMTPConnection`. When the test framework is
+torn down, the standard :class:`~django.core.mail.SMTPConnection` class is
restored, and the test outbox is destroyed.
The ``outbox`` attribute is a special attribute that is created *only* when