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

[martin.panter]

https://hg.python.org/cpython/rev/d70fcf1866ad
changeset:   105801:d70fcf1866ad
branch:      3.6
parent:      105797:0927b5c80c50
parent:      105799:9347d0b2ee08
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sat Dec 24 07:40:09 2016 +0000
summary:
  Issue #28960: Merge Thread.join() doc from 3.5

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