Merge branch 'master' into fix-issue-30688

diff --cc Doc/library/re.rst
index 9fafc0f462d599a2de9fc77afd5371e064ea9774,8c15462871b8f152ad8523427ba15b7052c8048b..ca09a91c0d259a70edcc8095e2d2b50e9b0b1890
--- 1/Doc/library/re.rst
--- 2/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@@ -443,15 -467,15 +467,15 @@@ character ``'$'``
  Most of the standard escapes supported by Python string literals are also
  accepted by the regular expression parser::
  
-    \a      \b      \f      \n      \N
-    \r      \t      \u      \U
-    \v      \x      \\
+    \a      \b      \f      \n
 -   \r      \t      \u      \U
 -   \v      \x      \\
++   \N      \r      \t      \u
++   \U      \v      \x      \\
  
  (Note that ``\b`` is used to represent word boundaries, and means "backspace"
  only inside character classes.)
  
 -``'\u'`` and ``'\U'`` escape sequences are only recognized in Unicode
 +``'\u'``, ``'\U'``, and ``'\N'`` escape sequences are only recognized in Unicode
- patterns.  In bytes patterns they are not treated specially.
+ patterns.  In bytes patterns they are errors.
  
  Octal escapes are included in a limited form.  If the first digit is a 0, or if
  there are three octal digits, it is considered an octal escape. Otherwise, it is

diff --cc Lib/sre_parse.py
Simple merge

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