From: Jason R. Coombs <jaraco@jaraco.com>
Date: Wed, 29 Jul 2015 18:25:58 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.5.0rc1~71^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3;p=thirdparty%2FPython%2Fcpython.git

Merge
---

dcf841b78e7579cdb886cb1a26639b9ee7fbe7b3
diff --cc Misc/NEWS
index 66b8554bdef5,63c0c711a533..38bdccba3d40
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -396,8 -396,9 +396,11 @@@ C AP
  Documentation
  -------------
  
 +- Issue #23589: Remove duplicate sentence from the FAQ.  Patch by Yongzhi Pan.
 +
+ - 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.