summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-08-02 14:42:24 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-08-02 14:42:24 (GMT)
commit3083c8889831eb557419799aa3a3478b899e3830 (patch)
tree47d528adde7abf763c98f7b7bfbc4941b6d24ea9
parent88bf51baff31eab153bfb3980ff318c469fc48a6 (diff)
parentef5c71617634ba24b6ed14d65d0466fe84e53057 (diff)
downloadcpython-3083c8889831eb557419799aa3a3478b899e3830.zip
cpython-3083c8889831eb557419799aa3a3478b899e3830.tar.gz
cpython-3083c8889831eb557419799aa3a3478b899e3830.tar.bz2
#12183: merge with 3.2.
-rw-r--r--Doc/library/shutil.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 799230c..6f70206 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -101,8 +101,9 @@ Directory and files operations
:func:`copy2`.
If *symlinks* is true, symbolic links in the source tree are represented as
- symbolic links in the new tree; if false or omitted, the contents of the
- linked files are copied to the new tree.
+ symbolic links in the new tree, but the metadata of the original links is NOT
+ copied; if false or omitted, the contents and metadata of the linked files
+ are copied to the new tree.
When *symlinks* is false, if the file pointed by the symlink doesn't
exist, a exception will be added in the list of errors raised in