[Python-checkins] r87495 - in python/branches/release27-maint: Doc/library/zipfile.rst

[eric.araujo]

Author: eric.araujo
Date: Sun Dec 26 18:55:02 2010
New Revision: 87495

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/library/zipfile.rst

Modified: python/branches/release27-maint/Doc/library/zipfile.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/zipfile.rst	(original)
+++ python/branches/release27-maint/Doc/library/zipfile.rst	Sun Dec 26 18:55:02 2010
@@ -303,7 +303,7 @@
 
    .. 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`.