From 11f335d4687a96a34b5c0969977b4bc82fe82183 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Thu, 27 Apr 2006 19:20:10 +0000
Subject: [PATCH] additions

---
 docs/reference/ChangeLog              | 5 +++++
 docs/reference/glib/tmpl/unicode.sgml | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index c42046f9d..b24ee0ec1 100644
--- 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 b7be4d22e..4b108d37a 100644
--- 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.