summaryrefslogtreecommitdiffstats
path: root/Doc/library/shutil.rst
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 18:15:12 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 18:15:12 (GMT)
commitbee325387b21b859054002a052149646399b52de (patch)
tree76d4edea625f87c01c50e3ac4d63d5582107868c /Doc/library/shutil.rst
parentd8b690f7ae57169d95f1cb4b3a0bccf5adfe6a30 (diff)
downloadcpython-bee325387b21b859054002a052149646399b52de.zip
cpython-bee325387b21b859054002a052149646399b52de.tar.gz
cpython-bee325387b21b859054002a052149646399b52de.tar.bz2
Merged revisions 63361-63373,63375,63377-63380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines Rename the test file of reprlib. ........ r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines Make generator repr consistent with function and code object repr. ........ r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines #2869: remove parameter from signature. ........ r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line Fixed #2870: cmathmodule.c compile error ........ r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line Following Amaury's advice ........ r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines #2890: support os.O_ASYNC and fcntl.FASYNC. ........ r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines #2845: fix copy2's docs. ........ r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines Don't allow keyword arguments to reversed(). ........ r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines Document O_ASYNC addition. ........ r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines Fix reprlib docs. ........
Diffstat (limited to 'Doc/library/shutil.rst')
-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 a3ab387..5ab2f29 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -73,8 +73,9 @@ copying and removal. For operations on individual files, see also the
.. function:: copy2(src, dst)
- Similar to :func:`copy`, but last access time and last modification time are
- copied as well. This is similar to the Unix command :program:`cp -p`.
+ Similar to :func:`copy`, but metadata is copied as well -- in fact, this is just
+ :func:`copy` followed by :func:`copystat`. This is similar to the
+ Unix command :program:`cp -p`.
.. function:: copytree(src, dst[, symlinks])