summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2011-02-03 17:47:17 +0100
committer?ric Araujo <merwok@netwok.org>2011-02-03 17:47:17 +0100
commit413ddd99169dec7df0715c33113f503ca354ce91 (patch)
tree91f1e3920cbea88e44381eed121e219970d7fbbe /docs/source
parent95b897fc5eef8a40f8d12ffd2a2bd2f1687fbb73 (diff)
parent892f8f9425abbfeb27a9836e7d481cd6827ae5d7 (diff)
downloaddisutils2-413ddd99169dec7df0715c33113f503ca354ce91.tar.gz
Branch merge
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/distutils/apiref.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/distutils/apiref.rst b/docs/source/distutils/apiref.rst
index c43ec2e..6951d84 100644
--- a/docs/source/distutils/apiref.rst
+++ b/docs/source/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.