[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/471d16b286db
changeset:   94970:471d16b286db
parent:      94968:eb4a0048978c
parent:      94969:16e676fd77c0
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Mar 12 22:41:14 2015 -0500
summary:
  merge 3.4

files:
  Doc/library/zipfile.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -210,7 +210,7 @@
    password used for encrypted files.  Calling  :meth:`.open` on a closed
    ZipFile will raise a  :exc:`RuntimeError`.
 
-   :func:`~ZipFile.open` is also a context manager and therefore supports the
+   :meth:`~ZipFile.open` is also a context manager and therefore supports the
    :keyword:`with` statement::
 
       with ZipFile('spam.zip') as myzip:

-- 
Repository URL: https://hg.python.org/cpython