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 (#10693).  Original patch by Eli Benderski.
........
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index c741cc0..834b722 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -121,7 +121,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