Merge: More whatsnew updates. Also move a C-API NEWS item out of library section.
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 7fbdc85..bebc233 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -1942,6 +1942,10 @@
- PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy.
+- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
+ and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
+ the current locale encoding.
+
- Add internal API for static strings (_Py_identifier et al.).
- Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described
@@ -2515,10 +2519,6 @@
- Issue #13560: os.strerror() now uses the current locale encoding instead of
UTF-8.
-- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
- and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
- the current locale encoding.
-
- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem
encoding and the surrogateescape error handler, rather than UTF-8. Patch
by David Watson.