diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:28:26 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:28:26 (GMT) |
commit | 972e04ec4666746dc8a441449aa5b63f89af5b98 (patch) | |
tree | f7d96b952d2f1ce7e0e024cc3e976d162cc9b565 /Doc | |
parent | ab23347916cc3261669621956814bef883620429 (diff) | |
download | cpython-972e04ec4666746dc8a441449aa5b63f89af5b98.zip cpython-972e04ec4666746dc8a441449aa5b63f89af5b98.tar.gz cpython-972e04ec4666746dc8a441449aa5b63f89af5b98.tar.bz2 |
Issue #28960: Drop comma attached to dash in Thread.join() description
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 |