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.
........
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 @@
*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
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 @@
'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
diff --git a/Misc/NEWS b/Misc/NEWS
index 758a2ff..db9cb05 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -318,6 +318,8 @@
Library
-------
+- Issue #8463: added missing reference to bztar in shutil's documentation.
+
- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6
(as long as the user didn't specify 'automatic proxy configuration').