summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-03-14 08:41:58 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-03-14 08:41:58 (GMT)
commit13312638b37dfdc725260d49df6402bfe70c9fc7 (patch)
tree8da8d7a39bec534eb8d54788236e1eff2af5b700 /Doc
parent6924bd72f588a9944e44cdf8a08db90edb630ebd (diff)
parent8fea2e6a502b9fb13905e5657a06f14c1afd0c24 (diff)
downloadcpython-13312638b37dfdc725260d49df6402bfe70c9fc7.zip
cpython-13312638b37dfdc725260d49df6402bfe70c9fc7.tar.gz
cpython-13312638b37dfdc725260d49df6402bfe70c9fc7.tar.bz2
Merge from 3.1
Diffstat (limited to 'Doc')
-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 cc40a2a..166f2f4 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -869,7 +869,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::