merge with 3.4

birkenfeld · birkenfeld · commit 455de40a6e99 · 2014-10-31T10:54:10.000+01:00
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
@@ -491,7 +491,7 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
    *logger* must be an object compatible with :pep:`282`, usually an instance of
    :class:`logging.Logger`.
 
-   The *verbose* argument is currently unused.
+   The *verbose* argument is unused and deprecated.
 
    .. versionchanged:: 3.5
       Added support for the *xztar* format.
