diff --git a/ChangeLog b/ChangeLog
index c515b6de1..4be1507ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c515b6de1..4be1507ae 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c515b6de1..4be1507ae 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c515b6de1..4be1507ae 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c515b6de1..4be1507ae 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c515b6de1..4be1507ae 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strfreev): Move docs inline, document behavior 
+	for NULL. (#116439, Steve Chaplin)
+
 2003-06-25  Abigail Brady  <morwen@evilmagic.org>
  
  	* glib/gconvert.c (g_convert_with_fallback): Use C99 style \uxxxx
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 78b0fd73a..8a7161eb8 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-02  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/tmpl/string_utils.sgml: Move g_strfreev() docs inline.
+
 2003-06-19  Matthias Clasen  <maclas@gmx.de>
 
 	* glib/tmpl/misc_utils.sgml: Move g_path_get_basename() docs inline.
diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index 99ae34fc5..b08e4e901 100644
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -32,7 +32,7 @@ The returned string should be freed when no longer needed.
 </para>
 
 @str: the string to duplicate.
-@Returns: a newly-allocated copy of @str. 
+@Returns: a newly-allocated copy of @str.
 
 
 <!-- ##### FUNCTION g_strndup ##### -->
@@ -277,6 +277,17 @@ returns the length of the allocated string.
 @Returns: 
 
 
+<!-- ##### FUNCTION g_vasprintf ##### -->
+<para>
+
+</para>
+
+@string: 
+@format: 
+@args: 
+@Returns: 
+
+
 <!-- ##### FUNCTION g_printf_string_upper_bound ##### -->
 <para>
 Calculates the maximum space needed to store the output of the
@@ -797,10 +808,10 @@ nesting such as <literal>g_ascii_strup (g_strcanon (str, "abc", '?'))</literal>.
 
 <!-- ##### FUNCTION g_strfreev ##### -->
 <para>
-Frees a %NULL-terminated array of strings, and the array itself.
+
 </para>
 
-@str_array: a %NULL-terminated array of strings to free.
+@str_array:
 
 
 <!-- ##### FUNCTION g_strconcat ##### -->
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 410c3e402..30072a0a6 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -2170,6 +2170,13 @@ g_strsplit (const gchar *string,
   return str_array;
 }
 
+/**
+ * g_strfreev:
+ * @str_array: a %NULL-terminated array of strings to free.
+
+ * Frees a %NULL-terminated array of strings, and the array itself.
+ * If called on a %NULL value, g_strfreev() simply returns. 
+ **/
 void
 g_strfreev (gchar **str_array)
 {