[Python-checkins] r87278 - in python/branches/release31-maint: Doc/distutils/apiref.rst Lib/distutils/archive_util.py

[eric.araujo]

Author: eric.araujo
Date: Wed Dec 15 21:30:51 2010
New Revision: 87278

Log:
Merged revisions 87277 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87277 | eric.araujo | 2010-12-15 21:26:30 +0100 (mer., 15 déc. 2010) | 2 lines
  
  Fix wrong name in docstring and doc.  Original patch by Eli Benderski.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/distutils/apiref.rst
   python/branches/release31-maint/Lib/distutils/archive_util.py

Modified: python/branches/release31-maint/Doc/distutils/apiref.rst
==============================================================================
--- python/branches/release31-maint/Doc/distutils/apiref.rst	(original)
+++ python/branches/release31-maint/Doc/distutils/apiref.rst	Wed Dec 15 21:30:51 2010
@@ -888,7 +888,7 @@
 .. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
 
    Create a zip file from all files in and under *base_dir*.  The output zip file
-   will be named *base_dir* + :file:`.zip`.  Uses either the  :mod:`zipfile` Python
+   will be named *base_name* + :file:`.zip`.  Uses either the  :mod:`zipfile` Python
    module (if available) or the InfoZIP :file:`zip`  utility (if installed and
    found on the default search path).  If neither  tool is available, raises
    :exc:`DistutilsExecError`.   Returns the name of the output zip file.

Modified: python/branches/release31-maint/Lib/distutils/archive_util.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/archive_util.py	(original)
+++ python/branches/release31-maint/Lib/distutils/archive_util.py	Wed Dec 15 21:30:51 2010
@@ -68,7 +68,7 @@
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
 
-    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    The output zip file will be named 'base_name' + ".zip".  Uses either the
     "zipfile" Python module (if available) or the InfoZIP "zip" utility
     (if installed and found on the default search path).  If neither tool is
     available, raises DistutilsExecError.  Returns the name of the output zip