summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-04-19 21:31:42 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-04-19 21:31:42 (GMT)
commit10a51afc807195706af20c29e87c4a56c62737ac (patch)
tree8d5384d29de8ffdd8478fa9f6ebc916982ab16cd /Lib/shutil.py
parent1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda (diff)
downloadcpython-10a51afc807195706af20c29e87c4a56c62737ac.zip
cpython-10a51afc807195706af20c29e87c4a56c62737ac.tar.gz
cpython-10a51afc807195706af20c29e87c4a56c62737ac.tar.bz2
Merged revisions 80221 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80221 | tarek.ziade | 2010-04-19 23:28:21 +0200 (Mon, 19 Apr 2010) | 1 line Fixed #8463: added missing reference to bztar in shutil's documentation. ........
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6688119..8ad0c64 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -523,7 +523,7 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
'base_name' is the name of the file to create, minus any format-specific
extension; 'format' is the archive format: one of "zip", "tar", "ztar",
- or "gztar".
+ "bztar" or "gztar".
'root_dir' is a directory that will be the root directory of the
archive; ie. we typically chdir into 'root_dir' before creating the