diff -r 34a65109d191 Doc/library/unittest.rst
--- a/Doc/library/unittest.rst	Mon Nov 18 21:47:35 2013 -0600
+++ b/Doc/library/unittest.rst	Tue Nov 19 20:12:19 2013 -0500
@@ -669,9 +669,9 @@
    .. method:: setUp()
 
       Method called to prepare the test fixture.  This is called immediately
-      before calling the test method; any exception raised by this method will
-      be considered an error rather than a test failure. The default
-      implementation does nothing.
+      before calling the test method; any exception raised by this method, other
+      than AssertionError, will be considered an error rather than a test failure.
+      The default implementation does nothing.
 
 
    .. method:: tearDown()
@@ -680,9 +680,10 @@
       result recorded.  This is called even if the test method raised an
       exception, so the implementation in subclasses may need to be particularly
       careful about checking internal state.  Any exception raised by this
-      method will be considered an error rather than a test failure.  This
-      method will only be called if the :meth:`setUp` succeeds, regardless of
-      the outcome of the test method. The default implementation does nothing.
+      method, other than AssertionError, will be considered an error rather than
+      a test failure.  This method will only be called if the :meth:`setUp`
+      succeeds, regardless of the outcome of the test method. The default
+      implementation does nothing.
 
 
    .. method:: setUpClass()