From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 10 Oct 2014 00:47:31 +0000 (-0400)
Subject: Merge: #18176: Change generic UCD PropList link to version specific link.
X-Git-Tag: v3.5.0a1~720
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2623a5db6f0bae52e6b98a818074ff3f642b7d06;p=thirdparty%2FPython%2Fcpython.git

Merge: #18176: Change generic UCD PropList link to version specific link.
---

2623a5db6f0bae52e6b98a818074ff3f642b7d06
diff --cc Doc/reference/lexical_analysis.rst
index ee1914a29c1d,454d98e5ecd8..561a75e3d1f8
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@@ -310,7 -310,9 +310,9 @@@ The Unicode category codes mentioned ab
  * *Mc* - spacing combining marks
  * *Nd* - decimal numbers
  * *Pc* - connector punctuations
- * *Other_ID_Start* - explicit list of characters in `PropList.txt <http://unicode.org/Public/UNIDATA/PropList.txt>`_ to support backwards compatibility
+ * *Other_ID_Start* - explicit list of characters in `PropList.txt
 -  <http://www.unicode.org/Public/6.3.0/ucd/PropList.txt>`_ to support backwards
++  <http://www.unicode.org/Public/7.0.0/ucd/PropList.txt>`_ to support backwards
+   compatibility
  * *Other_ID_Continue* - likewise
  
  All identifiers are converted into the normal form NFKC while parsing; comparison
diff --cc Tools/unicode/makeunicodedata.py
index 72e80d743f6c,7636a958e2aa..b7d31e880665
--- a/Tools/unicode/makeunicodedata.py
+++ b/Tools/unicode/makeunicodedata.py
@@@ -41,8 -41,8 +41,8 @@@ VERSION = "3.2
  # When changing UCD version please update
  #   * Doc/library/stdtypes.rst, and
  #   * Doc/library/unicodedata.rst
- #   * Doc/reference/lexical_analysis.rst
+ #   * Doc/reference/lexical_analysis.rst (two occurrences)
 -UNIDATA_VERSION = "6.3.0"
 +UNIDATA_VERSION = "7.0.0"
  UNICODE_DATA = "UnicodeData%s.txt"
  COMPOSITION_EXCLUSIONS = "CompositionExclusions%s.txt"
  EASTASIAN_WIDTH = "EastAsianWidth%s.txt"