[Python-checkins] cpython (merge 3.6 -> default): Issue #28960: Merge Thread.join() doc from 3.6

[martin.panter]

https://hg.python.org/cpython/rev/cefcfacd87e4
changeset:   105803:cefcfacd87e4
parent:      105798:e64a82371d72
parent:      105801:d70fcf1866ad
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sat Dec 24 07:45:17 2016 +0000
summary:
  Issue #28960: Merge Thread.join() doc from 3.6

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