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)
........

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index a01735b672a36237363546d3528c0577feae892f..346af1610bf7ae930c3d06e4d3f5ca78bf9497c6 100644 (file)
--- 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`.