Merged revisions 71607,71653,71696,71771,71786 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71607 | benjamin.peterson | 2009-04-14 23:23:09 +0200 (Di, 14 Apr 2009) | 1 line
tupel -> tuple
........
r71653 | raymond.hettinger | 2009-04-16 20:16:10 +0200 (Do, 16 Apr 2009) | 1 line
Clarify the behavior of any() and all() with an empty iterable.
........
r71696 | georg.brandl | 2009-04-18 10:26:21 +0200 (Sa, 18 Apr 2009) | 1 line
"not subscriptable" should be a bit more understandable than "unsubscriptable".
........
r71771 | raymond.hettinger | 2009-04-20 20:23:57 +0200 (Mo, 20 Apr 2009) | 1 line
Fix typo
........
r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line
#5757: fix copy-paste error in notify().
........
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 2b66461..d880157 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -537,12 +537,12 @@
.. method:: Condition.notify()
- Wake up a thread waiting on this condition, if any. Wait until notified or until
- a timeout occurs. If the calling thread has not acquired the lock when this
- method is called, a :exc:`RuntimeError` is raised.
+ Wake up a thread waiting on this condition, if any. If the calling thread
+ has not acquired the lock when this method is called, a :exc:`RuntimeError`
+ is raised.
- This method wakes up one of the threads waiting for the condition variable, if
- any are waiting; it is a no-op if no threads are waiting.
+ This method wakes up one of the threads waiting for the condition variable,
+ if any are waiting; it is a no-op if no threads are waiting.
The current implementation wakes up exactly one thread, if any are waiting.
However, it's not safe to rely on this behavior. A future, optimized