diff --git a/ChangeLog b/ChangeLog
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 05a2f9dfe..f496e75d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gmarkup.c (g_markup_parse_context_parse): Added
+	proper support for CDATA sections.
+
 2002-05-20  jacob berkman  <jacob@ximian.com>
 
 	* glib/gdir.c: include sys/types.h before dirent.h to build on
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index b51acee82..2d5f4f761 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-21  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/tmpl/markup.sgml: Updates.
+
 Sat May 18 00:44:35 2002  Tim Janik  <timj@gtk.org>
 
 	[merged from stable]
diff --git a/docs/reference/glib/tmpl/markup.sgml b/docs/reference/glib/tmpl/markup.sgml
index 58ac77988..b34d6ec2e 100644
--- a/docs/reference/glib/tmpl/markup.sgml
+++ b/docs/reference/glib/tmpl/markup.sgml
@@ -18,10 +18,8 @@ easily migrate to full-scale XML at a later time if the need arises.
 
 <para>
 GMarkup is not guaranteed to signal an error on all invalid XML; the
-parser may accept documents that an XML parser would not, e.g. the
-sequence <literal>&lt;[[</literal> has special meaning in XML and not
-in GMarkup. However, invalid XML documents are not considered valid
-GMarkup documents. 
+parser may accept documents that an XML parser would not. However, invalid XML 
+documents are not considered valid GMarkup documents. 
 </para>
 
 <para>
@@ -34,12 +32,12 @@ Only UTF-8 encoding is allowed.
 </listitem>
 <listitem>
 <para>
-No CDATA, no user-defined entities.
+No user-defined entities.
 </para>
 </listitem>
 <listitem>
 <para>
-Processing instructions and comments are "passed through" but are not 
+Processing instructions, comments and the doctype declaration are "passed through" but are not 
 interpreted in any way.
 </para>
 </listitem>
@@ -74,6 +72,11 @@ Attributes
 Character references
 </para>
 </listitem>
+<listitem>
+<para>
+Sections marked as CDATA
+</para>
+</listitem>
 </itemizedlist>
 </para>
 
@@ -135,8 +138,8 @@ is seen.
 @end_element: Callback to invoke when the closing tag of an element is seen
 @text: Callback to invoke when some text is seen (text is always
 inside an element)
-@passthrough: Callback to invoke for comments and processing
-instructions; if you're re-writing the parsed document, write the
+@passthrough: Callback to invoke for comments, processing
+instructions and doctype declarations; if you're re-writing the parsed document, write the
 passthrough text back out in the same position
 @error: Callback to invoke when an error occurs