[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[eric.araujo]

http://hg.python.org/cpython/rev/9552a0b36f60
changeset:   70592:9552a0b36f60
parent:      70591:e1830b97a195
parent:      70589:5e75517696d4
user:        Éric Araujo <merwok at netwok.org>
date:        Wed Jun 01 19:47:24 2011 +0200
summary:
  Merge 3.2

files:
  Doc/distutils/apiref.rst |  8 ++++----
  Modules/_threadmodule.c  |  2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1814,7 +1814,7 @@
 .. 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 @@
    :synopsis: Build the .py/.pyc files of a package
 
 
-.. class:: build_py(Command)
-
-.. class:: build_py_2to3(build_py)
+.. class:: 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
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -1098,7 +1098,7 @@
 
 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.");

-- 
Repository URL: http://hg.python.org/cpython