#15865: merge with 3.2.

diff --cc Doc/library/nntplib.rst
Simple merge

diff --cc Doc/library/threading.rst
index 275a578a77337f441e9aa3b0bf9d8c154eb1a623,43087ef153ad16af6393db043df125cc256f8535..7ab739b507936fe50174e8f7d86c1a333475e1db
--- 1/Doc/library/threading.rst
--- 2/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@@ -255,8 -255,7 +255,8 @@@ daemonic, and cannot be :meth:`~Thread.
  since it is impossible to detect the termination of alien threads.
  
  
- .. class:: Thread(group=None, target=None, name=None, args=(), kwargs={},
-                   verbose=None, *, daemon=None)
 -.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={})
++.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \
++                  daemon=None)
  
     This constructor should always be called with keyword arguments.  Arguments
     are:
@@@ -275,12 -274,6 +275,10 @@@
     *kwargs* is a dictionary of keyword arguments for the target invocation.
     Defaults to ``{}``.
  
-    *verbose* is a flag used for debugging messages.
- 
 +   If not ``None``, *daemon* explicitly sets whether the thread is daemonic.
 +   If ``None`` (the default), the daemonic property is inherited from the
 +   current thread.
 +
     If the subclass overrides the constructor, it must make sure to invoke the
     base class constructor (``Thread.__init__()``) before doing anything else to
     the thread.