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

[ross.lagerwall]

http://hg.python.org/cpython/rev/3bf07c74aef1
changeset:   68440:3bf07c74aef1
branch:      3.2
parent:      68437:f65aad1226b7
parent:      68439:5dabfc3e4dd5
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Mon Mar 14 10:41:58 2011 +0200
summary:
  Merge from 3.1

files:
  Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -869,7 +869,7 @@
 
 .. class:: Semaphore([value])
 
-   A bounded semaphore object: a clone of :class:`threading.Semaphore`.
+   A semaphore object: a clone of :class:`threading.Semaphore`.
 
 .. note::
 

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