summaryrefslogtreecommitdiffstats
path: root/Doc/library/shutil.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-31 09:54:10 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-31 09:54:10 (GMT)
commit455de40a6e99ad7548e6061733f9c5dae2327e83 (patch)
treedffd34e2e5ec3e5e0f5bbac4c7d807491d9462be /Doc/library/shutil.rst
parente21a531ef10e120a94434b3d4806a8106dd6f271 (diff)
parent36ac51095634c7b1c29432db5c60e1eeca620977 (diff)
downloadcpython-455de40a6e99ad7548e6061733f9c5dae2327e83.zip
cpython-455de40a6e99ad7548e6061733f9c5dae2327e83.tar.gz
cpython-455de40a6e99ad7548e6061733f9c5dae2327e83.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/library/shutil.rst')
-rw-r--r--Doc/library/shutil.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 6dade30..82974ad 100644
--- 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.