Merged revisions 87807,87820,87831,87859 via svnmerge from
svn+ssh://pythondev@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.
........
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 4a6041f..0766511 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -655,9 +655,9 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^
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
...