From f9f2e02de51321f06944164459830742c5eb1452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 30 Dec 2010 08:37:58 +0000
Subject: [PATCH] Merged revisions 87575 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87575 | martin.v.loewis | 2010-12-30 09:36:37 +0100 (Do, 30 Dez 2010) | 2 lines

  Issue #10542: Document that identifiers use XID_Start XID_Continue*.
........
---
 Doc/reference/lexical_analysis.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 9fdb3507da4..4b49738e268 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -292,9 +292,11 @@ Unicode Character Database as included in the :mod:`unicodedata` module.
 Identifiers are unlimited in length.  Case is significant.
 
 .. productionlist::
-   identifier: `id_start` `id_continue`*
+   identifier: `xid_start` `xid_continue`*
    id_start: <all characters in general categories Lu, Ll, Lt, Lm, Lo, Nl, the underscore, and characters with the Other_ID_Start property>
    id_continue: <all characters in `id_start`, plus characters in the categories Mn, Mc, Nd, Pc and others with the Other_ID_Continue property>
+   xid_start: <all characters in `id_start` whose NFKC normalization is in "id_start xid_continue*">
+   xid_continue: <all characters in `id_continue` whose NFKC normalization is in "id_continue*">
 
 The Unicode category codes mentioned above stand for:
 
@@ -308,6 +310,8 @@ The Unicode category codes mentioned above stand for:
 * *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_Continue* - likewise
 
 All identifiers are converted into the normal form NFKC while parsing; comparison
 of identifiers is based on NFKC.