Move conversion functions into GConv section.

Mon Nov 13 00:18:55 2000  Owen Taylor  <otaylor@redhat.com>

        * glib/glib-sections.sgml: Move conversion functions
	into GConv section.

	* gobject/gobject-docs.sgml: Fix some malformed sgml.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index b13c1ddb66d55bf11d79f9cb428206f904abd4d3..dbb12e7ee1b78a6d62bc128be6221e37e9f75828 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 13 00:18:55 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * glib/glib-sections.sgml: Move conversion functions
+       into GConv section.
+       
+       * gobject/gobject-docs.sgml: Fix some malformed sgml.
+
 Sun Nov  5 13:24:50 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/Makefile.am gobject/gobject-sections.sgml: Updates

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index c6c718d3f859407c285693c94a4a558a9d79e505..da7b1d4926e39781b16c222f17f772b1312111d0 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -736,6 +736,7 @@ g_file_error_from_errno
 g_file_get_contents
 g_file_test
 g_mkstemp
+g_file_open_tmp
 <SUBSECTION Private>
 g_file_error_quark
 </SECTION>
@@ -950,8 +951,6 @@ g_path_is_absolute
 g_path_skip_root
 g_path_get_basename
 g_path_get_dirname
-g_filename_to_utf8
-g_filename_from_utf8
 
 <SUBSECTION>
 g_find_program_in_path
@@ -1597,6 +1596,13 @@ g_random_double_range
 g_convert
 g_convert_with_fallback
 G_CONVERT_ERROR
+g_iconv_open
+g_iconv
+g_iconv_close
+g_locale_to_utf8
+g_filename_to_utf8
+g_filename_from_utf8
+g_locale_from_utf8
 GConvertError
 <SUBSECTION Private>
 g_convert_error_quark

diff --git a/docs/reference/glib/tmpl/conversions.sgml b/docs/reference/glib/tmpl/conversions.sgml
index e30a5dc0f3f240cc38d9c5106472df969e80ec30..5ce9133571364729b7e7d13d3b9c6e808a414e7b 100644 (file)
--- a/docs/reference/glib/tmpl/conversions.sgml
+++ b/docs/reference/glib/tmpl/conversions.sgml
@@ -52,6 +52,78 @@ Character Set Conversion
 
 
 
+<!-- ##### FUNCTION g_iconv_open ##### -->
+<para>
+
+</para>
+
+@to_codeset: 
+@from_codeset: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_iconv ##### -->
+<para>
+
+</para>
+
+@converter: 
+@inbuf: 
+@inbytes_left: 
+@outbuf: 
+@outbytes_left: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_iconv_close ##### -->
+<para>
+
+</para>
+
+@converter: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_locale_to_utf8 ##### -->
+<para>
+
+</para>
+
+@opsysstring: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_filename_to_utf8 ##### -->
+<para>
+
+</para>
+
+@opsysstring: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_filename_from_utf8 ##### -->
+<para>
+
+</para>
+
+@utf8string: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_locale_from_utf8 ##### -->
+<para>
+
+</para>
+
+@utf8string: 
+@error: 
+@Returns: 
+
+
 <!-- ##### ENUM GConvertError ##### -->
 <para>
 
@@ -60,4 +132,5 @@ Character Set Conversion
 @G_CONVERT_ERROR_NO_CONVERSION: 
 @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: 
 @G_CONVERT_ERROR_FAILED: 
+@G_CONVERT_ERROR_PARTIAL_INPUT: 
 

diff --git a/docs/reference/glib/tmpl/fileutils.sgml b/docs/reference/glib/tmpl/fileutils.sgml
index bc1db140a11c48ab9b8a819891343e4d5633a155..a5e90373568c877f1cd225172ad3cd5afe2f43f7 100644 (file)
--- a/docs/reference/glib/tmpl/fileutils.sgml
+++ b/docs/reference/glib/tmpl/fileutils.sgml
@@ -102,3 +102,14 @@ File Utilities
 @Returns: 
 
 
+<!-- ##### FUNCTION g_file_open_tmp ##### -->
+<para>
+
+</para>
+
+@tmpl: 
+@name_used: 
+@error: 
+@Returns: 
+
+

diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml
index e15bfb47463b2ff53786cf7689e2d8b699706d98..545da9cfc3f32216d6b7d649a7cdb87157418dae 100644 (file)
--- a/docs/reference/glib/tmpl/misc_utils.sgml
+++ b/docs/reference/glib/tmpl/misc_utils.sgml
@@ -170,24 +170,6 @@ freed when no longer needed.
 @Returns: the directory components of the file.
 
 
-<!-- ##### FUNCTION g_filename_to_utf8 ##### -->
-<para>
-
-</para>
-
-@opsysstring: 
-@Returns: 
-
-
-<!-- ##### FUNCTION g_filename_from_utf8 ##### -->
-<para>
-
-</para>
-
-@utf8string: 
-@Returns: 
-
-
 <!-- ##### FUNCTION g_find_program_in_path ##### -->
 <para>
 

diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml
index 9e25169ea9b83960bb3b893142a767fffac44411..bc9def6453a9689343b04a466d6e1622cc409a36 100644 (file)
--- a/docs/reference/gobject/gobject-docs.sgml
+++ b/docs/reference/gobject/gobject-docs.sgml
@@ -58,7 +58,6 @@
              fundamental types that can be used to generically handle object
              properties or otherwise parameterized types.
          </para></listitem></varlistentry>
-         <varlistentry><term></term><listitem><para>
        </variablelist>
       </para>
   </preface>