From: Éric Araujo <merwok@netwok.org>
Date: Sun, 26 Dec 2010 17:54:27 +0000 (+0000)
Subject: Merged revisions 87493 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8ffafbc52a6ea7934bc7a4f62d42bfd2d6a3354;p=thirdparty%2FPython%2Fcpython.git

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 a01735b672a3..346af1610bf7 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`.