[Python-checkins] cpython (merge 3.2 -> default): #13715: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/f1408e41e306
changeset:   74435:f1408e41e306
parent:      74432:3b097e0892cf
parent:      74434:f50ff6dd6b41
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Jan 16 08:46:11 2012 +0200
summary:
  #13715: merge with 3.2.

files:
  Doc/library/unicodedata.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/unicodedata.rst b/Doc/library/unicodedata.rst
--- a/Doc/library/unicodedata.rst
+++ b/Doc/library/unicodedata.rst
@@ -108,7 +108,7 @@
    based on the definition of canonical equivalence and compatibility equivalence.
    In Unicode, several characters can be expressed in various way. For example, the
    character U+00C7 (LATIN CAPITAL LETTER C WITH CEDILLA) can also be expressed as
-   the sequence U+0327 (COMBINING CEDILLA) U+0043 (LATIN CAPITAL LETTER C).
+   the sequence U+0043 (LATIN CAPITAL LETTER C) U+0327 (COMBINING CEDILLA).
 
    For each character, there are two normal forms: normal form C and normal form D.
    Normal form D (NFD) is also known as canonical decomposition, and translates

-- 
Repository URL: http://hg.python.org/cpython