Doc addition

2005-10-05  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmarkup.c (g_markup_escape_text): Doc addition

diff --git a/ChangeLog b/ChangeLog
index f20033ed6349105497f87e05fa17527e85a30201..0533ede28332bb66da3ca67ddbd9f0b114534fb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-10-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gmarkup.c (g_markup_escape_text): Doc addition
+
        * Makefile.am: Add Collation tests.
 
        * tests/collate/*: Inputs and expected outputs for collation tests.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f20033ed6349105497f87e05fa17527e85a30201..0533ede28332bb66da3ca67ddbd9f0b114534fb2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2005-10-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gmarkup.c (g_markup_escape_text): Doc addition
+
        * Makefile.am: Add Collation tests.
 
        * tests/collate/*: Inputs and expected outputs for collation tests.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f20033ed6349105497f87e05fa17527e85a30201..0533ede28332bb66da3ca67ddbd9f0b114534fb2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,7 @@
 2005-10-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gmarkup.c (g_markup_escape_text): Doc addition
+
        * Makefile.am: Add Collation tests.
 
        * tests/collate/*: Inputs and expected outputs for collation tests.

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 953da6112bb81cb07743b6e063d1855864c19678..9b57cf152dae5ee5dac9ade4fb2c3f015d478b9d 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1923,7 +1923,7 @@ append_escaped_text (GString     *str,
 /**
  * g_markup_escape_text:
  * @text: some valid UTF-8 text
- * @length: length of @text in bytes
+ * @length: length of @text in bytes, or -1 if the text is nul-terminated
  * 
  * Escapes text so that the markup parser will parse it verbatim.
  * Less than, greater than, ampersand, etc. are replaced with the