Merged revisions 87433 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87433 | alexander.belopolsky | 2010-12-21 20:37:36 -0500 (Tue, 21 Dec 2010) | 3 lines

  Both PEP 3131 and the current implementation use NFKC normalization
  for identifiers.  Fixed the documentation to agree.
........

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 51a291eaf237d23be8f932ec24c0a45a32293e8b..9fdb3507da4d40b9f0390502432a251ca2e20dfd 100644 (file)
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -309,8 +309,8 @@ The Unicode category codes mentioned above stand for:
 * *Nd* - decimal numbers
 * *Pc* - connector punctuations
 
-All identifiers are converted into the normal form NFC while parsing; comparison
-of identifiers is based on NFC.
+All identifiers are converted into the normal form NFKC while parsing; comparison
+of identifiers is based on NFKC.
 
 A non-normative HTML file listing all valid identifier characters for Unicode
 4.1 can be found at