diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:28:26 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:28:26 +0000 |
| commit | 1605d82ec568127b7de2591a757ee35db2acf916 (patch) | |
| tree | d740df55b0a23b0d9e4cb70c077d6fb92f63382c | |
| parent | 07f39dcdc1965bea0ed97020bd4fe65faf5572b1 (diff) | |
| download | cpython-1605d82ec568127b7de2591a757ee35db2acf916.tar.gz | |
Issue #28960: Drop comma attached to dash in Thread.join() description
| -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 cddbd52a3a..2792dfdce0 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 |