[Python-checkins] r81357 - in python/branches/release31-maint: Doc/library/unittest.rst

[stefan.krah]

Author: stefan.krah
Date: Wed May 19 18:11:36 2010
New Revision: 81357

Log:
Merged revisions 81356 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81356 | stefan.krah | 2010-05-19 18:09:41 +0200 (Wed, 19 May 2010) | 9 lines
  
  Merged revisions 81354 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81354 | stefan.krah | 2010-05-19 17:59:40 +0200 (Wed, 19 May 2010) | 3 lines
    
    Fix typo.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/unittest.rst

Modified: python/branches/release31-maint/Doc/library/unittest.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/unittest.rst	(original)
+++ python/branches/release31-maint/Doc/library/unittest.rst	Wed May 19 18:11:36 2010
@@ -589,7 +589,7 @@
 
    .. method:: skipTest(reason)
 
-      Calling this during the a test method or :meth:`setUp` skips the current
+      Calling this during a test method or :meth:`setUp` skips the current
       test.  See :ref:`unittest-skipping` for more information.
 
       .. versionadded:: 3.1