summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-12-15 20:30:51 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-12-15 20:30:51 (GMT)
commit7e2e321da310dd2a450ad3422b9567e0e2d04182 (patch)
tree6743a05a3a6d9f2a22e54bedc9bec54ab0c735ee /Doc
parent800dfee91a081547eaac9eabd5883998a5231324 (diff)
downloadcpython-7e2e321da310dd2a450ad3422b9567e0e2d04182.zip
cpython-7e2e321da310dd2a450ad3422b9567e0e2d04182.tar.gz
cpython-7e2e321da310dd2a450ad3422b9567e0e2d04182.tar.bz2
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 Bendersky. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/distutils/apiref.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index f76f72b..81de1ad 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -888,7 +888,7 @@ tarballs or zipfiles.
.. 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.