Port a couple of changes from 3.1.

diff --cc Doc/library/unittest.rst
index 8366bab394876ecdb2260f247734137336f7d8cb,f41bab3915c7d0040f4717857845cff4b9b195cc..a3de29b5994761018c753e174e01dfd97240bcce
--- 1/Doc/library/unittest.rst
--- 2/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@@ -1913,17 -1504,8 +1913,17 @@@ Loading and running test
        It is not intended to be called directly, but can be overridden in
        subclasses to provide a custom ``TestResult``.
  
 +      ``_makeResult()`` instantiates the class or callable passed in the
 +      ``TextTestRunner`` constructor as the ``resultclass`` argument. It
 +      defaults to :class:`TextTestResult` if no ``resultclass`` is provided.
 +      The result class is instantiated with the following arguments::
  
 -.. function:: main(module='__main__', defaultTest=None, argv=None, testRunner=TextTestRunner, testLoader=unittest.defaultTestLoader, exit=True)
 +        stream, descriptions, verbosity
 +
 +
 +.. function:: main(module='__main__', defaultTest=None, argv=None, testRunner=None, \
-                    testLoader=unittest.loader.defaultTestLoader, exit=True, verbosity=1, \
++                   testLoader=unittest.defaultTestLoader, exit=True, verbosity=1, \
 +                   failfast=None, catchbreak=None, buffer=None, warnings=None)
  
     A command-line program that runs a set of tests; this is primarily for making
     test modules conveniently executable.  The simplest use for this function is to