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

[ezio.melotti]

http://hg.python.org/cpython/rev/d065afeaff50
changeset:   69478:d065afeaff50
parent:      69474:b8d1cf9fde04
parent:      69477:a2a2882ce6b4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Apr 20 21:33:29 2011 +0300
summary:
  Merge with 3.2.

files:
  Doc/c-api/init.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -489,7 +489,7 @@
 :ref:`lock-objects` in the child. When extending or embedding Python, there
 is no way to inform Python of additional (non-Python) locks that need to be
 acquired before or reset after a fork. OS facilities such as
-:c:func:`posix_atfork` would need to be used to accomplish the same thing.
+:c:func:`pthread_atfork` would need to be used to accomplish the same thing.
 Additionally, when extending or embedding Python, calling :c:func:`fork`
 directly rather than through :func:`os.fork` (and returning to or calling
 into Python) may result in a deadlock by one of Python's internal locks

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