From: Jason R. Coombs <jaraco@jaraco.com>
Date: Wed, 29 Jul 2015 18:04:36 +0000 (-0400)
Subject: Issue #24729: Correct reference to open function.
X-Git-Tag: v3.5.0rc1~71^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=842c07414e336dce7a9ec74e1b7cedae2f7dd5ad;p=thirdparty%2FPython%2Fcpython.git

Issue #24729: Correct reference to open function.
---

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 29dc94863e72..c157f22e6c3e 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -248,8 +248,8 @@ omitted.
 
 Normally, files are opened in :dfn:`text mode`, that means, you read and write
 strings from and to the file, which are encoded in a specific encoding. If
-encoding is not specified the default is platform dependent (see :func:`~functions.open`).
-``'b'`` appended to the mode opens the file in
+encoding is not specified, the default is platform dependent (see
+:func:`open`). ``'b'`` appended to the mode opens the file in
 :dfn:`binary mode`: now the data is read and written in the form of bytes
 objects.  This mode should be used for all files that don't contain text.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 86267577bd73..63c0c711a533 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -396,6 +396,9 @@ C API
 Documentation
 -------------
 
+- Issue #24729: Correct IO tutorial to match implementation regarding
+  encoding parameter to open function.
+
 - Issue #24351: Clarify what is meant by "identifier" in the context of
   string.Template instances.