Issue #18759: Merged updates from 3.3.

diff --cc Doc/howto/logging-cookbook.rst
Simple merge

diff --cc Doc/library/logging.config.rst
index 16d3294832f42fe0a4a0cf7961d6e1ee33459a56,e34e010984c4bb8de5f3396297b0a0044d976486..37f29a09fb7c19d198e7905750d3c600ab496d70
--- 1/Doc/library/logging.config.rst
--- 2/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@@ -122,21 -101,11 +122,22 @@@ in :mod:`logging` itself) and defining 
     configurations. If no port is specified, the module's default
     :const:`DEFAULT_LOGGING_CONFIG_PORT` is used. Logging configurations will be
     sent as a file suitable for processing by :func:`fileConfig`. Returns a
-    :class:`Thread` instance on which you can call :meth:`start` to start the
-    server, and which you can :meth:`join` when appropriate. To stop the server,
+    :class:`~threading.Thread` instance on which you can call
+    :meth:`~threading.Thread.start` to start the server, and which you can
+    :meth:`~threading.Thread.join` when appropriate. To stop the server,
     call :func:`stopListening`.
  
 +   The ``verify`` argument, if specified, should be a callable which should
 +   verify whether bytes received across the socket are valid and should be
 +   processed. This could be done by encrypting and/or signing what is sent
 +   across the socket, such that the ``verify`` callable can perform
 +   signature verification and/or decryption. The ``verify`` callable is called
 +   with a single argument - the bytes received across the socket - and should
 +   return the bytes to be processed, or None to indicate that the bytes should
 +   be discarded. The returned bytes could be the same as the passed in bytes
 +   (e.g. when only verification is done), or they could be completely different
 +   (perhaps if decryption were performed).
 +
     To send a configuration to the socket, read in the configuration file and
     send it to the socket as a string of bytes preceded by a four-byte length
     string packed in binary using ``struct.pack('>L', n)``.

diff --cc Doc/library/logging.handlers.rst
Simple merge