[Python-checkins] cpython (3.5): Issue #28960: Drop comma attached to dash in Thread.join() description

Sat Dec 24 03:18:22 EST 2016

https://hg.python.org/cpython/rev/9347d0b2ee08
changeset: 105799:9347d0b2ee08
branch: 3.5
parent: 105796:9cb87e53e324
user: Martin Panter <vadmium+py at gmail.com>
date: Sat Dec 24 07:28:26 2016 +0000
summary:
 Issue #28960: Drop comma attached to dash in Thread.join() description
files:
 Doc/library/threading.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -256,7 +256,7 @@
 
 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
-- 
Repository URL: https://hg.python.org/cpython
