Fix docs for @str_return to conform to the main docs and the

Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/giochannel.c (g_io_channel_read_line): Fix
        docs for @str_return to conform to the main docs
        and the implementation as to whether the terminator
        is included. (#87964, Jacob Berkman)

diff --git a/ChangeLog b/ChangeLog
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2094ba7..452687a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Jul 25 20:57:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_read_line): Fix 
+       docs for @str_return to conform to the main docs
+       and the implementation as to whether the terminator
+       is included. (#87964, Jacob Berkman)
+
 Thu Jul 25 19:52:41 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/guniprop.c (real_tolower): Handle the 

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 2c229f6..5c19876 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1357,7 +1357,7 @@ reencode:
 /**
  * g_io_channel_read_line:
  * @channel: a #GIOChannel
- * @str_return: The line read from the #GIOChannel, not including the
+ * @str_return: The line read from the #GIOChannel, including the
  *              line terminator. This data should be freed with g_free()
  *              when no longer needed. This is a nul-terminated string. 
  *              If a @length of zero is returned, this will be %NULL instead.