summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-03-14 10:42:24 +0200
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-03-14 10:42:24 +0200
commit41b1228525da51fc9f75b4cc71570a27e84b8bc6 (patch)
treeb3d7af52ba910ff210a12990dff76ab4f41ef669
parent74fb7601ba2b5be65e1c8ce66e0dccbb55a5b174 (diff)
parent13312638b37dfdc725260d49df6402bfe70c9fc7 (diff)
downloadcpython-git-41b1228525da51fc9f75b4cc71570a27e84b8bc6.tar.gz
Merge with 3.2
-rw-r--r--Doc/library/multiprocessing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 9bdbf549ee..1a42380324 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -875,7 +875,7 @@ object -- see :ref:`multiprocessing-managers`.
.. class:: Semaphore([value])
- A bounded semaphore object: a clone of :class:`threading.Semaphore`.
+ A semaphore object: a clone of :class:`threading.Semaphore`.
.. note::