Merged revisions 73665,73693,73704-73705,73707,73712-73713,73824 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73665 | alexandre.vassalotti | 2009-06-28 21:01:51 -0400 (Sun, 28 Jun 2009) | 2 lines
Update docstrings for sys.getdlopenflags() and sys.setdlopenflags().
........
r73693 | jesse.noller | 2009-06-29 14:20:34 -0400 (Mon, 29 Jun 2009) | 1 line
Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons
........
r73704 | georg.brandl | 2009-06-30 12:15:43 -0400 (Tue, 30 Jun 2009) | 1 line
#6376: fix copy-n-paste oversight.
........
r73705 | georg.brandl | 2009-06-30 12:17:28 -0400 (Tue, 30 Jun 2009) | 1 line
#6374: add a bit of explanation about shell=True on Windows.
........
r73707 | georg.brandl | 2009-06-30 12:35:11 -0400 (Tue, 30 Jun 2009) | 1 line
#6371: fix link targets.
........
r73712 | ezio.melotti | 2009-06-30 18:51:06 -0400 (Tue, 30 Jun 2009) | 1 line
Fixed defaultTestCase -> defaultTestResult
........
r73713 | ezio.melotti | 2009-06-30 18:56:16 -0400 (Tue, 30 Jun 2009) | 1 line
Fixed a backslash that was not supposed to be there
........
r73824 | ezio.melotti | 2009-07-03 21:18:08 -0400 (Fri, 03 Jul 2009) | 1 line
#6398 typo: versio. -> version.
........
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 30e73cc..955c794 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -646,8 +646,8 @@
Run the test, collecting the result into the test result object passed as
*result*. If *result* is omitted or :const:`None`, a temporary result
- object is created (by calling the :meth:`defaultTestCase` method) and
- used; this result object is not returned to :meth:`run`'s caller.
+ object is created (by calling the :meth:`defaultTestResult` method) and
+ used. The result object is not returned to :meth:`run`'s caller.
The same effect may be had by simply calling the :class:`TestCase`
instance.