Issue #23181: More "codepoint" -> "code point".

diff --cc Doc/library/json.rst
Simple merge

diff --cc Lib/codecs.py
Simple merge

diff --cc Lib/email/message.py
Simple merge

diff --cc Lib/html/entities.py
index cbf4f76097172705193cce9416d99ede91c0c6c3,f7deae6eb04e8f394a5a0cb5cada19296f02840d..3e1778b768cef357f81a02d4f300b65caf899576
--- 1/Lib/html/entities.py
--- 2/Lib/html/entities.py
+++ b/Lib/html/entities.py
@@@ -1,9 -1,6 +1,9 @@@
  """HTML character entity references."""
  
- # maps the HTML entity name to the Unicode codepoint
 +__all__ = ['html5', 'name2codepoint', 'codepoint2name', 'entitydefs']
 +
 +
+ # maps the HTML entity name to the Unicode code point
  name2codepoint = {
      'AElig':    0x00c6, # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
      'Aacute':   0x00c1, # latin capital letter A with acute, U+00C1 ISOlat1

diff --cc Lib/test/test_unicode.py
Simple merge

diff --cc Modules/cjkcodecs/cjkcodecs.h
Simple merge

diff --cc Objects/unicodeobject.c
Simple merge

diff --cc Python/sysmodule.c
Simple merge