diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:40:09 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:40:09 (GMT) |
| commit | 3a72ee5b5a8d80bc63ba173e1fd689eab3bc3c57 (patch) | |
| tree | 2be976fd9ec14557fe57a853cd36d1ef4590e0b6 /Doc | |
| parent | 0dc1fa6d222f0357b0bf4032d78837cf54f4a690 (diff) | |
| parent | 972e04ec4666746dc8a441449aa5b63f89af5b98 (diff) | |
| download | cpython-3a72ee5b5a8d80bc63ba173e1fd689eab3bc3c57.zip cpython-3a72ee5b5a8d80bc63ba173e1fd689eab3bc3c57.tar.gz cpython-3a72ee5b5a8d80bc63ba173e1fd689eab3bc3c57.tar.bz2 | |
Issue #28960: Merge Thread.join() doc from 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/threading.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index cddbd52..2792dfd 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -256,7 +256,7 @@ since it is impossible to detect the termination of alien threads. Wait until the thread terminates. This blocks the calling thread until the thread whose :meth:`~Thread.join` method is called terminates -- either - normally or through an unhandled exception --, or until the optional + normally or through an unhandled exception -- or until the optional timeout occurs. When the *timeout* argument is present and not ``None``, it should be a |