#19006: merge with 3.5.

997e6c1d · Ezio Melotti · e2c9adb0 · f418db2e · 997e6c1d
Commit 997e6c1d authored Jan 12, 2016 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Doc/library/unittest.rst Doc/library/unittest.rst +4 -3

No files found.
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -762,8 +762,9 @@ Test cases

   .. _assert-methods:

-   The :class:`TestCase` class provides a number of methods to check for and
-   report failures, such as:
+   The :class:`TestCase` class provides several assert methods to check for and
+   report failures.  The following table lists the most commonly used methods
+   (see the tables below for more assert methods):

   +-----------------------------------------+-----------------------------+---------------+
   | Method                                  | Checks that                 | New in        |
@@ -884,7 +885,7 @@ Test cases



-   It is also possible to check the production of exceptions, warnings and
+   It is also possible to check the production of exceptions, warnings, and
   log messages using the following methods:

   +---------------------------------------------------------+--------------------------------------+------------+