Remove references to nonexisting functions

	* glib/gmain.c: Remove references to nonexisting functions
	g_source_set_callback_closure(), g_source_poll(), g_source_add()
	from docs.

	* glib/gdir.c (g_dir_open): Typo fix in docs.

	* glib/gasyncqueue.c (g_async_queue_lock):
	(g_async_queue_unref_and_unlock): Fix markup to avoid erroneous
	<link>s in docs.

	* glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.

	* glib/gtree.c: Replace some occurances of Gtree by GTree in docs.

	* glib/gstring.c (g_string_insert_unichar): Typo fix in docs.

	* glib/tmpl/conversions.sgml: Add GIConv.

	* glib/tmpl/main.sgml: Fix references to nonexisting functions
	g_main_loop_destroy(), g_source_add(), g_source_connect().

	* glib/glib-sections.txt: Add GIConv, g_str_has_prefix, g_str_has_suffix.

	* glib/tmpl/linked_lists_single.sgml:
	* glib/tmpl/linked_lists_double.sgml: GListAllocator doesn't exist.

	* glib/glib-docs.sgml: Declare hash entity.

	* glib/tmpl/macros.sgml: Escape # in #ifdef to suppress erroneous links.

	* gobject/Makefile.am, gobject/gobject-docs.sgml, gobject/tmpl/*:
	* glib/Makefile.am, glib/glib-docs.sgml, glib/tmpl/*: Produce XML,
	not SGML.

diff --git a/ChangeLog b/ChangeLog
index d934542..164b9e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d934542..164b9e4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmain.c: Remove references to nonexisting functions 
+       g_source_set_callback_closure(), g_source_poll(), g_source_add()
+       from docs.
+
+       * glib/gdir.c (g_dir_open): Typo fix in docs.
+
+       * glib/gasyncqueue.c (g_async_queue_lock):
+       (g_async_queue_unref_and_unlock): Fix markup to avoid erroneous 
+       <link>s in docs.
+
+       * glib/gwin32.c: Escape #'s leading to erroneous <link>s in docs.
+
+       * glib/gtree.c: Replace some occurances of Gtree by GTree in docs.
+
+       * glib/gstring.c (g_string_insert_unichar): Typo fix in docs.
+
 2002-05-23  Havoc Pennington  <hp@redhat.com>
 
        * glib/gspawn.c (fork_exec_with_pipes): on success, close the

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2d5f4f7..5559e23 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,26 @@
+2002-05-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/tmpl/conversions.sgml: Add GIConv.
+
+       * glib/tmpl/main.sgml: Fix references to nonexisting functions
+       g_main_loop_destroy(), g_source_add(), g_source_connect().
+       
+
+       * glib/glib-sections.txt: Add GIConv, g_str_has_prefix, g_str_has_suffix.
+
+       * glib/tmpl/linked_lists_single.sgml: 
+       * glib/tmpl/linked_lists_double.sgml: GListAllocator doesn't exist.
+
+       * glib/glib-docs.sgml: Declare hash entity.
+
+       * glib/tmpl/macros.sgml: Escape # in #ifdef to suppress erroneous links.
+
+2002-05-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gobject/Makefile.am, gobject/gobject-docs.sgml, gobject/tmpl/*:
+       * glib/Makefile.am, glib/glib-docs.sgml, glib/tmpl/*: Produce XML,
+       not SGML.
+
 2002-05-21  Matthias Clasen  <maclas@gmx.de>
 
        * glib/tmpl/markup.sgml: Updates.

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index e44a3c2..35a1f30 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../../..
 SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode
+MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=

diff --git a/docs/reference/glib/glib-docs.sgml b/docs/reference/glib/glib-docs.sgml
index 1e8dd2e..444d61e 100644 (file)
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@ -1,62 +1,66 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity glib-Basic-Types SYSTEM "sgml/types.sgml">
-<!entity glib-Limits-of-Basic-Types SYSTEM "sgml/limits.sgml">
-<!entity glib-Standard-Macros SYSTEM "sgml/macros.sgml">
-<!entity glib-Type-Conversion-Macros SYSTEM "sgml/type_conversion.sgml">
-<!entity glib-Byte-Order-Macros SYSTEM "sgml/byte_order.sgml">
-<!entity glib-Numerical-Definitions SYSTEM "sgml/numerical.sgml">
-<!entity glib-Miscellaneous-Macros SYSTEM "sgml/macros_misc.sgml">
-<!entity glib-Memory-Allocation SYSTEM "sgml/memory.sgml">
-<!entity glib-Error-Reporting SYSTEM "sgml/error_reporting.sgml">
-<!entity glib-Warnings-and-Assertions SYSTEM "sgml/warnings.sgml">
-<!entity glib-Message-Logging SYSTEM "sgml/messages.sgml">
-<!entity glib-Pattern-Matching SYSTEM "sgml/patterns.sgml">
-<!entity glib-Timers SYSTEM "sgml/timers.sgml">
-<!entity glib-String-Utility-Functions SYSTEM "sgml/string_utils.sgml">
-<!entity glib-Character-Set-Conversion SYSTEM "sgml/conversions.sgml">
-<!entity glib-Unicode-Manipulation SYSTEM "sgml/unicode.sgml">
-<!entity glib-Random-Numbers SYSTEM "sgml/random_numbers.sgml">
-<!entity glib-Miscellaneous-Utility-Functions SYSTEM "sgml/misc_utils.sgml">
-<!entity glib-Date-and-Time-Functions SYSTEM "sgml/date.sgml">
-<!entity glib-The-Main-Event-Loop SYSTEM "sgml/main.sgml">
-<!entity glib-Threads SYSTEM "sgml/threads.sgml">
-<!entity glib-Thread-Pools SYSTEM "sgml/thread_pools.sgml">
-<!entity glib-Async-Queues SYSTEM "sgml/async_queues.sgml">
-<!entity glib-IO-Channels SYSTEM "sgml/iochannels.sgml">
-<!entity glib-Hook-Functions SYSTEM "sgml/hooks.sgml">
-<!entity glib-Lexical-Scanner SYSTEM "sgml/scanner.sgml">
-<!entity glib-Dynamic-Loading-of-Modules SYSTEM "sgml/modules.sgml">
-<!entity glib-Automatic-String-Completion SYSTEM "sgml/completion.sgml">
-<!entity glib-Windows-Compatability-Functions SYSTEM "sgml/windows.sgml">
-<!entity glib-Memory-Chunks SYSTEM "sgml/memory_chunks.sgml">
-<!entity glib-Doubly-Linked-Lists SYSTEM "sgml/linked_lists_double.sgml">
-<!entity glib-Singly-Linked-Lists SYSTEM "sgml/linked_lists_single.sgml">
-<!entity glib-Double-ended-Queues SYSTEM "sgml/queue.sgml">
-<!entity glib-Trash-Stacks SYSTEM "sgml/trash_stack.sgml">
-<!entity glib-Hash-Tables SYSTEM "sgml/hash_tables.sgml">
-<!entity glib-Strings SYSTEM "sgml/strings.sgml">
-<!entity glib-String-Chunks SYSTEM "sgml/string_chunks.sgml">
-<!entity glib-Arrays SYSTEM "sgml/arrays.sgml">
-<!entity glib-Pointer-Arrays SYSTEM "sgml/arrays_pointer.sgml">
-<!entity glib-Byte-Arrays SYSTEM "sgml/arrays_byte.sgml">
-<!entity glib-Balanced-Binary-Trees SYSTEM "sgml/trees-binary.sgml">
-<!entity glib-N-ary-Trees SYSTEM "sgml/trees-nary.sgml">
-<!entity glib-Quarks SYSTEM "sgml/quarks.sgml">
-<!entity glib-Keyed-Data-Lists SYSTEM "sgml/datalist.sgml">
-<!entity glib-Datasets SYSTEM "sgml/datasets.sgml">
-<!entity glib-Relations-and-Tuples SYSTEM "sgml/relations.sgml">
-<!entity glib-Caches SYSTEM "sgml/caches.sgml">
-<!entity glib-Memory-Allocators SYSTEM "sgml/allocators.sgml">
-<!entity glib-Spawn SYSTEM "sgml/spawn.sgml">
-<!entity glib-Fileutils SYSTEM "sgml/fileutils.sgml">
-<!entity glib-Shell SYSTEM "sgml/shell.sgml">
-<!entity glib-Markup SYSTEM "sgml/markup.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY nbsp "&#x00a0;">
+<!ENTITY hash "#">
+<!ENTITY glib-Basic-Types SYSTEM "xml/types.xml">
+<!ENTITY glib-Limits-of-Basic-Types SYSTEM "xml/limits.xml">
+<!ENTITY glib-Standard-Macros SYSTEM "xml/macros.xml">
+<!ENTITY glib-Type-Conversion-Macros SYSTEM "xml/type_conversion.xml">
+<!ENTITY glib-Byte-Order-Macros SYSTEM "xml/byte_order.xml">
+<!ENTITY glib-Numerical-Definitions SYSTEM "xml/numerical.xml">
+<!ENTITY glib-Miscellaneous-Macros SYSTEM "xml/macros_misc.xml">
+<!ENTITY glib-Memory-Allocation SYSTEM "xml/memory.xml">
+<!ENTITY glib-Error-Reporting SYSTEM "xml/error_reporting.xml">
+<!ENTITY glib-Warnings-and-Assertions SYSTEM "xml/warnings.xml">
+<!ENTITY glib-Message-Logging SYSTEM "xml/messages.xml">
+<!ENTITY glib-Pattern-Matching SYSTEM "xml/patterns.xml">
+<!ENTITY glib-Timers SYSTEM "xml/timers.xml">
+<!ENTITY glib-String-Utility-Functions SYSTEM "xml/string_utils.xml">
+<!ENTITY glib-Character-Set-Conversion SYSTEM "xml/conversions.xml">
+<!ENTITY glib-Unicode-Manipulation SYSTEM "xml/unicode.xml">
+<!ENTITY glib-Random-Numbers SYSTEM "xml/random_numbers.xml">
+<!ENTITY glib-Miscellaneous-Utility-Functions SYSTEM "xml/misc_utils.xml">
+<!ENTITY glib-Date-and-Time-Functions SYSTEM "xml/date.xml">
+<!ENTITY glib-The-Main-Event-Loop SYSTEM "xml/main.xml">
+<!ENTITY glib-Threads SYSTEM "xml/threads.xml">
+<!ENTITY glib-Thread-Pools SYSTEM "xml/thread_pools.xml">
+<!ENTITY glib-Async-Queues SYSTEM "xml/async_queues.xml">
+<!ENTITY glib-IO-Channels SYSTEM "xml/iochannels.xml">
+<!ENTITY glib-Hook-Functions SYSTEM "xml/hooks.xml">
+<!ENTITY glib-Lexical-Scanner SYSTEM "xml/scanner.xml">
+<!ENTITY glib-Dynamic-Loading-of-Modules SYSTEM "xml/modules.xml">
+<!ENTITY glib-Automatic-String-Completion SYSTEM "xml/completion.xml">
+<!ENTITY glib-Windows-Compatability-Functions SYSTEM "xml/windows.xml">
+<!ENTITY glib-Memory-Chunks SYSTEM "xml/memory_chunks.xml">
+<!ENTITY glib-Doubly-Linked-Lists SYSTEM "xml/linked_lists_double.xml">
+<!ENTITY glib-Singly-Linked-Lists SYSTEM "xml/linked_lists_single.xml">
+<!ENTITY glib-Double-ended-Queues SYSTEM "xml/queue.xml">
+<!ENTITY glib-Trash-Stacks SYSTEM "xml/trash_stack.xml">
+<!ENTITY glib-Hash-Tables SYSTEM "xml/hash_tables.xml">
+<!ENTITY glib-Strings SYSTEM "xml/strings.xml">
+<!ENTITY glib-String-Chunks SYSTEM "xml/string_chunks.xml">
+<!ENTITY glib-Arrays SYSTEM "xml/arrays.xml">
+<!ENTITY glib-Pointer-Arrays SYSTEM "xml/arrays_pointer.xml">
+<!ENTITY glib-Byte-Arrays SYSTEM "xml/arrays_byte.xml">
+<!ENTITY glib-Balanced-Binary-Trees SYSTEM "xml/trees-binary.xml">
+<!ENTITY glib-N-ary-Trees SYSTEM "xml/trees-nary.xml">
+<!ENTITY glib-Quarks SYSTEM "xml/quarks.xml">
+<!ENTITY glib-Keyed-Data-Lists SYSTEM "xml/datalist.xml">
+<!ENTITY glib-Datasets SYSTEM "xml/datasets.xml">
+<!ENTITY glib-Relations-and-Tuples SYSTEM "xml/relations.xml">
+<!ENTITY glib-Caches SYSTEM "xml/caches.xml">
+<!ENTITY glib-Memory-Allocators SYSTEM "xml/allocators.xml">
+<!ENTITY glib-Spawn SYSTEM "xml/spawn.xml">
+<!ENTITY glib-Fileutils SYSTEM "xml/fileutils.xml">
+<!ENTITY glib-Shell SYSTEM "xml/shell.xml">
+<!ENTITY glib-Markup SYSTEM "xml/markup.xml">
 
-<!entity glib-Compiling SYSTEM "compiling.sgml">
-<!entity glib-Building SYSTEM "building.sgml">
-<!entity glib-Running SYSTEM "running.sgml">
-<!entity glib-Resources SYSTEM "resources.sgml">
-<!entity glib-Changes-2-0 SYSTEM "changes-2.0.sgml">
+<!ENTITY glib-Compiling SYSTEM "compiling.sgml">
+<!ENTITY glib-Building SYSTEM "building.sgml">
+<!ENTITY glib-Running SYSTEM "running.sgml">
+<!ENTITY glib-Resources SYSTEM "resources.sgml">
+<!ENTITY glib-Changes-2-0 SYSTEM "changes-2.0.sgml">
 
 ]>
 <book id="index">

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 414981d..a1c33a2 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -881,6 +881,8 @@ g_stpcpy
 g_strstr_len
 g_strrstr
 g_strrstr_len
+g_str_has_prefix
+g_str_has_suffix
 
 <SUBSECTION>
 g_strlcpy
@@ -1825,6 +1827,7 @@ g_random_double_range
 <FILE>conversions</FILE>
 g_convert
 g_convert_with_fallback
+GIConv
 g_convert_with_iconv
 G_CONVERT_ERROR
 g_iconv_open

diff --git a/docs/reference/glib/tmpl/arrays.sgml b/docs/reference/glib/tmpl/arrays.sgml
index c5c5e2a..3f360e1 100644 (file)
--- a/docs/reference/glib/tmpl/arrays.sgml
+++ b/docs/reference/glib/tmpl/arrays.sgml
@@ -39,10 +39,10 @@ To free an array, use g_array_free().
   /* We create a new array to store gint values.
      We don't want it zero-terminated or cleared to 0's. */
   garray = g_array_new (FALSE, FALSE, sizeof (gint));
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     g_array_append_val (garray, i);
 
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     if (g_array_index (garray, gint, i) != i)
       g_print ("ERROR: got %d instead of %d\n",
                g_array_index (garray, gint, i), i);

