From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 24 Dec 2016 07:28:26 +0000 (+0000)
Subject: Issue #28960: Drop comma attached to dash in Thread.join() description
X-Git-Tag: v3.5.3rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972e04ec4666746dc8a441449aa5b63f89af5b98;p=thirdparty%2FPython%2Fcpython.git

Issue #28960: Drop comma attached to dash in Thread.join() description
---

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index cddbd52a3aff..2792dfdce04c 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