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 2d1e58543cf0798fbf70a8111199cd6781350f6f..9d069032d0b82c41e4473abbc6be99d70c857749 100644 (file)
--- 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

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6688119bde4c5e5efdcf255abdec18f4232ecf42..8ad0c642935232ce2bf182ce9f4e80c03200f301 100644 (file)
--- 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

diff --git a/Misc/NEWS b/Misc/NEWS
index 758a2ffecdaef944aa800461b80143ce02f4712c..db9cb0515d530506614f32a0770a5d5f302c0f7b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -318,6 +318,8 @@ C-API
 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').