SGML doc fix.

Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
        * glib/gconvert.c (g_iconv_open): SGML doc fix.

diff --git a/ChangeLog b/ChangeLog
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 811df8d..cbc97b2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Dec 19 23:09:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gconvert.c (g_iconv_open): SGML doc fix.
+
 Tue Dec 18 21:11:10 2001  Tim Janik  <timj@gtk.org>
 
        * configure.in: add configure check to determine G_HAVE_GROWING_STACK.

diff --git a/glib/gconvert.c b/glib/gconvert.c
index e95b767..5ae83ef 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -97,7 +97,7 @@ extern const char **_g_charset_get_aliases (const char *canonical_name);
  * may be implemented via libiconv on UNIX flavors that lack
  * a native implementation.
  * 
- * &GLib; provides g_convert() and g_locale_to_utf8() which are likely
+ * GLib provides g_convert() and g_locale_to_utf8() which are likely
  * more convenient than the raw iconv wrappers.
  * 
  * Return value: a "conversion descriptor"
@@ -147,7 +147,7 @@ g_iconv_open (const gchar  *to_codeset,
  * may be implemented via libiconv on UNIX flavors that lack
  * a native implementation.
  *
- * &GLib; provides g_convert() and g_locale_to_utf8() which are likely
+ * GLib provides g_convert() and g_locale_to_utf8() which are likely
  * more convenient than the raw iconv wrappers.
  * 
  * Return value: count of non-reversible conversions, or -1 on error
@@ -174,7 +174,7 @@ g_iconv (GIConv   converter,
  * the conversion descriptor from g_iconv_open() when
  * you are done converting things.
  *
- * &GLib; provides g_convert() and g_locale_to_utf8() which are likely
+ * GLib provides g_convert() and g_locale_to_utf8() which are likely
  * more convenient than the raw iconv wrappers.
  * 
  * Return value: -1 on error, 0 on success
@@ -421,7 +421,7 @@ g_convert_with_iconv (const gchar *str,
  * for the fallback sequences in @fallback will be honored. Some
  * systems may do a approximate conversion from @from_codeset
  * to @to_codeset in their <function>iconv()</function> functions, 
- * in which case &GLib; will simply return that approximate conversion.
+ * in which case GLib will simply return that approximate conversion.
  *
  * Return value: If the conversion was successful, a newly allocated
  *               nul-terminated string, which must be freed with