--- rest25/library/unicodedata.rst	2008-12-19 16:58:07.000000000 +0900
+++ rest262/library/unicodedata.rst	2009-04-05 05:02:09.000000000 +0900
@@ -7,30 +7,30 @@
 .. moduleauthor:: Marc-Andre Lemburg <mal@lemburg.com>
 .. sectionauthor:: Marc-Andre Lemburg <mal@lemburg.com>
 .. sectionauthor:: Martin v. Löwis <martin@v.loewis.de>
 
 
 .. index::
    single: Unicode
    single: character
    pair: Unicode; database
 
 This module provides access to the Unicode Character Database which defines
 character properties for all Unicode characters. The data in this database is
-based on the :file:`UnicodeData.txt` file version 4.1.0 which is publicly
-available from `<ftp://ftp.unicode.org/>`_.
+based on the :file:`UnicodeData.txt` file version 5.1.0 which is publicly
+available from ftp://ftp.unicode.org/.
 
 The module uses the same names and symbols as defined by the UnicodeData File
-Format 4.1.0 (see `<http://www.unicode.org/Public/4.1.0/ucd/UCD.html>`_).  It
-defines the following functions:
+Format 5.1.0 (see http://www.unicode.org/Public/5.1.0/ucd/UCD.html).  It defines
+the following functions:
 
 
 .. function:: lookup(name)
 
    Look up character by name.  If a character with the given name is found, return
    the corresponding Unicode character.  If not found, :exc:`KeyError` is raised.
 
 
 .. function:: name(unichr[, default])
 
    Returns the name assigned to the Unicode character *unichr* as a string. If no
    name is defined, *default* is returned, or, if not given, :exc:`ValueError` is
@@ -98,68 +98,73 @@
    defined.
 
 
 .. function:: normalize(form, unistr)
 
    Return the normal form *form* for the Unicode string *unistr*. Valid values for
    *form* are 'NFC', 'NFKC', 'NFD', and 'NFKD'.
 
    The Unicode standard defines various normalization forms of a Unicode string,
    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+0043 (LATIN CAPITAL LETTER C) U+0327 (COMBINING CEDILLA).
+   the sequence U+0327 (COMBINING CEDILLA) U+0043 (LATIN CAPITAL LETTER C).
 
    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
    each character into its decomposed form. Normal form C (NFC) first applies a
    canonical decomposition, then composes pre-combined characters again.
 
    In addition to these two forms, there are two additional normal forms based on
    compatibility equivalence. In Unicode, certain characters are supported which
    normally would be unified with other characters. For example, U+2160 (ROMAN
    NUMERAL ONE) is really the same thing as U+0049 (LATIN CAPITAL LETTER I).
    However, it is supported in Unicode for compatibility with existing character
    sets (e.g. gb2312).
 
    The normal form KD (NFKD) will apply the compatibility decomposition, i.e.
    replace all compatibility characters with their equivalents. The normal form KC
    (NFKC) first applies the compatibility decomposition, followed by the canonical
    composition.
 
+   Even if two unicode strings are normalized and look the same to
+   a human reader, if one has combining characters and the other
+   doesn't, they may not compare equal.
+
    .. versionadded:: 2.3
 
 In addition, the module exposes the following constant:
 
 
 .. data:: unidata_version
 
    The version of the Unicode database used in this module.
 
    .. versionadded:: 2.3
 
 
 .. data:: ucd_3_2_0
 
    This is an object that has the same methods as the entire module, but uses the
    Unicode database version 3.2 instead, for applications that require this
    specific version of the Unicode database (such as IDNA).
 
    .. versionadded:: 2.5
 
-Examples::
+Examples:
 
+   >>> import unicodedata
    >>> unicodedata.lookup('LEFT CURLY BRACKET')
    u'{'
    >>> unicodedata.name(u'/')
    'SOLIDUS'
    >>> unicodedata.decimal(u'9')
    9
    >>> unicodedata.decimal(u'a')
    Traceback (most recent call last):
      File "<stdin>", line 1, in ?
    ValueError: not a decimal
    >>> unicodedata.category(u'A')  # 'L'etter, 'u'ppercase
-   'Lu'   
+   'Lu'
    >>> unicodedata.bidirectional(u'\u0660') # 'A'rabic, 'N'umber
    'AN'
 
