summaryrefslogtreecommitdiffstats
path: root/Doc/library/multiprocessing.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-09-13 17:46:05 (GMT)
committerGeorg Brandl <georg@python.org>2008-09-13 17:46:05 (GMT)
commitc575c9064769d37ac9555b7cd2907c25ab030810 (patch)
tree8b15a940b50eba4b66a62a2610904efe88d94d18 /Doc/library/multiprocessing.rst
parenta6fc212d2a2254ea2c3a6890bbb9b17cf0878529 (diff)
downloadcpython-c575c9064769d37ac9555b7cd2907c25ab030810.zip
cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.gz
cpython-c575c9064769d37ac9555b7cd2907c25ab030810.tar.bz2
Merged revisions 66452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66452 | georg.brandl | 2008-09-13 19:41:16 +0200 (Sat, 13 Sep 2008) | 2 lines Remove things specific to the old Macintosh, and spell "Mac OS X" consistently. ........
Diffstat (limited to 'Doc/library/multiprocessing.rst')
-rw-r--r--Doc/library/multiprocessing.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 3621412..dd816a0 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -478,7 +478,7 @@ For an example of the usage of queues for interprocess communication see
multithreading/multiprocessing semantics, this number is not reliable.
Note that this may raise :exc:`NotImplementedError` on Unix platforms like
- MacOS X where ``sem_getvalue()`` is not implemented.
+ Mac OS X where ``sem_getvalue()`` is not implemented.
.. method:: empty()
@@ -772,7 +772,7 @@ object -- see :ref:`multiprocessing-managers`.
A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`.
- (On Mac OSX this is indistinguishable from :class:`Semaphore` because
+ (On Mac OS X this is indistinguishable from :class:`Semaphore` because
``sem_getvalue()`` is not implemented on that platform).
.. class:: Condition([lock])