diff -r db1d20825d71 Doc/library/threading.rst
--- a/Doc/library/threading.rst	Tue Dec 13 10:03:34 2016 +0100
+++ b/Doc/library/threading.rst	Wed Dec 14 08:46:57 2016 -0500
@@ -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