Issue #28987: Merge doc and comment fixes from 3.6

diff --cc Misc/HISTORY
Simple merge

diff --cc Misc/NEWS
index cf5acfe1dc4308de59af64d82bc6c4883b31ebc1,b948db8540d52dcd192e52975a00af53bd3153ac..4e623a15d8eb14b180ecda375162e97694eea8cb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -23,14 -17,10 +23,14 @@@ Core and Builtin
    to/from UTF-8, instead of the locale encoding to avoid inconsistencies with
    os.fsencode() and os.fsdecode() which are already using UTF-8.
  
- - Issue #28991:  functools.lru_cache() was susceptible to an obscure $
+ - Issue #28991:  functools.lru_cache() was susceptible to an obscure reentrancy
    bug triggerable by a monkey-patched len() function.
  
- - Issue #28739: f-string expressions no longer accepted as docstrings and
 +- Issue #28147: Fix a memory leak in split-table dictionaries: setattr()
 +  must not convert combined table into split table. Patch written by INADA
 +  Naoki.
 +
+ - Issue #28739: f-string expressions are no longer accepted as docstrings and
    by ast.literal_eval() even if they do not include expressions.
  
  - Issue #28512: Fixed setting the offset attribute of SyntaxError by
@@@ -497,12 -632,6 +497,12 @@@ Librar
  Windows
  -------
  
- - Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun)
++- Issue #25778: winreg does not truncate string correctly (Patch by Eryk Sun)
 +
 +- Issue #28896: Deprecate WindowsRegistryFinder and disable it by default
 +
 +- Issue #28522: Fixes mishandled buffer reallocation in getpathp.c
 +
  - Issue #28402: Adds signed catalog files for stdlib on Windows.
  
  - Issue #28333: Enables Unicode for ps1/ps2 and input() prompts. (Patch by