summaryrefslogtreecommitdiffstats
path: root/Doc/library/threading.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-09 07:59:02 (GMT)
committerGeorg Brandl <georg@python.org>2011-01-09 07:59:02 (GMT)
commitec78b8b170355b124b8657dced4a9ddf78064cee (patch)
tree69f8bb7b494b840c70c8ad39db06b89f3507f4f9 /Doc/library/threading.rst
parent7fdc746a81a29a5f917fb41500b03c92adf40851 (diff)
downloadcpython-ec78b8b170355b124b8657dced4a9ddf78064cee.zip
cpython-ec78b8b170355b124b8657dced4a9ddf78064cee.tar.gz
cpython-ec78b8b170355b124b8657dced4a9ddf78064cee.tar.bz2
Merged revisions 87807,87820,87831,87859,87870 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r87807 | georg.brandl | 2011-01-06 20:28:18 +0100 (Do, 06 Jan 2011) | 1 line #10846: fix typo. ........ r87820 | georg.brandl | 2011-01-07 19:28:45 +0100 (Fr, 07 Jan 2011) | 1 line #10856: document (Base)Exception.args better. ........ r87831 | georg.brandl | 2011-01-07 21:58:25 +0100 (Fr, 07 Jan 2011) | 1 line Fix indent. ........ r87859 | georg.brandl | 2011-01-08 10:45:43 +0100 (Sa, 08 Jan 2011) | 1 line #10855: document close() semantics of wave objects. ........ r87870 | georg.brandl | 2011-01-08 22:04:25 +0100 (Sa, 08 Jan 2011) | 1 line zlib only works with bytes objects. ........
Diffstat (limited to 'Doc/library/threading.rst')
-rw-r--r--Doc/library/threading.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index efb0476..7d5370d 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -632,9 +632,9 @@ waiting until some other thread calls :meth:`release`.
^^^^^^^^^^^^^^^^^^^^^^^^^^
Semaphores are often used to guard resources with limited capacity, for example,
-a database server. In any situation where the size of the resource size is
-fixed, you should use a bounded semaphore. Before spawning any worker threads,
-your main thread would initialize the semaphore::
+a database server. In any situation where the size of the resource is fixed,
+you should use a bounded semaphore. Before spawning any worker threads, your
+main thread would initialize the semaphore::
maxconnections = 5
...