[Python-checkins] r87434 - in python/branches/release31-maint: Doc/reference/lexical_analysis.rst

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Wed Dec 22 02:55:15 2010
New Revision: 87434

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/reference/lexical_analysis.rst

Modified: python/branches/release31-maint/Doc/reference/lexical_analysis.rst
==============================================================================
--- python/branches/release31-maint/Doc/reference/lexical_analysis.rst	(original)
+++ python/branches/release31-maint/Doc/reference/lexical_analysis.rst	Wed Dec 22 02:55:15 2010
@@ -309,8 +309,8 @@
 * *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