additions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index c42046f9dbb5f623320584981b035864d7c1099f..b24ee0ec175cd0e17b5b8779b16435c964a58bc3 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/tmpl/unicode.sgml: Mention that GLib 2.12 will
+       support UCD 5.0.
+
 2006-04-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gobject/gobject-sections.txt:

diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index b7be4d22e1c3a7a652055ec8da3826edd3e8bcc1..4b108d37a3800949385431cb7ecf580ee65fa397 100644 (file)
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -15,6 +15,14 @@ collation on UTF-8 strings and finally functions to convert between
 the UTF-8, UTF-16 and UCS-4 encodings of Unicode.
 </para>
 
+<para>
+The implementations of the Unicode functions in GLib are based
+on the Unicode Character Data tables, which are available from
+<ulink url="http://www.unicode.org">www.unicode.org</ulink>.
+GLib 2.8 supports Unicode 4.0, GLib 2.10 supports Unicode 4.1,
+GLib 2.12 supports Unicode 5.0.
+</para>
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 <variablelist>
@@ -279,7 +287,6 @@ See <ulink url="http://www.unicode.org/Public/UNIDATA/UnicodeData.html"
 <!-- ##### ENUM GUnicodeBreakType ##### -->
 <para>
 These are the possible line break classifications.
-GLib 2.8 supports Unicode 4.0, GLib 2.10 supports Unicode 4.1.
 The five Hangul types were added in Unicode 4.1, so, has been
 introduced in GLib 2.10.  Note that new types may be added in the future.
 Applications should be ready to handle unknown values.