Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.1.X] Fixed #11961: Corrected a few typos in docs/testing.txt. Than…

…ks to timo for the patch.

Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d2b6f6c9489be96fc8d0995f8a44b9ce9c787b02 1 parent 88ec9d9
Karen Tracey authored

Showing 1 changed file with 5 additions and 5 deletions. Show diff stats Hide diff stats

  1. 10  docs/topics/testing.txt
10  docs/topics/testing.txt
@@ -515,7 +515,7 @@ arguments at time of construction:
515 515
         >>> c = Client()
516 516
         >>> c.get('/customers/details/?name=fred&age=7')
517 517
 
518  
-        If you provide URL both an encoded GET data and a data argument,
  518
+        If you provide a URL with both an encoded GET data and a data argument,
519 519
         the data argument will take precedence.
520 520
 
521 521
         If you set ``follow`` to ``True`` the client will follow any redirects
@@ -627,7 +627,7 @@ arguments at time of construction:
627 627
 
628 628
         .. versionadded:: 1.1
629 629
 
630  
-        Makes an PUT request on the provided ``path`` and returns a
  630
+        Makes a PUT request on the provided ``path`` and returns a
631 631
         ``Response`` object. Useful for testing RESTful interfaces. Acts just
632 632
         like :meth:`Client.post` except with the PUT request method.
633 633
 
@@ -1127,11 +1127,11 @@ Django, such as your machine's mail server, if you're running one.)
1127 1127
 
1128 1128
 During test running, each outgoing e-mail is saved in
1129 1129
 ``django.core.mail.outbox``. This is a simple list of all
1130  
-:class:`<~django.core.mail.EmailMessage>` instances that have been sent.
  1130
+:class:`~django.core.mail.EmailMessage` instances that have been sent.
1131 1131
 It does not exist under normal execution conditions, i.e., when you're not
1132 1132
 running unit tests. The outbox is created during test setup, along with the
1133  
-dummy :class:`<~django.core.mail.SMTPConnection>`. When the test framework is
1134  
-torn down, the standard :class:`<~django.core.mail.SMTPConnection>` class is
  1133
+dummy :class:`~django.core.mail.SMTPConnection`. When the test framework is
  1134
+torn down, the standard :class:`~django.core.mail.SMTPConnection` class is
1135 1135
 restored, and the test outbox is destroyed.
1136 1136
 
1137 1137
 The ``outbox`` attribute is a special attribute that is created *only* when

0 notes on commit d2b6f6c

Please sign in to comment.
Something went wrong with that request. Please try again.