diff --git a/docs/reference/glib/tmpl/arrays_byte.sgml b/docs/reference/glib/tmpl/arrays_byte.sgml
index 5a0c764..dedb301 100644 (file)
--- a/docs/reference/glib/tmpl/arrays_byte.sgml
+++ b/docs/reference/glib/tmpl/arrays_byte.sgml
@@ -30,10 +30,10 @@ To free a #GByteArray, use g_byte_array_free().
   gint i;
 
   gbarray = g_byte_array_new (<!-- -->);
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     g_byte_array_append (gbarray, (guint8*) "abcd", 4);
 
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     {
       g_assert (gbarray->data[4*i] == 'a');
       g_assert (gbarray->data[4*i+1] == 'b');

diff --git a/docs/reference/glib/tmpl/error_reporting.sgml b/docs/reference/glib/tmpl/error_reporting.sgml
index f3e2971..5c1192b 100644 (file)
--- a/docs/reference/glib/tmpl/error_reporting.sgml
+++ b/docs/reference/glib/tmpl/error_reporting.sgml
@@ -47,7 +47,7 @@ point to a location where an error can be placed. For example:
 gchar *contents;
 GError *err = NULL;
 contents = g_file_get_contents ("foo.txt", &err);
-g_assert ((contents == NULL && err != NULL) || (contents != NULL && err == NULL));
+g_assert ((contents == NULL && err != NULL) || (contents != NULL && err == NULL));
 if (err != NULL)
   {
     /* Report error to user, and free error */
@@ -110,7 +110,7 @@ foo_open_file (GError **error)
 
   fd = open ("file.txt", O_RDONLY);
 
-  if (fd < 0)
+  if (fd &lt; 0)
     {
       g_set_error (error,
                    FOO_ERROR,                 /* error domain */

diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml
index 381e81c..098c4c2 100644 (file)
--- a/docs/reference/glib/tmpl/glib-unused.sgml
+++ b/docs/reference/glib/tmpl/glib-unused.sgml
@@ -66,6 +66,14 @@ Specifies the type of function passed to g_set_error_handler().
 @hook_list: 
 @hook: 
 
+<!-- ##### STRUCT GIConv ##### -->
+<para>
+The <structname>GIConv</structname> struct wraps an
+<function>iconv()</function> conversion descriptor. It contains private data
+and should only be accessed using the following functions.
+</para>
+
+
 <!-- ##### ENUM GIOFileMode ##### -->
 <para>
 

diff --git a/docs/reference/glib/tmpl/hooks.sgml b/docs/reference/glib/tmpl/hooks.sgml
index f46e91e..677bf5a 100644 (file)
--- a/docs/reference/glib/tmpl/hooks.sgml
+++ b/docs/reference/glib/tmpl/hooks.sgml
@@ -218,7 +218,7 @@ g_hook_insert_sorted().
 
 @new_hook: the #GHook being inserted.
 @sibling: the #GHook to compare with @new_hook.
-@Returns: a value <= 0 if @new_hook should be before @sibling.
+@Returns: a value &lt;= 0 if @new_hook should be before @sibling.
 
 
 <!-- ##### FUNCTION g_hook_compare_ids ##### -->
@@ -229,7 +229,7 @@ if the second id is greater than the first.
 
 @new_hook: a #GHook.
 @sibling: a #GHook to compare with @new_hook.
-@Returns: a value <= 0 if the id of @sibling is >= the id of @new_hook.
+@Returns: a value &lt;= 0 if the id of @sibling is >= the id of @new_hook.
 
 
 <!-- ##### FUNCTION g_hook_get ##### -->
@@ -357,7 +357,7 @@ Returns the flags of a hook.
 <para>
 The position of the first bit which is not reserved for internal
 use be the #GHook implementation, i.e. 
-<literal>1 << G_HOOK_FLAG_USER_SHIFT</literal> is the first bit
+<literal>1 &lt;&lt; G_HOOK_FLAG_USER_SHIFT</literal> is the first bit
 which can be used for application-defined flags.
 </para>
 

diff --git a/docs/reference/glib/tmpl/linked_lists_double.sgml b/docs/reference/glib/tmpl/linked_lists_double.sgml
index e55b62e..be76f7b 100644 (file)
--- a/docs/reference/glib/tmpl/linked_lists_double.sgml
+++ b/docs/reference/glib/tmpl/linked_lists_double.sgml
@@ -25,7 +25,7 @@ of the
 or simply pointers to any type of data.
 </para>
 <para>
-List elements are allocated in blocks using a #GListAllocator, which is
+List elements are allocated in blocks using a #GAllocator, which is
 more efficient than allocating elements individually.
 </para>
 <para>
@@ -216,7 +216,7 @@ the first node matching the given data.
 <!-- ##### FUNCTION g_list_free ##### -->
 <para>
 Frees all of the memory used by a #GList.
-The freed elements are added to the #GListAllocator free list.
+The freed elements are added to the #GAllocator free list.
 </para>
 <note>
 <para>
@@ -302,7 +302,7 @@ integer if the first value comes after the second.
 
 @a: a value.
 @b: a value to compare with.
-@Returns: negative value if @a < @b; zero if @a = @b; positive value
+@Returns: negative value if @a &lt; @b; zero if @a = @b; positive value
 if @a > @b.
 
 
@@ -328,7 +328,7 @@ integer if the first value comes after the second.
 @a: a value.
 @b: a value to compare with.
 @user_data: user data to pass to comparison function.
-@Returns: negative value if @a < @b; zero if @a = @b; positive value
+@Returns: negative value if @a &lt; @b; zero if @a = @b; positive value
 if @a > @b.
 
 

diff --git a/docs/reference/glib/tmpl/linked_lists_single.sgml b/docs/reference/glib/tmpl/linked_lists_single.sgml
index a51ca84..0c09e4f 100644 (file)
--- a/docs/reference/glib/tmpl/linked_lists_single.sgml
+++ b/docs/reference/glib/tmpl/linked_lists_single.sgml
@@ -25,7 +25,7 @@ of the
 or simply pointers to any type of data.
 </para>
 <para>
-List elements are allocated in blocks using a #GListAllocator, which is
+List elements are allocated in blocks using a #GAllocator, which is
 more efficient than allocating elements individually.
 </para>
 <para>
@@ -224,7 +224,7 @@ the first node matching the given data.
 <!-- ##### FUNCTION g_slist_free ##### -->
 <para>
 Frees all of the memory used by a #GSList.
-The freed elements are added to the #GListAllocator free list.
+The freed elements are added to the #GAllocator free list.
 </para>
 
 @list: a #GSList.

diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml
index 37a6fe7..6e3f12a 100644 (file)
--- a/docs/reference/glib/tmpl/macros.sgml
+++ b/docs/reference/glib/tmpl/macros.sgml
@@ -38,7 +38,7 @@ The micro version number of the GLib library.
 <!-- ##### MACRO G_OS_WIN32 ##### -->
 <para>
 This macro is defined only on Windows. So you can bracket
-Windows-specific code in "#ifdef G_OS_WIN32".
+Windows-specific code in "&hash;ifdef G_OS_WIN32".
 </para>
 
 
@@ -46,7 +46,7 @@ Windows-specific code in "#ifdef G_OS_WIN32".
 <!-- ##### MACRO G_OS_BEOS ##### -->
 <para>
 This macro is defined only on BeOS. So you can bracket
-BeOS-specific code in "#ifdef G_OS_BEOS".
+BeOS-specific code in "&hash;ifdef G_OS_BEOS".
 </para>
 
 
@@ -54,7 +54,7 @@ BeOS-specific code in "#ifdef G_OS_BEOS".
 <!-- ##### MACRO G_OS_UNIX ##### -->
 <para>
 This macro is defined only on UNIX. So you can bracket
-UNIX-specific code in "#ifdef G_OS_UNIX".
+UNIX-specific code in "&hash;ifdef G_OS_UNIX".
 </para>
 
 

diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml
index aaf0033..44970ee 100644 (file)
--- a/docs/reference/glib/tmpl/main.sgml
+++ b/docs/reference/glib/tmpl/main.sgml
@@ -10,7 +10,7 @@ manages all available sources of events.
     GLib and GTK+ applications. These events can come from any number of
     different types of sources such as file descriptors (plain files,
     pipes or sockets) and timeouts.  New types of event sources can also
-    be added using g_source_add().
+    be added using g_source_attach().
   </para>
   <para>
     To allow multiple independent sets of sources to be handled in
@@ -89,11 +89,11 @@ manages all available sources of events.
     </para>
     <para>
       The operation of these functions can best be seen in terms
-      of a state diagram, as shown in <xref linkend="mainloop-states">.
+      of a state diagram, as shown in <xref linkend="mainloop-states"/>.
     </para>
     <figure id="mainloop-states">
       <title>States of a Main Context</title>
-      <graphic fileref="mainloop-states.gif" format="gif"></graphic>
+      <graphic fileref="mainloop-states.gif" format="GIF"></graphic>
     </figure>
   </refsect2>
 
@@ -184,7 +184,7 @@ very important since calling g_main_run() will set this to %TRUE anyway.
 <!-- ##### MACRO g_main_destroy ##### -->
 <para>
 Frees the memory allocated for the #GMainLoop. A compatibility macro, see
-g_main_loop_destroy().
+g_main_loop_unref().
 </para>
 
 @loop: a #GMainLoop.
@@ -587,8 +587,8 @@ g_main_context_set_poll_func() for full details.
 <!-- ##### STRUCT GPollFD ##### -->
 <para>
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -631,8 +631,8 @@ an event source.
 The #GSourceFuncs struct contains a table of functions used to handle
 event sources in a generic manner.
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -664,7 +664,7 @@ called, so the source should be checked again here.
 Called to dispatch the event source, after it has returned %TRUE in
 either its @prepare or its @check function. The @dispatch function is
 passed in a callback function and data. The callback function may be
-%NULL if the source was never connected using g_source_connect(). The
+%NULL if the source was never connected using g_source_attach(). The
 @dispatch function should call the callback function with data and
 whatever additional parameters are needed for this type of event source.
 </entry>

diff --git a/docs/reference/glib/tmpl/memory.sgml b/docs/reference/glib/tmpl/memory.sgml
index 0510f15..0c8f7c5 100644 (file)
--- a/docs/reference/glib/tmpl/memory.sgml
+++ b/docs/reference/glib/tmpl/memory.sgml
@@ -127,7 +127,7 @@ Allocates @size bytes on the stack; these bytes will be freed when the current
 stack frame is cleaned up. This macro essentially just wraps the 
 <function>alloca()</function> function present on most UNIX variants. 
 Thus it provides the same advantages and pitfalls as <function>alloca()</function>:
-<msgtext><variablelist>
+<variablelist>
   <varlistentry><term></term><listitem><para>
     + <function>alloca()</function> is very fast, as on most systems it's implemented by just adjusting
     the stack pointer register.
@@ -153,7 +153,7 @@ Thus it provides the same advantages and pitfalls as <function>alloca()</functio
       will be freed together with the variable sized array upon exit of that scope, and
       not upon exit of the enclosing function scope.
   </para></listitem></varlistentry>
-</variablelist></msgtext>
+</variablelist>
 
 </para>
 

diff --git a/docs/reference/glib/tmpl/memory_chunks.sgml b/docs/reference/glib/tmpl/memory_chunks.sgml
index 1cddb70..8336f86 100644 (file)
--- a/docs/reference/glib/tmpl/memory_chunks.sgml
+++ b/docs/reference/glib/tmpl/memory_chunks.sgml
@@ -68,18 +68,18 @@ To help debug memory chunks, use g_mem_chunk_info() and g_mem_chunk_print().
   mem_chunk = g_mem_chunk_new ("test mem chunk", 50, 100, G_ALLOC_AND_FREE);
 
   /* Now allocate 10000 atoms. */
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     {
       mem[i] = g_chunk_new (gchar, mem_chunk);
 
       /* Fill in the atom memory with some junk. */
-      for (j = 0; j < 50; j++)
+      for (j = 0; j &lt; 50; j++)
        mem[i][j] = i * j;
     }
 
   /* Now free all of the atoms. Note that since we are going to destroy the
      GMemChunk, this wouldn't normally be used. */
-  for (i = 0; i < 10000; i++)
+  for (i = 0; i &lt; 10000; i++)
     {
       g_mem_chunk_free (mem_chunk, mem[i]);
     }

diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index a0ff56e..0391d9b 100644 (file)
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -104,6 +104,26 @@ The returned string should be freed when no longer needed.
 @Returns: 
 
 
+<!-- ##### FUNCTION g_str_has_prefix ##### -->
+<para>
+
+</para>
+
+@str: 
+@prefix: 
+@Returns: 
+
+
+<!-- ##### FUNCTION g_str_has_suffix ##### -->
+<para>
+
+</para>
+
+@str: 
+@suffix: 
+@Returns: 
+
+
 <!-- ##### FUNCTION g_strlcpy ##### -->
 <para>
 Portability wrapper that calls strlcpy() on systems which have it, and emulates
@@ -562,8 +582,8 @@ how to replace it.
 
 @s1: a string.
 @s2: a string to compare with @s1.
-@Returns: 0 if the strings match, a negative value if @s1 < @s2, or a positive
-value if @s1 > @s2.
+@Returns: 0 if the strings match, a negative value if @s1 &lt; @s2, or a positive
+value if @s1 &gt; @s2.
 
 
 <!-- ##### FUNCTION g_strncasecmp ##### -->
@@ -595,8 +615,8 @@ UTF-8.
 @s1: a string.
 @s2: a string to compare with @s1.
 @n: the maximum number of characters to compare.
-@Returns: 0 if the strings match, a negative value if @s1 < @s2, or a positive
-value if @s1 > @s2.
+@Returns: 0 if the strings match, a negative value if @s1 &lt; @s2, or a positive
+value if @s1 &gt; @s2.
 
 
 <!-- ##### FUNCTION g_strreverse ##### -->

diff --git a/docs/reference/glib/tmpl/strings.sgml b/docs/reference/glib/tmpl/strings.sgml
index 7df271b..45daad7 100644 (file)
--- a/docs/reference/glib/tmpl/strings.sgml
+++ b/docs/reference/glib/tmpl/strings.sgml
@@ -73,8 +73,10 @@ you do not have to worry about having enough space to copy the string.
 </para>
 
 @string: the destination #GString. Its current contents are destroyed.
-@val: the string to copy into @string.
+@rval: 
 @Returns: the destination #GString.
+<!-- # Unused Parameters # -->
+@val: the string to copy into @string.
 
 
 <!-- ##### MACRO g_string_sprintf ##### -->

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index 25601e2..09fc9d6 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -1022,7 +1022,7 @@ example:
 
     g_static_rw_lock_reader_lock (&rwlock);
 
-    if (index < array->len)
+    if (index &lt; array->len)
       retval = g_ptr_array_index (array, index);
 
     g_static_rw_lock_reader_unlock (&amp;rwlock);

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 2462df3..c04bae3 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../../../gobject
 SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=
+MKDB_OPTIONS=--output-format=xml
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html

diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml
index 7588b3e..434be96 100644 (file)
--- a/docs/reference/gobject/gobject-docs.sgml
+++ b/docs/reference/gobject/gobject-docs.sgml
@@ -1,17 +1,20 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity gobject-GType SYSTEM "sgml/gtype.sgml">
-<!entity gobject-GTypePlugin SYSTEM "sgml/gtypeplugin.sgml">
-<!entity gobject-GTypeModule SYSTEM "sgml/gtypemodule.sgml">
-<!entity gobject-The-Base-Object-Type SYSTEM "sgml/objects.sgml">
-<!entity gobject-Enumeration-and-Flag-Types SYSTEM "sgml/enumerations_flags.sgml">
-<!entity gobject-Boxed-Types SYSTEM "sgml/gboxed.sgml">
-<!entity gobject-Generic-values SYSTEM "sgml/generic_values.sgml">
-<!entity gobject-param-value-types SYSTEM "sgml/param_value_types.sgml">
-<!entity gobject-GParamSpec SYSTEM "sgml/gparamspec.sgml">
-<!entity gobject-Varargs-Value-Collection SYSTEM "sgml/value_collection.sgml">
-<!entity gobject-Signals SYSTEM "sgml/signals.sgml">
-<!entity gobject-Closures SYSTEM "sgml/gclosure.sgml">
-<!entity gobject-Value-Arrays SYSTEM "sgml/value_arrays.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY nbsp "&#x00a0;">
+<!ENTITY gobject-GType SYSTEM "xml/gtype.xml">
+<!ENTITY gobject-GTypePlugin SYSTEM "xml/gtypeplugin.xml">
+<!ENTITY gobject-GTypeModule SYSTEM "xml/gtypemodule.xml">
+<!ENTITY gobject-The-Base-Object-Type SYSTEM "xml/objects.xml">
+<!ENTITY gobject-Enumeration-and-Flag-Types SYSTEM "xml/enumerations_flags.xml">
+<!ENTITY gobject-Boxed-Types SYSTEM "xml/gboxed.xml">
+<!ENTITY gobject-Generic-values SYSTEM "xml/generic_values.xml">
+<!ENTITY gobject-param-value-types SYSTEM "xml/param_value_types.xml">
+<!ENTITY gobject-GParamSpec SYSTEM "xml/gparamspec.xml">
+<!ENTITY gobject-Varargs-Value-Collection SYSTEM "xml/value_collection.xml">
+<!ENTITY gobject-Signals SYSTEM "xml/signals.xml">
+<!ENTITY gobject-Closures SYSTEM "xml/gclosure.xml">
+<!ENTITY gobject-Value-Arrays SYSTEM "xml/value_arrays.xml">
 ]>
 <book id="index">
   <bookinfo>

diff --git a/docs/reference/gobject/tmpl/gclosure.sgml b/docs/reference/gobject/tmpl/gclosure.sgml
index e375ce6..42774be 100644 (file)
--- a/docs/reference/gobject/tmpl/gclosure.sgml
+++ b/docs/reference/gobject/tmpl/gclosure.sgml
@@ -175,7 +175,7 @@ When closures are newly created, they get an initial reference count
 of 1, eventhough no caller has yet invoked g_closure_ref() on the @closure.
 Code entities that store closures for notification purposes are supposed
 to call this function, for example like this:
-<msgtext><programlisting>
+<informalexample><programlisting>
 static GClosure *notify_closure = NULL;
 void
 foo_notify_set_closure (GClosure *closure)
@@ -189,7 +189,7 @@ foo_notify_set_closure (GClosure *closure)
       g_closure_sink (notify_closure);
     }
 }
-</programlisting></msgtext>
+</programlisting></informalexample>
 Because g_closure_sink() may decrement the reference count of a closure
 (if it hasn't been called on @closure yet) just like g_closure_unref(),
 g_closure_ref() should be called prior to this function.

diff --git a/docs/reference/gobject/tmpl/gtype.sgml b/docs/reference/gobject/tmpl/gtype.sgml
index d155927..092b1f1 100644 (file)
--- a/docs/reference/gobject/tmpl/gtype.sgml
+++ b/docs/reference/gobject/tmpl/gtype.sgml
@@ -235,22 +235,22 @@ to serve as a container for values of a type.
                        old contents. E.g. for the implementation of a string
                        value that may never be %NULL, the implementation might
                        look like:
-<msgtext><programlisting>
+<programlisting>
 {
   value-&gt;data[0].v_pointer = g_strdup ("");
 }
-</programlisting></msgtext>
+</programlisting>
 @value_free:           Free any old contents that might be left in the
                        data array of the passed in @value. No resources may
                        remain allocated through the #GValue contents after
                        this function returns. E.g. for our above string type:
-<msgtext><programlisting>
+<programlisting>
 {
   /* only free strings without a specific flag for static storage */
-  if (!(value-&gt;data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
+  if (!(value-&gt;data[1].v_uint &amp; G_VALUE_NOCOPY_CONTENTS))
     g_free (value-&gt;data[0].v_pointer);
 }
-</programlisting></msgtext>
+</programlisting>
 @value_copy:           @dest_value is a #GValue with zero-filled data section
                        and @src_value is a properly setup #GValue of same or
                        derived type.
@@ -258,24 +258,24 @@ to serve as a container for values of a type.
                        @src_value into @dest_value in a way, that even after
                        @src_value has been freed, the contents of @dest_value
                        remain valid. String type example:
-<msgtext><programlisting>
+<programlisting>
 {
   dest_value-&gt;data[0].v_pointer = g_strdup (src_value-&gt;data[0].v_pointer);
 }
-</programlisting></msgtext>
+</programlisting>
 @value_peek_pointer:   If the value contents fit into a pointer, such as objects
                        or strings, return this pointer, so the caller can peek at
                        the current contents. To extend on our above string example:
-<msgtext><programlisting>
+<programlisting>
 {
   return value-&gt;data[0].v_pointer;
 }
-</programlisting></msgtext>
+</programlisting>
 @collect_format:       A string format describing how to collect the contents of
                        this value, bit-by-bit. Each character in the format represents
                        an argument to be collected, the characters themselves indicate
                        the type of the argument. Currently supported arguments are:
-<msgtext><variablelist>
+<variablelist>
   <varlistentry><term></term><listitem><para>
         'i' - Integers. passed as collect_values[].v_int.
   </para></listitem></varlistentry>
@@ -288,7 +288,7 @@ to serve as a container for values of a type.
   <varlistentry><term></term><listitem><para>
         'p' - Pointers. passed as collect_values[].v_pointer.
   </para></listitem></varlistentry>
-</variablelist></msgtext>
+</variablelist>
                        It should be noted, that for variable argument list construction,
                        ANSI C promotes every type smaller than an integer to an int, and
                        floats to doubles. So for collection of short int or char, 'i'
@@ -313,11 +313,11 @@ to serve as a container for values of a type.
                        Thus an extra copy of the contents stored in @collect_values is
                        not required for assignment to @value.
                        For our above string example, we continue with:
-<msgtext><programlisting>
+<programlisting>
 {
   if (!collect_values[0].v_pointer)
     value->data[0].v_pointer = g_strdup ("");
-  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
+  else if (collect_flags &amp; G_VALUE_NOCOPY_CONTENTS)
     {
       value-&gt;data[0].v_pointer = collect_values[0].v_pointer;
       /* keep a flag for the value_free() implementation to not free this string */
@@ -328,7 +328,7 @@ to serve as a container for values of a type.
 
   return NULL;
 }
-</programlisting></msgtext>
+</programlisting>
                        It should be noted, that it is generally a bad idea to follow the
                        #G_VALUE_NOCOPY_CONTENTS hint for reference counted types. Due to
                        reentrancy requirements and reference count assertions performed
@@ -336,7 +336,7 @@ to serve as a container for values of a type.
                        for reference counted contents stored in the value-&gt;data array.
                        To deviate from our string example for a moment, and taking a look
                        at an exemplary implementation for collect_value() of #GObject:
-<msgtext><programlisting>
+<programlisting>
 {
   if (collect_values[0].v_pointer)
     {
@@ -349,7 +349,7 @@ to serve as a container for values of a type.
   else
     return g_strdup_printf ("Object passed as invalid NULL pointer");
 }
-</programlisting></msgtext>
+</programlisting>
                        The reference count for valid objects is always incremented,
                        regardless of @collect_flags. For invalid objects, the example
                        returns a newly allocated string without altering @value.
@@ -378,23 +378,23 @@ to serve as a container for values of a type.
                        Similar to collect_value() the function may prematurely abort
                        by returning a newly allocated string describing an error condition.
                        To complete the string example:
-<msgtext><programlisting>
+<programlisting>
 {
   gchar **string_p = collect_values[0].v_pointer;
 
   if (!string_p)
     return g_strdup_printf ("string location passed as NULL");
 
-  if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
+  if (collect_flags &amp; G_VALUE_NOCOPY_CONTENTS)
     *string_p = value-&gt;data[0].v_pointer;
   else
     *string_p = g_strdup (value-&gt;data[0].v_pointer);
 
 }
-</programlisting></msgtext>
+</programlisting>
                        And an exemplary version of lcopy_value() for
                        reference-counted types:
-<msgtext><programlisting>
+<programlisting>
 {
   GObject **object_p = collect_values[0].v_pointer;
 
@@ -402,13 +402,13 @@ to serve as a container for values of a type.
     return g_strdup_printf ("object location passed as NULL");
   if (!value-&gt;data[0].v_pointer)
     *object_p = NULL;
-  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) /* always honour */
+  else if (collect_flags &amp; G_VALUE_NOCOPY_CONTENTS) /* always honour */
     *object_p = value-&gt;data[0].v_pointer;
   else
     *object_p = g_object_ref (value-&gt;data[0].v_pointer);
   return NULL;
 }
-</programlisting></msgtext>
+</programlisting>
 
 <!-- ##### MACRO G_TYPE_FROM_INSTANCE ##### -->
 <para>
@@ -676,9 +676,9 @@ a reference count on their parent classes as long as they are instantiated,
 the returned class will always exist. This function is essentially
 equivalent to:
 
-<msgtext><programlisting>
+<programlisting>
 g_type_class_peek (g_type_parent (G_TYPE_FROM_CLASS (g_class)));
-</programlisting></msgtext>
+</programlisting>
 
 </para>
 
@@ -832,7 +832,7 @@ is performed for class initialization of derived types as well.
 An example may help to correspond the intend of the different class
 initializers:
 
-<msgtext><programlisting>
+<programlisting>
 typedef struct {
   GObjectClass parent_class;
   gint         static_integer;
@@ -874,7 +874,7 @@ type_b_class_init (TypeBClass *class)
 {
   class->static_float = 3.14159265358979323846;
 }
-</programlisting></msgtext>
+</programlisting>
 Initialization of TypeBClass will first cause initialization of
 TypeAClass (derived classes reference their parent classes, see
 g_type_class_ref() on this).

diff --git a/docs/reference/gobject/tmpl/objects.sgml b/docs/reference/gobject/tmpl/objects.sgml
index 73e11c4..29ec9ad 100644 (file)
--- a/docs/reference/gobject/tmpl/objects.sgml
+++ b/docs/reference/gobject/tmpl/objects.sgml
@@ -440,7 +440,7 @@ without invoking it's destroy() function (if any was
 set).
 Usually, calling this function is only required to update
 user data pointers with a destroy notifier, for example:
-<msgtext><programlisting>
+<programlisting>
 void
 object_add_to_user_list (GObject     *object,
                          const gchar *new_string)
@@ -464,7 +464,7 @@ free_string_list (gpointer data)
     g_free (node->data);
   g_list_free (list);
 }
-</programlisting></msgtext>
+</programlisting>
 Using g_object_get_qdata() in the above example, instead of g_object_steal_qdata()
 would have left the destroy function set, and thus the partial string list would
 have been freed upon g_object_set_qdata_full().

diff --git a/docs/reference/gobject/tmpl/signals.sgml b/docs/reference/gobject/tmpl/signals.sgml
index 46fe5a2..408a8c2 100644 (file)
--- a/docs/reference/gobject/tmpl/signals.sgml
+++ b/docs/reference/gobject/tmpl/signals.sgml
@@ -180,11 +180,11 @@ filled in by the g_signal_query() function.
 @n_params:     The number of parameters that user callbacks take.
 @param_types:  The individual parameter types for user callbacks, note that the
                effective callback signature is:
-<msgtext><programlisting>
+<programlisting>
 @return_type callback (#gpointer     data1,
                       [#param_types param_names,]
                        #gpointer     data2);
-</programlisting></msgtext>
+</programlisting>
 
 <!-- ##### MACRO G_SIGNAL_TYPE_STATIC_SCOPE ##### -->
 <para>

diff --git a/docs/reference/gobject/tmpl/value_arrays.sgml b/docs/reference/gobject/tmpl/value_arrays.sgml
index a1d9f8d..b9e6219 100644 (file)
--- a/docs/reference/gobject/tmpl/value_arrays.sgml
+++ b/docs/reference/gobject/tmpl/value_arrays.sgml
@@ -88,7 +88,7 @@ Insert a copy of @value at specified position into @value_array.
 </para>
 
 @value_array: #GValueArray to add an element to
-@index:       insertion position, must be <= value_array->n_values
+@index:       insertion position, must be &lt;= value_array-&gt;n_values
 @value:       #GValue to copy into #GValueArray
 @Returns:     the #GValueArray passed in as @value_array
 
@@ -99,7 +99,7 @@ Remove the value at position @index from @value_array.
 </para>
 
 @value_array: #GValueArray to remove an element from
-@index:       position of value to remove, must be < value_array->n_values
+@index:       position of value to remove, must be &lt; value_array->n_values
 @Returns:     the #GValueArray passed in as @value_array
 
 

diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
index 2da05e7..d9e6489 100644 (file)
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -97,7 +97,7 @@ g_async_queue_ref_unlocked (GAsyncQueue *queue)
  * destroyed and the memory allocated will be freed. So you are not
  * allowed to use the @queue afterwards, as it might have disappeared.
  * The obvious asymmetry (it is not named
- * g_async_queue_unref_unlocked()) is because the queue can't be
+ * g_async_queue_unref_unlocked(<!-- -->)) is because the queue can't be
  * unlocked after unreffing it, as it might already have disappeared.
  **/
 void 
@@ -146,7 +146,7 @@ g_async_queue_unref (GAsyncQueue *queue)
  * @queue: a #GAsyncQueue.
  * 
  * Acquires the @queue's lock. After that you can only call the
- * <function>g_async_queue_*_unlocked()</function> function variants on that
+ * <function>g_async_queue_*_unlocked(<!-- -->)</function> function variants on that
  * @queue. Otherwise it will deadlock.
  **/
 void

diff --git a/glib/gdir.c b/glib/gdir.c
index 63b0f6e..1fa3644 100644 (file)
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -51,7 +51,7 @@ struct _GDir
  *
  * Opens a directory for reading. The names of the files
  * in the directory can then be retrieved using
- * g_dir_get_name().
+ * g_dir_read_name().
  *
  * Return value: a newly allocated #GDir on success, %NULL on failure.
  *   If non-%NULL, you must free the result with g_dir_close()

diff --git a/glib/gmain.c b/glib/gmain.c
index 663a901..3c7c9f2 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -695,7 +695,7 @@ g_main_context_default (void)
  * <literal>sizeof (GSource)</literal>.
  * 
  * The source will not initially be associated with any #GMainContext
- * and must be added to one with g_source_add() before it will be
+ * and must be added to one with g_source_attach() before it will be
  * executed.
  * 
  * Return value: the newly-created #GSource.
@@ -965,7 +965,7 @@ g_source_add_poll (GSource *source,
 /**
  * g_source_remove_poll:
  * @source:a #GSource 
- * @fd: a #GPollFD structure previously passed to g_source_poll().
+ * @fd: a #GPollFD structure previously passed to g_source_add_poll().
  * 
  * Removes a file descriptor from the set of file descriptors polled for
  * this source. 
@@ -1002,8 +1002,8 @@ g_source_remove_poll (GSource *source,
  *                  and getting the callback and data
  * 
  * Sets the callback function storing the data as a refcounted callback
- * "object". This is used to implement g_source_set_callback_closure()
- * and internally. Note that calling g_source_set_callback_indirect() assumes
+ * "object". This is used internally. Note that calling 
+ * g_source_set_callback_indirect() assumes
  * an initial reference count on @callback_data, and thus
  * @callback_funcs->unref will eventually be called once more
  * than @callback_funcs->ref.

diff --git a/glib/gstring.c b/glib/gstring.c
index 817140e..aab4f1f 100644 (file)
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -555,7 +555,7 @@ g_string_insert_c (GString *string,
 
 /**
  * g_string_insert_unichar:
- * @string: a #Gstring
+ * @string: a #GString
  * @pos: the position at which to insert character, or -1 to
  *       append at the end of the string.
  * @wc: a Unicode character

diff --git a/glib/gtree.c b/glib/gtree.c
index 2e0351f..91524d4 100644 (file)
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -271,7 +271,7 @@ g_tree_destroy (GTree *tree)
 
 /**
  * g_tree_insert:
- * @tree: a #Gtree.
+ * @tree: a #GTree.
  * @key: the key to insert.
  * @value: the value corresponding to the key.
  * 
@@ -302,7 +302,7 @@ g_tree_insert (GTree    *tree,
 
 /**
  * g_tree_replace:
- * @tree: a #Gtree.
+ * @tree: a #GTree.
  * @key: the key to insert.
  * @value: the value corresponding to the key.
  * 
@@ -334,7 +334,7 @@ g_tree_replace (GTree    *tree,
 
 /**
  * g_tree_remove:
- * @tree: a #Gtree.
+ * @tree: a #GTree.
  * @key: the key to remove.
  * 
  * Removes a key/value pair from a #GTree.
@@ -354,7 +354,7 @@ g_tree_remove (GTree         *tree,
 
 /**
  * g_tree_steal:
- * @tree: a #Gtree.
+ * @tree: a #GTree.
  * @key: the key to remove.
  * 
  * Removes a key and its associated value from a #GTree without calling 

diff --git a/glib/gwin32.c b/glib/gwin32.c
index 2f97785..16a645e 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -632,8 +632,8 @@ get_package_directory_from_module (gchar *module_name)
  * is the same identifier as used for
  * <literal>GETTEXT_PACKAGE</literal> in software configured according
  * to GNU standards. The function first looks in the Windows Registry
- * for the value <literal>#InstallationDirectory</literal> in the key
- * <literal>#HKLM\Software\@package</literal>, and if that value
+ * for the value <literal>&hash;InstallationDirectory</literal> in the key
+ * <literal>&hash;HKLM\Software\@package</literal>, and if that value
  * exists and is a string, returns that.
  *
  * If @package is %NULL, or the above value isn't found in the