Merge

diff --cc Misc/NEWS
index 66b8554bdef557de6a8c86756dd99d043fa97ff7,63c0c711a533be69d9e36f00e56544e3d69d3599..38bdccba3d40b9218f38bd24b295df27c015d58d
--- 1/Misc/NEWS
--- 2/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.