Merge 3.2

merwok · merwok · commit 5397c797f4ca · 2011-06-01T19:47:24.000+02:00
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
@@ -1814,7 +1814,7 @@ Subclasses of :class:`Command` must define the following methods.
 .. module:: distutils.command.bdist_msi
    :synopsis: Build a binary distribution as a Windows MSI file
 
-.. class:: bdist_msi(Command)
+.. class:: bdist_msi
 
    Builds a `Windows Installer`_ (.msi) binary package.
 
@@ -1893,9 +1893,9 @@ Subclasses of :class:`Command` must define the following methods.
    :synopsis: Build the .py/.pyc files of a package
 
 
-.. class:: build_py(Command)
+.. class:: build_py
 
-.. class:: build_py_2to3(build_py)
+.. class:: build_py_2to3
 
    Alternative implementation of build_py which also runs the
    2to3 conversion library on each .py file that is going to be
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -1098,7 +1098,7 @@ thread_PyThread_exit_thread(PyObject *self)
 
 PyDoc_STRVAR(exit_doc,
 "exit()\n\
-(PyThread_exit_thread() is an obsolete synonym)\n\
+(exit_thread() is an obsolete synonym)\n\
 \n\
 This is synonymous to ``raise SystemExit''.  It will cause the current\n\
 thread to exit silently unless the exception is caught.");
