summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-12-26 17:54:27 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-12-26 17:54:27 (GMT)
commita8ffafbc52a6ea7934bc7a4f62d42bfd2d6a3354 (patch)
treeaa26f7905b788da0b0119a40ff69510e3a503255 /Doc/library
parent4e8e7aef5a37e25ce11fb275d48772066c0fd45a (diff)
downloadcpython-a8ffafbc52a6ea7934bc7a4f62d42bfd2d6a3354.zip
cpython-a8ffafbc52a6ea7934bc7a4f62d42bfd2d6a3354.tar.gz
cpython-a8ffafbc52a6ea7934bc7a4f62d42bfd2d6a3354.tar.bz2
Merged revisions 87493 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87493 | eric.araujo | 2010-12-26 18:53:27 +0100 (dim., 26 déc. 2010) | 2 lines Fix typo (#10770) ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/zipfile.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index a01735b..346af16 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -275,7 +275,7 @@ ZipFile Objects
.. note::
- When passing a :class:`ZipInfo` instance as the *zinfo_or_acrname* parameter,
+ When passing a :class:`ZipInfo` instance as the *zinfo_or_arcname* parameter,
the compression method used will be that specified in the *compress_type*
member of the given :class:`ZipInfo` instance. By default, the
:class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`.