summaryrefslogtreecommitdiffstats
path: root/Doc
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 /Doc
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 'Doc')
-rw-r--r--Doc/library/shutil.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 2d1e585..9d06903 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -221,7 +221,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", or "gztar".
+ "zip", "tar", "ztar", "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