merge with 3.4

diff --cc Doc/extending/extending.rst
Simple merge

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

diff --cc Doc/library/collections.abc.rst
Simple merge

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

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

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

diff --cc Doc/library/shutil.rst
index 4717134291ebb524df3eb6783767ea8639b68b00,998254fab25e366de51b7c0086058d86a050ed8b..6dade303f281be5aa424335a31453e5d7f8fdaba
--- 1/Doc/library/shutil.rst
--- 2/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@@ -488,9 -458,8 +491,11 @@@ provided.  They rely on the :mod:`zipfi
     *logger* must be an object compatible with :pep:`282`, usually an instance of
     :class:`logging.Logger`.
  
+    The *verbose* argument is currently unused.
+ 
 +   .. versionchanged:: 3.5
 +      Added support for the *xztar* format.
 +
  
  .. function:: get_archive_formats()
  

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

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

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

diff --cc Doc/library/unittest.mock.rst
Simple merge

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/reference/expressions.rst
Simple merge

diff --cc Doc/reference/lexical_analysis.rst
Simple merge

diff --cc Doc/reference/simple_stmts.rst
Simple merge