[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Fri Oct 31 10:54:18 CET 2014

https://hg.python.org/cpython/rev/548e57e58086
changeset: 93318:548e57e58086
parent: 93313:187a14b58a4c
parent: 93317:335ff0c6d879
user: Georg Brandl <georg at python.org>
date: Fri Oct 31 10:54:10 2014 +0100
summary:
 merge with 3.4
files:
 Doc/library/shutil.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -491,7 +491,7 @@
 *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.
-- 
Repository URL: https://hg.python.org/cpython
