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

[benjamin.peterson]

https://hg.python.org/cpython/rev/a9f36ec5d944
changeset:   95125:a9f36ec5d944
parent:      95122:1aad901e0307
parent:      95123:e5de4ee6aa4a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 22 10:15:12 2015 -0400
summary:
  merge 3.4 (#22933)

files:
  Doc/library/shutil.rst |  9 +++------
  1 files changed, 3 insertions(+), 6 deletions(-)


diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -288,12 +288,9 @@
    Recursively move a file or directory (*src*) to another location (*dst*)
    and return the destination.
 
-   If the destination is a directory or a symlink to a directory, then *src* is
-   moved inside that directory.
-
-   The destination directory must not already exist.  If the destination already
-   exists but is not a directory, it may be overwritten depending on
-   :func:`os.rename` semantics.
+   If the destination is an existing directory, then *src* is moved inside that
+   directory. If the destination already exists but is not a directory, it may
+   be overwritten depending on :func:`os.rename` semantics.
 
    If the destination is on the current filesystem, then :func:`os.rename` is
    used. Otherwise, *src* is copied to *dst* using *copy_function* and then

-- 
Repository URL: https://hg.python.org/cpython