[Python-checkins] cpython (merge default -> default): Merged changes.

Thu May 5 14:00:11 CEST 2011

http://hg.python.org/cpython/rev/e4d254fbaaeb
changeset: 69847:e4d254fbaaeb
parent: 69846:7c5d91ac4f68
parent: 69845:7c9717836c28
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Thu May 05 12:59:59 2011 +0100
summary:
 Merged changes.
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
@@ -883,7 +883,7 @@
 modules.
 
 Also note that combining this functionality with :c:func:`PyGILState_\*` APIs
-is delicate, become these APIs assume a bijection between Python thread states
+is delicate, because these APIs assume a bijection between Python thread states
 and OS-level threads, an assumption broken by the presence of sub-interpreters.
 It is highly recommended that you don't switch sub-interpreters between a pair
 of matching :c:func:`PyGILState_Ensure` and :c:func:`PyGILState_Release` calls.
-- 
Repository URL: http://hg.python.org/cpython
