mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Branch merge

Browse source
This commit is contained in:
Éric Araujo 2011-06-01 19:28:26 +02:00
commit 2845365bf2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/distutils/apiref.rst
View file

@ -1815,7 +1815,7 @@ Subclasses of :class:`Command` must define the following methods.
.. module:: distutils.command.bdist_msi .. module:: distutils.command.bdist_msi
:synopsis: Build a binary distribution as a Windows MSI file :synopsis: Build a binary distribution as a Windows MSI file
.. class:: bdist_msi(Command) .. class:: bdist_msi
Builds a `Windows Installer`_ (.msi) binary package. Builds a `Windows Installer`_ (.msi) binary package.

2
Modules/threadmodule.c
View file

@ -715,7 +715,7 @@ thread_PyThread_exit_thread(PyObject *self)
PyDoc_STRVAR(exit_doc, PyDoc_STRVAR(exit_doc,
"exit()\n\ "exit()\n\
(PyThread_exit_thread() is an obsolete synonym)\n\ (exit_thread() is an obsolete synonym)\n\
\n\ \n\
This is synonymous to ``raise SystemExit''. It will cause the current\n\ This is synonymous to ``raise SystemExit''. It will cause the current\n\
thread to exit silently unless the exception is caught."); thread to exit silently unless the exception is caught.");