[Python-checkins] r77797 - in python/branches/py3k: Doc/library/unittest.rst

[ezio.melotti]

Author: ezio.melotti
Date: Wed Jan 27 21:58:07 2010
New Revision: 77797

Log:
Merged revisions 77796 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77796 | ezio.melotti | 2010-01-27 22:25:11 +0200 (Wed, 27 Jan 2010) | 1 line
  
  #7765: typos
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/unittest.rst

Modified: python/branches/py3k/Doc/library/unittest.rst
==============================================================================
--- python/branches/py3k/Doc/library/unittest.rst	(original)
+++ python/branches/py3k/Doc/library/unittest.rst	Wed Jan 27 21:58:07 2010
@@ -107,7 +107,7 @@
 
 You can run tests with more detail (higher verbosity) by passing in the -v flag::
 
-   python-m unittest -v test_module
+   python -m unittest -v test_module
 
 For a list of all the command line options::
 
@@ -149,8 +149,8 @@
 The -s, -p, & -t options can be passsed in as positional arguments. The
 following two command lines are equivalent::
 
-   python -m unittest -s project_directory -p '*_test.py'
-   python -m unittest project_directory '*_test.py'
+   python -m unittest discover -s project_directory -p '*_test.py'
+   python -m unittest discover project_directory '*_test.py'
 
 Test modules and packages can customize test loading and discovery by through
 the `load_tests protocol`_.
@@ -1436,7 +1436,7 @@
 
    .. method:: stopTestRun(test)
 
-      Called once before any tests are executed.
+      Called once after all tests are executed.
 
       .. versionadded:: 2.7