Merged revisions 84945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line
#9911: doc copyedits.
........
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 0ef2e03..6fc49eb 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -634,7 +634,7 @@
.. function:: skipUnless(condition, reason)
- Skip the decoratored test unless *condition* is true.
+ Skip the decorated test unless *condition* is true.
.. function:: expectedFailure
@@ -1523,8 +1523,8 @@
.. attribute:: expectedFailures
- A list contaning 2-tuples of :class:`TestCase` instances and strings
- holding formatted tracebacks. Each tuple represents a expected failures
+ A list containing 2-tuples of :class:`TestCase` instances and strings
+ holding formatted tracebacks. Each tuple represents an expected failure
of the test case.
.. attribute:: unexpectedSuccesses