summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-04-20 21:40:47 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-04-20 21:40:47 (GMT)
commit5e2be8737dad3c7bdaf198d2637d9ef947b5f2f1 (patch)
tree53a741624965a9e7dd398a3bf320f70566e61896 /Doc
parent33798fde76327161e4154bb3b6e774ebe5e902eb (diff)
downloadcpython-5e2be8737dad3c7bdaf198d2637d9ef947b5f2f1.zip
cpython-5e2be8737dad3c7bdaf198d2637d9ef947b5f2f1.tar.gz
cpython-5e2be8737dad3c7bdaf198d2637d9ef947b5f2f1.tar.bz2
Merged revisions 80282 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80282 | tarek.ziade | 2010-04-20 23:09:06 +0200 (Tue, 20 Apr 2010) | 1 line removed ztar support in shutil.make_archive ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/shutil.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 5fd17d2..4191e0e 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -237,7 +237,7 @@ Archives operations
*base_name* is the name of the file to create, including the path, minus
any format-specific extension. *format* is the archive format: one of
- "zip", "tar", "ztar", "bztar" or "gztar".
+ "zip", "tar", "bztar" or "gztar".
*root_dir* is a directory that will be the root directory of the
archive; i.e. we typically chdir into *root_dir* before creating the
@@ -264,7 +264,6 @@ Archives operations
- *gztar*: gzip'ed tar-file
- *bztar*: bzip2'ed tar-file
- - *ztar*: compressed tar file
- *tar*: uncompressed tar file
- *zip*: ZIP file