--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-gconf.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-gconf.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2661550" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589861" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2661621" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2589932" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-gconf"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2661550"></a><span class="refentrytitle">gnome-gconf</span>
+<a name="id2589861"></a><span class="refentrytitle">gnome-gconf</span>
 </h2>
 <p>gnome-gconf &#8212; Provides access to the gconf module.</p>
 </td>
@@ -59,23 +59,15 @@
 #include &lt;libgnome/libgnome.h&gt;
 
 
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              <a class="link" href="libgnome-gnome-gconf.html#gnome-gconf-get-gnome-libs-settings-relative">gnome_gconf_get_gnome_libs_settings_relative</a>
-                                                        (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *subkey);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              <a class="link" href="libgnome-gnome-gconf.html#gnome-gconf-get-app-settings-relative">gnome_gconf_get_app_settings_relative</a>
+gchar*              <a class="link" href="libgnome-gnome-gconf.html#gnome-gconf-get-gnome-libs-settings-relative">gnome_gconf_get_gnome_libs_settings_relative</a>
+                                                        (const gchar *subkey);
+gchar*              <a class="link" href="libgnome-gnome-gconf.html#gnome-gconf-get-app-settings-relative">gnome_gconf_get_app_settings_relative</a>
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *subkey);
+                                                         const gchar *subkey);
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661621"></a><h2>Description</h2>
+<a name="id2589932"></a><h2>Description</h2>
 <p>
 The gconf module provides a means for storing configuration parameters in a
 directory-like structure. This module supplies a couple of convenience wrappers
@@ -83,16 +75,12 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661639"></a><h2>Details</h2>
+<a name="id2589950"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2661650"></a><h3>
+<a name="id2589960"></a><h3>
 <a name="gnome-gconf-get-gnome-libs-settings-relative"></a>gnome_gconf_get_gnome_libs_settings_relative ()</h3>
-<a class="indexterm" name="id2661663"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              gnome_gconf_get_gnome_libs_settings_relative
-                                                        (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *subkey);</pre>
+<a class="indexterm" name="id2589974"></a><pre class="programlisting">gchar*              gnome_gconf_get_gnome_libs_settings_relative
+                                                        (const gchar *subkey);</pre>
 <p>
 Gets the full key name for a GNOME desktop specific
 setting for a specific application. Those keys are used to store application-specific
@@ -119,15 +107,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2661730"></a><h3>
+<a name="id2590041"></a><h3>
 <a name="gnome-gconf-get-app-settings-relative"></a>gnome_gconf_get_app_settings_relative ()</h3>
-<a class="indexterm" name="id2661744"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              gnome_gconf_get_app_settings_relative
+<a class="indexterm" name="id2590055"></a><pre class="programlisting">gchar*              gnome_gconf_get_app_settings_relative
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *subkey);</pre>
+                                                         const gchar *subkey);</pre>
 <p>
 Gets the full key name for an application specific
 setting.  That is "/apps/&lt;application_id&gt;/<em class="parameter"><code>subkey</code></em>".</p>
@@ -139,9 +123,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> pointer or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for the default
+<td> <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> pointer or <code class="literal">NULL</code> for the default
 </td>
 </tr>
 <tr>
@@ -159,9 +141,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661857"></a><div class="refsect2" lang="en"><a name="id2661858"></a></div>
+<a name="id2590168"></a><div class="refsect2" lang="en"><a name="id2590169"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2661859"></a></div>
+<div class="refsect2" lang="en"><a name="id2590170"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix02.html
+++ libgnome-2.21.90/doc/reference/html/ix02.html
@@ -38,187 +38,187 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691894"></a>Index of deprecated symbols</h2></div></div></div>
+<a name="id2620206"></a>Index of deprecated symbols</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>G</h3>
 <dl>
-<dt>gnome_config_assemble_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680675">gnome_config_assemble_vector ()</a>
+<dt>gnome_config_assemble_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608986">gnome_config_assemble_vector ()</a>
 </dt>
-<dt>gnome_config_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682148">gnome_config_clean_file()</a>
+<dt>gnome_config_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610460">gnome_config_clean_file()</a>
 </dt>
-<dt>gnome_config_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2682495">gnome_config_clean_key()</a>
+<dt>gnome_config_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2610806">gnome_config_clean_key()</a>
 </dt>
-<dt>gnome_config_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2682324">gnome_config_clean_section()</a>
+<dt>gnome_config_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2610636">gnome_config_clean_section()</a>
 </dt>
-<dt>gnome_config_drop_all, <a class="indexterm" href="libgnome-gnome-config.html#id2681587">gnome_config_drop_all ()</a>
+<dt>gnome_config_drop_all, <a class="indexterm" href="libgnome-gnome-config.html#id2609898">gnome_config_drop_all ()</a>
 </dt>
-<dt>gnome_config_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681990">gnome_config_drop_file()</a>
+<dt>gnome_config_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610301">gnome_config_drop_file()</a>
 </dt>
-<dt>gnome_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670330">gnome_config_file()</a>
+<dt>gnome_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598642">gnome_config_file()</a>
 </dt>
-<dt>gnome_config_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679439">gnome_config_get_bool()</a>
+<dt>gnome_config_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2607751">gnome_config_get_bool()</a>
 </dt>
-<dt>gnome_config_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679516">gnome_config_get_bool_with_default()</a>
+<dt>gnome_config_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607828">gnome_config_get_bool_with_default()</a>
 </dt>
-<dt>gnome_config_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2678892">gnome_config_get_float()</a>
+<dt>gnome_config_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607204">gnome_config_get_float()</a>
 </dt>
-<dt>gnome_config_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678969">gnome_config_get_float_with_default()</a>
+<dt>gnome_config_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607281">gnome_config_get_float_with_default()</a>
 </dt>
-<dt>gnome_config_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678346">gnome_config_get_int()</a>
+<dt>gnome_config_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2606658">gnome_config_get_int()</a>
 </dt>
-<dt>gnome_config_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678423">gnome_config_get_int_with_default()</a>
+<dt>gnome_config_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606735">gnome_config_get_int_with_default()</a>
 </dt>
-<dt>gnome_config_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2682658">gnome_config_get_real_path()</a>
+<dt>gnome_config_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2610970">gnome_config_get_real_path()</a>
 </dt>
-<dt>gnome_config_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677151">gnome_config_get_string()</a>
+<dt>gnome_config_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605463">gnome_config_get_string()</a>
 </dt>
-<dt>gnome_config_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677240">gnome_config_get_string_with_default()</a>
+<dt>gnome_config_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605551">gnome_config_get_string_with_default()</a>
 </dt>
-<dt>gnome_config_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677352">gnome_config_get_translated_string()</a>
+<dt>gnome_config_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605663">gnome_config_get_translated_string()</a>
 </dt>
-<dt>gnome_config_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677442">gnome_config_get_translated_string_with_default()</a>
+<dt>gnome_config_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605754">gnome_config_get_translated_string_with_default()</a>
 </dt>
-<dt>gnome_config_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2679984">gnome_config_get_vector()</a>
+<dt>gnome_config_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608296">gnome_config_get_vector()</a>
 </dt>
-<dt>gnome_config_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2680091">gnome_config_get_vector_with_default()</a>
+<dt>gnome_config_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608402">gnome_config_get_vector_with_default()</a>
 </dt>
-<dt>gnome_config_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2680805">gnome_config_has_section()</a>
+<dt>gnome_config_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2609116">gnome_config_has_section()</a>
 </dt>
-<dt>gnome_config_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2681013">gnome_config_init_iterator()</a>
+<dt>gnome_config_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2609325">gnome_config_init_iterator()</a>
 </dt>
-<dt>gnome_config_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2681207">gnome_config_init_iterator_sections()</a>
+<dt>gnome_config_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2609518">gnome_config_init_iterator_sections()</a>
 </dt>
-<dt>gnome_config_iterator_next, <a class="indexterm" href="libgnome-gnome-config.html#id2681403">gnome_config_iterator_next ()</a>
+<dt>gnome_config_iterator_next, <a class="indexterm" href="libgnome-gnome-config.html#id2609715">gnome_config_iterator_next ()</a>
 </dt>
-<dt>gnome_config_make_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2682960">gnome_config_make_vector ()</a>
+<dt>gnome_config_make_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2611272">gnome_config_make_vector ()</a>
 </dt>
-<dt>gnome_config_pop_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2682906">gnome_config_pop_prefix ()</a>
+<dt>gnome_config_pop_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2611218">gnome_config_pop_prefix ()</a>
 </dt>
-<dt>gnome_config_private_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682235">gnome_config_private_clean_file()</a>
+<dt>gnome_config_private_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610547">gnome_config_private_clean_file()</a>
 </dt>
-<dt>gnome_config_private_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2682576">gnome_config_private_clean_key()</a>
+<dt>gnome_config_private_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2610887">gnome_config_private_clean_key()</a>
 </dt>
-<dt>gnome_config_private_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2682409">gnome_config_private_clean_section()</a>
+<dt>gnome_config_private_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2610720">gnome_config_private_clean_section()</a>
 </dt>
-<dt>gnome_config_private_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682074">gnome_config_private_drop_file()</a>
+<dt>gnome_config_private_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610386">gnome_config_private_drop_file()</a>
 </dt>
-<dt>gnome_config_private_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679615">gnome_config_private_get_bool()</a>
+<dt>gnome_config_private_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2607927">gnome_config_private_get_bool()</a>
 </dt>
-<dt>gnome_config_private_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679695">gnome_config_private_get_bool_with_default()</a>
+<dt>gnome_config_private_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608006">gnome_config_private_get_bool_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679069">gnome_config_private_get_float()</a>
+<dt>gnome_config_private_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607381">gnome_config_private_get_float()</a>
 </dt>
-<dt>gnome_config_private_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679149">gnome_config_private_get_float_with_default()</a>
+<dt>gnome_config_private_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607461">gnome_config_private_get_float_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678523">gnome_config_private_get_int()</a>
+<dt>gnome_config_private_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2606835">gnome_config_private_get_int()</a>
 </dt>
-<dt>gnome_config_private_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678603">gnome_config_private_get_int_with_default()</a>
+<dt>gnome_config_private_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606914">gnome_config_private_get_int_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2682733">gnome_config_private_get_real_path()</a>
+<dt>gnome_config_private_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2611045">gnome_config_private_get_real_path()</a>
 </dt>
-<dt>gnome_config_private_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677556">gnome_config_private_get_string()</a>
+<dt>gnome_config_private_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605867">gnome_config_private_get_string()</a>
 </dt>
-<dt>gnome_config_private_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677646">gnome_config_private_get_string_with_default()</a>
+<dt>gnome_config_private_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605958">gnome_config_private_get_string_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677760">gnome_config_private_get_translated_string()</a>
+<dt>gnome_config_private_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606071">gnome_config_private_get_translated_string()</a>
 </dt>
-<dt>gnome_config_private_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677853">gnome_config_private_get_translated_string_with_default()</a>
+<dt>gnome_config_private_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606164">gnome_config_private_get_translated_string_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680214">gnome_config_private_get_vector()</a>
+<dt>gnome_config_private_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608525">gnome_config_private_get_vector()</a>
 </dt>
-<dt>gnome_config_private_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2680323">gnome_config_private_get_vector_with_default()</a>
+<dt>gnome_config_private_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608634">gnome_config_private_get_vector_with_default()</a>
 </dt>
-<dt>gnome_config_private_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2680908">gnome_config_private_has_section()</a>
+<dt>gnome_config_private_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2609220">gnome_config_private_has_section()</a>
 </dt>
-<dt>gnome_config_private_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2681110">gnome_config_private_init_iterator()</a>
+<dt>gnome_config_private_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2609421">gnome_config_private_init_iterator()</a>
 </dt>
-<dt>gnome_config_private_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2681304">gnome_config_private_init_iterator_sections()</a>
+<dt>gnome_config_private_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2609616">gnome_config_private_init_iterator_sections()</a>
 </dt>
-<dt>gnome_config_private_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679890">gnome_config_private_set_bool()</a>
+<dt>gnome_config_private_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2608201">gnome_config_private_set_bool()</a>
 </dt>
-<dt>gnome_config_private_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679344">gnome_config_private_set_float()</a>
+<dt>gnome_config_private_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607656">gnome_config_private_set_float()</a>
 </dt>
-<dt>gnome_config_private_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678797">gnome_config_private_set_int()</a>
+<dt>gnome_config_private_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2607109">gnome_config_private_set_int()</a>
 </dt>
-<dt>gnome_config_private_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678155">gnome_config_private_set_string()</a>
+<dt>gnome_config_private_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606467">gnome_config_private_set_string()</a>
 </dt>
-<dt>gnome_config_private_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678250">gnome_config_private_set_translated_string()</a>
+<dt>gnome_config_private_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606561">gnome_config_private_set_translated_string()</a>
 </dt>
-<dt>gnome_config_private_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680561">gnome_config_private_set_vector()</a>
+<dt>gnome_config_private_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608872">gnome_config_private_set_vector()</a>
 </dt>
-<dt>gnome_config_private_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681863">gnome_config_private_sync_file()</a>
+<dt>gnome_config_private_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610175">gnome_config_private_sync_file()</a>
 </dt>
-<dt>gnome_config_push_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2682810">gnome_config_push_prefix ()</a>
+<dt>gnome_config_push_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2611122">gnome_config_push_prefix ()</a>
 </dt>
-<dt>gnome_config_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679797">gnome_config_set_bool()</a>
+<dt>gnome_config_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2608108">gnome_config_set_bool()</a>
 </dt>
-<dt>gnome_config_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679251">gnome_config_set_float()</a>
+<dt>gnome_config_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607563">gnome_config_set_float()</a>
 </dt>
-<dt>gnome_config_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678705">gnome_config_set_int()</a>
+<dt>gnome_config_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2607016">gnome_config_set_int()</a>
 </dt>
-<dt>gnome_config_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677968">gnome_config_set_string()</a>
+<dt>gnome_config_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606280">gnome_config_set_string()</a>
 </dt>
-<dt>gnome_config_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678061">gnome_config_set_translated_string()</a>
+<dt>gnome_config_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606372">gnome_config_set_translated_string()</a>
 </dt>
-<dt>gnome_config_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680448">gnome_config_set_vector()</a>
+<dt>gnome_config_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608760">gnome_config_set_vector()</a>
 </dt>
-<dt>gnome_config_sync, <a class="indexterm" href="libgnome-gnome-config.html#id2681642">gnome_config_sync ()</a>
+<dt>gnome_config_sync, <a class="indexterm" href="libgnome-gnome-config.html#id2609954">gnome_config_sync ()</a>
 </dt>
-<dt>gnome_config_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681737">gnome_config_sync_file()</a>
+<dt>gnome_config_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610048">gnome_config_sync_file()</a>
 </dt>
-<dt>gnome_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670059">gnome_datadir_file()</a>
+<dt>gnome_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598370">gnome_datadir_file()</a>
 </dt>
-<dt>gnome_i18n_get_language_list, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690287">gnome_i18n_get_language_list ()</a>
+<dt>gnome_i18n_get_language_list, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618599">gnome_i18n_get_language_list ()</a>
 </dt>
-<dt>gnome_i18n_pop_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690494">gnome_i18n_pop_c_numeric_locale ()</a>
+<dt>gnome_i18n_pop_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618806">gnome_i18n_pop_c_numeric_locale ()</a>
 </dt>
-<dt>gnome_i18n_push_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690412">gnome_i18n_push_c_numeric_locale ()</a>
+<dt>gnome_i18n_push_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618724">gnome_i18n_push_c_numeric_locale ()</a>
 </dt>
-<dt>gnome_is_program_in_path, <a class="indexterm" href="libgnome-gnome-util.html#id2668730">gnome_is_program_in_path()</a>
+<dt>gnome_is_program_in_path, <a class="indexterm" href="libgnome-gnome-util.html#id2597041">gnome_is_program_in_path()</a>
 </dt>
-<dt>gnome_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2669969">gnome_libdir_file()</a>
+<dt>gnome_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598280">gnome_libdir_file()</a>
 </dt>
-<dt>GNOME_PARAM_POPT_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2651306">GNOME_PARAM_POPT_CONTEXT</a>
+<dt>GNOME_PARAM_POPT_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2579613">GNOME_PARAM_POPT_CONTEXT</a>
 </dt>
-<dt>GNOME_PARAM_POPT_FLAGS, <a class="indexterm" href="libgnome-gnome-program.html#id2651264">GNOME_PARAM_POPT_FLAGS</a>
+<dt>GNOME_PARAM_POPT_FLAGS, <a class="indexterm" href="libgnome-gnome-program.html#id2579572">GNOME_PARAM_POPT_FLAGS</a>
 </dt>
-<dt>GNOME_PARAM_POPT_TABLE, <a class="indexterm" href="libgnome-gnome-program.html#id2651207">GNOME_PARAM_POPT_TABLE</a>
+<dt>GNOME_PARAM_POPT_TABLE, <a class="indexterm" href="libgnome-gnome-program.html#id2579514">GNOME_PARAM_POPT_TABLE</a>
 </dt>
-<dt>gnome_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670240">gnome_pixmap_file()</a>
+<dt>gnome_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598551">gnome_pixmap_file()</a>
 </dt>
-<dt>gnome_program_parse_args, <a class="indexterm" href="libgnome-gnome-program.html#id2651041">gnome_program_parse_args ()</a>
+<dt>gnome_program_parse_args, <a class="indexterm" href="libgnome-gnome-program.html#id2579348">gnome_program_parse_args ()</a>
 </dt>
-<dt>gnome_program_postinit, <a class="indexterm" href="libgnome-gnome-program.html#id2651120">gnome_program_postinit ()</a>
+<dt>gnome_program_postinit, <a class="indexterm" href="libgnome-gnome-program.html#id2579427">gnome_program_postinit ()</a>
 </dt>
-<dt>gnome_program_preinit, <a class="indexterm" href="libgnome-gnome-program.html#id2650854">gnome_program_preinit ()</a>
+<dt>gnome_program_preinit, <a class="indexterm" href="libgnome-gnome-program.html#id2579161">gnome_program_preinit ()</a>
 </dt>
-<dt>gnome_score_get_notable, <a class="indexterm" href="libgnome-gnome-score.html#id2691536">gnome_score_get_notable ()</a>
+<dt>gnome_score_get_notable, <a class="indexterm" href="libgnome-gnome-score.html#id2619848">gnome_score_get_notable ()</a>
 </dt>
-<dt>gnome_score_init, <a class="indexterm" href="libgnome-gnome-score.html#id2691256">gnome_score_init ()</a>
+<dt>gnome_score_init, <a class="indexterm" href="libgnome-gnome-score.html#id2619568">gnome_score_init ()</a>
 </dt>
-<dt>gnome_score_log, <a class="indexterm" href="libgnome-gnome-score.html#id2691378">gnome_score_log ()</a>
+<dt>gnome_score_log, <a class="indexterm" href="libgnome-gnome-score.html#id2619690">gnome_score_log ()</a>
 </dt>
-<dt>gnome_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670149">gnome_sound_file()</a>
+<dt>gnome_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598460">gnome_sound_file()</a>
 </dt>
-<dt>gnome_unconditional_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670788">gnome_unconditional_config_file()</a>
+<dt>gnome_unconditional_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2599099">gnome_unconditional_config_file()</a>
 </dt>
-<dt>gnome_unconditional_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670512">gnome_unconditional_datadir_file()</a>
+<dt>gnome_unconditional_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598824">gnome_unconditional_datadir_file()</a>
 </dt>
-<dt>gnome_unconditional_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670420">gnome_unconditional_libdir_file()</a>
+<dt>gnome_unconditional_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598732">gnome_unconditional_libdir_file()</a>
 </dt>
-<dt>gnome_unconditional_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670696">gnome_unconditional_pixmap_file()</a>
+<dt>gnome_unconditional_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2599007">gnome_unconditional_pixmap_file()</a>
 </dt>
-<dt>gnome_unconditional_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670604">gnome_unconditional_sound_file()</a>
+<dt>gnome_unconditional_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598915">gnome_unconditional_sound_file()</a>
 </dt>
-<dt>gnome_util_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2669793">gnome_util_user_home()</a>
+<dt>gnome_util_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2598104">gnome_util_user_home()</a>
 </dt>
-<dt>g_concat_dir_and_file, <a class="indexterm" href="libgnome-gnome-util.html#id2669460">g_concat_dir_and_file()</a>
+<dt>g_concat_dir_and_file, <a class="indexterm" href="libgnome-gnome-util.html#id2597771">g_concat_dir_and_file()</a>
 </dt>
-<dt>g_copy_vector, <a class="indexterm" href="libgnome-gnome-util.html#id2669864">g_copy_vector()</a>
+<dt>g_copy_vector, <a class="indexterm" href="libgnome-gnome-util.html#id2598175">g_copy_vector()</a>
 </dt>
-<dt>g_file_exists, <a class="indexterm" href="libgnome-gnome-util.html#id2669572">g_file_exists()</a>
+<dt>g_file_exists, <a class="indexterm" href="libgnome-gnome-util.html#id2597883">g_file_exists()</a>
 </dt>
-<dt>g_unix_error_string, <a class="indexterm" href="libgnome-gnome-util.html#id2669678">g_unix_error_string()</a>
+<dt>g_unix_error_string, <a class="indexterm" href="libgnome-gnome-util.html#id2597989">g_unix_error_string()</a>
 </dt>
 </dl>
 </div></div>
--- libgnome-2.21.90.orig/doc/reference/html/ix03.html
+++ libgnome-2.21.90/doc/reference/html/ix03.html
@@ -38,17 +38,17 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691904"></a>Index of new symbols in 2.2</h2></div></div></div>
+<a name="id2620216"></a>Index of new symbols in 2.2</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>G</h3>
 <dl>
-<dt>gnome_help_display_desktop_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2663931">gnome_help_display_desktop_with_env ()</a>
+<dt>gnome_help_display_desktop_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2592242">gnome_help_display_desktop_with_env ()</a>
 </dt>
-<dt>gnome_help_display_uri_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2664395">gnome_help_display_uri_with_env ()</a>
+<dt>gnome_help_display_uri_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2592706">gnome_help_display_uri_with_env ()</a>
 </dt>
-<dt>gnome_help_display_with_doc_id_and_env, <a class="indexterm" href="libgnome-gnome-help.html#id2663316">gnome_help_display_with_doc_id_and_env ()</a>
+<dt>gnome_help_display_with_doc_id_and_env, <a class="indexterm" href="libgnome-gnome-help.html#id2591627">gnome_help_display_with_doc_id_and_env ()</a>
 </dt>
-<dt>gnome_url_show_with_env, <a class="indexterm" href="libgnome-gnome-url.html#id2667420">gnome_url_show_with_env ()</a>
+<dt>gnome_url_show_with_env, <a class="indexterm" href="libgnome-gnome-url.html#id2595731">gnome_url_show_with_env ()</a>
 </dt>
 </dl>
 </div></div>
--- libgnome-2.21.90.orig/doc/reference/html/ch01.html
+++ libgnome-2.21.90/doc/reference/html/ch01.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2598141"></a>Initializing Applications and Starting Programs</h2></div></div></div>
+<a name="id2566731"></a>Initializing Applications and Starting Programs</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libgnome-gnome-program.html">gnome-program</a></span><span class="refpurpose"> &#8212; Initialize and retrieve information about a GNOME application.</span>
--- libgnome-2.21.90.orig/doc/reference/html/ch05.html
+++ libgnome-2.21.90/doc/reference/html/ch05.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2674406"></a>Lower Level Interactions</h2></div></div></div>
+<a name="id2602718"></a>Lower Level Interactions</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libgnome-libgnometypebuiltins.html">libgnometypebuiltins</a></span><span class="refpurpose"> &#8212; Some type macros defined by libgnome.</span>
 </dt></dl></div>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome.devhelp2
+++ libgnome-2.21.90/doc/reference/html/libgnome.devhelp2
@@ -83,16 +83,16 @@
     <keyword type="macro" name="GNOME_PARAM_GNOME_PATH" link="libgnome-gnome-program.html#GNOME-PARAM-GNOME-PATH:CAPS"/>
     <keyword type="macro" name="GNOME_PARAM_NONE" link="libgnome-gnome-program.html#GNOME-PARAM-NONE:CAPS"/>
     <keyword type="macro" name="GNOME_PROGRAM_STANDARD_PROPERTIES" link="libgnome-gnome-program.html#GNOME-PROGRAM-STANDARD-PROPERTIES:CAPS"/>
-    <keyword type="" name="" link="libgnome-gnome-program.html#id2651949"/>
-    <keyword type="" name="" link="libgnome-gnome-program.html#id2651950"/>
+    <keyword type="" name="" link="libgnome-gnome-program.html#id2580256"/>
+    <keyword type="" name="" link="libgnome-gnome-program.html#id2580257"/>
     <keyword type="macro" name="LIBGNOME_MODULE" link="libgnome-gnome-init.html#LIBGNOME-MODULE:CAPS"/>
     <keyword type="function" name="libgnome_module_info_get ()" link="libgnome-gnome-init.html#libgnome-module-info-get"/>
     <keyword type="function" name="gnome_bonobo_module_info_get ()" link="libgnome-gnome-init.html#gnome-bonobo-module-info-get"/>
     <keyword type="function" name="gnome_user_dir_get ()" link="libgnome-gnome-init.html#gnome-user-dir-get"/>
     <keyword type="function" name="gnome_user_private_dir_get ()" link="libgnome-gnome-init.html#gnome-user-private-dir-get"/>
     <keyword type="function" name="gnome_user_accels_dir_get ()" link="libgnome-gnome-init.html#gnome-user-accels-dir-get"/>
-    <keyword type="" name="" link="libgnome-gnome-init.html#id2657168"/>
-    <keyword type="" name="" link="libgnome-gnome-init.html#id2657169"/>
+    <keyword type="" name="" link="libgnome-gnome-init.html#id2585478"/>
+    <keyword type="" name="" link="libgnome-gnome-init.html#id2585479"/>
     <keyword type="function" name="gnome_execute_async ()" link="libgnome-gnome-exec.html#gnome-execute-async"/>
     <keyword type="function" name="gnome_execute_async_fds ()" link="libgnome-gnome-exec.html#gnome-execute-async-fds"/>
     <keyword type="function" name="gnome_execute_async_with_env ()" link="libgnome-gnome-exec.html#gnome-execute-async-with-env"/>
@@ -102,12 +102,12 @@
     <keyword type="function" name="gnome_prepend_terminal_to_vector ()" link="libgnome-gnome-exec.html#gnome-prepend-terminal-to-vector"/>
     <keyword type="function" name="gnome_execute_terminal_shell ()" link="libgnome-gnome-exec.html#gnome-execute-terminal-shell"/>
     <keyword type="function" name="gnome_execute_terminal_shell_fds ()" link="libgnome-gnome-exec.html#gnome-execute-terminal-shell-fds"/>
-    <keyword type="" name="" link="libgnome-gnome-exec.html#id2659633"/>
-    <keyword type="" name="" link="libgnome-gnome-exec.html#id2659634"/>
+    <keyword type="" name="" link="libgnome-gnome-exec.html#id2587944"/>
+    <keyword type="" name="" link="libgnome-gnome-exec.html#id2587945"/>
     <keyword type="function" name="gnome_gconf_get_gnome_libs_settings_relative ()" link="libgnome-gnome-gconf.html#gnome-gconf-get-gnome-libs-settings-relative"/>
     <keyword type="function" name="gnome_gconf_get_app_settings_relative ()" link="libgnome-gnome-gconf.html#gnome-gconf-get-app-settings-relative"/>
-    <keyword type="" name="" link="libgnome-gnome-gconf.html#id2661858"/>
-    <keyword type="" name="" link="libgnome-gnome-gconf.html#id2661859"/>
+    <keyword type="" name="" link="libgnome-gnome-gconf.html#id2590169"/>
+    <keyword type="" name="" link="libgnome-gnome-gconf.html#id2590170"/>
     <keyword type="enum" name="enum GnomeHelpError" link="libgnome-gnome-help.html#GnomeHelpError"/>
     <keyword type="macro" name="GNOME_HELP_ERROR" link="libgnome-gnome-help.html#GNOME-HELP-ERROR:CAPS"/>
     <keyword type="function" name="gnome_help_display ()" link="libgnome-gnome-help.html#gnome-help-display"/>
@@ -117,14 +117,14 @@
     <keyword type="function" name="gnome_help_display_desktop_with_env ()" link="libgnome-gnome-help.html#gnome-help-display-desktop-with-env" since="2.2"/>
     <keyword type="function" name="gnome_help_display_uri ()" link="libgnome-gnome-help.html#gnome-help-display-uri"/>
     <keyword type="function" name="gnome_help_display_uri_with_env ()" link="libgnome-gnome-help.html#gnome-help-display-uri-with-env" since="2.2"/>
-    <keyword type="" name="" link="libgnome-gnome-help.html#id2664599"/>
-    <keyword type="" name="" link="libgnome-gnome-help.html#id2664600"/>
+    <keyword type="" name="" link="libgnome-gnome-help.html#id2592910"/>
+    <keyword type="" name="" link="libgnome-gnome-help.html#id2592911"/>
     <keyword type="enum" name="enum GnomeURLError" link="libgnome-gnome-url.html#GnomeURLError"/>
     <keyword type="macro" name="GNOME_URL_ERROR" link="libgnome-gnome-url.html#GNOME-URL-ERROR:CAPS"/>
     <keyword type="function" name="gnome_url_show ()" link="libgnome-gnome-url.html#gnome-url-show"/>
     <keyword type="function" name="gnome_url_show_with_env ()" link="libgnome-gnome-url.html#gnome-url-show-with-env" since="2.2"/>
-    <keyword type="" name="" link="libgnome-gnome-url.html#id2667604"/>
-    <keyword type="" name="" link="libgnome-gnome-url.html#id2667605"/>
+    <keyword type="" name="" link="libgnome-gnome-url.html#id2595915"/>
+    <keyword type="" name="" link="libgnome-gnome-url.html#id2595916"/>
     <keyword type="macro" name="gnome_is_program_in_path()" link="libgnome-gnome-util.html#gnome-is-program-in-path" deprecated=""/>
     <keyword type="function" name="g_extension_pointer ()" link="libgnome-gnome-util.html#g-extension-pointer"/>
     <keyword type="macro" name="gnome_util_prepend_user_home()" link="libgnome-gnome-util.html#gnome-util-prepend-user-home"/>
@@ -148,25 +148,25 @@
     <keyword type="macro" name="gnome_unconditional_sound_file()" link="libgnome-gnome-util.html#gnome-unconditional-sound-file" deprecated=""/>
     <keyword type="macro" name="gnome_unconditional_pixmap_file()" link="libgnome-gnome-util.html#gnome-unconditional-pixmap-file" deprecated=""/>
     <keyword type="macro" name="gnome_unconditional_config_file()" link="libgnome-gnome-util.html#gnome-unconditional-config-file" deprecated=""/>
-    <keyword type="" name="" link="libgnome-gnome-util.html#id2670882"/>
-    <keyword type="" name="" link="libgnome-gnome-util.html#id2670883"/>
+    <keyword type="" name="" link="libgnome-gnome-util.html#id2599194"/>
+    <keyword type="" name="" link="libgnome-gnome-util.html#id2599195"/>
     <keyword type="function" name="gnome_sound_init ()" link="libgnome-gnome-sound.html#gnome-sound-init"/>
     <keyword type="function" name="gnome_sound_shutdown ()" link="libgnome-gnome-sound.html#gnome-sound-shutdown"/>
     <keyword type="function" name="gnome_sound_play ()" link="libgnome-gnome-sound.html#gnome-sound-play"/>
     <keyword type="function" name="gnome_sound_sample_load ()" link="libgnome-gnome-sound.html#gnome-sound-sample-load"/>
     <keyword type="function" name="gnome_sound_connection_get ()" link="libgnome-gnome-sound.html#gnome-sound-connection-get"/>
-    <keyword type="" name="" link="libgnome-gnome-sound.html#id2673945"/>
-    <keyword type="" name="" link="libgnome-gnome-sound.html#id2673946"/>
+    <keyword type="" name="" link="libgnome-gnome-sound.html#id2602256"/>
+    <keyword type="" name="" link="libgnome-gnome-sound.html#id2602257"/>
     <keyword type="enum" name="enum GnomeTriggerType" link="libgnome-gnome-triggers.html#GnomeTriggerType"/>
     <keyword type="function" name="GnomeTriggerActionFunction ()" link="libgnome-gnome-triggers.html#GnomeTriggerActionFunction"/>
-    <keyword type="" name="" link="libgnome-gnome-triggers.html#id2674983"/>
-    <keyword type="" name="" link="libgnome-gnome-triggers.html#id2674984"/>
+    <keyword type="" name="" link="libgnome-gnome-triggers.html#id2603294"/>
+    <keyword type="" name="" link="libgnome-gnome-triggers.html#id2603296"/>
     <keyword type="macro" name="GNOME_TYPE_TRIGGER_TYPE" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-TRIGGER-TYPE:CAPS"/>
     <keyword type="macro" name="GNOME_TYPE_FILE_DOMAIN" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-FILE-DOMAIN:CAPS"/>
     <keyword type="macro" name="GNOME_TYPE_HELP_ERROR" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-HELP-ERROR:CAPS"/>
     <keyword type="macro" name="GNOME_TYPE_URL_ERROR" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-URL-ERROR:CAPS"/>
-    <keyword type="" name="" link="libgnome-libgnometypebuiltins.html#id2675727"/>
-    <keyword type="" name="" link="libgnome-libgnometypebuiltins.html#id2675728"/>
+    <keyword type="" name="" link="libgnome-libgnometypebuiltins.html#id2604038"/>
+    <keyword type="" name="" link="libgnome-libgnometypebuiltins.html#id2604039"/>
     <keyword type="macro" name="gnome_config_get_string()" link="libgnome-gnome-config.html#gnome-config-get-string" deprecated=""/>
     <keyword type="macro" name="gnome_config_get_string_with_default()" link="libgnome-gnome-config.html#gnome-config-get-string-with-default" deprecated=""/>
     <keyword type="macro" name="gnome_config_get_translated_string()" link="libgnome-gnome-config.html#gnome-config-get-translated-string" deprecated=""/>
@@ -228,17 +228,17 @@
     <keyword type="function" name="gnome_config_push_prefix ()" link="libgnome-gnome-config.html#gnome-config-push-prefix" deprecated=""/>
     <keyword type="function" name="gnome_config_pop_prefix ()" link="libgnome-gnome-config.html#gnome-config-pop-prefix" deprecated=""/>
     <keyword type="function" name="gnome_config_make_vector ()" link="libgnome-gnome-config.html#gnome-config-make-vector" deprecated=""/>
-    <keyword type="" name="" link="libgnome-gnome-config.html#id2683099"/>
-    <keyword type="" name="" link="libgnome-gnome-config.html#id2683100"/>
+    <keyword type="" name="" link="libgnome-gnome-config.html#id2611410"/>
+    <keyword type="" name="" link="libgnome-gnome-config.html#id2611411"/>
     <keyword type="function" name="gnome_i18n_get_language_list ()" link="libgnome-gnome-i18n.html#gnome-i18n-get-language-list" deprecated=""/>
     <keyword type="function" name="gnome_i18n_push_c_numeric_locale ()" link="libgnome-gnome-i18n.html#gnome-i18n-push-c-numeric-locale" deprecated=""/>
     <keyword type="function" name="gnome_i18n_pop_c_numeric_locale ()" link="libgnome-gnome-i18n.html#gnome-i18n-pop-c-numeric-locale" deprecated=""/>
-    <keyword type="" name="" link="libgnome-gnome-i18n.html#id2690566"/>
-    <keyword type="" name="" link="libgnome-gnome-i18n.html#id2690567"/>
+    <keyword type="" name="" link="libgnome-gnome-i18n.html#id2618878"/>
+    <keyword type="" name="" link="libgnome-gnome-i18n.html#id2618879"/>
     <keyword type="function" name="gnome_score_init ()" link="libgnome-gnome-score.html#gnome-score-init" deprecated=""/>
     <keyword type="function" name="gnome_score_log ()" link="libgnome-gnome-score.html#gnome-score-log" deprecated=""/>
     <keyword type="function" name="gnome_score_get_notable ()" link="libgnome-gnome-score.html#gnome-score-get-notable" deprecated=""/>
-    <keyword type="" name="" link="libgnome-gnome-score.html#id2691759"/>
-    <keyword type="" name="" link="libgnome-gnome-score.html#id2691760"/>
+    <keyword type="" name="" link="libgnome-gnome-score.html#id2620071"/>
+    <keyword type="" name="" link="libgnome-gnome-score.html#id2620072"/>
   </functions>
 </book>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-exec.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-exec.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ch02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2656458" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2584768" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2658122" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2586433" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-exec"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2656458"></a><span class="refentrytitle">gnome-exec</span>
+<a name="id2584768"></a><span class="refentrytitle">gnome-exec</span>
 </h2>
 <p>gnome-exec &#8212; Execution of programs from within GNOME applications.</p>
 </td>
@@ -65,9 +65,7 @@
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-fds">gnome_execute_async_fds</a>             (const char *dir,
                                                          int argc,
                                                          char * const argv[],
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);
+                                                         gboolean close_fds);
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-with-env">gnome_execute_async_with_env</a>        (const char *dir,
                                                          int argc,
                                                          char * const argv[],
@@ -78,29 +76,23 @@
                                                          char * const argv[],
                                                          int envc,
                                                          char * const envv[],
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);
+                                                         gboolean close_fds);
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-shell">gnome_execute_shell</a>                 (const char *dir,
                                                          const char *commandline);
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-shell-fds">gnome_execute_shell_fds</a>             (const char *dir,
                                                          const char *commandline,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);
+                                                         gboolean close_fds);
 void                <a class="link" href="libgnome-gnome-exec.html#gnome-prepend-terminal-to-vector">gnome_prepend_terminal_to_vector</a>    (int *argc,
                                                          char ***argv);
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-terminal-shell">gnome_execute_terminal_shell</a>        (const char *dir,
                                                          const char *commandline);
 int                 <a class="link" href="libgnome-gnome-exec.html#gnome-execute-terminal-shell-fds">gnome_execute_terminal_shell_fds</a>    (const char *dir,
                                                          const char *commandline,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);
+                                                         gboolean close_fds);
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2658122"></a><h2>Description</h2>
+<a name="id2586433"></a><h2>Description</h2>
 <p>
 The gnome-execute family of functions are provided to simplify execution of
 programs from withing GNOME applications.  These routines are required to avoid
@@ -113,11 +105,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2658147"></a><h2>Details</h2>
+<a name="id2586457"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2658157"></a><h3>
+<a name="id2586467"></a><h3>
 <a name="gnome-execute-async"></a>gnome_execute_async ()</h3>
-<a class="indexterm" name="id2658170"></a><pre class="programlisting">int                 gnome_execute_async                 (const char *dir,
+<a class="indexterm" name="id2586481"></a><pre class="programlisting">int                 gnome_execute_async                 (const char *dir,
                                                          int argc,
                                                          char * const argv[]);</pre>
 <p>
@@ -131,9 +123,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executesd, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executesd, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -157,14 +147,12 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2658307"></a><h3>
+<a name="id2586618"></a><h3>
 <a name="gnome-execute-async-fds"></a>gnome_execute_async_fds ()</h3>
-<a class="indexterm" name="id2658320"></a><pre class="programlisting">int                 gnome_execute_async_fds             (const char *dir,
+<a class="indexterm" name="id2586631"></a><pre class="programlisting">int                 gnome_execute_async_fds             (const char *dir,
                                                          int argc,
                                                          char * const argv[],
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);</pre>
+                                                         gboolean close_fds);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-with-env-fds"><code class="function">gnome_execute_async_with_env_fds()</code></a>, but doesn't add
 anything to child's environment.</p>
@@ -176,9 +164,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executed, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executed, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -194,9 +180,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>close_fds</code></em>&#160;:</span></p></td>
-<td> If <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a>, will close all but file descriptors 0, 1 and 2.
+<td> If <code class="literal">TRUE</code>, will close all but file descriptors 0, 1 and 2.
 </td>
 </tr>
 <tr>
@@ -209,9 +193,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2658490"></a><h3>
+<a name="id2586800"></a><h3>
 <a name="gnome-execute-async-with-env"></a>gnome_execute_async_with_env ()</h3>
-<a class="indexterm" name="id2658503"></a><pre class="programlisting">int                 gnome_execute_async_with_env        (const char *dir,
+<a class="indexterm" name="id2586813"></a><pre class="programlisting">int                 gnome_execute_async_with_env        (const char *dir,
                                                          int argc,
                                                          char * const argv[],
                                                          int envc,
@@ -264,16 +248,14 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2658692"></a><h3>
+<a name="id2587002"></a><h3>
 <a name="gnome-execute-async-with-env-fds"></a>gnome_execute_async_with_env_fds ()</h3>
-<a class="indexterm" name="id2658706"></a><pre class="programlisting">int                 gnome_execute_async_with_env_fds    (const char *dir,
+<a class="indexterm" name="id2587016"></a><pre class="programlisting">int                 gnome_execute_async_with_env_fds    (const char *dir,
                                                          int argc,
                                                          char * const argv[],
                                                          int envc,
                                                          char * const envv[],
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);</pre>
+                                                         gboolean close_fds);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-with-env"><code class="function">gnome_execute_async_with_env()</code></a> but has a flag to
 decide whether or not to close fd's</p>
@@ -285,9 +267,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executed, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executed, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -313,9 +293,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>close_fds</code></em>&#160;:</span></p></td>
-<td> If <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> will close all fds but 0,1, and 2
+<td> If <code class="literal">TRUE</code> will close all fds but 0,1, and 2
 </td>
 </tr>
 <tr>
@@ -328,9 +306,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2658919"></a><h3>
+<a name="id2587229"></a><h3>
 <a name="gnome-execute-shell"></a>gnome_execute_shell ()</h3>
-<a class="indexterm" name="id2658932"></a><pre class="programlisting">int                 gnome_execute_shell                 (const char *dir,
+<a class="indexterm" name="id2587242"></a><pre class="programlisting">int                 gnome_execute_shell                 (const char *dir,
                                                          const char *commandline);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-with-env"><code class="function">gnome_execute_async_with_env()</code></a>, but uses the user's shell
@@ -344,9 +322,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executed, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executed, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -365,13 +341,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2659049"></a><h3>
+<a name="id2587359"></a><h3>
 <a name="gnome-execute-shell-fds"></a>gnome_execute_shell_fds ()</h3>
-<a class="indexterm" name="id2659061"></a><pre class="programlisting">int                 gnome_execute_shell_fds             (const char *dir,
+<a class="indexterm" name="id2587372"></a><pre class="programlisting">int                 gnome_execute_shell_fds             (const char *dir,
                                                          const char *commandline,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);</pre>
+                                                         gboolean close_fds);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async-with-env-fds"><code class="function">gnome_execute_async_with_env_fds()</code></a>, but uses the user's
 shell to run the desired program.  Note that the pid of the shell is
@@ -384,9 +358,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executed, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executed, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -410,19 +382,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2659212"></a><h3>
+<a name="id2587522"></a><h3>
 <a name="gnome-prepend-terminal-to-vector"></a>gnome_prepend_terminal_to_vector ()</h3>
-<a class="indexterm" name="id2659225"></a><pre class="programlisting">void                gnome_prepend_terminal_to_vector    (int *argc,
+<a class="indexterm" name="id2587535"></a><pre class="programlisting">void                gnome_prepend_terminal_to_vector    (int *argc,
                                                          char ***argv);</pre>
 <p>
 Prepends a terminal (either the one configured as default in
 the user's GNOME setup, or one of the common xterm emulators) to the passed
 in vector, modifying it in the process.  The vector should be allocated with
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-malloc"
-><span class="type">g_malloc</span></a>, as this will <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><span class="type">g_free</span></a> the original vector.  Also all elements must
+<span class="type">g_malloc</span>, as this will <span class="type">g_free</span> the original vector.  Also all elements must
 have been allocated separately.  That is the standard glib/GNOME way of
 doing vectors however.  If the integer that <em class="parameter"><code>argc</code></em> points to is negative, the
 size will first be computed.  Also note that passing in pointers to a vector
@@ -448,17 +416,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2659329"></a><h3>
+<a name="id2587640"></a><h3>
 <a name="gnome-execute-terminal-shell"></a>gnome_execute_terminal_shell ()</h3>
-<a class="indexterm" name="id2659342"></a><pre class="programlisting">int                 gnome_execute_terminal_shell        (const char *dir,
+<a class="indexterm" name="id2587653"></a><pre class="programlisting">int                 gnome_execute_terminal_shell        (const char *dir,
                                                          const char *commandline);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-async"><span class="type">gnome_execute_async</span></a>, except that it runs the
 terminal as well.  Note that the pid of the terminal is
 returned, not the pid of the user's program.
-If commandline is <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>, just the shell is run.</p>
+If commandline is <code class="literal">NULL</code>, just the shell is run.</p>
 <p>
 
 </p>
@@ -486,20 +452,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2659457"></a><h3>
+<a name="id2587768"></a><h3>
 <a name="gnome-execute-terminal-shell-fds"></a>gnome_execute_terminal_shell_fds ()</h3>
-<a class="indexterm" name="id2659470"></a><pre class="programlisting">int                 gnome_execute_terminal_shell_fds    (const char *dir,
+<a class="indexterm" name="id2587781"></a><pre class="programlisting">int                 gnome_execute_terminal_shell_fds    (const char *dir,
                                                          const char *commandline,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> close_fds);</pre>
+                                                         gboolean close_fds);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-exec.html#gnome-execute-shell-fds"><code class="function">gnome_execute_shell_fds()</code></a>, except that it runs the
 terminal as well.  Note that the pid of the terminal is
 returned, not the pid of the user's program.
-If commandline is <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>, just the shell is run.</p>
+If commandline is <code class="literal">NULL</code>, just the shell is run.</p>
 <p>
 
 </p>
@@ -508,9 +470,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dir</code></em>&#160;:</span></p></td>
-<td> Directory in which child should be executed, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for current
+<td> Directory in which child should be executed, or <code class="literal">NULL</code> for current
       directory
 </td>
 </tr>
@@ -534,9 +494,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2659632"></a><div class="refsect2" lang="en"><a name="id2659633"></a></div>
+<a name="id2587942"></a><div class="refsect2" lang="en"><a name="id2587944"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2659634"></a></div>
+<div class="refsect2" lang="en"><a name="id2587945"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ch04.html
+++ libgnome-2.21.90/doc/reference/html/ch04.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2667731"></a>Miscellaneous</h2></div></div></div>
+<a name="id2596042"></a>Miscellaneous</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libgnome-gnome-util.html">gnome-util</a></span><span class="refpurpose"> &#8212; Miscellaneous utility functions.</span>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-libgnometypebuiltins.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-libgnometypebuiltins.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ch06.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2674491" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2602802" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2674541" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2602852" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-libgnometypebuiltins"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2674491"></a><span class="refentrytitle">libgnometypebuiltins</span>
+<a name="id2602802"></a><span class="refentrytitle">libgnometypebuiltins</span>
 </h2>
 <p>libgnometypebuiltins &#8212; Some type macros defined by libgnome.</p>
 </td>
@@ -67,7 +67,7 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2674541"></a><h2>Description</h2>
+<a name="id2602852"></a><h2>Description</h2>
 <p>
 Most applications will not need to use the macros in this section. They are the
 types of the various enumerations created elsewhere in libgnome and registered
@@ -75,11 +75,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2675563"></a><h2>Details</h2>
+<a name="id2603874"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2675573"></a><h3>
+<a name="id2603884"></a><h3>
 <a name="GNOME-TYPE-TRIGGER-TYPE:CAPS"></a>GNOME_TYPE_TRIGGER_TYPE</h3>
-<a class="indexterm" name="id2675587"></a><pre class="programlisting">#define GNOME_TYPE_TRIGGER_TYPE gnome_trigger_type_get_type()
+<a class="indexterm" name="id2603898"></a><pre class="programlisting">#define GNOME_TYPE_TRIGGER_TYPE gnome_trigger_type_get_type()
 </pre>
 <p>
 The type of the <a class="link" href="libgnome-gnome-triggers.html#GnomeTriggerType"><span class="type">GnomeTriggerType</span></a> enum.
@@ -87,9 +87,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2675611"></a><h3>
+<a name="id2603923"></a><h3>
 <a name="GNOME-TYPE-FILE-DOMAIN:CAPS"></a>GNOME_TYPE_FILE_DOMAIN</h3>
-<a class="indexterm" name="id2675625"></a><pre class="programlisting">#define GNOME_TYPE_FILE_DOMAIN gnome_file_domain_get_type()
+<a class="indexterm" name="id2603936"></a><pre class="programlisting">#define GNOME_TYPE_FILE_DOMAIN gnome_file_domain_get_type()
 </pre>
 <p>
 The type of the <a class="link" href="libgnome-gnome-program.html#GnomeFileDomain"><span class="type">GnomeFileDomain</span></a> enum.
@@ -97,9 +97,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2675650"></a><h3>
+<a name="id2603961"></a><h3>
 <a name="GNOME-TYPE-HELP-ERROR:CAPS"></a>GNOME_TYPE_HELP_ERROR</h3>
-<a class="indexterm" name="id2675662"></a><pre class="programlisting">#define GNOME_TYPE_HELP_ERROR gnome_help_error_get_type()
+<a class="indexterm" name="id2603974"></a><pre class="programlisting">#define GNOME_TYPE_HELP_ERROR gnome_help_error_get_type()
 </pre>
 <p>
 The type of the <a class="link" href="libgnome-gnome-help.html#GnomeHelpError"><span class="type">GnomeHelpError</span></a> enum.
@@ -107,9 +107,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2675687"></a><h3>
+<a name="id2603998"></a><h3>
 <a name="GNOME-TYPE-URL-ERROR:CAPS"></a>GNOME_TYPE_URL_ERROR</h3>
-<a class="indexterm" name="id2675700"></a><pre class="programlisting">#define GNOME_TYPE_URL_ERROR gnome_url_error_get_type()
+<a class="indexterm" name="id2604011"></a><pre class="programlisting">#define GNOME_TYPE_URL_ERROR gnome_url_error_get_type()
 </pre>
 <p>
 The type of the <a class="link" href="libgnome-gnome-url.html#GnomeURLError"><span class="type">GnomeURLError</span></a> enum.
@@ -117,9 +117,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2675726"></a><div class="refsect2" lang="en"><a name="id2675727"></a></div>
+<a name="id2604037"></a><div class="refsect2" lang="en"><a name="id2604038"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2675728"></a></div>
+<div class="refsect2" lang="en"><a name="id2604039"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-url.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-url.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ch04.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2666913" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2595224" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2667010" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2595321" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-url"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2666913"></a><span class="refentrytitle">gnome-url</span>
+<a name="id2595224"></a><span class="refentrytitle">gnome-url</span>
 </h2>
 <p>gnome-url &#8212; Display urls using appropriate viewers.</p>
 </td>
@@ -61,24 +61,16 @@
 
 enum                <a class="link" href="libgnome-gnome-url.html#GnomeURLError">GnomeURLError</a>;
 #define             <a class="link" href="libgnome-gnome-url.html#GNOME-URL-ERROR:CAPS">GNOME_URL_ERROR</a>
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-url.html#gnome-url-show">gnome_url_show</a>                      (const char *url,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-url.html#gnome-url-show-with-env">gnome_url_show_with_env</a>             (const char *url,
+gboolean            <a class="link" href="libgnome-gnome-url.html#gnome-url-show">gnome_url_show</a>                      (const char *url,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-url.html#gnome-url-show-with-env">gnome_url_show_with_env</a>             (const char *url,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
+                                                         GError **error);
 
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2667010"></a><h2>Description</h2>
+<a name="id2595321"></a><h2>Description</h2>
 <p>
 A GNOME user can configure which viewers they wish to use to view certain
 protocols. Protocols can include http, ftp (where "view" might mean
@@ -88,11 +80,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2667029"></a><h2>Details</h2>
+<a name="id2595340"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2667040"></a><h3>
+<a name="id2595351"></a><h3>
 <a name="GnomeURLError"></a>enum GnomeURLError</h3>
-<a class="indexterm" name="id2667052"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2595363"></a><pre class="programlisting">typedef enum {
   GNOME_URL_ERROR_PARSE,
   GNOME_URL_ERROR_LAUNCH,
   GNOME_URL_ERROR_URL,
@@ -152,9 +144,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2667246"></a><h3>
+<a name="id2595557"></a><h3>
 <a name="GNOME-URL-ERROR:CAPS"></a>GNOME_URL_ERROR</h3>
-<a class="indexterm" name="id2667259"></a><pre class="programlisting">#define GNOME_URL_ERROR (gnome_url_error_quark ())
+<a class="indexterm" name="id2595569"></a><pre class="programlisting">#define GNOME_URL_ERROR (gnome_url_error_quark ())
 </pre>
 <p>
 The class (domain) of errors raised by this module.
@@ -162,14 +154,10 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2667275"></a><h3>
+<a name="id2595586"></a><h3>
 <a name="gnome-url-show"></a>gnome_url_show ()</h3>
-<a class="indexterm" name="id2667288"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_url_show                      (const char *url,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<a class="indexterm" name="id2595598"></a><pre class="programlisting">gboolean            gnome_url_show                      (const char *url,
+                                                         GError **error);</pre>
 <p>
 Once the input has been converted into a fully qualified url this function
 calls gnome_vfs_url_show. Any error codes returned by gnome-vfs will be wrapped
@@ -194,11 +182,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if everything went fine, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case
+<td> <code class="literal">TRUE</code> if everything went fine, <code class="literal">FALSE</code> otherwise (in which case
 <em class="parameter"><code>error</code></em> will contain the actual error).
 </td>
 </tr>
@@ -207,15 +191,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2667420"></a><h3>
+<a name="id2595731"></a><h3>
 <a name="gnome-url-show-with-env"></a>gnome_url_show_with_env ()</h3>
-<a class="indexterm" name="id2667435"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_url_show_with_env             (const char *url,
+<a class="indexterm" name="id2595746"></a><pre class="programlisting">gboolean            gnome_url_show_with_env             (const char *url,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-url.html#gnome-url-show"><code class="function">gnome_url_show()</code></a>, but gnome_vfs_url_show_with_env
 will be called with the given envirnoment.</p>
@@ -232,9 +212,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em>&#160;:</span></p></td>
-<td> child's environment, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to inherit parent's.
+<td> child's environment, or <code class="literal">NULL</code> to inherit parent's.
 </td>
 </tr>
 <tr>
@@ -244,11 +222,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if everything went fine, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case
+<td> <code class="literal">TRUE</code> if everything went fine, <code class="literal">FALSE</code> otherwise (in which case
 <em class="parameter"><code>error</code></em> will contain the actual error).
 
 </td>
@@ -260,9 +234,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2667603"></a><div class="refsect2" lang="en"><a name="id2667604"></a></div>
+<a name="id2595914"></a><div class="refsect2" lang="en"><a name="id2595915"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2667605"></a></div>
+<div class="refsect2" lang="en"><a name="id2595916"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix09.html
+++ libgnome-2.21.90/doc/reference/html/ix09.html
@@ -38,10 +38,10 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691958"></a>Index of new symbols in 2.14</h2></div></div></div>
+<a name="id2620270"></a>Index of new symbols in 2.14</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>G</h3>
-<dl><dt>GNOME_PARAM_GOPTION_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2651356">GNOME_PARAM_GOPTION_CONTEXT</a>
+<dl><dt>GNOME_PARAM_GOPTION_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2579663">GNOME_PARAM_GOPTION_CONTEXT</a>
 </dt></dl>
 </div></div>
 </div>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-i18n.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-i18n.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-score.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2690146" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2618458" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2690216" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2618528" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-i18n"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2690146"></a><span class="refentrytitle">gnome-i18n</span>
+<a name="id2618458"></a><span class="refentrytitle">gnome-i18n</span>
 </h2>
 <p>gnome-i18n &#8212; Support for localization and internationalization.</p>
 </td>
@@ -59,18 +59,14 @@
 #include &lt;libgnome/libgnome.h&gt;
 
 
-const <a
-href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
->GList</a>*        <a class="link" href="libgnome-gnome-i18n.html#gnome-i18n-get-language-list">gnome_i18n_get_language_list</a>        (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *category_name);
+const GList*        <a class="link" href="libgnome-gnome-i18n.html#gnome-i18n-get-language-list">gnome_i18n_get_language_list</a>        (const gchar *category_name);
 void                <a class="link" href="libgnome-gnome-i18n.html#gnome-i18n-push-c-numeric-locale">gnome_i18n_push_c_numeric_locale</a>    (void);
 void                <a class="link" href="libgnome-gnome-i18n.html#gnome-i18n-pop-c-numeric-locale">gnome_i18n_pop_c_numeric_locale</a>     (void);
 
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2690216"></a><h2>Description</h2>
+<a name="id2618528"></a><h2>Description</h2>
 <p>
 This module allows the programmer to internationalize his application by
 providing functions to retrieve the preferred languages of the user as well as
@@ -87,23 +83,17 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2690277"></a><h2>Details</h2>
+<a name="id2618589"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2690287"></a><h3>
+<a name="id2618599"></a><h3>
 <a name="gnome-i18n-get-language-list"></a>gnome_i18n_get_language_list ()</h3>
-<a class="indexterm" name="id2690303"></a><pre class="programlisting">const <a
-href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
->GList</a>*        gnome_i18n_get_language_list        (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *category_name);</pre>
+<a class="indexterm" name="id2618614"></a><pre class="programlisting">const GList*        gnome_i18n_get_language_list        (const gchar *category_name);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_i18n_get_language_list</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-This function is deprecated. You should be using <a
-href="/usr/share/gtk-doc/html/glib/glib-I18N.html#g-get-language-names"
-><code class="function">g_get_language_names()</code></a> instead.
+This function is deprecated. You should be using <code class="function">g_get_language_names()</code> instead.
 </p>
 <p>
 This computes a list of language strings that the user wants.  It searches in
@@ -138,9 +128,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2690412"></a><h3>
+<a name="id2618724"></a><h3>
 <a name="gnome-i18n-push-c-numeric-locale"></a>gnome_i18n_push_c_numeric_locale ()</h3>
-<a class="indexterm" name="id2690428"></a><pre class="programlisting">void                gnome_i18n_push_c_numeric_locale    (void);</pre>
+<a class="indexterm" name="id2618739"></a><pre class="programlisting">void                gnome_i18n_push_c_numeric_locale    (void);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_i18n_push_c_numeric_locale</code> is deprecated and should not be used in newly-written code.</p>
@@ -159,9 +149,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2690494"></a><h3>
+<a name="id2618806"></a><h3>
 <a name="gnome-i18n-pop-c-numeric-locale"></a>gnome_i18n_pop_c_numeric_locale ()</h3>
-<a class="indexterm" name="id2690510"></a><pre class="programlisting">void                gnome_i18n_pop_c_numeric_locale     (void);</pre>
+<a class="indexterm" name="id2618822"></a><pre class="programlisting">void                gnome_i18n_pop_c_numeric_locale     (void);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_i18n_pop_c_numeric_locale</code> is deprecated and should not be used in newly-written code.</p>
@@ -178,9 +168,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2690565"></a><div class="refsect2" lang="en"><a name="id2690566"></a></div>
+<a name="id2618876"></a><div class="refsect2" lang="en"><a name="id2618878"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2690567"></a></div>
+<div class="refsect2" lang="en"><a name="id2618879"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ch02.html
+++ libgnome-2.21.90/doc/reference/html/ch02.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2660894"></a>Configuration</h2></div></div></div>
+<a name="id2589204"></a>Configuration</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libgnome-gnome-gconf.html">gnome-gconf</a></span><span class="refpurpose"> &#8212; Provides access to the gconf module.</span>
 </dt></dl></div>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-program.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-program.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-init.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2598144" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2533113" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2648123" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2576430" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-program"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2598144"></a><span class="refentrytitle">gnome-program</span>
+<a name="id2533113"></a><span class="refentrytitle">gnome-program</span>
 </h2>
 <p>gnome-program &#8212; Initialize and retrieve information about a GNOME application.</p>
 </td>
@@ -75,9 +75,7 @@
                                                          char **argv,
                                                          const char *first_property_name,
                                                          ...);
-<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       <a class="link" href="libgnome-gnome-program.html#gnome-program-initv">gnome_program_initv</a>                 (<a
-href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
->GType</a> type,
+<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       <a class="link" href="libgnome-gnome-program.html#gnome-program-initv">gnome_program_initv</a>                 (GType type,
                                                          const char *app_id,
                                                          const char *app_version,
                                                          const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info,
@@ -91,37 +89,19 @@
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);
 const char*         <a class="link" href="libgnome-gnome-program.html#gnome-program-get-app-id">gnome_program_get_app_id</a>            (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);
 const char*         <a class="link" href="libgnome-gnome-program.html#gnome-program-get-app-version">gnome_program_get_app_version</a>       (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              <a class="link" href="libgnome-gnome-program.html#gnome-program-locate-file">gnome_program_locate_file</a>           (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+gchar*              <a class="link" href="libgnome-gnome-program.html#gnome-program-locate-file">gnome_program_locate_file</a>           (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          <a class="link" href="libgnome-gnome-program.html#GnomeFileDomain">GnomeFileDomain</a> domain,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *file_name,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> only_if_exists,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html#GSList"
->GSList</a> **ret_locations);
+                                                         const gchar *file_name,
+                                                         gboolean only_if_exists,
+                                                         GSList **ret_locations);
 
 void                <a class="link" href="libgnome-gnome-program.html#gnome-program-module-register">gnome_program_module_register</a>       (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-program.html#gnome-program-module-registered">gnome_program_module_registered</a>     (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);
+gboolean            <a class="link" href="libgnome-gnome-program.html#gnome-program-module-registered">gnome_program_module_registered</a>     (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);
 const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* <a class="link" href="libgnome-gnome-program.html#gnome-program-module-load">gnome_program_module_load</a>        (const char *mod_name);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"
->guint</a>               <a class="link" href="libgnome-gnome-program.html#gnome-program-install-property">gnome_program_install_property</a>      (GnomeProgramClass *pclass,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectGetPropertyFunc"
->GObjectGetPropertyFunc</a> get_fn,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectSetPropertyFunc"
->GObjectSetPropertyFunc</a> set_fn,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec);
+guint               <a class="link" href="libgnome-gnome-program.html#gnome-program-install-property">gnome_program_install_property</a>      (GnomeProgramClass *pclass,
+                                                         GObjectGetPropertyFunc get_fn,
+                                                         GObjectSetPropertyFunc set_fn,
+                                                         GParamSpec *pspec);
 poptContext         <a class="link" href="libgnome-gnome-program.html#gnome-program-preinit">gnome_program_preinit</a>               (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *app_id,
                                                          const char *app_version,
@@ -156,17 +136,17 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2648123"></a><h2>Description</h2>
+<a name="id2576430"></a><h2>Description</h2>
 <p>
 
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2648136"></a><h2>Details</h2>
+<a name="id2576443"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2648146"></a><h3>
+<a name="id2576453"></a><h3>
 <a name="GnomeFileDomain"></a>enum GnomeFileDomain</h3>
-<a class="indexterm" name="id2648156"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2576463"></a><pre class="programlisting">typedef enum {
     GNOME_FILE_DOMAIN_UNKNOWN = 0,
 
     /* Gnome installed files */
@@ -271,9 +251,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2648476"></a><h3>
+<a name="id2576783"></a><h3>
 <a name="GnomeProgram"></a>GnomeProgram</h3>
-<a class="indexterm" name="id2648486"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2576793"></a><pre class="programlisting">typedef struct {
     GObject object;
 
     GnomeProgramPrivate *_priv;
@@ -287,12 +267,8 @@
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term"><a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>&#160;<em class="structfield"><code>object</code></em>;</span></p></td>
-<td>A <a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"
-><span class="type">GObject</span></a> containing the parameters and their values which were set
+<td><p><span class="term">GObject&#160;<em class="structfield"><code>object</code></em>;</span></p></td>
+<td>A <span class="type">GObject</span> containing the parameters and their values which were set
 dring initialisation.
 </td>
 </tr>
@@ -307,9 +283,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2648564"></a><h3>
+<a name="id2576871"></a><h3>
 <a name="GnomeModuleInfo"></a>GnomeModuleInfo</h3>
-<a class="indexterm" name="id2648579"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2576886"></a><pre class="programlisting">typedef struct {
     const char *name;
     const char *version;
     const char *description;
@@ -352,42 +328,32 @@
 </tr>
 <tr>
 <td><p><span class="term">const&#160;char&#160;*<em class="structfield"><code>description</code></em>;</span></p></td>
-<td>A string describing the module (can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+<td>A string describing the module (can be <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="libgnome-gnome-program.html#GnomeModuleRequirement">GnomeModuleRequirement</a>&#160;*<em class="structfield"><code>requirements</code></em>;</span></p></td>
 <td>A pointer to an array of modules that are required by this
 module. The last module in the array should have its required_version field set
-to <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>.
+to <code class="literal">NULL</code>.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="libgnome-gnome-program.html#GnomeModuleHook">GnomeModuleHook</a>&#160;<em class="structfield"><code>instance_init</code></em>;</span></p></td>
 <td>A function to call to initialise an instance of this module
-(can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+(can be <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="libgnome-gnome-program.html#GnomeModuleHook">GnomeModuleHook</a>&#160;<em class="structfield"><code>pre_args_parse</code></em>;</span></p></td>
 <td>A function to call before parsing the arguments for this
-module (can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+module (can be <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="libgnome-gnome-program.html#GnomeModuleHook">GnomeModuleHook</a>&#160;<em class="structfield"><code>post_args_parse</code></em>;</span></p></td>
 <td>A function to call after parsing the arguments for this
-module (can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+module (can be <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
@@ -408,9 +374,7 @@
 <tr>
 <td><p><span class="term"><a class="link" href="libgnome-gnome-program.html#GnomeModuleClassInitHook">GnomeModuleClassInitHook</a>&#160;<em class="structfield"><code>class_init</code></em>;</span></p></td>
 <td>A function to call to initialise this module prior to creating any
-instances (can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+instances (can be <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
@@ -420,14 +384,8 @@
 </tr>
 <tr>
 <td><p><span class="term">GnomeModuleGetGOptionGroupFunc&#160;<em class="structfield"><code>get_goption_group_func</code></em>;</span></p></td>
-<td>A function which must return a non-<a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> <a
-href="/usr/share/gtk-doc/html/glib/glib-Commandline-option-parser.html#GOptionGroup"
-><span class="type">GOptionGroup</span></a>,
-which will be added to the <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> s <a
-href="/usr/share/gtk-doc/html/glib/glib-Commandline-option-parser.html#GOptionContext"
-><span class="type">GOptionContext</span></a> during
+<td>A function which must return a non-<code class="literal">NULL</code> <span class="type">GOptionGroup</span>,
+which will be added to the <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> s <span class="type">GOptionContext</span> during
 #<a class="link" href="libgnome-gnome-program.html#gnome-program-init"><code class="function">gnome_program_init()</code></a>.
 
 </td>
@@ -437,9 +395,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2648963"></a><h3>
+<a name="id2577270"></a><h3>
 <a name="GnomeModuleRequirement"></a>GnomeModuleRequirement</h3>
-<a class="indexterm" name="id2648974"></a><pre class="programlisting">typedef struct {
+<a class="indexterm" name="id2577281"></a><pre class="programlisting">typedef struct {
     const char *required_version;
     const GnomeModuleInfo *module_info;
 } GnomeModuleRequirement;
@@ -467,9 +425,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649042"></a><h3>
+<a name="id2577349"></a><h3>
 <a name="GnomeModuleInitHook"></a>GnomeModuleInitHook ()</h3>
-<a class="indexterm" name="id2649052"></a><pre class="programlisting">void                (*GnomeModuleInitHook)              (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *mod_info);</pre>
+<a class="indexterm" name="id2577359"></a><pre class="programlisting">void                (*GnomeModuleInitHook)              (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *mod_info);</pre>
 <p>
 A function that will be called to allow a module to do any pre-initialisation
 it might need to do prior to having arguments parsed by the controlling parent
@@ -489,9 +447,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649097"></a><h3>
+<a name="id2577404"></a><h3>
 <a name="GnomeModuleClassInitHook"></a>GnomeModuleClassInitHook ()</h3>
-<a class="indexterm" name="id2649107"></a><pre class="programlisting">void                (*GnomeModuleClassInitHook)         (GnomeProgramClass *klass,
+<a class="indexterm" name="id2577414"></a><pre class="programlisting">void                (*GnomeModuleClassInitHook)         (GnomeProgramClass *klass,
                                                          const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *mod_info);</pre>
 <p>
 A function called to perform any class specific setup that is required by each
@@ -518,9 +476,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649177"></a><h3>
+<a name="id2577484"></a><h3>
 <a name="GnomeModuleHook"></a>GnomeModuleHook ()</h3>
-<a class="indexterm" name="id2649187"></a><pre class="programlisting">void                (*GnomeModuleHook)                  (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2577494"></a><pre class="programlisting">void                (*GnomeModuleHook)                  (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *mod_info);</pre>
 <p>
 A function that is called to perform some intialisation in a module (which
@@ -547,9 +505,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649263"></a><h3>
+<a name="id2577570"></a><h3>
 <a name="gnome-program-init"></a>gnome_program_init ()</h3>
-<a class="indexterm" name="id2649274"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_init                  (const char *app_id,
+<a class="indexterm" name="id2577581"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_init                  (const char *app_id,
                                                          const char *app_version,
                                                          const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info,
                                                          int argc,
@@ -573,9 +531,7 @@
 </p>
 <p>
 It loads the specified <em class="parameter"><code>module_info</code></em>, which is normally <a class="link" href="libgnome-gnome-init.html#LIBGNOME-MODULE:CAPS"><span class="type">LIBGNOME_MODULE</span></a> or
-<a
-href="/usr/share/gtk-doc/html/libgnomeui/libgnomeui-gnome-ui-init.html#LIBGNOMEUI-MODULE:CAPS"
-><span class="type">LIBGNOMEUI_MODULE</span></a> and pulls in all the dependencies.  Programs that are not
+<span class="type">LIBGNOMEUI_MODULE</span> and pulls in all the dependencies.  Programs that are not
 running in setuid or setgid mode will also load modules specified in the
 <em class="parameter"><code>--load-modules</code></em> and also in the <em class="parameter"><code>GNOME_MODULES</code></em> environment variable.
 </p>
@@ -583,7 +539,7 @@
 using a goption table that is defined elsewhere.
 </p>
 <div class="example">
-<a name="id2649405"></a><p class="title"><b>Example&#160;1.&#160;Initializing a GNOME application (deprecated, using popt)</b></p>
+<a name="id2577712"></a><p class="title"><b>Example&#160;1.&#160;Initializing a GNOME application (deprecated, using popt)</b></p>
 <div class="example-contents"><pre class="programlisting">
 int main(int argc, char **argv) {
 	GnomeProgram *my_app;
@@ -612,7 +568,7 @@
 elaborate example of an option entry table):
 </p>
 <div class="example">
-<a name="id2649443"></a><p class="title"><b>Example&#160;2.&#160;Initializing a GNOME application (new, using GOption)</b></p>
+<a name="id2577750"></a><p class="title"><b>Example&#160;2.&#160;Initializing a GNOME application (new, using GOption)</b></p>
 <div class="example-contents"><pre class="programlisting">
 int main(int argc, char **argv) {
 	gchar **remaining_args = NULL;
@@ -697,19 +653,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>first_property_name</code></em>&#160;:</span></p></td>
-<td> The first item in a <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>-terminated list of attribute
-name and value pairs (so this will be an attribute name or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>).
+<td> The first item in a <code class="literal">NULL</code>-terminated list of attribute
+name and value pairs (so this will be an attribute name or <code class="literal">NULL</code>).
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>...</code></em>&#160;:</span></p></td>
-<td> The continuation of a <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>-terminated list of attribute name/value
+<td> The continuation of a <code class="literal">NULL</code>-terminated list of attribute name/value
 pairs.
 </td>
 </tr>
@@ -724,11 +674,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649661"></a><h3>
+<a name="id2577968"></a><h3>
 <a name="gnome-program-initv"></a>gnome_program_initv ()</h3>
-<a class="indexterm" name="id2649672"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_initv                 (<a
-href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
->GType</a> type,
+<a class="indexterm" name="id2577979"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_initv                 (GType type,
                                                          const char *app_id,
                                                          const char *app_version,
                                                          const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info,
@@ -778,17 +726,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>first_property_name</code></em>&#160;:</span></p></td>
-<td> The first item in a <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>-terminated list of attribute
+<td> The first item in a <code class="literal">NULL</code>-terminated list of attribute
 name/value.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>args</code></em>&#160;:</span></p></td>
-<td> The remaining elements in the <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> terminated list (of which
+<td> The remaining elements in the <code class="literal">NULL</code> terminated list (of which
 <em class="parameter"><code>first_property_name</code></em> is the first element).
 </td>
 </tr>
@@ -802,15 +746,13 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649916"></a><h3>
+<a name="id2578223"></a><h3>
 <a name="gnome-program-get"></a>gnome_program_get ()</h3>
-<a class="indexterm" name="id2649926"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_get                   (void);</pre>
+<a class="indexterm" name="id2578233"></a><pre class="programlisting"><a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a>*       gnome_program_get                   (void);</pre>
 <p>
 Retrieves an object that stored information about the application's state.
 Other functions assume this will always return a <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> object which
-(if not <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>) has already been initialized.</p>
+(if not <code class="literal">NULL</code>) has already been initialized.</p>
 <p>
 
 </p>
@@ -818,9 +760,7 @@
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> The application's <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> instance, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> if it does not
+<td> The application's <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> instance, or <code class="literal">NULL</code> if it does not
 exist.
 </td>
 </tr></tbody>
@@ -828,17 +768,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2649994"></a><h3>
+<a name="id2578301"></a><h3>
 <a name="gnome-program-get-human-readable-name"></a>gnome_program_get_human_readable_name ()</h3>
-<a class="indexterm" name="id2650006"></a><pre class="programlisting">const char*         gnome_program_get_human_readable_name
+<a class="indexterm" name="id2578314"></a><pre class="programlisting">const char*         gnome_program_get_human_readable_name
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
 <p>
 This function returns a pointer to a static string that the
 application has provided as a human readable name. The app
 should provide the name with the <a class="link" href="libgnome-gnome-program.html#GNOME-PARAM-HUMAN-READABLE-NAME:CAPS"><span class="type">GNOME_PARAM_HUMAN_READABLE_NAME</span></a>
-init argument. Returns <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> if no name was set.</p>
+init argument. Returns <code class="literal">NULL</code> if no name was set.</p>
 <p>
 
 </p>
@@ -860,9 +798,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650083"></a><h3>
+<a name="id2578390"></a><h3>
 <a name="gnome-program-get-app-id"></a>gnome_program_get_app_id ()</h3>
-<a class="indexterm" name="id2650093"></a><pre class="programlisting">const char*         gnome_program_get_app_id            (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
+<a class="indexterm" name="id2578400"></a><pre class="programlisting">const char*         gnome_program_get_app_id            (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
 <p>
 This function returns a pointer to a static string that the
 application has provided as an identifier. This is not meant as a
@@ -889,9 +827,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650152"></a><h3>
+<a name="id2578459"></a><h3>
 <a name="gnome-program-get-app-version"></a>gnome_program_get_app_version ()</h3>
-<a class="indexterm" name="id2650164"></a><pre class="programlisting">const char*         gnome_program_get_app_version       (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
+<a class="indexterm" name="id2578471"></a><pre class="programlisting">const char*         gnome_program_get_app_version       (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
 <p>
 This function returns a pointer to a static string that the
 application has provided as a version number. This is not meant as a
@@ -918,30 +856,20 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650224"></a><h3>
+<a name="id2578531"></a><h3>
 <a name="gnome-program-locate-file"></a>gnome_program_locate_file ()</h3>
-<a class="indexterm" name="id2650235"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a>*              gnome_program_locate_file           (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2578542"></a><pre class="programlisting">gchar*              gnome_program_locate_file           (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          <a class="link" href="libgnome-gnome-program.html#GnomeFileDomain">GnomeFileDomain</a> domain,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *file_name,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> only_if_exists,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html#GSList"
->GSList</a> **ret_locations);</pre>
+                                                         const gchar *file_name,
+                                                         gboolean only_if_exists,
+                                                         GSList **ret_locations);</pre>
 <p>
 This function finds a full path to the <em class="parameter"><code>file_name</code></em> located in the specified
 "domain". A domain is a name for a collection of related files.
 For example, common domains are "libdir", "pixmap", and "config".
 </p>
 <p>
-If <em class="parameter"><code>ret_locations</code></em> is <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>, only one pathname is returned. Otherwise,
+If <em class="parameter"><code>ret_locations</code></em> is <code class="literal">NULL</code>, only one pathname is returned. Otherwise,
 alternative paths are returned in <em class="parameter"><code>ret_locations</code></em>.
 </p>
 <p>
@@ -961,9 +889,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> A valid <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> object or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> (in which case the current
+<td> A valid <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> object or <code class="literal">NULL</code> (in which case the current
 application is used).
 </td>
 </tr>
@@ -985,20 +911,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ret_locations</code></em>&#160;:</span></p></td>
-<td> If this is not <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>, a list of all the possible locations
+<td> If this is not <code class="literal">NULL</code>, a list of all the possible locations
                 of the file will be returned.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
 <td> The full path to the file (if it exists or only_if_exists is
-         <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a>) or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>.
+         <code class="literal">FALSE</code>) or <code class="literal">NULL</code>.
 </td>
 </tr>
 </tbody>
@@ -1006,9 +926,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650472"></a><h3>
+<a name="id2578780"></a><h3>
 <a name="gnome-program-module-register"></a>gnome_program_module_register ()</h3>
-<a class="indexterm" name="id2650485"></a><pre class="programlisting">void                gnome_program_module_register       (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);</pre>
+<a class="indexterm" name="id2578792"></a><pre class="programlisting">void                gnome_program_module_register       (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);</pre>
 <p>
 This function is used to register a module to be initialized by the
 GNOME library framework. The memory pointed to by <em class="parameter"><code>module_info</code></em> must be
@@ -1030,11 +950,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650551"></a><h3>
+<a name="id2578858"></a><h3>
 <a name="gnome-program-module-registered"></a>gnome_program_module_registered ()</h3>
-<a class="indexterm" name="id2650564"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_program_module_registered     (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);</pre>
+<a class="indexterm" name="id2578871"></a><pre class="programlisting">gboolean            gnome_program_module_registered     (const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a> *module_info);</pre>
 <p>
 This method checks to see whether a specific module has been
              initialized in the specified program.</p>
@@ -1061,9 +979,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650624"></a><h3>
+<a name="id2578931"></a><h3>
 <a name="gnome-program-module-load"></a>gnome_program_module_load ()</h3>
-<a class="indexterm" name="id2650635"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* gnome_program_module_load        (const char *mod_name);</pre>
+<a class="indexterm" name="id2578942"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* gnome_program_module_load        (const char *mod_name);</pre>
 <p>
 Loads a shared library that contains a
 <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo"><span class="type">GnomeModuleInfo</span></a> dynamic_module_info structure.</p>
@@ -1080,9 +998,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> The <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo"><span class="type">GnomeModuleInfo</span></a> structure that was loaded, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> if the
+<td> The <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo"><span class="type">GnomeModuleInfo</span></a> structure that was loaded, or <code class="literal">NULL</code> if the
 module could not be loaded.
 </td>
 </tr>
@@ -1091,20 +1007,12 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650713"></a><h3>
+<a name="id2579020"></a><h3>
 <a name="gnome-program-install-property"></a>gnome_program_install_property ()</h3>
-<a class="indexterm" name="id2650725"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"
->guint</a>               gnome_program_install_property      (GnomeProgramClass *pclass,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectGetPropertyFunc"
->GObjectGetPropertyFunc</a> get_fn,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectSetPropertyFunc"
->GObjectSetPropertyFunc</a> set_fn,
-                                                         <a
-href="/usr/share/gtk-doc/html/gobject/gobject-GParamSpec.html#GParamSpec"
->GParamSpec</a> *pspec);</pre>
+<a class="indexterm" name="id2579032"></a><pre class="programlisting">guint               gnome_program_install_property      (GnomeProgramClass *pclass,
+                                                         GObjectGetPropertyFunc get_fn,
+                                                         GObjectSetPropertyFunc set_fn,
+                                                         GParamSpec *pspec);</pre>
 <p>
 Install a collection of available properties, their default values and the
 functions to set and retrieve these properties.
@@ -1148,9 +1056,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2650854"></a><h3>
+<a name="id2579161"></a><h3>
 <a name="gnome-program-preinit"></a>gnome_program_preinit ()</h3>
-<a class="indexterm" name="id2650867"></a><pre class="programlisting">poptContext         gnome_program_preinit               (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2579174"></a><pre class="programlisting">poptContext         gnome_program_preinit               (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *app_id,
                                                          const char *app_version,
                                                          int argc,
@@ -1197,9 +1105,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
 <td> A poptContext representing the argument parsing state,
-or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> if using GOption argument parsing.
+or <code class="literal">NULL</code> if using GOption argument parsing.
 </td>
 </tr>
 </tbody>
@@ -1207,9 +1113,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651041"></a><h3>
+<a name="id2579348"></a><h3>
 <a name="gnome-program-parse-args"></a>gnome_program_parse_args ()</h3>
-<a class="indexterm" name="id2651055"></a><pre class="programlisting">void                gnome_program_parse_args            (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
+<a class="indexterm" name="id2579362"></a><pre class="programlisting">void                gnome_program_parse_args            (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_program_parse_args</code> has been deprecated since version 2.18 and should not be used in newly-written code. Use <a class="link" href="libgnome-gnome-program.html#gnome-program-init"><code class="function">gnome_program_init()</code></a> instead.</p>
@@ -1230,9 +1136,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651120"></a><h3>
+<a name="id2579427"></a><h3>
 <a name="gnome-program-postinit"></a>gnome_program_postinit ()</h3>
-<a class="indexterm" name="id2651133"></a><pre class="programlisting">void                gnome_program_postinit              (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
+<a class="indexterm" name="id2579440"></a><pre class="programlisting">void                gnome_program_postinit              (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_program_postinit</code> has been deprecated since version 2.18 and should not be used in newly-written code. Use <a class="link" href="libgnome-gnome-program.html#gnome-program-init"><code class="function">gnome_program_init()</code></a> instead.</p>
@@ -1254,9 +1160,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651207"></a><h3>
+<a name="id2579514"></a><h3>
 <a name="GNOME-PARAM-POPT-TABLE:CAPS"></a>GNOME_PARAM_POPT_TABLE</h3>
-<a class="indexterm" name="id2651219"></a><pre class="programlisting">#define GNOME_PARAM_POPT_TABLE          "popt-table"
+<a class="indexterm" name="id2579526"></a><pre class="programlisting">#define GNOME_PARAM_POPT_TABLE          "popt-table"
 </pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
@@ -1271,9 +1177,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651264"></a><h3>
+<a name="id2579572"></a><h3>
 <a name="GNOME-PARAM-POPT-FLAGS:CAPS"></a>GNOME_PARAM_POPT_FLAGS</h3>
-<a class="indexterm" name="id2651278"></a><pre class="programlisting">#define GNOME_PARAM_POPT_FLAGS          "popt-flags"
+<a class="indexterm" name="id2579585"></a><pre class="programlisting">#define GNOME_PARAM_POPT_FLAGS          "popt-flags"
 </pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
@@ -1285,9 +1191,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651306"></a><h3>
+<a name="id2579613"></a><h3>
 <a name="GNOME-PARAM-POPT-CONTEXT:CAPS"></a>GNOME_PARAM_POPT_CONTEXT</h3>
-<a class="indexterm" name="id2651321"></a><pre class="programlisting">#define GNOME_PARAM_POPT_CONTEXT        "popt-context"
+<a class="indexterm" name="id2579628"></a><pre class="programlisting">#define GNOME_PARAM_POPT_CONTEXT        "popt-context"
 </pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
@@ -1300,16 +1206,14 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651356"></a><h3>
+<a name="id2579663"></a><h3>
 <a name="GNOME-PARAM-GOPTION-CONTEXT:CAPS"></a>GNOME_PARAM_GOPTION_CONTEXT</h3>
-<a class="indexterm" name="id2651370"></a><pre class="programlisting">#define GNOME_PARAM_GOPTION_CONTEXT     "goption-context"
+<a class="indexterm" name="id2579677"></a><pre class="programlisting">#define GNOME_PARAM_GOPTION_CONTEXT     "goption-context"
 </pre>
 <p>
 This parameter contains the GOptionContext pointer that <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> is using for
 GOption parsing (write on init only). The <a class="link" href="libgnome-gnome-program.html#GnomeProgram"><span class="type">GnomeProgram</span></a> will assume ownership of the
-passed <a
-href="/usr/share/gtk-doc/html/glib/glib-Commandline-option-parser.html#GOptionContext"
-><span class="type">GOptionContext</span></a>.
+passed <span class="type">GOptionContext</span>.
 Mutually exclusive with using the <a class="link" href="libgnome-gnome-program.html#GNOME-PARAM-POPT-TABLE:CAPS"><span class="type">GNOME_PARAM_POPT_TABLE</span></a> parameter.
 </p>
 <p class="since">Since 2.14
@@ -1319,22 +1223,20 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651419"></a><h3>
+<a name="id2579726"></a><h3>
 <a name="GNOME-PARAM-CREATE-DIRECTORIES:CAPS"></a>GNOME_PARAM_CREATE_DIRECTORIES</h3>
-<a class="indexterm" name="id2651431"></a><pre class="programlisting">#define GNOME_PARAM_CREATE_DIRECTORIES  "create-directories"
+<a class="indexterm" name="id2579738"></a><pre class="programlisting">#define GNOME_PARAM_CREATE_DIRECTORIES  "create-directories"
 </pre>
 <p>
-This parameter contains <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if the standard GNOME directories should be
+This parameter contains <code class="literal">TRUE</code> if the standard GNOME directories should be
 created on startup.
 </p>
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651456"></a><h3>
+<a name="id2579763"></a><h3>
 <a name="GNOME-PARAM-ENABLE-SOUND:CAPS"></a>GNOME_PARAM_ENABLE_SOUND</h3>
-<a class="indexterm" name="id2651468"></a><pre class="programlisting">#define GNOME_PARAM_ENABLE_SOUND        "enable-sound"
+<a class="indexterm" name="id2579775"></a><pre class="programlisting">#define GNOME_PARAM_ENABLE_SOUND        "enable-sound"
 </pre>
 <p>
 This parameter determines whether or not to enable sound on startup.
@@ -1342,9 +1244,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651484"></a><h3>
+<a name="id2579791"></a><h3>
 <a name="GNOME-PARAM-ESPEAKER:CAPS"></a>GNOME_PARAM_ESPEAKER</h3>
-<a class="indexterm" name="id2651495"></a><pre class="programlisting">#define GNOME_PARAM_ESPEAKER            "espeaker"
+<a class="indexterm" name="id2579802"></a><pre class="programlisting">#define GNOME_PARAM_ESPEAKER            "espeaker"
 </pre>
 <p>
 This parameter describes how to connect to esd.
@@ -1352,9 +1254,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651510"></a><h3>
+<a name="id2579817"></a><h3>
 <a name="GNOME-PARAM-APP-ID:CAPS"></a>GNOME_PARAM_APP_ID</h3>
-<a class="indexterm" name="id2651521"></a><pre class="programlisting">#define GNOME_PARAM_APP_ID              "app-id"
+<a class="indexterm" name="id2579828"></a><pre class="programlisting">#define GNOME_PARAM_APP_ID              "app-id"
 </pre>
 <p>
 This parameter contains the ID string to use for the application (readable).
@@ -1362,9 +1264,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651537"></a><h3>
+<a name="id2579844"></a><h3>
 <a name="GNOME-PARAM-APP-VERSION:CAPS"></a>GNOME_PARAM_APP_VERSION</h3>
-<a class="indexterm" name="id2651548"></a><pre class="programlisting">#define GNOME_PARAM_APP_VERSION         "app-version"
+<a class="indexterm" name="id2579855"></a><pre class="programlisting">#define GNOME_PARAM_APP_VERSION         "app-version"
 </pre>
 <p>
 This parameter contains the application version (readable).
@@ -1372,9 +1274,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651564"></a><h3>
+<a name="id2579871"></a><h3>
 <a name="GNOME-PARAM-GNOME-PREFIX:CAPS"></a>GNOME_PARAM_GNOME_PREFIX</h3>
-<a class="indexterm" name="id2651576"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_PREFIX        "gnome-prefix"
+<a class="indexterm" name="id2579883"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_PREFIX        "gnome-prefix"
 </pre>
 <p>
 This parameter contains the prefix where the main GNOME system is installed
@@ -1383,9 +1285,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651593"></a><h3>
+<a name="id2579900"></a><h3>
 <a name="GNOME-PARAM-GNOME-SYSCONFDIR:CAPS"></a>GNOME_PARAM_GNOME_SYSCONFDIR</h3>
-<a class="indexterm" name="id2651604"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_SYSCONFDIR    "gnome-sysconfdir"
+<a class="indexterm" name="id2579911"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_SYSCONFDIR    "gnome-sysconfdir"
 </pre>
 <p>
 This parameter contains the prefix where the GNOME configuration files
@@ -1394,9 +1296,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651622"></a><h3>
+<a name="id2579929"></a><h3>
 <a name="GNOME-PARAM-GNOME-DATADIR:CAPS"></a>GNOME_PARAM_GNOME_DATADIR</h3>
-<a class="indexterm" name="id2651634"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_DATADIR       "gnome-datadir"
+<a class="indexterm" name="id2579941"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_DATADIR       "gnome-datadir"
 </pre>
 <p>
 This parameter contains the prefix where the GNOME data files are installed
@@ -1405,9 +1307,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651651"></a><h3>
+<a name="id2579958"></a><h3>
 <a name="GNOME-PARAM-GNOME-LIBDIR:CAPS"></a>GNOME_PARAM_GNOME_LIBDIR</h3>
-<a class="indexterm" name="id2651663"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_LIBDIR        "gnome-libdir"
+<a class="indexterm" name="id2579970"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_LIBDIR        "gnome-libdir"
 </pre>
 <p>
 This parameter contains the prefix where the GNOME library files are installed
@@ -1416,9 +1318,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651679"></a><h3>
+<a name="id2579986"></a><h3>
 <a name="GNOME-PARAM-APP-PREFIX:CAPS"></a>GNOME_PARAM_APP_PREFIX</h3>
-<a class="indexterm" name="id2651690"></a><pre class="programlisting">#define GNOME_PARAM_APP_PREFIX          "app-prefix"
+<a class="indexterm" name="id2579997"></a><pre class="programlisting">#define GNOME_PARAM_APP_PREFIX          "app-prefix"
 </pre>
 <p>
 This parameter contains the prefix where this application was installed
@@ -1427,9 +1329,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651706"></a><h3>
+<a name="id2580013"></a><h3>
 <a name="GNOME-PARAM-APP-SYSCONFDIR:CAPS"></a>GNOME_PARAM_APP_SYSCONFDIR</h3>
-<a class="indexterm" name="id2651718"></a><pre class="programlisting">#define GNOME_PARAM_APP_SYSCONFDIR      "app-sysconfdir"
+<a class="indexterm" name="id2580025"></a><pre class="programlisting">#define GNOME_PARAM_APP_SYSCONFDIR      "app-sysconfdir"
 </pre>
 <p>
 This parameter contains the prefix where this application's configuration files
@@ -1438,9 +1340,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651734"></a><h3>
+<a name="id2580041"></a><h3>
 <a name="GNOME-PARAM-APP-DATADIR:CAPS"></a>GNOME_PARAM_APP_DATADIR</h3>
-<a class="indexterm" name="id2651746"></a><pre class="programlisting">#define GNOME_PARAM_APP_DATADIR         "app-datadir"
+<a class="indexterm" name="id2580053"></a><pre class="programlisting">#define GNOME_PARAM_APP_DATADIR         "app-datadir"
 </pre>
 <p>
 This parameter contains the prefix where this application's data files are
@@ -1449,9 +1351,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651763"></a><h3>
+<a name="id2580070"></a><h3>
 <a name="GNOME-PARAM-APP-LIBDIR:CAPS"></a>GNOME_PARAM_APP_LIBDIR</h3>
-<a class="indexterm" name="id2651773"></a><pre class="programlisting">#define GNOME_PARAM_APP_LIBDIR          "app-libdir"
+<a class="indexterm" name="id2580080"></a><pre class="programlisting">#define GNOME_PARAM_APP_LIBDIR          "app-libdir"
 </pre>
 <p>
 This parameter contains the prefix where this application's library files are
@@ -1460,9 +1362,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651790"></a><h3>
+<a name="id2580097"></a><h3>
 <a name="GNOME-PARAM-HUMAN-READABLE-NAME:CAPS"></a>GNOME_PARAM_HUMAN_READABLE_NAME</h3>
-<a class="indexterm" name="id2651802"></a><pre class="programlisting">#define GNOME_PARAM_HUMAN_READABLE_NAME "human-readable-name"
+<a class="indexterm" name="id2580109"></a><pre class="programlisting">#define GNOME_PARAM_HUMAN_READABLE_NAME "human-readable-name"
 </pre>
 <p>
 This parameter contains the human readable name of the application (readable).
@@ -1470,9 +1372,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651819"></a><h3>
+<a name="id2580126"></a><h3>
 <a name="GNOME-PARAM-GNOME-PATH:CAPS"></a>GNOME_PARAM_GNOME_PATH</h3>
-<a class="indexterm" name="id2651830"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_PATH          "gnome-path"
+<a class="indexterm" name="id2580137"></a><pre class="programlisting">#define GNOME_PARAM_GNOME_PATH          "gnome-path"
 </pre>
 <p>
 This parameter contains the path in which to look for installed files (taken
@@ -1481,9 +1383,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651846"></a><h3>
+<a name="id2580154"></a><h3>
 <a name="GNOME-PARAM-NONE:CAPS"></a>GNOME_PARAM_NONE</h3>
-<a class="indexterm" name="id2651857"></a><pre class="programlisting">#define GNOME_PARAM_NONE                NULL
+<a class="indexterm" name="id2580164"></a><pre class="programlisting">#define GNOME_PARAM_NONE                NULL
 </pre>
 <p>
 Used to terminate a list of parameters and their values.
@@ -1491,9 +1393,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2651872"></a><h3>
+<a name="id2580180"></a><h3>
 <a name="GNOME-PROGRAM-STANDARD-PROPERTIES:CAPS"></a>GNOME_PROGRAM_STANDARD_PROPERTIES</h3>
-<a class="indexterm" name="id2651885"></a><pre class="programlisting">#define             GNOME_PROGRAM_STANDARD_PROPERTIES</pre>
+<a class="indexterm" name="id2580192"></a><pre class="programlisting">#define             GNOME_PROGRAM_STANDARD_PROPERTIES</pre>
 <p>
 When PREFIX, SYSCONFDIR, DATADIR and LIBDIR are defined during the build
 process, this macro can be used to assign these values to
@@ -1507,9 +1409,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2651948"></a><div class="refsect2" lang="en"><a name="id2651949"></a></div>
+<a name="id2580255"></a><div class="refsect2" lang="en"><a name="id2580256"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2651950"></a></div>
+<div class="refsect2" lang="en"><a name="id2580257"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix07.html
+++ libgnome-2.21.90/doc/reference/html/ix07.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691939"></a>Index of new symbols in 2.10</h2></div></div></div>
+<a name="id2620251"></a>Index of new symbols in 2.10</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix05.html
+++ libgnome-2.21.90/doc/reference/html/ix05.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691922"></a>Index of new symbols in 2.6</h2></div></div></div>
+<a name="id2620233"></a>Index of new symbols in 2.6</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome.devhelp
+++ libgnome-2.21.90/doc/reference/html/libgnome.devhelp
@@ -83,16 +83,16 @@
     <function name="GNOME_PARAM_GNOME_PATH" link="libgnome-gnome-program.html#GNOME-PARAM-GNOME-PATH:CAPS"/>
     <function name="GNOME_PARAM_NONE" link="libgnome-gnome-program.html#GNOME-PARAM-NONE:CAPS"/>
     <function name="GNOME_PROGRAM_STANDARD_PROPERTIES" link="libgnome-gnome-program.html#GNOME-PROGRAM-STANDARD-PROPERTIES:CAPS"/>
-    <function name="" link="libgnome-gnome-program.html#id2651949"/>
-    <function name="" link="libgnome-gnome-program.html#id2651950"/>
+    <function name="" link="libgnome-gnome-program.html#id2580256"/>
+    <function name="" link="libgnome-gnome-program.html#id2580257"/>
     <function name="LIBGNOME_MODULE" link="libgnome-gnome-init.html#LIBGNOME-MODULE:CAPS"/>
     <function name="libgnome_module_info_get ()" link="libgnome-gnome-init.html#libgnome-module-info-get"/>
     <function name="gnome_bonobo_module_info_get ()" link="libgnome-gnome-init.html#gnome-bonobo-module-info-get"/>
     <function name="gnome_user_dir_get ()" link="libgnome-gnome-init.html#gnome-user-dir-get"/>
     <function name="gnome_user_private_dir_get ()" link="libgnome-gnome-init.html#gnome-user-private-dir-get"/>
     <function name="gnome_user_accels_dir_get ()" link="libgnome-gnome-init.html#gnome-user-accels-dir-get"/>
-    <function name="" link="libgnome-gnome-init.html#id2657168"/>
-    <function name="" link="libgnome-gnome-init.html#id2657169"/>
+    <function name="" link="libgnome-gnome-init.html#id2585478"/>
+    <function name="" link="libgnome-gnome-init.html#id2585479"/>
     <function name="gnome_execute_async ()" link="libgnome-gnome-exec.html#gnome-execute-async"/>
     <function name="gnome_execute_async_fds ()" link="libgnome-gnome-exec.html#gnome-execute-async-fds"/>
     <function name="gnome_execute_async_with_env ()" link="libgnome-gnome-exec.html#gnome-execute-async-with-env"/>
@@ -102,12 +102,12 @@
     <function name="gnome_prepend_terminal_to_vector ()" link="libgnome-gnome-exec.html#gnome-prepend-terminal-to-vector"/>
     <function name="gnome_execute_terminal_shell ()" link="libgnome-gnome-exec.html#gnome-execute-terminal-shell"/>
     <function name="gnome_execute_terminal_shell_fds ()" link="libgnome-gnome-exec.html#gnome-execute-terminal-shell-fds"/>
-    <function name="" link="libgnome-gnome-exec.html#id2659633"/>
-    <function name="" link="libgnome-gnome-exec.html#id2659634"/>
+    <function name="" link="libgnome-gnome-exec.html#id2587944"/>
+    <function name="" link="libgnome-gnome-exec.html#id2587945"/>
     <function name="gnome_gconf_get_gnome_libs_settings_relative ()" link="libgnome-gnome-gconf.html#gnome-gconf-get-gnome-libs-settings-relative"/>
     <function name="gnome_gconf_get_app_settings_relative ()" link="libgnome-gnome-gconf.html#gnome-gconf-get-app-settings-relative"/>
-    <function name="" link="libgnome-gnome-gconf.html#id2661858"/>
-    <function name="" link="libgnome-gnome-gconf.html#id2661859"/>
+    <function name="" link="libgnome-gnome-gconf.html#id2590169"/>
+    <function name="" link="libgnome-gnome-gconf.html#id2590170"/>
     <function name="enum GnomeHelpError" link="libgnome-gnome-help.html#GnomeHelpError"/>
     <function name="GNOME_HELP_ERROR" link="libgnome-gnome-help.html#GNOME-HELP-ERROR:CAPS"/>
     <function name="gnome_help_display ()" link="libgnome-gnome-help.html#gnome-help-display"/>
@@ -117,14 +117,14 @@
     <function name="gnome_help_display_desktop_with_env ()" link="libgnome-gnome-help.html#gnome-help-display-desktop-with-env"/>
     <function name="gnome_help_display_uri ()" link="libgnome-gnome-help.html#gnome-help-display-uri"/>
     <function name="gnome_help_display_uri_with_env ()" link="libgnome-gnome-help.html#gnome-help-display-uri-with-env"/>
-    <function name="" link="libgnome-gnome-help.html#id2664599"/>
-    <function name="" link="libgnome-gnome-help.html#id2664600"/>
+    <function name="" link="libgnome-gnome-help.html#id2592910"/>
+    <function name="" link="libgnome-gnome-help.html#id2592911"/>
     <function name="enum GnomeURLError" link="libgnome-gnome-url.html#GnomeURLError"/>
     <function name="GNOME_URL_ERROR" link="libgnome-gnome-url.html#GNOME-URL-ERROR:CAPS"/>
     <function name="gnome_url_show ()" link="libgnome-gnome-url.html#gnome-url-show"/>
     <function name="gnome_url_show_with_env ()" link="libgnome-gnome-url.html#gnome-url-show-with-env"/>
-    <function name="" link="libgnome-gnome-url.html#id2667604"/>
-    <function name="" link="libgnome-gnome-url.html#id2667605"/>
+    <function name="" link="libgnome-gnome-url.html#id2595915"/>
+    <function name="" link="libgnome-gnome-url.html#id2595916"/>
     <function name="gnome_is_program_in_path()" link="libgnome-gnome-util.html#gnome-is-program-in-path"/>
     <function name="g_extension_pointer ()" link="libgnome-gnome-util.html#g-extension-pointer"/>
     <function name="gnome_util_prepend_user_home()" link="libgnome-gnome-util.html#gnome-util-prepend-user-home"/>
@@ -148,25 +148,25 @@
     <function name="gnome_unconditional_sound_file()" link="libgnome-gnome-util.html#gnome-unconditional-sound-file"/>
     <function name="gnome_unconditional_pixmap_file()" link="libgnome-gnome-util.html#gnome-unconditional-pixmap-file"/>
     <function name="gnome_unconditional_config_file()" link="libgnome-gnome-util.html#gnome-unconditional-config-file"/>
-    <function name="" link="libgnome-gnome-util.html#id2670882"/>
-    <function name="" link="libgnome-gnome-util.html#id2670883"/>
+    <function name="" link="libgnome-gnome-util.html#id2599194"/>
+    <function name="" link="libgnome-gnome-util.html#id2599195"/>
     <function name="gnome_sound_init ()" link="libgnome-gnome-sound.html#gnome-sound-init"/>
     <function name="gnome_sound_shutdown ()" link="libgnome-gnome-sound.html#gnome-sound-shutdown"/>
     <function name="gnome_sound_play ()" link="libgnome-gnome-sound.html#gnome-sound-play"/>
     <function name="gnome_sound_sample_load ()" link="libgnome-gnome-sound.html#gnome-sound-sample-load"/>
     <function name="gnome_sound_connection_get ()" link="libgnome-gnome-sound.html#gnome-sound-connection-get"/>
-    <function name="" link="libgnome-gnome-sound.html#id2673945"/>
-    <function name="" link="libgnome-gnome-sound.html#id2673946"/>
+    <function name="" link="libgnome-gnome-sound.html#id2602256"/>
+    <function name="" link="libgnome-gnome-sound.html#id2602257"/>
     <function name="enum GnomeTriggerType" link="libgnome-gnome-triggers.html#GnomeTriggerType"/>
     <function name="GnomeTriggerActionFunction ()" link="libgnome-gnome-triggers.html#GnomeTriggerActionFunction"/>
-    <function name="" link="libgnome-gnome-triggers.html#id2674983"/>
-    <function name="" link="libgnome-gnome-triggers.html#id2674984"/>
+    <function name="" link="libgnome-gnome-triggers.html#id2603294"/>
+    <function name="" link="libgnome-gnome-triggers.html#id2603296"/>
     <function name="GNOME_TYPE_TRIGGER_TYPE" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-TRIGGER-TYPE:CAPS"/>
     <function name="GNOME_TYPE_FILE_DOMAIN" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-FILE-DOMAIN:CAPS"/>
     <function name="GNOME_TYPE_HELP_ERROR" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-HELP-ERROR:CAPS"/>
     <function name="GNOME_TYPE_URL_ERROR" link="libgnome-libgnometypebuiltins.html#GNOME-TYPE-URL-ERROR:CAPS"/>
-    <function name="" link="libgnome-libgnometypebuiltins.html#id2675727"/>
-    <function name="" link="libgnome-libgnometypebuiltins.html#id2675728"/>
+    <function name="" link="libgnome-libgnometypebuiltins.html#id2604038"/>
+    <function name="" link="libgnome-libgnometypebuiltins.html#id2604039"/>
     <function name="gnome_config_get_string()" link="libgnome-gnome-config.html#gnome-config-get-string"/>
     <function name="gnome_config_get_string_with_default()" link="libgnome-gnome-config.html#gnome-config-get-string-with-default"/>
     <function name="gnome_config_get_translated_string()" link="libgnome-gnome-config.html#gnome-config-get-translated-string"/>
@@ -228,17 +228,17 @@
     <function name="gnome_config_push_prefix ()" link="libgnome-gnome-config.html#gnome-config-push-prefix"/>
     <function name="gnome_config_pop_prefix ()" link="libgnome-gnome-config.html#gnome-config-pop-prefix"/>
     <function name="gnome_config_make_vector ()" link="libgnome-gnome-config.html#gnome-config-make-vector"/>
-    <function name="" link="libgnome-gnome-config.html#id2683099"/>
-    <function name="" link="libgnome-gnome-config.html#id2683100"/>
+    <function name="" link="libgnome-gnome-config.html#id2611410"/>
+    <function name="" link="libgnome-gnome-config.html#id2611411"/>
     <function name="gnome_i18n_get_language_list ()" link="libgnome-gnome-i18n.html#gnome-i18n-get-language-list"/>
     <function name="gnome_i18n_push_c_numeric_locale ()" link="libgnome-gnome-i18n.html#gnome-i18n-push-c-numeric-locale"/>
     <function name="gnome_i18n_pop_c_numeric_locale ()" link="libgnome-gnome-i18n.html#gnome-i18n-pop-c-numeric-locale"/>
-    <function name="" link="libgnome-gnome-i18n.html#id2690566"/>
-    <function name="" link="libgnome-gnome-i18n.html#id2690567"/>
+    <function name="" link="libgnome-gnome-i18n.html#id2618878"/>
+    <function name="" link="libgnome-gnome-i18n.html#id2618879"/>
     <function name="gnome_score_init ()" link="libgnome-gnome-score.html#gnome-score-init"/>
     <function name="gnome_score_log ()" link="libgnome-gnome-score.html#gnome-score-log"/>
     <function name="gnome_score_get_notable ()" link="libgnome-gnome-score.html#gnome-score-get-notable"/>
-    <function name="" link="libgnome-gnome-score.html#id2691759"/>
-    <function name="" link="libgnome-gnome-score.html#id2691760"/>
+    <function name="" link="libgnome-gnome-score.html#id2620071"/>
+    <function name="" link="libgnome-gnome-score.html#id2620072"/>
   </functions>
 </book>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-util.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-util.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-sound.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2668382" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2596694" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2668678" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2596989" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-util"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2668382"></a><span class="refentrytitle">gnome-util</span>
+<a name="id2596694"></a><span class="refentrytitle">gnome-util</span>
 </h2>
 <p>gnome-util &#8212; Miscellaneous utility functions.</p>
 </td>
@@ -66,9 +66,7 @@
 char*               <a class="link" href="libgnome-gnome-util.html#gnome-util-user-shell">gnome_util_user_shell</a>               (void);
 int                 <a class="link" href="libgnome-gnome-util.html#gnome-setenv">gnome_setenv</a>                        (const char *name,
                                                          const char *value,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> overwrite);
+                                                         gboolean overwrite);
 void                <a class="link" href="libgnome-gnome-util.html#gnome-unsetenv">gnome_unsetenv</a>                      (const char *name);
 void                <a class="link" href="libgnome-gnome-util.html#gnome-clearenv">gnome_clearenv</a>                      (void);
 
@@ -90,7 +88,7 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2668678"></a><h2>Description</h2>
+<a name="id2596989"></a><h2>Description</h2>
 <p>
 The functions in this section provide some shortcuts to finding certain file
 paths. There are also some functions for manipulating environment variables for
@@ -107,19 +105,17 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2668720"></a><h2>Details</h2>
+<a name="id2597031"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2668730"></a><h3>
+<a name="id2597041"></a><h3>
 <a name="gnome-is-program-in-path"></a>gnome_is_program_in_path()</h3>
-<a class="indexterm" name="id2668746"></a><pre class="programlisting">#define             gnome_is_program_in_path(program)</pre>
+<a class="indexterm" name="id2597057"></a><pre class="programlisting">#define             gnome_is_program_in_path(program)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_is_program_in_path</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-Deprecated, use <a
-href="/usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html#g-find-program-in-path"
-><span class="type">g_find_program_in_path</span></a></p>
+Deprecated, use <span class="type">g_find_program_in_path</span></p>
 <p>
 
 </p>
@@ -133,12 +129,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> if program is not on the path or a string
-allocated with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-malloc"
-><code class="function">g_malloc()</code></a> with the full path name of the program
+<td> <code class="literal">NULL</code> if program is not on the path or a string
+allocated with <code class="function">g_malloc()</code> with the full path name of the program
 found.
 </td>
 </tr>
@@ -147,9 +139,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2668837"></a><h3>
+<a name="id2597148"></a><h3>
 <a name="g-extension-pointer"></a>g_extension_pointer ()</h3>
-<a class="indexterm" name="id2668850"></a><pre class="programlisting">const char*         g_extension_pointer                 (const char *path);</pre>
+<a class="indexterm" name="id2597161"></a><pre class="programlisting">const char*         g_extension_pointer                 (const char *path);</pre>
 <p>
 Extracts the extension from the end of a filename (the part after the final
 '.' in the filename).</p>
@@ -176,9 +168,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2668915"></a><h3>
+<a name="id2597226"></a><h3>
 <a name="gnome-util-prepend-user-home"></a>gnome_util_prepend_user_home()</h3>
-<a class="indexterm" name="id2668928"></a><pre class="programlisting">#define             gnome_util_prepend_user_home(x)</pre>
+<a class="indexterm" name="id2597240"></a><pre class="programlisting">#define             gnome_util_prepend_user_home(x)</pre>
 <p>
 Prepends the home directory of the user to a filename.
 </p>
@@ -193,9 +185,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
 <td>A string containing <em class="parameter"><code>x</code></em> with the user's home directory path prepended.
-The string should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer required.
+The string should be freed with <code class="function">g_free()</code> when no longer required.
 
 
 </td>
@@ -205,9 +195,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2668992"></a><h3>
+<a name="id2597303"></a><h3>
 <a name="gnome-util-home-file"></a>gnome_util_home_file()</h3>
-<a class="indexterm" name="id2669005"></a><pre class="programlisting">#define             gnome_util_home_file(afile)</pre>
+<a class="indexterm" name="id2597317"></a><pre class="programlisting">#define             gnome_util_home_file(afile)</pre>
 <p>
 Similar to <a class="link" href="libgnome-gnome-util.html#gnome-util-prepend-user-home"><code class="function">gnome_util_prepend_user_home()</code></a>, except that "/home/fred/.gnome2",
 instead of just "/home/fred/" is put on the front.
@@ -218,9 +208,7 @@
 <td><p><span class="term"><em class="parameter"><code>afile</code></em>&#160;:</span></p></td>
 <td> A filename relative to the user's .gnome2 directory.
 Returns: A string containing <em class="parameter"><code>afile</code></em> with the user's home directory path  and
-"/.gnome2" prepended. The string should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer
+"/.gnome2" prepended. The string should be freed with <code class="function">g_free()</code> when no longer
 required.
 
 
@@ -230,9 +218,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669072"></a><h3>
+<a name="id2597383"></a><h3>
 <a name="gnome-util-user-shell"></a>gnome_util_user_shell ()</h3>
-<a class="indexterm" name="id2669084"></a><pre class="programlisting">char*               gnome_util_user_shell               (void);</pre>
+<a class="indexterm" name="id2597396"></a><pre class="programlisting">char*               gnome_util_user_shell               (void);</pre>
 <p>
 Retrieves the user's preferred shell.</p>
 <p>
@@ -249,13 +237,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669126"></a><h3>
+<a name="id2597437"></a><h3>
 <a name="gnome-setenv"></a>gnome_setenv ()</h3>
-<a class="indexterm" name="id2669138"></a><pre class="programlisting">int                 gnome_setenv                        (const char *name,
+<a class="indexterm" name="id2597450"></a><pre class="programlisting">int                 gnome_setenv                        (const char *name,
                                                          const char *value,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> overwrite);</pre>
+                                                         gboolean overwrite);</pre>
 <p>
 Adds "<em class="parameter"><code>name</code></em>=<em class="parameter"><code>value</code></em>" to the environment. Note that on systems without setenv,
 this leaks memory so please do not use inside a loop or anything like that.
@@ -263,9 +249,7 @@
 used).
 </p>
 <p>
-If <em class="parameter"><code>overwrite</code></em> is <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> and the variable already exists in the environment,
+If <em class="parameter"><code>overwrite</code></em> is <code class="literal">FALSE</code> and the variable already exists in the environment,
 then <code class="literal">0</code> is returned and the value is not changed.</p>
 <p>
 
@@ -285,9 +269,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>overwrite</code></em>&#160;:</span></p></td>
-<td> If <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a>, overwrite the existing <em class="parameter"><code>name</code></em> variable in the
+<td> If <code class="literal">TRUE</code>, overwrite the existing <em class="parameter"><code>name</code></em> variable in the
 environment.
 </td>
 </tr>
@@ -302,9 +284,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669348"></a><h3>
+<a name="id2597659"></a><h3>
 <a name="gnome-unsetenv"></a>gnome_unsetenv ()</h3>
-<a class="indexterm" name="id2669361"></a><pre class="programlisting">void                gnome_unsetenv                      (const char *name);</pre>
+<a class="indexterm" name="id2597672"></a><pre class="programlisting">void                gnome_unsetenv                      (const char *name);</pre>
 <p>
 Removes <em class="parameter"><code>name</code></em> from the environment.
 In case there is no native implementation of unsetenv,
@@ -324,9 +306,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669420"></a><h3>
+<a name="id2597731"></a><h3>
 <a name="gnome-clearenv"></a>gnome_clearenv ()</h3>
-<a class="indexterm" name="id2669432"></a><pre class="programlisting">void                gnome_clearenv                      (void);</pre>
+<a class="indexterm" name="id2597744"></a><pre class="programlisting">void                gnome_clearenv                      (void);</pre>
 <p>
 Clears out the environment completely.
 In case there is no native implementation of clearenv,
@@ -338,17 +320,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669460"></a><h3>
+<a name="id2597771"></a><h3>
 <a name="g-concat-dir-and-file"></a>g_concat_dir_and_file()</h3>
-<a class="indexterm" name="id2669475"></a><pre class="programlisting">#define             g_concat_dir_and_file(dir,file)</pre>
+<a class="indexterm" name="id2597787"></a><pre class="programlisting">#define             g_concat_dir_and_file(dir,file)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">g_concat_dir_and_file</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-Programs should use <a
-href="/usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html#g-build-filename"
-><code class="function">g_build_filename()</code></a> instead of this function.
+Programs should use <code class="function">g_build_filename()</code> instead of this function.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -376,9 +356,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669572"></a><h3>
+<a name="id2597883"></a><h3>
 <a name="g-file-exists"></a>g_file_exists()</h3>
-<a class="indexterm" name="id2669587"></a><pre class="programlisting">#define             g_file_exists(filename)</pre>
+<a class="indexterm" name="id2597898"></a><pre class="programlisting">#define             g_file_exists(filename)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">g_file_exists</code> is deprecated and should not be used in newly-written code.</p>
@@ -397,11 +377,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td>Returns <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>filename</code></em> exists, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td>Returns <code class="literal">TRUE</code> if <em class="parameter"><code>filename</code></em> exists, <code class="literal">FALSE</code> otherwise.
 
 
 </td>
@@ -411,20 +387,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669678"></a><h3>
+<a name="id2597989"></a><h3>
 <a name="g-unix-error-string"></a>g_unix_error_string()</h3>
-<a class="indexterm" name="id2669693"></a><pre class="programlisting">#define             g_unix_error_string(error_num)</pre>
+<a class="indexterm" name="id2598004"></a><pre class="programlisting">#define             g_unix_error_string(error_num)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">g_unix_error_string</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-Programs should use <a
-href="/usr/share/gtk-doc/html/glib/glib-String-Utility-Functions.html#g-strerror"
-><code class="function">g_strerror()</code></a> instead of this function. Also, note that the
-returned string is only valid until the next call to <a
-href="/usr/share/gtk-doc/html/glib/glib-String-Utility-Functions.html#g-strerror"
-><code class="function">g_strerror()</code></a> or
+Programs should use <code class="function">g_strerror()</code> instead of this function. Also, note that the
+returned string is only valid until the next call to <code class="function">g_strerror()</code> or
 <a class="link" href="libgnome-gnome-util.html#g-unix-error-string"><code class="function">g_unix_error_string()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -447,17 +419,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669793"></a><h3>
+<a name="id2598104"></a><h3>
 <a name="gnome-util-user-home"></a>gnome_util_user_home()</h3>
-<a class="indexterm" name="id2669808"></a><pre class="programlisting">#define             gnome_util_user_home()</pre>
+<a class="indexterm" name="id2598119"></a><pre class="programlisting">#define             gnome_util_user_home()</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_util_user_home</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-Programs should use <a
-href="/usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html#g-get-home-dir"
-><code class="function">g_get_home_dir()</code></a> instead of this function.
+Programs should use <code class="function">g_get_home_dir()</code> instead of this function.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -472,33 +442,27 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669864"></a><h3>
+<a name="id2598175"></a><h3>
 <a name="g-copy-vector"></a>g_copy_vector()</h3>
-<a class="indexterm" name="id2669879"></a><pre class="programlisting">#define             g_copy_vector(vec)</pre>
+<a class="indexterm" name="id2598190"></a><pre class="programlisting">#define             g_copy_vector(vec)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">g_copy_vector</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-Use <a
-href="/usr/share/gtk-doc/html/glib/glib-String-Utility-Functions.html#g-strdupv"
-><code class="function">g_strdupv()</code></a> instead of this function.
+Use <code class="function">g_strdupv()</code> instead of this function.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>vec</code></em>&#160;:</span></p></td>
-<td>An array of strings. <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> terminated.
+<td>An array of strings. <code class="literal">NULL</code> terminated.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td>A copy of the <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>-terminated string array.
+<td>A copy of the <code class="literal">NULL</code>-terminated string array.
 
 
 </td>
@@ -508,9 +472,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2669969"></a><h3>
+<a name="id2598280"></a><h3>
 <a name="gnome-libdir-file"></a>gnome_libdir_file()</h3>
-<a class="indexterm" name="id2669983"></a><pre class="programlisting">#define             gnome_libdir_file(f)</pre>
+<a class="indexterm" name="id2598295"></a><pre class="programlisting">#define             gnome_libdir_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_libdir_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -539,9 +503,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670059"></a><h3>
+<a name="id2598370"></a><h3>
 <a name="gnome-datadir-file"></a>gnome_datadir_file()</h3>
-<a class="indexterm" name="id2670074"></a><pre class="programlisting">#define             gnome_datadir_file(f)</pre>
+<a class="indexterm" name="id2598385"></a><pre class="programlisting">#define             gnome_datadir_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_datadir_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -570,9 +534,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670149"></a><h3>
+<a name="id2598460"></a><h3>
 <a name="gnome-sound-file"></a>gnome_sound_file()</h3>
-<a class="indexterm" name="id2670164"></a><pre class="programlisting">#define             gnome_sound_file(f)</pre>
+<a class="indexterm" name="id2598476"></a><pre class="programlisting">#define             gnome_sound_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_sound_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -601,9 +565,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670240"></a><h3>
+<a name="id2598551"></a><h3>
 <a name="gnome-pixmap-file"></a>gnome_pixmap_file()</h3>
-<a class="indexterm" name="id2670255"></a><pre class="programlisting">#define             gnome_pixmap_file(f)</pre>
+<a class="indexterm" name="id2598566"></a><pre class="programlisting">#define             gnome_pixmap_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_pixmap_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -632,9 +596,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670330"></a><h3>
+<a name="id2598642"></a><h3>
 <a name="gnome-config-file"></a>gnome_config_file()</h3>
-<a class="indexterm" name="id2670345"></a><pre class="programlisting">#define             gnome_config_file(f)</pre>
+<a class="indexterm" name="id2598656"></a><pre class="programlisting">#define             gnome_config_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -663,9 +627,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670420"></a><h3>
+<a name="id2598732"></a><h3>
 <a name="gnome-unconditional-libdir-file"></a>gnome_unconditional_libdir_file()</h3>
-<a class="indexterm" name="id2670436"></a><pre class="programlisting">#define             gnome_unconditional_libdir_file(f)</pre>
+<a class="indexterm" name="id2598747"></a><pre class="programlisting">#define             gnome_unconditional_libdir_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_unconditional_libdir_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -694,9 +658,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670512"></a><h3>
+<a name="id2598824"></a><h3>
 <a name="gnome-unconditional-datadir-file"></a>gnome_unconditional_datadir_file()</h3>
-<a class="indexterm" name="id2670528"></a><pre class="programlisting">#define             gnome_unconditional_datadir_file(f)</pre>
+<a class="indexterm" name="id2598839"></a><pre class="programlisting">#define             gnome_unconditional_datadir_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_unconditional_datadir_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -725,9 +689,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670604"></a><h3>
+<a name="id2598915"></a><h3>
 <a name="gnome-unconditional-sound-file"></a>gnome_unconditional_sound_file()</h3>
-<a class="indexterm" name="id2670620"></a><pre class="programlisting">#define             gnome_unconditional_sound_file(f)</pre>
+<a class="indexterm" name="id2598931"></a><pre class="programlisting">#define             gnome_unconditional_sound_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_unconditional_sound_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -756,9 +720,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670696"></a><h3>
+<a name="id2599007"></a><h3>
 <a name="gnome-unconditional-pixmap-file"></a>gnome_unconditional_pixmap_file()</h3>
-<a class="indexterm" name="id2670711"></a><pre class="programlisting">#define             gnome_unconditional_pixmap_file(f)</pre>
+<a class="indexterm" name="id2599023"></a><pre class="programlisting">#define             gnome_unconditional_pixmap_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_unconditional_pixmap_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -787,9 +751,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2670788"></a><h3>
+<a name="id2599099"></a><h3>
 <a name="gnome-unconditional-config-file"></a>gnome_unconditional_config_file()</h3>
-<a class="indexterm" name="id2670804"></a><pre class="programlisting">#define             gnome_unconditional_config_file(f)</pre>
+<a class="indexterm" name="id2599115"></a><pre class="programlisting">#define             gnome_unconditional_config_file(f)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_unconditional_config_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -818,9 +782,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670881"></a><div class="refsect2" lang="en"><a name="id2670882"></a></div>
+<a name="id2599193"></a><div class="refsect2" lang="en"><a name="id2599194"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2670883"></a></div>
+<div class="refsect2" lang="en"><a name="id2599195"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-triggers.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-triggers.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ch05.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2673960" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2602272" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2674620" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2602932" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-triggers"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2673960"></a><span class="refentrytitle">gnome-triggers</span>
+<a name="id2602272"></a><span class="refentrytitle">gnome-triggers</span>
 </h2>
 <p>gnome-triggers &#8212; Hierarchical signal mechanism for GNOME events.</p>
 </td>
@@ -66,7 +66,7 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2674620"></a><h2>Description</h2>
+<a name="id2602932"></a><h2>Description</h2>
 <p>
 The triggers API provides a way for applications to tell GNOME about
 interesting events that then cause something to happen (for example, playing a
@@ -90,11 +90,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2674668"></a><h2>Details</h2>
+<a name="id2602979"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2674678"></a><h3>
+<a name="id2602989"></a><h3>
 <a name="GnomeTriggerType"></a>enum GnomeTriggerType</h3>
-<a class="indexterm" name="id2674691"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2603002"></a><pre class="programlisting">typedef enum {
 	GTRIG_NONE,
 	GTRIG_FUNCTION,
 	GTRIG_COMMAND,
@@ -134,42 +134,32 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2674814"></a><h3>
+<a name="id2603125"></a><h3>
 <a name="GnomeTriggerActionFunction"></a>GnomeTriggerActionFunction ()</h3>
-<a class="indexterm" name="id2674827"></a><pre class="programlisting">void                (*GnomeTriggerActionFunction)       (char *msg,
+<a class="indexterm" name="id2603139"></a><pre class="programlisting">void                (*GnomeTriggerActionFunction)       (char *msg,
                                                          char *level,
                                                          char *supinfo[]);</pre>
 <p>
 The signature of a function that can used as a target for <a class="link" href="libgnome-gnome-triggers.html#GTRIG-FUNCTION:CAPS"><span class="type">GTRIG_FUNCTION</span></a>
-types of <a
-href="/usr/share/gtk-doc/html/libgnome/libgnome-gnome-triggers.html#GnomeTrigger"
-><span class="type">GnomeTrigger</span></a> instances.
+types of <span class="type">GnomeTrigger</span> instances.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>msg</code></em>&#160;:</span></p></td>
-<td>The human-readable message that was passed to <a
-href="/usr/share/gtk-doc/html/libgnome/libgnome-gnome-triggers.html#gnome-triggers-do"
-><code class="function">gnome_triggers_do()</code></a>. May be
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>.
+<td>The human-readable message that was passed to <code class="function">gnome_triggers_do()</code>. May be
+<code class="literal">NULL</code>.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>level</code></em>&#160;:</span></p></td>
-<td>The severity level of the event. May be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>.
+<td>The severity level of the event. May be <code class="literal">NULL</code>.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>supinfo</code></em>&#160;:</span></p></td>
-<td>The section in which the event belongs. This is a <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> terminated
+<td>The section in which the event belongs. This is a <code class="literal">NULL</code> terminated
 array.
 
 
@@ -180,9 +170,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2674982"></a><div class="refsect2" lang="en"><a name="id2674983"></a></div>
+<a name="id2603293"></a><div class="refsect2" lang="en"><a name="id2603294"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2674984"></a></div>
+<div class="refsect2" lang="en"><a name="id2603296"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix10.html
+++ libgnome-2.21.90/doc/reference/html/ix10.html
@@ -37,7 +37,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691967"></a>Index of new symbols in 2.16</h2></div></div></div>
+<a name="id2620279"></a>Index of new symbols in 2.16</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix01.html
+++ libgnome-2.21.90/doc/reference/html/ix01.html
@@ -38,361 +38,361 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691888"></a>Index</h2></div></div></div>
+<a name="id2620200"></a>Index</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>G</h3>
 <dl>
-<dt>GnomeFileDomain, <a class="indexterm" href="libgnome-gnome-program.html#id2648146">enum GnomeFileDomain</a>
+<dt>GnomeFileDomain, <a class="indexterm" href="libgnome-gnome-program.html#id2576453">enum GnomeFileDomain</a>
 </dt>
-<dt>GnomeHelpError, <a class="indexterm" href="libgnome-gnome-help.html#id2662663">enum GnomeHelpError</a>
+<dt>GnomeHelpError, <a class="indexterm" href="libgnome-gnome-help.html#id2590974">enum GnomeHelpError</a>
 </dt>
-<dt>GnomeModuleClassInitHook, <a class="indexterm" href="libgnome-gnome-program.html#id2649097">GnomeModuleClassInitHook ()</a>
+<dt>GnomeModuleClassInitHook, <a class="indexterm" href="libgnome-gnome-program.html#id2577404">GnomeModuleClassInitHook ()</a>
 </dt>
-<dt>GnomeModuleHook, <a class="indexterm" href="libgnome-gnome-program.html#id2649177">GnomeModuleHook ()</a>
+<dt>GnomeModuleHook, <a class="indexterm" href="libgnome-gnome-program.html#id2577484">GnomeModuleHook ()</a>
 </dt>
-<dt>GnomeModuleInfo, <a class="indexterm" href="libgnome-gnome-program.html#id2648564">GnomeModuleInfo</a>
+<dt>GnomeModuleInfo, <a class="indexterm" href="libgnome-gnome-program.html#id2576871">GnomeModuleInfo</a>
 </dt>
-<dt>GnomeModuleInitHook, <a class="indexterm" href="libgnome-gnome-program.html#id2649042">GnomeModuleInitHook ()</a>
+<dt>GnomeModuleInitHook, <a class="indexterm" href="libgnome-gnome-program.html#id2577349">GnomeModuleInitHook ()</a>
 </dt>
-<dt>GnomeModuleRequirement, <a class="indexterm" href="libgnome-gnome-program.html#id2648963">GnomeModuleRequirement</a>
+<dt>GnomeModuleRequirement, <a class="indexterm" href="libgnome-gnome-program.html#id2577270">GnomeModuleRequirement</a>
 </dt>
-<dt>GnomeProgram, <a class="indexterm" href="libgnome-gnome-program.html#id2648476">GnomeProgram</a>
+<dt>GnomeProgram, <a class="indexterm" href="libgnome-gnome-program.html#id2576783">GnomeProgram</a>
 </dt>
-<dt>GnomeTriggerActionFunction, <a class="indexterm" href="libgnome-gnome-triggers.html#id2674814">GnomeTriggerActionFunction ()</a>
+<dt>GnomeTriggerActionFunction, <a class="indexterm" href="libgnome-gnome-triggers.html#id2603125">GnomeTriggerActionFunction ()</a>
 </dt>
-<dt>GnomeTriggerType, <a class="indexterm" href="libgnome-gnome-triggers.html#id2674678">enum GnomeTriggerType</a>
+<dt>GnomeTriggerType, <a class="indexterm" href="libgnome-gnome-triggers.html#id2602989">enum GnomeTriggerType</a>
 </dt>
-<dt>GnomeURLError, <a class="indexterm" href="libgnome-gnome-url.html#id2667040">enum GnomeURLError</a>
+<dt>GnomeURLError, <a class="indexterm" href="libgnome-gnome-url.html#id2595351">enum GnomeURLError</a>
 </dt>
-<dt>gnome_bonobo_module_info_get, <a class="indexterm" href="libgnome-gnome-init.html#id2656901">gnome_bonobo_module_info_get ()</a>
+<dt>gnome_bonobo_module_info_get, <a class="indexterm" href="libgnome-gnome-init.html#id2585212">gnome_bonobo_module_info_get ()</a>
 </dt>
-<dt>gnome_clearenv, <a class="indexterm" href="libgnome-gnome-util.html#id2669420">gnome_clearenv ()</a>
+<dt>gnome_clearenv, <a class="indexterm" href="libgnome-gnome-util.html#id2597731">gnome_clearenv ()</a>
 </dt>
-<dt>gnome_config_assemble_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680675">gnome_config_assemble_vector ()</a>
+<dt>gnome_config_assemble_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608986">gnome_config_assemble_vector ()</a>
 </dt>
-<dt>gnome_config_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682148">gnome_config_clean_file()</a>
+<dt>gnome_config_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610460">gnome_config_clean_file()</a>
 </dt>
-<dt>gnome_config_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2682495">gnome_config_clean_key()</a>
+<dt>gnome_config_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2610806">gnome_config_clean_key()</a>
 </dt>
-<dt>gnome_config_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2682324">gnome_config_clean_section()</a>
+<dt>gnome_config_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2610636">gnome_config_clean_section()</a>
 </dt>
-<dt>gnome_config_drop_all, <a class="indexterm" href="libgnome-gnome-config.html#id2681587">gnome_config_drop_all ()</a>
+<dt>gnome_config_drop_all, <a class="indexterm" href="libgnome-gnome-config.html#id2609898">gnome_config_drop_all ()</a>
 </dt>
-<dt>gnome_config_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681990">gnome_config_drop_file()</a>
+<dt>gnome_config_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610301">gnome_config_drop_file()</a>
 </dt>
-<dt>gnome_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670330">gnome_config_file()</a>
+<dt>gnome_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598642">gnome_config_file()</a>
 </dt>
-<dt>gnome_config_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679439">gnome_config_get_bool()</a>
+<dt>gnome_config_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2607751">gnome_config_get_bool()</a>
 </dt>
-<dt>gnome_config_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679516">gnome_config_get_bool_with_default()</a>
+<dt>gnome_config_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607828">gnome_config_get_bool_with_default()</a>
 </dt>
-<dt>gnome_config_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2678892">gnome_config_get_float()</a>
+<dt>gnome_config_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607204">gnome_config_get_float()</a>
 </dt>
-<dt>gnome_config_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678969">gnome_config_get_float_with_default()</a>
+<dt>gnome_config_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607281">gnome_config_get_float_with_default()</a>
 </dt>
-<dt>gnome_config_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678346">gnome_config_get_int()</a>
+<dt>gnome_config_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2606658">gnome_config_get_int()</a>
 </dt>
-<dt>gnome_config_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678423">gnome_config_get_int_with_default()</a>
+<dt>gnome_config_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606735">gnome_config_get_int_with_default()</a>
 </dt>
-<dt>gnome_config_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2682658">gnome_config_get_real_path()</a>
+<dt>gnome_config_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2610970">gnome_config_get_real_path()</a>
 </dt>
-<dt>gnome_config_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677151">gnome_config_get_string()</a>
+<dt>gnome_config_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605463">gnome_config_get_string()</a>
 </dt>
-<dt>gnome_config_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677240">gnome_config_get_string_with_default()</a>
+<dt>gnome_config_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605551">gnome_config_get_string_with_default()</a>
 </dt>
-<dt>gnome_config_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677352">gnome_config_get_translated_string()</a>
+<dt>gnome_config_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605663">gnome_config_get_translated_string()</a>
 </dt>
-<dt>gnome_config_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677442">gnome_config_get_translated_string_with_default()</a>
+<dt>gnome_config_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605754">gnome_config_get_translated_string_with_default()</a>
 </dt>
-<dt>gnome_config_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2679984">gnome_config_get_vector()</a>
+<dt>gnome_config_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608296">gnome_config_get_vector()</a>
 </dt>
-<dt>gnome_config_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2680091">gnome_config_get_vector_with_default()</a>
+<dt>gnome_config_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608402">gnome_config_get_vector_with_default()</a>
 </dt>
-<dt>gnome_config_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2680805">gnome_config_has_section()</a>
+<dt>gnome_config_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2609116">gnome_config_has_section()</a>
 </dt>
-<dt>gnome_config_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2681013">gnome_config_init_iterator()</a>
+<dt>gnome_config_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2609325">gnome_config_init_iterator()</a>
 </dt>
-<dt>gnome_config_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2681207">gnome_config_init_iterator_sections()</a>
+<dt>gnome_config_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2609518">gnome_config_init_iterator_sections()</a>
 </dt>
-<dt>gnome_config_iterator_next, <a class="indexterm" href="libgnome-gnome-config.html#id2681403">gnome_config_iterator_next ()</a>
+<dt>gnome_config_iterator_next, <a class="indexterm" href="libgnome-gnome-config.html#id2609715">gnome_config_iterator_next ()</a>
 </dt>
-<dt>gnome_config_make_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2682960">gnome_config_make_vector ()</a>
+<dt>gnome_config_make_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2611272">gnome_config_make_vector ()</a>
 </dt>
-<dt>gnome_config_pop_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2682906">gnome_config_pop_prefix ()</a>
+<dt>gnome_config_pop_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2611218">gnome_config_pop_prefix ()</a>
 </dt>
-<dt>gnome_config_private_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682235">gnome_config_private_clean_file()</a>
+<dt>gnome_config_private_clean_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610547">gnome_config_private_clean_file()</a>
 </dt>
-<dt>gnome_config_private_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2682576">gnome_config_private_clean_key()</a>
+<dt>gnome_config_private_clean_key, <a class="indexterm" href="libgnome-gnome-config.html#id2610887">gnome_config_private_clean_key()</a>
 </dt>
-<dt>gnome_config_private_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2682409">gnome_config_private_clean_section()</a>
+<dt>gnome_config_private_clean_section, <a class="indexterm" href="libgnome-gnome-config.html#id2610720">gnome_config_private_clean_section()</a>
 </dt>
-<dt>gnome_config_private_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2682074">gnome_config_private_drop_file()</a>
+<dt>gnome_config_private_drop_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610386">gnome_config_private_drop_file()</a>
 </dt>
-<dt>gnome_config_private_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679615">gnome_config_private_get_bool()</a>
+<dt>gnome_config_private_get_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2607927">gnome_config_private_get_bool()</a>
 </dt>
-<dt>gnome_config_private_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679695">gnome_config_private_get_bool_with_default()</a>
+<dt>gnome_config_private_get_bool_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608006">gnome_config_private_get_bool_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679069">gnome_config_private_get_float()</a>
+<dt>gnome_config_private_get_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607381">gnome_config_private_get_float()</a>
 </dt>
-<dt>gnome_config_private_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2679149">gnome_config_private_get_float_with_default()</a>
+<dt>gnome_config_private_get_float_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2607461">gnome_config_private_get_float_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678523">gnome_config_private_get_int()</a>
+<dt>gnome_config_private_get_int, <a class="indexterm" href="libgnome-gnome-config.html#id2606835">gnome_config_private_get_int()</a>
 </dt>
-<dt>gnome_config_private_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2678603">gnome_config_private_get_int_with_default()</a>
+<dt>gnome_config_private_get_int_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606914">gnome_config_private_get_int_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2682733">gnome_config_private_get_real_path()</a>
+<dt>gnome_config_private_get_real_path, <a class="indexterm" href="libgnome-gnome-config.html#id2611045">gnome_config_private_get_real_path()</a>
 </dt>
-<dt>gnome_config_private_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677556">gnome_config_private_get_string()</a>
+<dt>gnome_config_private_get_string, <a class="indexterm" href="libgnome-gnome-config.html#id2605867">gnome_config_private_get_string()</a>
 </dt>
-<dt>gnome_config_private_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677646">gnome_config_private_get_string_with_default()</a>
+<dt>gnome_config_private_get_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2605958">gnome_config_private_get_string_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677760">gnome_config_private_get_translated_string()</a>
+<dt>gnome_config_private_get_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606071">gnome_config_private_get_translated_string()</a>
 </dt>
-<dt>gnome_config_private_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2677853">gnome_config_private_get_translated_string_with_default()</a>
+<dt>gnome_config_private_get_translated_string_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2606164">gnome_config_private_get_translated_string_with_default()</a>
 </dt>
-<dt>gnome_config_private_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680214">gnome_config_private_get_vector()</a>
+<dt>gnome_config_private_get_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608525">gnome_config_private_get_vector()</a>
 </dt>
-<dt>gnome_config_private_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2680323">gnome_config_private_get_vector_with_default()</a>
+<dt>gnome_config_private_get_vector_with_default, <a class="indexterm" href="libgnome-gnome-config.html#id2608634">gnome_config_private_get_vector_with_default()</a>
 </dt>
-<dt>gnome_config_private_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2680908">gnome_config_private_has_section()</a>
+<dt>gnome_config_private_has_section, <a class="indexterm" href="libgnome-gnome-config.html#id2609220">gnome_config_private_has_section()</a>
 </dt>
-<dt>gnome_config_private_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2681110">gnome_config_private_init_iterator()</a>
+<dt>gnome_config_private_init_iterator, <a class="indexterm" href="libgnome-gnome-config.html#id2609421">gnome_config_private_init_iterator()</a>
 </dt>
-<dt>gnome_config_private_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2681304">gnome_config_private_init_iterator_sections()</a>
+<dt>gnome_config_private_init_iterator_sections, <a class="indexterm" href="libgnome-gnome-config.html#id2609616">gnome_config_private_init_iterator_sections()</a>
 </dt>
-<dt>gnome_config_private_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679890">gnome_config_private_set_bool()</a>
+<dt>gnome_config_private_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2608201">gnome_config_private_set_bool()</a>
 </dt>
-<dt>gnome_config_private_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679344">gnome_config_private_set_float()</a>
+<dt>gnome_config_private_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607656">gnome_config_private_set_float()</a>
 </dt>
-<dt>gnome_config_private_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678797">gnome_config_private_set_int()</a>
+<dt>gnome_config_private_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2607109">gnome_config_private_set_int()</a>
 </dt>
-<dt>gnome_config_private_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678155">gnome_config_private_set_string()</a>
+<dt>gnome_config_private_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606467">gnome_config_private_set_string()</a>
 </dt>
-<dt>gnome_config_private_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678250">gnome_config_private_set_translated_string()</a>
+<dt>gnome_config_private_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606561">gnome_config_private_set_translated_string()</a>
 </dt>
-<dt>gnome_config_private_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680561">gnome_config_private_set_vector()</a>
+<dt>gnome_config_private_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608872">gnome_config_private_set_vector()</a>
 </dt>
-<dt>gnome_config_private_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681863">gnome_config_private_sync_file()</a>
+<dt>gnome_config_private_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610175">gnome_config_private_sync_file()</a>
 </dt>
-<dt>gnome_config_push_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2682810">gnome_config_push_prefix ()</a>
+<dt>gnome_config_push_prefix, <a class="indexterm" href="libgnome-gnome-config.html#id2611122">gnome_config_push_prefix ()</a>
 </dt>
-<dt>gnome_config_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2679797">gnome_config_set_bool()</a>
+<dt>gnome_config_set_bool, <a class="indexterm" href="libgnome-gnome-config.html#id2608108">gnome_config_set_bool()</a>
 </dt>
-<dt>gnome_config_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2679251">gnome_config_set_float()</a>
+<dt>gnome_config_set_float, <a class="indexterm" href="libgnome-gnome-config.html#id2607563">gnome_config_set_float()</a>
 </dt>
-<dt>gnome_config_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2678705">gnome_config_set_int()</a>
+<dt>gnome_config_set_int, <a class="indexterm" href="libgnome-gnome-config.html#id2607016">gnome_config_set_int()</a>
 </dt>
-<dt>gnome_config_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2677968">gnome_config_set_string()</a>
+<dt>gnome_config_set_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606280">gnome_config_set_string()</a>
 </dt>
-<dt>gnome_config_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2678061">gnome_config_set_translated_string()</a>
+<dt>gnome_config_set_translated_string, <a class="indexterm" href="libgnome-gnome-config.html#id2606372">gnome_config_set_translated_string()</a>
 </dt>
-<dt>gnome_config_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2680448">gnome_config_set_vector()</a>
+<dt>gnome_config_set_vector, <a class="indexterm" href="libgnome-gnome-config.html#id2608760">gnome_config_set_vector()</a>
 </dt>
-<dt>gnome_config_sync, <a class="indexterm" href="libgnome-gnome-config.html#id2681642">gnome_config_sync ()</a>
+<dt>gnome_config_sync, <a class="indexterm" href="libgnome-gnome-config.html#id2609954">gnome_config_sync ()</a>
 </dt>
-<dt>gnome_config_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2681737">gnome_config_sync_file()</a>
+<dt>gnome_config_sync_file, <a class="indexterm" href="libgnome-gnome-config.html#id2610048">gnome_config_sync_file()</a>
 </dt>
-<dt>gnome_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670059">gnome_datadir_file()</a>
+<dt>gnome_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598370">gnome_datadir_file()</a>
 </dt>
-<dt>gnome_execute_async, <a class="indexterm" href="libgnome-gnome-exec.html#id2658157">gnome_execute_async ()</a>
+<dt>gnome_execute_async, <a class="indexterm" href="libgnome-gnome-exec.html#id2586467">gnome_execute_async ()</a>
 </dt>
-<dt>gnome_execute_async_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2658307">gnome_execute_async_fds ()</a>
+<dt>gnome_execute_async_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2586618">gnome_execute_async_fds ()</a>
 </dt>
-<dt>gnome_execute_async_with_env, <a class="indexterm" href="libgnome-gnome-exec.html#id2658490">gnome_execute_async_with_env ()</a>
+<dt>gnome_execute_async_with_env, <a class="indexterm" href="libgnome-gnome-exec.html#id2586800">gnome_execute_async_with_env ()</a>
 </dt>
-<dt>gnome_execute_async_with_env_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2658692">gnome_execute_async_with_env_fds ()</a>
+<dt>gnome_execute_async_with_env_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2587002">gnome_execute_async_with_env_fds ()</a>
 </dt>
-<dt>gnome_execute_shell, <a class="indexterm" href="libgnome-gnome-exec.html#id2658919">gnome_execute_shell ()</a>
+<dt>gnome_execute_shell, <a class="indexterm" href="libgnome-gnome-exec.html#id2587229">gnome_execute_shell ()</a>
 </dt>
-<dt>gnome_execute_shell_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2659049">gnome_execute_shell_fds ()</a>
+<dt>gnome_execute_shell_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2587359">gnome_execute_shell_fds ()</a>
 </dt>
-<dt>gnome_execute_terminal_shell, <a class="indexterm" href="libgnome-gnome-exec.html#id2659329">gnome_execute_terminal_shell ()</a>
+<dt>gnome_execute_terminal_shell, <a class="indexterm" href="libgnome-gnome-exec.html#id2587640">gnome_execute_terminal_shell ()</a>
 </dt>
-<dt>gnome_execute_terminal_shell_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2659457">gnome_execute_terminal_shell_fds ()</a>
+<dt>gnome_execute_terminal_shell_fds, <a class="indexterm" href="libgnome-gnome-exec.html#id2587768">gnome_execute_terminal_shell_fds ()</a>
 </dt>
-<dt>gnome_gconf_get_app_settings_relative, <a class="indexterm" href="libgnome-gnome-gconf.html#id2661730">gnome_gconf_get_app_settings_relative ()</a>
+<dt>gnome_gconf_get_app_settings_relative, <a class="indexterm" href="libgnome-gnome-gconf.html#id2590041">gnome_gconf_get_app_settings_relative ()</a>
 </dt>
-<dt>gnome_gconf_get_gnome_libs_settings_relative, <a class="indexterm" href="libgnome-gnome-gconf.html#id2661650">gnome_gconf_get_gnome_libs_settings_relative ()</a>
+<dt>gnome_gconf_get_gnome_libs_settings_relative, <a class="indexterm" href="libgnome-gnome-gconf.html#id2589960">gnome_gconf_get_gnome_libs_settings_relative ()</a>
 </dt>
-<dt>gnome_help_display, <a class="indexterm" href="libgnome-gnome-help.html#id2662794">gnome_help_display ()</a>
+<dt>gnome_help_display, <a class="indexterm" href="libgnome-gnome-help.html#id2591105">gnome_help_display ()</a>
 </dt>
-<dt>gnome_help_display_desktop, <a class="indexterm" href="libgnome-gnome-help.html#id2663627">gnome_help_display_desktop ()</a>
+<dt>gnome_help_display_desktop, <a class="indexterm" href="libgnome-gnome-help.html#id2591938">gnome_help_display_desktop ()</a>
 </dt>
-<dt>gnome_help_display_desktop_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2663931">gnome_help_display_desktop_with_env ()</a>
+<dt>gnome_help_display_desktop_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2592242">gnome_help_display_desktop_with_env ()</a>
 </dt>
-<dt>gnome_help_display_uri, <a class="indexterm" href="libgnome-gnome-help.html#id2664231">gnome_help_display_uri ()</a>
+<dt>gnome_help_display_uri, <a class="indexterm" href="libgnome-gnome-help.html#id2592542">gnome_help_display_uri ()</a>
 </dt>
-<dt>gnome_help_display_uri_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2664395">gnome_help_display_uri_with_env ()</a>
+<dt>gnome_help_display_uri_with_env, <a class="indexterm" href="libgnome-gnome-help.html#id2592706">gnome_help_display_uri_with_env ()</a>
 </dt>
-<dt>gnome_help_display_with_doc_id, <a class="indexterm" href="libgnome-gnome-help.html#id2662981">gnome_help_display_with_doc_id ()</a>
+<dt>gnome_help_display_with_doc_id, <a class="indexterm" href="libgnome-gnome-help.html#id2591292">gnome_help_display_with_doc_id ()</a>
 </dt>
-<dt>gnome_help_display_with_doc_id_and_env, <a class="indexterm" href="libgnome-gnome-help.html#id2663316">gnome_help_display_with_doc_id_and_env ()</a>
+<dt>gnome_help_display_with_doc_id_and_env, <a class="indexterm" href="libgnome-gnome-help.html#id2591627">gnome_help_display_with_doc_id_and_env ()</a>
 </dt>
-<dt>GNOME_HELP_ERROR, <a class="indexterm" href="libgnome-gnome-help.html#id2662754">GNOME_HELP_ERROR</a>
+<dt>GNOME_HELP_ERROR, <a class="indexterm" href="libgnome-gnome-help.html#id2591065">GNOME_HELP_ERROR</a>
 </dt>
-<dt>gnome_i18n_get_language_list, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690287">gnome_i18n_get_language_list ()</a>
+<dt>gnome_i18n_get_language_list, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618599">gnome_i18n_get_language_list ()</a>
 </dt>
-<dt>gnome_i18n_pop_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690494">gnome_i18n_pop_c_numeric_locale ()</a>
+<dt>gnome_i18n_pop_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618806">gnome_i18n_pop_c_numeric_locale ()</a>
 </dt>
-<dt>gnome_i18n_push_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2690412">gnome_i18n_push_c_numeric_locale ()</a>
+<dt>gnome_i18n_push_c_numeric_locale, <a class="indexterm" href="libgnome-gnome-i18n.html#id2618724">gnome_i18n_push_c_numeric_locale ()</a>
 </dt>
-<dt>gnome_is_program_in_path, <a class="indexterm" href="libgnome-gnome-util.html#id2668730">gnome_is_program_in_path()</a>
+<dt>gnome_is_program_in_path, <a class="indexterm" href="libgnome-gnome-util.html#id2597041">gnome_is_program_in_path()</a>
 </dt>
-<dt>gnome_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2669969">gnome_libdir_file()</a>
+<dt>gnome_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598280">gnome_libdir_file()</a>
 </dt>
-<dt>GNOME_PARAM_APP_DATADIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651734">GNOME_PARAM_APP_DATADIR</a>
+<dt>GNOME_PARAM_APP_DATADIR, <a class="indexterm" href="libgnome-gnome-program.html#id2580041">GNOME_PARAM_APP_DATADIR</a>
 </dt>
-<dt>GNOME_PARAM_APP_ID, <a class="indexterm" href="libgnome-gnome-program.html#id2651510">GNOME_PARAM_APP_ID</a>
+<dt>GNOME_PARAM_APP_ID, <a class="indexterm" href="libgnome-gnome-program.html#id2579817">GNOME_PARAM_APP_ID</a>
 </dt>
-<dt>GNOME_PARAM_APP_LIBDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651763">GNOME_PARAM_APP_LIBDIR</a>
+<dt>GNOME_PARAM_APP_LIBDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2580070">GNOME_PARAM_APP_LIBDIR</a>
 </dt>
-<dt>GNOME_PARAM_APP_PREFIX, <a class="indexterm" href="libgnome-gnome-program.html#id2651679">GNOME_PARAM_APP_PREFIX</a>
+<dt>GNOME_PARAM_APP_PREFIX, <a class="indexterm" href="libgnome-gnome-program.html#id2579986">GNOME_PARAM_APP_PREFIX</a>
 </dt>
-<dt>GNOME_PARAM_APP_SYSCONFDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651706">GNOME_PARAM_APP_SYSCONFDIR</a>
+<dt>GNOME_PARAM_APP_SYSCONFDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2580013">GNOME_PARAM_APP_SYSCONFDIR</a>
 </dt>
-<dt>GNOME_PARAM_APP_VERSION, <a class="indexterm" href="libgnome-gnome-program.html#id2651537">GNOME_PARAM_APP_VERSION</a>
+<dt>GNOME_PARAM_APP_VERSION, <a class="indexterm" href="libgnome-gnome-program.html#id2579844">GNOME_PARAM_APP_VERSION</a>
 </dt>
-<dt>GNOME_PARAM_CREATE_DIRECTORIES, <a class="indexterm" href="libgnome-gnome-program.html#id2651419">GNOME_PARAM_CREATE_DIRECTORIES</a>
+<dt>GNOME_PARAM_CREATE_DIRECTORIES, <a class="indexterm" href="libgnome-gnome-program.html#id2579726">GNOME_PARAM_CREATE_DIRECTORIES</a>
 </dt>
-<dt>GNOME_PARAM_ENABLE_SOUND, <a class="indexterm" href="libgnome-gnome-program.html#id2651456">GNOME_PARAM_ENABLE_SOUND</a>
+<dt>GNOME_PARAM_ENABLE_SOUND, <a class="indexterm" href="libgnome-gnome-program.html#id2579763">GNOME_PARAM_ENABLE_SOUND</a>
 </dt>
-<dt>GNOME_PARAM_ESPEAKER, <a class="indexterm" href="libgnome-gnome-program.html#id2651484">GNOME_PARAM_ESPEAKER</a>
+<dt>GNOME_PARAM_ESPEAKER, <a class="indexterm" href="libgnome-gnome-program.html#id2579791">GNOME_PARAM_ESPEAKER</a>
 </dt>
-<dt>GNOME_PARAM_GNOME_DATADIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651622">GNOME_PARAM_GNOME_DATADIR</a>
+<dt>GNOME_PARAM_GNOME_DATADIR, <a class="indexterm" href="libgnome-gnome-program.html#id2579929">GNOME_PARAM_GNOME_DATADIR</a>
 </dt>
-<dt>GNOME_PARAM_GNOME_LIBDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651651">GNOME_PARAM_GNOME_LIBDIR</a>
+<dt>GNOME_PARAM_GNOME_LIBDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2579958">GNOME_PARAM_GNOME_LIBDIR</a>
 </dt>
-<dt>GNOME_PARAM_GNOME_PATH, <a class="indexterm" href="libgnome-gnome-program.html#id2651819">GNOME_PARAM_GNOME_PATH</a>
+<dt>GNOME_PARAM_GNOME_PATH, <a class="indexterm" href="libgnome-gnome-program.html#id2580126">GNOME_PARAM_GNOME_PATH</a>
 </dt>
-<dt>GNOME_PARAM_GNOME_PREFIX, <a class="indexterm" href="libgnome-gnome-program.html#id2651564">GNOME_PARAM_GNOME_PREFIX</a>
+<dt>GNOME_PARAM_GNOME_PREFIX, <a class="indexterm" href="libgnome-gnome-program.html#id2579871">GNOME_PARAM_GNOME_PREFIX</a>
 </dt>
-<dt>GNOME_PARAM_GNOME_SYSCONFDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2651593">GNOME_PARAM_GNOME_SYSCONFDIR</a>
+<dt>GNOME_PARAM_GNOME_SYSCONFDIR, <a class="indexterm" href="libgnome-gnome-program.html#id2579900">GNOME_PARAM_GNOME_SYSCONFDIR</a>
 </dt>
-<dt>GNOME_PARAM_GOPTION_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2651356">GNOME_PARAM_GOPTION_CONTEXT</a>
+<dt>GNOME_PARAM_GOPTION_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2579663">GNOME_PARAM_GOPTION_CONTEXT</a>
 </dt>
-<dt>GNOME_PARAM_HUMAN_READABLE_NAME, <a class="indexterm" href="libgnome-gnome-program.html#id2651790">GNOME_PARAM_HUMAN_READABLE_NAME</a>
+<dt>GNOME_PARAM_HUMAN_READABLE_NAME, <a class="indexterm" href="libgnome-gnome-program.html#id2580097">GNOME_PARAM_HUMAN_READABLE_NAME</a>
 </dt>
-<dt>GNOME_PARAM_NONE, <a class="indexterm" href="libgnome-gnome-program.html#id2651846">GNOME_PARAM_NONE</a>
+<dt>GNOME_PARAM_NONE, <a class="indexterm" href="libgnome-gnome-program.html#id2580154">GNOME_PARAM_NONE</a>
 </dt>
-<dt>GNOME_PARAM_POPT_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2651306">GNOME_PARAM_POPT_CONTEXT</a>
+<dt>GNOME_PARAM_POPT_CONTEXT, <a class="indexterm" href="libgnome-gnome-program.html#id2579613">GNOME_PARAM_POPT_CONTEXT</a>
 </dt>
-<dt>GNOME_PARAM_POPT_FLAGS, <a class="indexterm" href="libgnome-gnome-program.html#id2651264">GNOME_PARAM_POPT_FLAGS</a>
+<dt>GNOME_PARAM_POPT_FLAGS, <a class="indexterm" href="libgnome-gnome-program.html#id2579572">GNOME_PARAM_POPT_FLAGS</a>
 </dt>
-<dt>GNOME_PARAM_POPT_TABLE, <a class="indexterm" href="libgnome-gnome-program.html#id2651207">GNOME_PARAM_POPT_TABLE</a>
+<dt>GNOME_PARAM_POPT_TABLE, <a class="indexterm" href="libgnome-gnome-program.html#id2579514">GNOME_PARAM_POPT_TABLE</a>
 </dt>
-<dt>gnome_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670240">gnome_pixmap_file()</a>
+<dt>gnome_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598551">gnome_pixmap_file()</a>
 </dt>
-<dt>gnome_prepend_terminal_to_vector, <a class="indexterm" href="libgnome-gnome-exec.html#id2659212">gnome_prepend_terminal_to_vector ()</a>
+<dt>gnome_prepend_terminal_to_vector, <a class="indexterm" href="libgnome-gnome-exec.html#id2587522">gnome_prepend_terminal_to_vector ()</a>
 </dt>
-<dt>gnome_program_get, <a class="indexterm" href="libgnome-gnome-program.html#id2649916">gnome_program_get ()</a>
+<dt>gnome_program_get, <a class="indexterm" href="libgnome-gnome-program.html#id2578223">gnome_program_get ()</a>
 </dt>
-<dt>gnome_program_get_app_id, <a class="indexterm" href="libgnome-gnome-program.html#id2650083">gnome_program_get_app_id ()</a>
+<dt>gnome_program_get_app_id, <a class="indexterm" href="libgnome-gnome-program.html#id2578390">gnome_program_get_app_id ()</a>
 </dt>
-<dt>gnome_program_get_app_version, <a class="indexterm" href="libgnome-gnome-program.html#id2650152">gnome_program_get_app_version ()</a>
+<dt>gnome_program_get_app_version, <a class="indexterm" href="libgnome-gnome-program.html#id2578459">gnome_program_get_app_version ()</a>
 </dt>
-<dt>gnome_program_get_human_readable_name, <a class="indexterm" href="libgnome-gnome-program.html#id2649994">gnome_program_get_human_readable_name ()</a>
+<dt>gnome_program_get_human_readable_name, <a class="indexterm" href="libgnome-gnome-program.html#id2578301">gnome_program_get_human_readable_name ()</a>
 </dt>
-<dt>gnome_program_init, <a class="indexterm" href="libgnome-gnome-program.html#id2649263">gnome_program_init ()</a>
+<dt>gnome_program_init, <a class="indexterm" href="libgnome-gnome-program.html#id2577570">gnome_program_init ()</a>
 </dt>
-<dt>gnome_program_initv, <a class="indexterm" href="libgnome-gnome-program.html#id2649661">gnome_program_initv ()</a>
+<dt>gnome_program_initv, <a class="indexterm" href="libgnome-gnome-program.html#id2577968">gnome_program_initv ()</a>
 </dt>
-<dt>gnome_program_install_property, <a class="indexterm" href="libgnome-gnome-program.html#id2650713">gnome_program_install_property ()</a>
+<dt>gnome_program_install_property, <a class="indexterm" href="libgnome-gnome-program.html#id2579020">gnome_program_install_property ()</a>
 </dt>
-<dt>gnome_program_locate_file, <a class="indexterm" href="libgnome-gnome-program.html#id2650224">gnome_program_locate_file ()</a>
+<dt>gnome_program_locate_file, <a class="indexterm" href="libgnome-gnome-program.html#id2578531">gnome_program_locate_file ()</a>
 </dt>
-<dt>gnome_program_module_load, <a class="indexterm" href="libgnome-gnome-program.html#id2650624">gnome_program_module_load ()</a>
+<dt>gnome_program_module_load, <a class="indexterm" href="libgnome-gnome-program.html#id2578931">gnome_program_module_load ()</a>
 </dt>
-<dt>gnome_program_module_register, <a class="indexterm" href="libgnome-gnome-program.html#id2650472">gnome_program_module_register ()</a>
+<dt>gnome_program_module_register, <a class="indexterm" href="libgnome-gnome-program.html#id2578780">gnome_program_module_register ()</a>
 </dt>
-<dt>gnome_program_module_registered, <a class="indexterm" href="libgnome-gnome-program.html#id2650551">gnome_program_module_registered ()</a>
+<dt>gnome_program_module_registered, <a class="indexterm" href="libgnome-gnome-program.html#id2578858">gnome_program_module_registered ()</a>
 </dt>
-<dt>gnome_program_parse_args, <a class="indexterm" href="libgnome-gnome-program.html#id2651041">gnome_program_parse_args ()</a>
+<dt>gnome_program_parse_args, <a class="indexterm" href="libgnome-gnome-program.html#id2579348">gnome_program_parse_args ()</a>
 </dt>
-<dt>gnome_program_postinit, <a class="indexterm" href="libgnome-gnome-program.html#id2651120">gnome_program_postinit ()</a>
+<dt>gnome_program_postinit, <a class="indexterm" href="libgnome-gnome-program.html#id2579427">gnome_program_postinit ()</a>
 </dt>
-<dt>gnome_program_preinit, <a class="indexterm" href="libgnome-gnome-program.html#id2650854">gnome_program_preinit ()</a>
+<dt>gnome_program_preinit, <a class="indexterm" href="libgnome-gnome-program.html#id2579161">gnome_program_preinit ()</a>
 </dt>
-<dt>GNOME_PROGRAM_STANDARD_PROPERTIES, <a class="indexterm" href="libgnome-gnome-program.html#id2651872">GNOME_PROGRAM_STANDARD_PROPERTIES</a>
+<dt>GNOME_PROGRAM_STANDARD_PROPERTIES, <a class="indexterm" href="libgnome-gnome-program.html#id2580180">GNOME_PROGRAM_STANDARD_PROPERTIES</a>
 </dt>
-<dt>gnome_score_get_notable, <a class="indexterm" href="libgnome-gnome-score.html#id2691536">gnome_score_get_notable ()</a>
+<dt>gnome_score_get_notable, <a class="indexterm" href="libgnome-gnome-score.html#id2619848">gnome_score_get_notable ()</a>
 </dt>
-<dt>gnome_score_init, <a class="indexterm" href="libgnome-gnome-score.html#id2691256">gnome_score_init ()</a>
+<dt>gnome_score_init, <a class="indexterm" href="libgnome-gnome-score.html#id2619568">gnome_score_init ()</a>
 </dt>
-<dt>gnome_score_log, <a class="indexterm" href="libgnome-gnome-score.html#id2691378">gnome_score_log ()</a>
+<dt>gnome_score_log, <a class="indexterm" href="libgnome-gnome-score.html#id2619690">gnome_score_log ()</a>
 </dt>
-<dt>gnome_setenv, <a class="indexterm" href="libgnome-gnome-util.html#id2669126">gnome_setenv ()</a>
+<dt>gnome_setenv, <a class="indexterm" href="libgnome-gnome-util.html#id2597437">gnome_setenv ()</a>
 </dt>
-<dt>gnome_sound_connection_get, <a class="indexterm" href="libgnome-gnome-sound.html#id2673854">gnome_sound_connection_get ()</a>
+<dt>gnome_sound_connection_get, <a class="indexterm" href="libgnome-gnome-sound.html#id2602166">gnome_sound_connection_get ()</a>
 </dt>
-<dt>gnome_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670149">gnome_sound_file()</a>
+<dt>gnome_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598460">gnome_sound_file()</a>
 </dt>
-<dt>gnome_sound_init, <a class="indexterm" href="libgnome-gnome-sound.html#id2673556">gnome_sound_init ()</a>
+<dt>gnome_sound_init, <a class="indexterm" href="libgnome-gnome-sound.html#id2601867">gnome_sound_init ()</a>
 </dt>
-<dt>gnome_sound_play, <a class="indexterm" href="libgnome-gnome-sound.html#id2673658">gnome_sound_play ()</a>
+<dt>gnome_sound_play, <a class="indexterm" href="libgnome-gnome-sound.html#id2601969">gnome_sound_play ()</a>
 </dt>
-<dt>gnome_sound_sample_load, <a class="indexterm" href="libgnome-gnome-sound.html#id2673729">gnome_sound_sample_load ()</a>
+<dt>gnome_sound_sample_load, <a class="indexterm" href="libgnome-gnome-sound.html#id2602040">gnome_sound_sample_load ()</a>
 </dt>
-<dt>gnome_sound_shutdown, <a class="indexterm" href="libgnome-gnome-sound.html#id2673620">gnome_sound_shutdown ()</a>
+<dt>gnome_sound_shutdown, <a class="indexterm" href="libgnome-gnome-sound.html#id2601931">gnome_sound_shutdown ()</a>
 </dt>
-<dt>GNOME_TYPE_FILE_DOMAIN, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2675611">GNOME_TYPE_FILE_DOMAIN</a>
+<dt>GNOME_TYPE_FILE_DOMAIN, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2603923">GNOME_TYPE_FILE_DOMAIN</a>
 </dt>
-<dt>GNOME_TYPE_HELP_ERROR, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2675650">GNOME_TYPE_HELP_ERROR</a>
+<dt>GNOME_TYPE_HELP_ERROR, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2603961">GNOME_TYPE_HELP_ERROR</a>
 </dt>
-<dt>GNOME_TYPE_TRIGGER_TYPE, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2675573">GNOME_TYPE_TRIGGER_TYPE</a>
+<dt>GNOME_TYPE_TRIGGER_TYPE, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2603884">GNOME_TYPE_TRIGGER_TYPE</a>
 </dt>
-<dt>GNOME_TYPE_URL_ERROR, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2675687">GNOME_TYPE_URL_ERROR</a>
+<dt>GNOME_TYPE_URL_ERROR, <a class="indexterm" href="libgnome-libgnometypebuiltins.html#id2603998">GNOME_TYPE_URL_ERROR</a>
 </dt>
-<dt>gnome_unconditional_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670788">gnome_unconditional_config_file()</a>
+<dt>gnome_unconditional_config_file, <a class="indexterm" href="libgnome-gnome-util.html#id2599099">gnome_unconditional_config_file()</a>
 </dt>
-<dt>gnome_unconditional_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670512">gnome_unconditional_datadir_file()</a>
+<dt>gnome_unconditional_datadir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598824">gnome_unconditional_datadir_file()</a>
 </dt>
-<dt>gnome_unconditional_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670420">gnome_unconditional_libdir_file()</a>
+<dt>gnome_unconditional_libdir_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598732">gnome_unconditional_libdir_file()</a>
 </dt>
-<dt>gnome_unconditional_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670696">gnome_unconditional_pixmap_file()</a>
+<dt>gnome_unconditional_pixmap_file, <a class="indexterm" href="libgnome-gnome-util.html#id2599007">gnome_unconditional_pixmap_file()</a>
 </dt>
-<dt>gnome_unconditional_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2670604">gnome_unconditional_sound_file()</a>
+<dt>gnome_unconditional_sound_file, <a class="indexterm" href="libgnome-gnome-util.html#id2598915">gnome_unconditional_sound_file()</a>
 </dt>
-<dt>gnome_unsetenv, <a class="indexterm" href="libgnome-gnome-util.html#id2669348">gnome_unsetenv ()</a>
+<dt>gnome_unsetenv, <a class="indexterm" href="libgnome-gnome-util.html#id2597659">gnome_unsetenv ()</a>
 </dt>
-<dt>GNOME_URL_ERROR, <a class="indexterm" href="libgnome-gnome-url.html#id2667246">GNOME_URL_ERROR</a>
+<dt>GNOME_URL_ERROR, <a class="indexterm" href="libgnome-gnome-url.html#id2595557">GNOME_URL_ERROR</a>
 </dt>
-<dt>gnome_url_show, <a class="indexterm" href="libgnome-gnome-url.html#id2667275">gnome_url_show ()</a>
+<dt>gnome_url_show, <a class="indexterm" href="libgnome-gnome-url.html#id2595586">gnome_url_show ()</a>
 </dt>
-<dt>gnome_url_show_with_env, <a class="indexterm" href="libgnome-gnome-url.html#id2667420">gnome_url_show_with_env ()</a>
+<dt>gnome_url_show_with_env, <a class="indexterm" href="libgnome-gnome-url.html#id2595731">gnome_url_show_with_env ()</a>
 </dt>
-<dt>gnome_user_accels_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2657096">gnome_user_accels_dir_get ()</a>
+<dt>gnome_user_accels_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2585406">gnome_user_accels_dir_get ()</a>
 </dt>
-<dt>gnome_user_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2656970">gnome_user_dir_get ()</a>
+<dt>gnome_user_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2585280">gnome_user_dir_get ()</a>
 </dt>
-<dt>gnome_user_private_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2657026">gnome_user_private_dir_get ()</a>
+<dt>gnome_user_private_dir_get, <a class="indexterm" href="libgnome-gnome-init.html#id2585336">gnome_user_private_dir_get ()</a>
 </dt>
-<dt>gnome_util_home_file, <a class="indexterm" href="libgnome-gnome-util.html#id2668992">gnome_util_home_file()</a>
+<dt>gnome_util_home_file, <a class="indexterm" href="libgnome-gnome-util.html#id2597303">gnome_util_home_file()</a>
 </dt>
-<dt>gnome_util_prepend_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2668915">gnome_util_prepend_user_home()</a>
+<dt>gnome_util_prepend_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2597226">gnome_util_prepend_user_home()</a>
 </dt>
-<dt>gnome_util_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2669793">gnome_util_user_home()</a>
+<dt>gnome_util_user_home, <a class="indexterm" href="libgnome-gnome-util.html#id2598104">gnome_util_user_home()</a>
 </dt>
-<dt>gnome_util_user_shell, <a class="indexterm" href="libgnome-gnome-util.html#id2669072">gnome_util_user_shell ()</a>
+<dt>gnome_util_user_shell, <a class="indexterm" href="libgnome-gnome-util.html#id2597383">gnome_util_user_shell ()</a>
 </dt>
-<dt>g_concat_dir_and_file, <a class="indexterm" href="libgnome-gnome-util.html#id2669460">g_concat_dir_and_file()</a>
+<dt>g_concat_dir_and_file, <a class="indexterm" href="libgnome-gnome-util.html#id2597771">g_concat_dir_and_file()</a>
 </dt>
-<dt>g_copy_vector, <a class="indexterm" href="libgnome-gnome-util.html#id2669864">g_copy_vector()</a>
+<dt>g_copy_vector, <a class="indexterm" href="libgnome-gnome-util.html#id2598175">g_copy_vector()</a>
 </dt>
-<dt>g_extension_pointer, <a class="indexterm" href="libgnome-gnome-util.html#id2668837">g_extension_pointer ()</a>
+<dt>g_extension_pointer, <a class="indexterm" href="libgnome-gnome-util.html#id2597148">g_extension_pointer ()</a>
 </dt>
-<dt>g_file_exists, <a class="indexterm" href="libgnome-gnome-util.html#id2669572">g_file_exists()</a>
+<dt>g_file_exists, <a class="indexterm" href="libgnome-gnome-util.html#id2597883">g_file_exists()</a>
 </dt>
-<dt>g_unix_error_string, <a class="indexterm" href="libgnome-gnome-util.html#id2669678">g_unix_error_string()</a>
+<dt>g_unix_error_string, <a class="indexterm" href="libgnome-gnome-util.html#id2597989">g_unix_error_string()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>L</h3>
 <dl>
-<dt>LIBGNOME_MODULE, <a class="indexterm" href="libgnome-gnome-init.html#id2656787">LIBGNOME_MODULE</a>
+<dt>LIBGNOME_MODULE, <a class="indexterm" href="libgnome-gnome-init.html#id2585097">LIBGNOME_MODULE</a>
 </dt>
-<dt>libgnome_module_info_get, <a class="indexterm" href="libgnome-gnome-init.html#id2656836">libgnome_module_info_get ()</a>
+<dt>libgnome_module_info_get, <a class="indexterm" href="libgnome-gnome-init.html#id2585147">libgnome_module_info_get ()</a>
 </dt>
 </dl>
 </div>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-score.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-score.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2689913" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2618225" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2691191" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2619502" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-score"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2689913"></a><span class="refentrytitle">gnome-score</span>
+<a name="id2618225"></a><span class="refentrytitle">gnome-score</span>
 </h2>
 <p>gnome-score &#8212; Tracking best scores for games</p>
 </td>
@@ -59,41 +59,19 @@
 #include &lt;libgnome/libgnome.h&gt;
 
 
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                <a class="link" href="libgnome-gnome-score.html#gnome-score-init">gnome_score_init</a>                    (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *gamename);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                <a class="link" href="libgnome-gnome-score.html#gnome-score-log">gnome_score_log</a>                     (<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"
->gfloat</a> score,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *level,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> higher_to_lower_score_order);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                <a class="link" href="libgnome-gnome-score.html#gnome-score-get-notable">gnome_score_get_notable</a>             (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *gamename,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *level,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> ***names,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"
->gfloat</a> **scores,
+gint                <a class="link" href="libgnome-gnome-score.html#gnome-score-init">gnome_score_init</a>                    (const gchar *gamename);
+gint                <a class="link" href="libgnome-gnome-score.html#gnome-score-log">gnome_score_log</a>                     (gfloat score,
+                                                         const gchar *level,
+                                                         gboolean higher_to_lower_score_order);
+gint                <a class="link" href="libgnome-gnome-score.html#gnome-score-get-notable">gnome_score_get_notable</a>             (const gchar *gamename,
+                                                         const gchar *level,
+                                                         gchar ***names,
+                                                         gfloat **scores,
                                                          time_t **scoretimes);
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2691191"></a><h2>Description</h2>
+<a name="id2619502"></a><h2>Description</h2>
 <p>
 The routines in this module provide a simple way to keep track of users' scores
 in a game.
@@ -109,15 +87,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2691246"></a><h2>Details</h2>
+<a name="id2619558"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2691256"></a><h3>
+<a name="id2619568"></a><h3>
 <a name="gnome-score-init"></a>gnome_score_init ()</h3>
-<a class="indexterm" name="id2691271"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                gnome_score_init                    (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *gamename);</pre>
+<a class="indexterm" name="id2619583"></a><pre class="programlisting">gint                gnome_score_init                    (const gchar *gamename);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_score_init</code> is deprecated and should not be used in newly-written code.</p>
@@ -148,19 +122,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2691378"></a><h3>
+<a name="id2619690"></a><h3>
 <a name="gnome-score-log"></a>gnome_score_log ()</h3>
-<a class="indexterm" name="id2691393"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                gnome_score_log                     (<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"
->gfloat</a> score,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *level,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a> higher_to_lower_score_order);</pre>
+<a class="indexterm" name="id2619705"></a><pre class="programlisting">gint                gnome_score_log                     (gfloat score,
+                                                         const gchar *level,
+                                                         gboolean higher_to_lower_score_order);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_score_log</code> is deprecated and should not be used in newly-written code.</p>
@@ -187,9 +153,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>higher_to_lower_score_order</code></em>&#160;:</span></p></td>
-<td> Set to <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if high scores are better than
+<td> Set to <code class="literal">TRUE</code> if high scores are better than
 low scores.
 </td>
 </tr>
@@ -203,22 +167,12 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2691536"></a><h3>
+<a name="id2619848"></a><h3>
 <a name="gnome-score-get-notable"></a>gnome_score_get_notable ()</h3>
-<a class="indexterm" name="id2691551"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
->gint</a>                gnome_score_get_notable             (const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *gamename,
-                                                         const <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> *level,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
->gchar</a> ***names,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"
->gfloat</a> **scores,
+<a class="indexterm" name="id2619863"></a><pre class="programlisting">gint                gnome_score_get_notable             (const gchar *gamename,
+                                                         const gchar *level,
+                                                         gchar ***names,
+                                                         gfloat **scores,
                                                          time_t **scoretimes);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
@@ -260,9 +214,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
 <td> The number of scores returned.  The <em class="parameter"><code>names</code></em>, <em class="parameter"><code>scores</code></em> and <em class="parameter"><code>scoretime</code></em>
-pointers point to regions that were allocated with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-malloc"
-><code class="function">g_malloc()</code></a> with the
+pointers point to regions that were allocated with <code class="function">g_malloc()</code> with the
 contents.
 </td>
 </tr>
@@ -271,9 +223,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2691758"></a><div class="refsect2" lang="en"><a name="id2691759"></a></div>
+<a name="id2620070"></a><div class="refsect2" lang="en"><a name="id2620071"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2691760"></a></div>
+<div class="refsect2" lang="en"><a name="id2620072"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-config.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-config.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-i18n.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2676047" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2604359" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2676767" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2605078" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-config"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2676047"></a><span class="refentrytitle">gnome-config</span>
+<a name="id2604359"></a><span class="refentrytitle">gnome-config</span>
 </h2>
 <p>gnome-config &#8212; Access to configuration files.</p>
 </td>
@@ -113,9 +113,7 @@
                                                          char **value);
 
 void                <a class="link" href="libgnome-gnome-config.html#gnome-config-drop-all">gnome_config_drop_all</a>               (void);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-config.html#gnome-config-sync">gnome_config_sync</a>                   (void);
+gboolean            <a class="link" href="libgnome-gnome-config.html#gnome-config-sync">gnome_config_sync</a>                   (void);
 #define             <a class="link" href="libgnome-gnome-config.html#gnome-config-sync-file">gnome_config_sync_file</a>              (path)
 #define             <a class="link" href="libgnome-gnome-config.html#gnome-config-private-sync-file">gnome_config_private_sync_file</a>      (path)
 #define             <a class="link" href="libgnome-gnome-config.html#gnome-config-drop-file">gnome_config_drop_file</a>              (path)
@@ -137,7 +135,7 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2676767"></a><h2>Description</h2>
+<a name="id2605078"></a><h2>Description</h2>
 <p>
 This module provides a simple method of retrieving and storing configuration
 data that resides in files. It also provides the ability to supply default
@@ -268,20 +266,18 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2677141"></a><h2>Details</h2>
+<a name="id2605452"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2677151"></a><h3>
+<a name="id2605463"></a><h3>
 <a name="gnome-config-get-string"></a>gnome_config_get_string()</h3>
-<a class="indexterm" name="id2677166"></a><pre class="programlisting">#define             gnome_config_get_string(path)</pre>
+<a class="indexterm" name="id2605478"></a><pre class="programlisting">#define             gnome_config_get_string(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_string</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string. This value should
-be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+be freed with <code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -303,18 +299,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677240"></a><h3>
+<a name="id2605551"></a><h3>
 <a name="gnome-config-get-string-with-default"></a>gnome_config_get_string_with_default()</h3>
-<a class="indexterm" name="id2677256"></a><pre class="programlisting">#define             gnome_config_get_string_with_default(path,def)</pre>
+<a class="indexterm" name="id2605568"></a><pre class="programlisting">#define             gnome_config_get_string_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_string_with_default</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string. This value should
-be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+be freed with <code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -343,18 +337,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677352"></a><h3>
+<a name="id2605663"></a><h3>
 <a name="gnome-config-get-translated-string"></a>gnome_config_get_translated_string()</h3>
-<a class="indexterm" name="id2677368"></a><pre class="programlisting">#define             gnome_config_get_translated_string(path)</pre>
+<a class="indexterm" name="id2605680"></a><pre class="programlisting">#define             gnome_config_get_translated_string(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_translated_string</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string appropriate for the
-current language. The returned value should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no
+current language. The returned value should be freed with <code class="function">g_free()</code> when no
 longer needed.</p>
 <p>
 
@@ -377,18 +369,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677442"></a><h3>
+<a name="id2605754"></a><h3>
 <a name="gnome-config-get-translated-string-with-default"></a>gnome_config_get_translated_string_with_default()</h3>
-<a class="indexterm" name="id2677459"></a><pre class="programlisting">#define             gnome_config_get_translated_string_with_default(path,def)</pre>
+<a class="indexterm" name="id2605771"></a><pre class="programlisting">#define             gnome_config_get_translated_string_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_translated_string_with_default</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string appropriate for the
-current language. The returned value should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no
+current language. The returned value should be freed with <code class="function">g_free()</code> when no
 longer needed.</p>
 <p>
 
@@ -418,9 +408,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677556"></a><h3>
+<a name="id2605867"></a><h3>
 <a name="gnome-config-private-get-string"></a>gnome_config_private_get_string()</h3>
-<a class="indexterm" name="id2677571"></a><pre class="programlisting">#define             gnome_config_private_get_string(path)</pre>
+<a class="indexterm" name="id2605883"></a><pre class="programlisting">#define             gnome_config_private_get_string(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_string</code> is deprecated and should not be used in newly-written code.</p>
@@ -428,9 +418,7 @@
 <p>
 Retrieves the value of a configuration item from the user's private
 configuration directory as a string. This value should be freed with
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+<code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -452,9 +440,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677646"></a><h3>
+<a name="id2605958"></a><h3>
 <a name="gnome-config-private-get-string-with-default"></a>gnome_config_private_get_string_with_default()</h3>
-<a class="indexterm" name="id2677663"></a><pre class="programlisting">#define             gnome_config_private_get_string_with_default(path,def)</pre>
+<a class="indexterm" name="id2605974"></a><pre class="programlisting">#define             gnome_config_private_get_string_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_string_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -462,9 +450,7 @@
 <p>
 Retrieves the value of a configuration item from the user's private
 configuration directory as a string. This value should be freed with
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+<code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -493,18 +479,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677760"></a><h3>
+<a name="id2606071"></a><h3>
 <a name="gnome-config-private-get-translated-string"></a>gnome_config_private_get_translated_string()</h3>
-<a class="indexterm" name="id2677777"></a><pre class="programlisting">#define             gnome_config_private_get_translated_string(path)</pre>
+<a class="indexterm" name="id2606088"></a><pre class="programlisting">#define             gnome_config_private_get_translated_string(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_translated_string</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string appropriate for the
-current language. The returned value should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no
+current language. The returned value should be freed with <code class="function">g_free()</code> when no
 longer needed.  The item is retrieved from the user's private configuration
 storage area.</p>
 <p>
@@ -528,18 +512,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677853"></a><h3>
+<a name="id2606164"></a><h3>
 <a name="gnome-config-private-get-translated-string-with-default"></a>gnome_config_private_get_translated_string_with_default()</h3>
-<a class="indexterm" name="id2677870"></a><pre class="programlisting">#define             gnome_config_private_get_translated_string_with_default(path,def)</pre>
+<a class="indexterm" name="id2606181"></a><pre class="programlisting">#define             gnome_config_private_get_translated_string_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_translated_string_with_default</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string appropriate for the
-current language. The returned value should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no
+current language. The returned value should be freed with <code class="function">g_free()</code> when no
 longer needed.  The item is retrieved from the user's private configuration
 storage area.</p>
 <p>
@@ -570,9 +552,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2677968"></a><h3>
+<a name="id2606280"></a><h3>
 <a name="gnome-config-set-string"></a>gnome_config_set_string()</h3>
-<a class="indexterm" name="id2677984"></a><pre class="programlisting">#define             gnome_config_set_string(path,new_value)</pre>
+<a class="indexterm" name="id2606295"></a><pre class="programlisting">#define             gnome_config_set_string(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_string</code> is deprecated and should not be used in newly-written code.</p>
@@ -601,9 +583,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678061"></a><h3>
+<a name="id2606372"></a><h3>
 <a name="gnome-config-set-translated-string"></a>gnome_config_set_translated_string()</h3>
-<a class="indexterm" name="id2678077"></a><pre class="programlisting">#define             gnome_config_set_translated_string(path,value)</pre>
+<a class="indexterm" name="id2606388"></a><pre class="programlisting">#define             gnome_config_set_translated_string(path,value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_translated_string</code> is deprecated and should not be used in newly-written code.</p>
@@ -633,9 +615,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678155"></a><h3>
+<a name="id2606467"></a><h3>
 <a name="gnome-config-private-set-string"></a>gnome_config_private_set_string()</h3>
-<a class="indexterm" name="id2678171"></a><pre class="programlisting">#define             gnome_config_private_set_string(path,new_value)</pre>
+<a class="indexterm" name="id2606482"></a><pre class="programlisting">#define             gnome_config_private_set_string(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_string</code> is deprecated and should not be used in newly-written code.</p>
@@ -665,9 +647,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678250"></a><h3>
+<a name="id2606561"></a><h3>
 <a name="gnome-config-private-set-translated-string"></a>gnome_config_private_set_translated_string()</h3>
-<a class="indexterm" name="id2678266"></a><pre class="programlisting">#define             gnome_config_private_set_translated_string(path,new_value)</pre>
+<a class="indexterm" name="id2606578"></a><pre class="programlisting">#define             gnome_config_private_set_translated_string(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_translated_string</code> is deprecated and should not be used in newly-written code.</p>
@@ -697,9 +679,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678346"></a><h3>
+<a name="id2606658"></a><h3>
 <a name="gnome-config-get-int"></a>gnome_config_get_int()</h3>
-<a class="indexterm" name="id2678361"></a><pre class="programlisting">#define             gnome_config_get_int(path)</pre>
+<a class="indexterm" name="id2606673"></a><pre class="programlisting">#define             gnome_config_get_int(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_int</code> is deprecated and should not be used in newly-written code.</p>
@@ -727,9 +709,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678423"></a><h3>
+<a name="id2606735"></a><h3>
 <a name="gnome-config-get-int-with-default"></a>gnome_config_get_int_with_default()</h3>
-<a class="indexterm" name="id2678439"></a><pre class="programlisting">#define             gnome_config_get_int_with_default(path,def)</pre>
+<a class="indexterm" name="id2606751"></a><pre class="programlisting">#define             gnome_config_get_int_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_int_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -764,9 +746,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678523"></a><h3>
+<a name="id2606835"></a><h3>
 <a name="gnome-config-private-get-int"></a>gnome_config_private_get_int()</h3>
-<a class="indexterm" name="id2678539"></a><pre class="programlisting">#define             gnome_config_private_get_int(path)</pre>
+<a class="indexterm" name="id2606850"></a><pre class="programlisting">#define             gnome_config_private_get_int(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_int</code> is deprecated and should not be used in newly-written code.</p>
@@ -795,9 +777,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678603"></a><h3>
+<a name="id2606914"></a><h3>
 <a name="gnome-config-private-get-int-with-default"></a>gnome_config_private_get_int_with_default()</h3>
-<a class="indexterm" name="id2678619"></a><pre class="programlisting">#define             gnome_config_private_get_int_with_default(path,def)</pre>
+<a class="indexterm" name="id2606931"></a><pre class="programlisting">#define             gnome_config_private_get_int_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_int_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -833,9 +815,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678705"></a><h3>
+<a name="id2607016"></a><h3>
 <a name="gnome-config-set-int"></a>gnome_config_set_int()</h3>
-<a class="indexterm" name="id2678720"></a><pre class="programlisting">#define             gnome_config_set_int(path,new_value)</pre>
+<a class="indexterm" name="id2607031"></a><pre class="programlisting">#define             gnome_config_set_int(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_int</code> is deprecated and should not be used in newly-written code.</p>
@@ -864,9 +846,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678797"></a><h3>
+<a name="id2607109"></a><h3>
 <a name="gnome-config-private-set-int"></a>gnome_config_private_set_int()</h3>
-<a class="indexterm" name="id2678813"></a><pre class="programlisting">#define             gnome_config_private_set_int(path,new_value)</pre>
+<a class="indexterm" name="id2607125"></a><pre class="programlisting">#define             gnome_config_private_set_int(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_int</code> is deprecated and should not be used in newly-written code.</p>
@@ -896,9 +878,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678892"></a><h3>
+<a name="id2607204"></a><h3>
 <a name="gnome-config-get-float"></a>gnome_config_get_float()</h3>
-<a class="indexterm" name="id2678907"></a><pre class="programlisting">#define             gnome_config_get_float(path)</pre>
+<a class="indexterm" name="id2607219"></a><pre class="programlisting">#define             gnome_config_get_float(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_float</code> is deprecated and should not be used in newly-written code.</p>
@@ -926,9 +908,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2678969"></a><h3>
+<a name="id2607281"></a><h3>
 <a name="gnome-config-get-float-with-default"></a>gnome_config_get_float_with_default()</h3>
-<a class="indexterm" name="id2678986"></a><pre class="programlisting">#define             gnome_config_get_float_with_default(path,def)</pre>
+<a class="indexterm" name="id2607297"></a><pre class="programlisting">#define             gnome_config_get_float_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_float_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -963,9 +945,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679069"></a><h3>
+<a name="id2607381"></a><h3>
 <a name="gnome-config-private-get-float"></a>gnome_config_private_get_float()</h3>
-<a class="indexterm" name="id2679085"></a><pre class="programlisting">#define             gnome_config_private_get_float(path)</pre>
+<a class="indexterm" name="id2607397"></a><pre class="programlisting">#define             gnome_config_private_get_float(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_float</code> is deprecated and should not be used in newly-written code.</p>
@@ -995,9 +977,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679149"></a><h3>
+<a name="id2607461"></a><h3>
 <a name="gnome-config-private-get-float-with-default"></a>gnome_config_private_get_float_with_default()</h3>
-<a class="indexterm" name="id2679167"></a><pre class="programlisting">#define             gnome_config_private_get_float_with_default(path,def)</pre>
+<a class="indexterm" name="id2607478"></a><pre class="programlisting">#define             gnome_config_private_get_float_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_float_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -1033,9 +1015,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679251"></a><h3>
+<a name="id2607563"></a><h3>
 <a name="gnome-config-set-float"></a>gnome_config_set_float()</h3>
-<a class="indexterm" name="id2679267"></a><pre class="programlisting">#define             gnome_config_set_float(path,new_value)</pre>
+<a class="indexterm" name="id2607578"></a><pre class="programlisting">#define             gnome_config_set_float(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_float</code> is deprecated and should not be used in newly-written code.</p>
@@ -1064,9 +1046,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679344"></a><h3>
+<a name="id2607656"></a><h3>
 <a name="gnome-config-private-set-float"></a>gnome_config_private_set_float()</h3>
-<a class="indexterm" name="id2679360"></a><pre class="programlisting">#define             gnome_config_private_set_float(path,new_value)</pre>
+<a class="indexterm" name="id2607672"></a><pre class="programlisting">#define             gnome_config_private_set_float(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_float</code> is deprecated and should not be used in newly-written code.</p>
@@ -1096,9 +1078,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679439"></a><h3>
+<a name="id2607751"></a><h3>
 <a name="gnome-config-get-bool"></a>gnome_config_get_bool()</h3>
-<a class="indexterm" name="id2679454"></a><pre class="programlisting">#define             gnome_config_get_bool(path)</pre>
+<a class="indexterm" name="id2607766"></a><pre class="programlisting">#define             gnome_config_get_bool(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_bool</code> is deprecated and should not be used in newly-written code.</p>
@@ -1126,9 +1108,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679516"></a><h3>
+<a name="id2607828"></a><h3>
 <a name="gnome-config-get-bool-with-default"></a>gnome_config_get_bool_with_default()</h3>
-<a class="indexterm" name="id2679532"></a><pre class="programlisting">#define             gnome_config_get_bool_with_default(path,def)</pre>
+<a class="indexterm" name="id2607844"></a><pre class="programlisting">#define             gnome_config_get_bool_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_bool_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -1163,9 +1145,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679615"></a><h3>
+<a name="id2607927"></a><h3>
 <a name="gnome-config-private-get-bool"></a>gnome_config_private_get_bool()</h3>
-<a class="indexterm" name="id2679631"></a><pre class="programlisting">#define             gnome_config_private_get_bool(path)</pre>
+<a class="indexterm" name="id2607943"></a><pre class="programlisting">#define             gnome_config_private_get_bool(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_bool</code> is deprecated and should not be used in newly-written code.</p>
@@ -1193,9 +1175,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679695"></a><h3>
+<a name="id2608006"></a><h3>
 <a name="gnome-config-private-get-bool-with-default"></a>gnome_config_private_get_bool_with_default()</h3>
-<a class="indexterm" name="id2679712"></a><pre class="programlisting">#define             gnome_config_private_get_bool_with_default(path,def)</pre>
+<a class="indexterm" name="id2608024"></a><pre class="programlisting">#define             gnome_config_private_get_bool_with_default(path,def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_bool_with_default</code> is deprecated and should not be used in newly-written code.</p>
@@ -1230,9 +1212,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679797"></a><h3>
+<a name="id2608108"></a><h3>
 <a name="gnome-config-set-bool"></a>gnome_config_set_bool()</h3>
-<a class="indexterm" name="id2679812"></a><pre class="programlisting">#define             gnome_config_set_bool(path,new_value)</pre>
+<a class="indexterm" name="id2608124"></a><pre class="programlisting">#define             gnome_config_set_bool(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_bool</code> is deprecated and should not be used in newly-written code.</p>
@@ -1261,9 +1243,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679890"></a><h3>
+<a name="id2608201"></a><h3>
 <a name="gnome-config-private-set-bool"></a>gnome_config_private_set_bool()</h3>
-<a class="indexterm" name="id2679905"></a><pre class="programlisting">#define             gnome_config_private_set_bool(path,new_value)</pre>
+<a class="indexterm" name="id2608217"></a><pre class="programlisting">#define             gnome_config_private_set_bool(path,new_value)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_bool</code> is deprecated and should not be used in newly-written code.</p>
@@ -1292,18 +1274,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2679984"></a><h3>
+<a name="id2608296"></a><h3>
 <a name="gnome-config-get-vector"></a>gnome_config_get_vector()</h3>
-<a class="indexterm" name="id2680000"></a><pre class="programlisting">#define             gnome_config_get_vector(path, argcp, argvp)</pre>
+<a class="indexterm" name="id2608311"></a><pre class="programlisting">#define             gnome_config_get_vector(path, argcp, argvp)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_vector</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string array.
-The returned vector should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+The returned vector should be freed with <code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -1330,18 +1310,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680091"></a><h3>
+<a name="id2608402"></a><h3>
 <a name="gnome-config-get-vector-with-default"></a>gnome_config_get_vector_with_default()</h3>
-<a class="indexterm" name="id2680107"></a><pre class="programlisting">#define             gnome_config_get_vector_with_default(path, argcp, argvp, def)</pre>
+<a class="indexterm" name="id2608419"></a><pre class="programlisting">#define             gnome_config_get_vector_with_default(path, argcp, argvp, def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_vector_with_default</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string array.
-The returned vector should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed.</p>
+The returned vector should be freed with <code class="function">g_free()</code> when no longer needed.</p>
 <p>
 
 </p>
@@ -1374,18 +1352,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680214"></a><h3>
+<a name="id2608525"></a><h3>
 <a name="gnome-config-private-get-vector"></a>gnome_config_private_get_vector()</h3>
-<a class="indexterm" name="id2680229"></a><pre class="programlisting">#define             gnome_config_private_get_vector(path, argcp, argvp)</pre>
+<a class="indexterm" name="id2608541"></a><pre class="programlisting">#define             gnome_config_private_get_vector(path, argcp, argvp)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_vector</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string array.
-The returned vector should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed. The
+The returned vector should be freed with <code class="function">g_free()</code> when no longer needed. The
 configuration value is retrieved from the user's private configuration
 storage area.</p>
 <p>
@@ -1414,18 +1390,16 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680323"></a><h3>
+<a name="id2608634"></a><h3>
 <a name="gnome-config-private-get-vector-with-default"></a>gnome_config_private_get_vector_with_default()</h3>
-<a class="indexterm" name="id2680340"></a><pre class="programlisting">#define             gnome_config_private_get_vector_with_default(path, argcp, argvp, def)</pre>
+<a class="indexterm" name="id2608651"></a><pre class="programlisting">#define             gnome_config_private_get_vector_with_default(path, argcp, argvp, def)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_vector_with_default</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
 Retrieves the value of a configuration item as a string array.
-The returned vector should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when no longer needed. The
+The returned vector should be freed with <code class="function">g_free()</code> when no longer needed. The
 configuration value is retrieved from the user's private configuration
 storage area.</p>
 <p>
@@ -1460,9 +1434,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680448"></a><h3>
+<a name="id2608760"></a><h3>
 <a name="gnome-config-set-vector"></a>gnome_config_set_vector()</h3>
-<a class="indexterm" name="id2680464"></a><pre class="programlisting">#define             gnome_config_set_vector(path,argc,argv)</pre>
+<a class="indexterm" name="id2608775"></a><pre class="programlisting">#define             gnome_config_set_vector(path,argc,argv)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_set_vector</code> is deprecated and should not be used in newly-written code.</p>
@@ -1496,9 +1470,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680561"></a><h3>
+<a name="id2608872"></a><h3>
 <a name="gnome-config-private-set-vector"></a>gnome_config_private_set_vector()</h3>
-<a class="indexterm" name="id2680576"></a><pre class="programlisting">#define             gnome_config_private_set_vector(path,argc,argv)</pre>
+<a class="indexterm" name="id2608888"></a><pre class="programlisting">#define             gnome_config_private_set_vector(path,argc,argv)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_set_vector</code> is deprecated and should not be used in newly-written code.</p>
@@ -1532,9 +1506,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680675"></a><h3>
+<a name="id2608986"></a><h3>
 <a name="gnome-config-assemble-vector"></a>gnome_config_assemble_vector ()</h3>
-<a class="indexterm" name="id2680690"></a><pre class="programlisting">char*               gnome_config_assemble_vector        (int argc,
+<a class="indexterm" name="id2609002"></a><pre class="programlisting">char*               gnome_config_assemble_vector        (int argc,
                                                          const char *const argv[]);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
@@ -1542,9 +1516,7 @@
 </div>
 <p>
 This routine returns the the strings in the array contactenated by
-spaces. The return value should be freed with <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free"
-><code class="function">g_free()</code></a> when it is no longer
+spaces. The return value should be freed with <code class="function">g_free()</code> when it is no longer
 required.</p>
 <p>
 
@@ -1572,9 +1544,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680805"></a><h3>
+<a name="id2609116"></a><h3>
 <a name="gnome-config-has-section"></a>gnome_config_has_section()</h3>
-<a class="indexterm" name="id2680820"></a><pre class="programlisting">#define             gnome_config_has_section(path)</pre>
+<a class="indexterm" name="id2609131"></a><pre class="programlisting">#define             gnome_config_has_section(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_has_section</code> is deprecated and should not be used in newly-written code.</p>
@@ -1595,11 +1567,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if the section exists, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the section exists, <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -1607,9 +1575,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2680908"></a><h3>
+<a name="id2609220"></a><h3>
 <a name="gnome-config-private-has-section"></a>gnome_config_private_has_section()</h3>
-<a class="indexterm" name="id2680924"></a><pre class="programlisting">#define             gnome_config_private_has_section(path)</pre>
+<a class="indexterm" name="id2609236"></a><pre class="programlisting">#define             gnome_config_private_has_section(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_has_section</code> is deprecated and should not be used in newly-written code.</p>
@@ -1630,11 +1598,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if the section exists, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the section exists, <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -1642,9 +1606,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681013"></a><h3>
+<a name="id2609325"></a><h3>
 <a name="gnome-config-init-iterator"></a>gnome_config_init_iterator()</h3>
-<a class="indexterm" name="id2681029"></a><pre class="programlisting">#define             gnome_config_init_iterator(path)</pre>
+<a class="indexterm" name="id2609340"></a><pre class="programlisting">#define             gnome_config_init_iterator(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_init_iterator</code> is deprecated and should not be used in newly-written code.</p>
@@ -1675,9 +1639,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681110"></a><h3>
+<a name="id2609421"></a><h3>
 <a name="gnome-config-private-init-iterator"></a>gnome_config_private_init_iterator()</h3>
-<a class="indexterm" name="id2681126"></a><pre class="programlisting">#define             gnome_config_private_init_iterator(path)</pre>
+<a class="indexterm" name="id2609437"></a><pre class="programlisting">#define             gnome_config_private_init_iterator(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_init_iterator</code> is deprecated and should not be used in newly-written code.</p>
@@ -1708,9 +1672,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681207"></a><h3>
+<a name="id2609518"></a><h3>
 <a name="gnome-config-init-iterator-sections"></a>gnome_config_init_iterator_sections()</h3>
-<a class="indexterm" name="id2681223"></a><pre class="programlisting">#define             gnome_config_init_iterator_sections(path)</pre>
+<a class="indexterm" name="id2609535"></a><pre class="programlisting">#define             gnome_config_init_iterator_sections(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_init_iterator_sections</code> is deprecated and should not be used in newly-written code.</p>
@@ -1741,9 +1705,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681304"></a><h3>
+<a name="id2609616"></a><h3>
 <a name="gnome-config-private-init-iterator-sections"></a>gnome_config_private_init_iterator_sections()</h3>
-<a class="indexterm" name="id2681322"></a><pre class="programlisting">#define             gnome_config_private_init_iterator_sections(path)</pre>
+<a class="indexterm" name="id2609633"></a><pre class="programlisting">#define             gnome_config_private_init_iterator_sections(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_init_iterator_sections</code> is deprecated and should not be used in newly-written code.</p>
@@ -1774,9 +1738,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681403"></a><h3>
+<a name="id2609715"></a><h3>
 <a name="gnome-config-iterator-next"></a>gnome_config_iterator_next ()</h3>
-<a class="indexterm" name="id2681419"></a><pre class="programlisting">void*               gnome_config_iterator_next          (void *iterator_handle,
+<a class="indexterm" name="id2609731"></a><pre class="programlisting">void*               gnome_config_iterator_next          (void *iterator_handle,
                                                          char **key,
                                                          char **value);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -1784,15 +1748,11 @@
 <p><code class="literal">gnome_config_iterator_next</code> is deprecated and should not be used in newly-written code.</p>
 </div>
 <p>
-If <em class="parameter"><code>key</code></em> is non-NULL, then <em class="parameter"><code>key</code></em> will point to a <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-malloc"
-><code class="function">g_malloc()</code></a>ed region that
+If <em class="parameter"><code>key</code></em> is non-NULL, then <em class="parameter"><code>key</code></em> will point to a <code class="function">g_malloc()</code>ed region that
 holds the key.
 </p>
 <p>
-If <em class="parameter"><code>value</code></em> is non-NULL, then <em class="parameter"><code>value</code></em> will point to a <a
-href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-malloc"
-><code class="function">g_malloc()</code></a>ed region that
+If <em class="parameter"><code>value</code></em> is non-NULL, then <em class="parameter"><code>value</code></em> will point to a <code class="function">g_malloc()</code>ed region that
 holds the key.</p>
 <p>
 
@@ -1828,9 +1788,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681587"></a><h3>
+<a name="id2609898"></a><h3>
 <a name="gnome-config-drop-all"></a>gnome_config_drop_all ()</h3>
-<a class="indexterm" name="id2681602"></a><pre class="programlisting">void                gnome_config_drop_all               (void);</pre>
+<a class="indexterm" name="id2609914"></a><pre class="programlisting">void                gnome_config_drop_all               (void);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_drop_all</code> is deprecated and should not be used in newly-written code.</p>
@@ -1845,11 +1805,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681642"></a><h3>
+<a name="id2609954"></a><h3>
 <a name="gnome-config-sync"></a>gnome_config_sync ()</h3>
-<a class="indexterm" name="id2681658"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_config_sync                   (void);</pre>
+<a class="indexterm" name="id2609969"></a><pre class="programlisting">gboolean            gnome_config_sync                   (void);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_sync</code> is deprecated and should not be used in newly-written code.</p>
@@ -1868,11 +1826,7 @@
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if everything went well. <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> if any file
+<td> <code class="literal">TRUE</code> if everything went well. <code class="literal">FALSE</code> if any file
 could not be written to disk.
 </td>
 </tr></tbody>
@@ -1880,9 +1834,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681737"></a><h3>
+<a name="id2610048"></a><h3>
 <a name="gnome-config-sync-file"></a>gnome_config_sync_file()</h3>
-<a class="indexterm" name="id2681753"></a><pre class="programlisting">#define             gnome_config_sync_file(path)</pre>
+<a class="indexterm" name="id2610064"></a><pre class="programlisting">#define             gnome_config_sync_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_sync_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -1908,14 +1862,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if everything went well, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> if the file
-could not be written to for some reason.  <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> is only returned
+<td> <code class="literal">TRUE</code> if everything went well, <code class="literal">FALSE</code> if the file
+could not be written to for some reason.  <code class="literal">FALSE</code> is only returned
 when a write was actually attempted and failed.
 </td>
 </tr>
@@ -1924,9 +1872,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681863"></a><h3>
+<a name="id2610175"></a><h3>
 <a name="gnome-config-private-sync-file"></a>gnome_config_private_sync_file()</h3>
-<a class="indexterm" name="id2681879"></a><pre class="programlisting">#define             gnome_config_private_sync_file(path)</pre>
+<a class="indexterm" name="id2610190"></a><pre class="programlisting">#define             gnome_config_private_sync_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_sync_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -1952,14 +1900,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> if everything went well, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> if the file
-could not be written to for some reason.  <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> is only returned
+<td> <code class="literal">TRUE</code> if everything went well, <code class="literal">FALSE</code> if the file
+could not be written to for some reason.  <code class="literal">FALSE</code> is only returned
 when a write was actually attempted and failed.
 </td>
 </tr>
@@ -1968,9 +1910,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2681990"></a><h3>
+<a name="id2610301"></a><h3>
 <a name="gnome-config-drop-file"></a>gnome_config_drop_file()</h3>
-<a class="indexterm" name="id2682005"></a><pre class="programlisting">#define             gnome_config_drop_file(path)</pre>
+<a class="indexterm" name="id2610317"></a><pre class="programlisting">#define             gnome_config_drop_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_drop_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -1993,9 +1935,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682074"></a><h3>
+<a name="id2610386"></a><h3>
 <a name="gnome-config-private-drop-file"></a>gnome_config_private_drop_file()</h3>
-<a class="indexterm" name="id2682090"></a><pre class="programlisting">#define             gnome_config_private_drop_file(path)</pre>
+<a class="indexterm" name="id2610402"></a><pre class="programlisting">#define             gnome_config_private_drop_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_drop_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -2017,9 +1959,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682148"></a><h3>
+<a name="id2610460"></a><h3>
 <a name="gnome-config-clean-file"></a>gnome_config_clean_file()</h3>
-<a class="indexterm" name="id2682163"></a><pre class="programlisting">#define             gnome_config_clean_file(path)</pre>
+<a class="indexterm" name="id2610475"></a><pre class="programlisting">#define             gnome_config_clean_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_clean_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -2044,9 +1986,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682235"></a><h3>
+<a name="id2610547"></a><h3>
 <a name="gnome-config-private-clean-file"></a>gnome_config_private_clean_file()</h3>
-<a class="indexterm" name="id2682251"></a><pre class="programlisting">#define             gnome_config_private_clean_file(path)</pre>
+<a class="indexterm" name="id2610563"></a><pre class="programlisting">#define             gnome_config_private_clean_file(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_clean_file</code> is deprecated and should not be used in newly-written code.</p>
@@ -2071,9 +2013,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682324"></a><h3>
+<a name="id2610636"></a><h3>
 <a name="gnome-config-clean-section"></a>gnome_config_clean_section()</h3>
-<a class="indexterm" name="id2682340"></a><pre class="programlisting">#define             gnome_config_clean_section(path)</pre>
+<a class="indexterm" name="id2610652"></a><pre class="programlisting">#define             gnome_config_clean_section(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_clean_section</code> is deprecated and should not be used in newly-written code.</p>
@@ -2096,9 +2038,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682409"></a><h3>
+<a name="id2610720"></a><h3>
 <a name="gnome-config-private-clean-section"></a>gnome_config_private_clean_section()</h3>
-<a class="indexterm" name="id2682426"></a><pre class="programlisting">#define             gnome_config_private_clean_section(path)</pre>
+<a class="indexterm" name="id2610737"></a><pre class="programlisting">#define             gnome_config_private_clean_section(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_clean_section</code> is deprecated and should not be used in newly-written code.</p>
@@ -2121,9 +2063,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682495"></a><h3>
+<a name="id2610806"></a><h3>
 <a name="gnome-config-clean-key"></a>gnome_config_clean_key()</h3>
-<a class="indexterm" name="id2682510"></a><pre class="programlisting">#define             gnome_config_clean_key(path)</pre>
+<a class="indexterm" name="id2610821"></a><pre class="programlisting">#define             gnome_config_clean_key(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_clean_key</code> is deprecated and should not be used in newly-written code.</p>
@@ -2147,9 +2089,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682576"></a><h3>
+<a name="id2610887"></a><h3>
 <a name="gnome-config-private-clean-key"></a>gnome_config_private_clean_key()</h3>
-<a class="indexterm" name="id2682591"></a><pre class="programlisting">#define             gnome_config_private_clean_key(path)</pre>
+<a class="indexterm" name="id2610903"></a><pre class="programlisting">#define             gnome_config_private_clean_key(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_clean_key</code> is deprecated and should not be used in newly-written code.</p>
@@ -2174,9 +2116,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682658"></a><h3>
+<a name="id2610970"></a><h3>
 <a name="gnome-config-get-real-path"></a>gnome_config_get_real_path()</h3>
-<a class="indexterm" name="id2682674"></a><pre class="programlisting">#define             gnome_config_get_real_path(path)</pre>
+<a class="indexterm" name="id2610985"></a><pre class="programlisting">#define             gnome_config_get_real_path(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_get_real_path</code> is deprecated and should not be used in newly-written code.</p>
@@ -2205,9 +2147,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682733"></a><h3>
+<a name="id2611045"></a><h3>
 <a name="gnome-config-private-get-real-path"></a>gnome_config_private_get_real_path()</h3>
-<a class="indexterm" name="id2682750"></a><pre class="programlisting">#define             gnome_config_private_get_real_path(path)</pre>
+<a class="indexterm" name="id2611061"></a><pre class="programlisting">#define             gnome_config_private_get_real_path(path)</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_private_get_real_path</code> is deprecated and should not be used in newly-written code.</p>
@@ -2237,9 +2179,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682810"></a><h3>
+<a name="id2611122"></a><h3>
 <a name="gnome-config-push-prefix"></a>gnome_config_push_prefix ()</h3>
-<a class="indexterm" name="id2682826"></a><pre class="programlisting">void                gnome_config_push_prefix            (const char *path);</pre>
+<a class="indexterm" name="id2611137"></a><pre class="programlisting">void                gnome_config_push_prefix            (const char *path);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_push_prefix</code> is deprecated and should not be used in newly-written code.</p>
@@ -2269,9 +2211,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682906"></a><h3>
+<a name="id2611218"></a><h3>
 <a name="gnome-config-pop-prefix"></a>gnome_config_pop_prefix ()</h3>
-<a class="indexterm" name="id2682921"></a><pre class="programlisting">void                gnome_config_pop_prefix             (void);</pre>
+<a class="indexterm" name="id2611233"></a><pre class="programlisting">void                gnome_config_pop_prefix             (void);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_config_pop_prefix</code> is deprecated and should not be used in newly-written code.</p>
@@ -2284,9 +2226,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2682960"></a><h3>
+<a name="id2611272"></a><h3>
 <a name="gnome-config-make-vector"></a>gnome_config_make_vector ()</h3>
-<a class="indexterm" name="id2682976"></a><pre class="programlisting">void                gnome_config_make_vector            (const char *string,
+<a class="indexterm" name="id2611287"></a><pre class="programlisting">void                gnome_config_make_vector            (const char *string,
                                                          int *argcp,
                                                          char ***argvp);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -2323,9 +2265,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2683098"></a><div class="refsect2" lang="en"><a name="id2683099"></a></div>
+<a name="id2611409"></a><div class="refsect2" lang="en"><a name="id2611410"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2683100"></a></div>
+<div class="refsect2" lang="en"><a name="id2611411"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix08.html
+++ libgnome-2.21.90/doc/reference/html/ix08.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691949"></a>Index of new symbols in 2.12</h2></div></div></div>
+<a name="id2620261"></a>Index of new symbols in 2.12</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-init.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-init.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-exec.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2656660" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2584971" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2656762" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2585073" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-init"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2656660"></a><span class="refentrytitle">gnome-init</span>
+<a name="id2584971"></a><span class="refentrytitle">gnome-init</span>
 </h2>
 <p>gnome-init &#8212; Functions used during initialisation of libgnome and other platform libraries.</p>
 </td>
@@ -72,17 +72,17 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2656762"></a><h2>Description</h2>
+<a name="id2585073"></a><h2>Description</h2>
 <p>
 
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2656777"></a><h2>Details</h2>
+<a name="id2585087"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2656787"></a><h3>
+<a name="id2585097"></a><h3>
 <a name="LIBGNOME-MODULE:CAPS"></a>LIBGNOME_MODULE</h3>
-<a class="indexterm" name="id2656800"></a><pre class="programlisting">#define LIBGNOME_MODULE libgnome_module_info_get()
+<a class="indexterm" name="id2585111"></a><pre class="programlisting">#define LIBGNOME_MODULE libgnome_module_info_get()
 </pre>
 <p>
 This macro wraps the call to <a class="link" href="libgnome-gnome-init.html#libgnome-module-info-get"><code class="function">libgnome_module_info_get()</code></a> and is the usual way of
@@ -91,9 +91,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2656836"></a><h3>
+<a name="id2585147"></a><h3>
 <a name="libgnome-module-info-get"></a>libgnome_module_info_get ()</h3>
-<a class="indexterm" name="id2656850"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* libgnome_module_info_get         (void);</pre>
+<a class="indexterm" name="id2585160"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* libgnome_module_info_get         (void);</pre>
 <p>
 Retrieves the current libgnome version and the modules it depends on.</p>
 <p>
@@ -111,9 +111,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2656901"></a><h3>
+<a name="id2585212"></a><h3>
 <a name="gnome-bonobo-module-info-get"></a>gnome_bonobo_module_info_get ()</h3>
-<a class="indexterm" name="id2656915"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* gnome_bonobo_module_info_get     (void);</pre>
+<a class="indexterm" name="id2585226"></a><pre class="programlisting">const <a class="link" href="libgnome-gnome-program.html#GnomeModuleInfo">GnomeModuleInfo</a>* gnome_bonobo_module_info_get     (void);</pre>
 <p>
 Retrieves the bonobo module version and indicate that it requires the current
 libgnome and its dependencies (although libbonobo does not depend on
@@ -134,9 +134,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2656970"></a><h3>
+<a name="id2585280"></a><h3>
 <a name="gnome-user-dir-get"></a>gnome_user_dir_get ()</h3>
-<a class="indexterm" name="id2656983"></a><pre class="programlisting">const char*         gnome_user_dir_get                  (void);</pre>
+<a class="indexterm" name="id2585293"></a><pre class="programlisting">const char*         gnome_user_dir_get                  (void);</pre>
 <p>
 Retrieves the user-specific directory for GNOME apps to use ($HOME/.gnome2
 is the usual GNOME 2 value).</p>
@@ -154,9 +154,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2657026"></a><h3>
+<a name="id2585336"></a><h3>
 <a name="gnome-user-private-dir-get"></a>gnome_user_private_dir_get ()</h3>
-<a class="indexterm" name="id2657040"></a><pre class="programlisting">const char*         gnome_user_private_dir_get          (void);</pre>
+<a class="indexterm" name="id2585350"></a><pre class="programlisting">const char*         gnome_user_private_dir_get          (void);</pre>
 <p>
 Differs from <a class="link" href="libgnome-gnome-init.html#gnome-user-dir-get"><code class="function">gnome_user_dir_get()</code></a> in that the directory returned here will
 have had permissions of 0700 (rwx------) enforced when it was created.  Of
@@ -177,9 +177,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2657096"></a><h3>
+<a name="id2585406"></a><h3>
 <a name="gnome-user-accels-dir-get"></a>gnome_user_accels_dir_get ()</h3>
-<a class="indexterm" name="id2657110"></a><pre class="programlisting">const char*         gnome_user_accels_dir_get           (void);</pre>
+<a class="indexterm" name="id2585420"></a><pre class="programlisting">const char*         gnome_user_accels_dir_get           (void);</pre>
 <p>
 Retrieves the user-specific directory that stores the keyboard shortcut files
 for each GNOME app. Note that most applications should be using GConf for
@@ -199,9 +199,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2657167"></a><div class="refsect2" lang="en"><a name="id2657168"></a></div>
+<a name="id2585477"></a><div class="refsect2" lang="en"><a name="id2585478"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2657169"></a></div>
+<div class="refsect2" lang="en"><a name="id2585479"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-help.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-help.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-url.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2661384" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589694" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2662635" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2590946" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-help"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2661384"></a><span class="refentrytitle">gnome-help</span>
+<a name="id2589694"></a><span class="refentrytitle">gnome-help</span>
 </h2>
 <p>gnome-help &#8212; Display application and GNOME system help.</p>
 </td>
@@ -61,70 +61,42 @@
 
 enum                <a class="link" href="libgnome-gnome-help.html#GnomeHelpError">GnomeHelpError</a>;
 #define             <a class="link" href="libgnome-gnome-help.html#GNOME-HELP-ERROR:CAPS">GNOME_HELP_ERROR</a>
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display">gnome_help_display</a>                  (const char *file_name,
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display">gnome_help_display</a>                  (const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-with-doc-id">gnome_help_display_with_doc_id</a>      (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-with-doc-id">gnome_help_display_with_doc_id</a>      (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-with-doc-id-and-env">gnome_help_display_with_doc_id_and_env</a>
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-with-doc-id-and-env">gnome_help_display_with_doc_id_and_env</a>
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-desktop">gnome_help_display_desktop</a>          (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-desktop">gnome_help_display_desktop</a>          (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-desktop-with-env">gnome_help_display_desktop_with_env</a> (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-desktop-with-env">gnome_help_display_desktop_with_env</a> (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-uri">gnome_help_display_uri</a>              (const char *help_uri,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-uri-with-env">gnome_help_display_uri_with_env</a>     (const char *help_uri,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-uri">gnome_help_display_uri</a>              (const char *help_uri,
+                                                         GError **error);
+gboolean            <a class="link" href="libgnome-gnome-help.html#gnome-help-display-uri-with-env">gnome_help_display_uri_with_env</a>     (const char *help_uri,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);
+                                                         GError **error);
 
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2662635"></a><h2>Description</h2>
+<a name="id2590946"></a><h2>Description</h2>
 <p>
 These functions provide a way to display help files that are either installed
 as part of the main GNOME installation or that are specific to the current
@@ -132,11 +104,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2662652"></a><h2>Details</h2>
+<a name="id2590963"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2662663"></a><h3>
+<a name="id2590974"></a><h3>
 <a name="GnomeHelpError"></a>enum GnomeHelpError</h3>
-<a class="indexterm" name="id2662676"></a><pre class="programlisting">typedef enum {
+<a class="indexterm" name="id2590986"></a><pre class="programlisting">typedef enum {
   GNOME_HELP_ERROR_INTERNAL,
   GNOME_HELP_ERROR_NOT_FOUND
 } GnomeHelpError;
@@ -164,28 +136,22 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2662754"></a><h3>
+<a name="id2591065"></a><h3>
 <a name="GNOME-HELP-ERROR:CAPS"></a>GNOME_HELP_ERROR</h3>
-<a class="indexterm" name="id2662768"></a><pre class="programlisting">#define GNOME_HELP_ERROR (gnome_help_error_quark ())
+<a class="indexterm" name="id2591078"></a><pre class="programlisting">#define GNOME_HELP_ERROR (gnome_help_error_quark ())
 </pre>
 <p>
 The class (or domain) of errors raised directly by the gnome-help module. This
-is used as a value in the domain field of the <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> structure.
+is used as a value in the domain field of the <span class="type">GError</span> structure.
 </p>
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2662794"></a><h3>
+<a name="id2591105"></a><h3>
 <a name="gnome-help-display"></a>gnome_help_display ()</h3>
-<a class="indexterm" name="id2662807"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display                  (const char *file_name,
+<a class="indexterm" name="id2591118"></a><pre class="programlisting">gboolean            gnome_help_display                  (const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Displays the help file specified by <em class="parameter"><code>file_name</code></em> at location <em class="parameter"><code>link_id</code></em> in the
 preferred help browser of the user.</p>
@@ -202,29 +168,19 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>link_id</code></em>&#160;:</span></p></td>
-<td> Can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>. If set, refers to an anchor or section id within the
+<td> Can be <code class="literal">NULL</code>. If set, refers to an anchor or section id within the
 requested document.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 </td>
 </tr>
@@ -233,17 +189,13 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2662981"></a><h3>
+<a name="id2591292"></a><h3>
 <a name="gnome-help-display-with-doc-id"></a>gnome_help_display_with_doc_id ()</h3>
-<a class="indexterm" name="id2662994"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_with_doc_id      (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2591305"></a><pre class="programlisting">gboolean            gnome_help_display_with_doc_id      (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Displays the help file specified by <em class="parameter"><code>file_name</code></em> at location <em class="parameter"><code>link_id</code></em> within
 the <em class="parameter"><code>doc_id</code></em> domain in the preferred help browser of the user.  Most of the
@@ -254,9 +206,7 @@
 looking for <em class="parameter"><code>file_name</code></em> in the applications installed help location (found by
 <a class="link" href="libgnome-gnome-program.html#GNOME-FILE-DOMAIN-APP-HELP:CAPS"><span class="type">GNOME_FILE_DOMAIN_APP_HELP</span></a>) and its app_id.  The resulting URI is roughly
 in the form "ghelp:appid/file_name?link_id".  If a matching file cannot be
-found, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> is returned and <em class="parameter"><code>error</code></em> is set.
+found, <code class="literal">FALSE</code> is returned and <em class="parameter"><code>error</code></em> is set.
 </p>
 <p>
 Please note that this only displays application help.  To display help files
@@ -270,16 +220,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> The current application object, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for the default one.
+<td> The current application object, or <code class="literal">NULL</code> for the default one.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>doc_id</code></em>&#160;:</span></p></td>
-<td> The document identifier, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to default to the application ID
+<td> The document identifier, or <code class="literal">NULL</code> to default to the application ID
 (app_id) of the specified <em class="parameter"><code>program</code></em>.
 </td>
 </tr>
@@ -290,29 +236,19 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>link_id</code></em>&#160;:</span></p></td>
-<td> Can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>. If set, refers to an anchor or section id within the
+<td> Can be <code class="literal">NULL</code>. If set, refers to an anchor or section id within the
 requested document.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 </td>
 </tr>
@@ -321,19 +257,15 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2663316"></a><h3>
+<a name="id2591627"></a><h3>
 <a name="gnome-help-display-with-doc-id-and-env"></a>gnome_help_display_with_doc_id_and_env ()</h3>
-<a class="indexterm" name="id2663333"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_with_doc_id_and_env
+<a class="indexterm" name="id2591644"></a><pre class="programlisting">gboolean            gnome_help_display_with_doc_id_and_env
                                                         (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Like <code class="function">gnome_display_with_doc_id()</code>, but the the contents of <em class="parameter"><code>envp</code></em>
 will become the url viewer's environment rather than inheriting
@@ -346,16 +278,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> The current application object, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for the default one.
+<td> The current application object, or <code class="literal">NULL</code> for the default one.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>doc_id</code></em>&#160;:</span></p></td>
-<td> The document identifier, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to default to empty string.
+<td> The document identifier, or <code class="literal">NULL</code> to default to empty string.
 (app_id) of the specified <em class="parameter"><code>program</code></em>.
 </td>
 </tr>
@@ -366,36 +294,24 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>link_id</code></em>&#160;:</span></p></td>
-<td> Can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>. If set, refers to an anchor or section id within the
+<td> Can be <code class="literal">NULL</code>. If set, refers to an anchor or section id within the
 requested document.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em>&#160;:</span></p></td>
-<td> child's environment, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to inherit parent's.
+<td> child's environment, or <code class="literal">NULL</code> to inherit parent's.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 
 </td>
@@ -407,25 +323,19 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2663627"></a><h3>
+<a name="id2591938"></a><h3>
 <a name="gnome-help-display-desktop"></a>gnome_help_display_desktop ()</h3>
-<a class="indexterm" name="id2663641"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_desktop          (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2591952"></a><pre class="programlisting">gboolean            gnome_help_display_desktop          (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Displays the GNOME system help file specified by <em class="parameter"><code>file_name</code></em> at location
 <em class="parameter"><code>link_id</code></em> in the preferred help browser of the user.  This is done by creating
 a "ghelp" URI, by looking for <em class="parameter"><code>file_name</code></em> in the system help domain
 (<a class="link" href="libgnome-gnome-program.html#GNOME-FILE-DOMAIN-HELP:CAPS"><span class="type">GNOME_FILE_DOMAIN_HELP</span></a>) and it's app_id.  This domain is determined when
-the library is compiled.  If a matching file cannot be found, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> is
+the library is compiled.  If a matching file cannot be found, <code class="literal">FALSE</code> is
 returned and <em class="parameter"><code>error</code></em> is set.
 </p>
 <p>
@@ -439,9 +349,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> The current application object, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for the default one.
+<td> The current application object, or <code class="literal">NULL</code> for the default one.
 </td>
 </tr>
 <tr>
@@ -457,29 +365,19 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>link_id</code></em>&#160;:</span></p></td>
-<td> Can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>. If set, refers to an anchor or section id within the
+<td> Can be <code class="literal">NULL</code>. If set, refers to an anchor or section id within the
 requested document.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 </td>
 </tr>
@@ -488,18 +386,14 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2663931"></a><h3>
+<a name="id2592242"></a><h3>
 <a name="gnome-help-display-desktop-with-env"></a>gnome_help_display_desktop_with_env ()</h3>
-<a class="indexterm" name="id2663947"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_desktop_with_env (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
+<a class="indexterm" name="id2592258"></a><pre class="programlisting">gboolean            gnome_help_display_desktop_with_env (<a class="link" href="libgnome-gnome-program.html#GnomeProgram">GnomeProgram</a> *program,
                                                          const char *doc_id,
                                                          const char *file_name,
                                                          const char *link_id,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-help.html#gnome-help-display-desktop"><code class="function">gnome_help_display_desktop()</code></a>, but the the contents of <em class="parameter"><code>envp</code></em>
 will become the url viewer's environment rather than inheriting
@@ -512,9 +406,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>program</code></em>&#160;:</span></p></td>
-<td> The current application object, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> for the default one.
+<td> The current application object, or <code class="literal">NULL</code> for the default one.
 </td>
 </tr>
 <tr>
@@ -530,36 +422,24 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>link_id</code></em>&#160;:</span></p></td>
-<td> Can be <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>. If set, refers to an anchor or section id within the
+<td> Can be <code class="literal">NULL</code>. If set, refers to an anchor or section id within the
 requested document.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em>&#160;:</span></p></td>
-<td> child's environment, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to inherit parent's.
+<td> child's environment, or <code class="literal">NULL</code> to inherit parent's.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 
 </td>
@@ -571,14 +451,10 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2664231"></a><h3>
+<a name="id2592542"></a><h3>
 <a name="gnome-help-display-uri"></a>gnome_help_display_uri ()</h3>
-<a class="indexterm" name="id2664244"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_uri              (const char *help_uri,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<a class="indexterm" name="id2592555"></a><pre class="programlisting">gboolean            gnome_help_display_uri              (const char *help_uri,
+                                                         GError **error);</pre>
 <p>
 Displays <em class="parameter"><code>help_uri</code></em> in the user's preferred viewer. You should never need to
 call this function directly in code, since it is just a wrapper for
@@ -598,21 +474,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 </td>
 </tr>
@@ -621,15 +489,11 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2664395"></a><h3>
+<a name="id2592706"></a><h3>
 <a name="gnome-help-display-uri-with-env"></a>gnome_help_display_uri_with_env ()</h3>
-<a class="indexterm" name="id2664410"></a><pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
->gboolean</a>            gnome_help_display_uri_with_env     (const char *help_uri,
+<a class="indexterm" name="id2592721"></a><pre class="programlisting">gboolean            gnome_help_display_uri_with_env     (const char *help_uri,
                                                          char **envp,
-                                                         <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+                                                         GError **error);</pre>
 <p>
 Like <a class="link" href="libgnome-gnome-help.html#gnome-help-display-uri"><code class="function">gnome_help_display_uri()</code></a>, but the the contents of <em class="parameter"><code>envp</code></em>
 will become the help viewer's environment rather than inheriting
@@ -647,28 +511,18 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em>&#160;:</span></p></td>
-<td> child's environment, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a> to inherit parent's.
+<td> child's environment, or <code class="literal">NULL</code> to inherit parent's.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em>&#160;:</span></p></td>
-<td> A <a
-href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> instance that will hold the specifics of any error which
-occurs during processing, or <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
-><code class="literal">NULL</code></a>
+<td> A <span class="type">GError</span> instance that will hold the specifics of any error which
+occurs during processing, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
-<td> <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
-><code class="literal">TRUE</code></a> on success, <a
-href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
-><code class="literal">FALSE</code></a> otherwise (in which case <em class="parameter"><code>error</code></em> will
+<td> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise (in which case <em class="parameter"><code>error</code></em> will
 contain the actual error).
 
 </td>
@@ -680,9 +534,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2664598"></a><div class="refsect2" lang="en"><a name="id2664599"></a></div>
+<a name="id2592909"></a><div class="refsect2" lang="en"><a name="id2592910"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2664600"></a></div>
+<div class="refsect2" lang="en"><a name="id2592911"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/libgnome-gnome-sound.html
+++ libgnome-2.21.90/doc/reference/html/libgnome-gnome-sound.html
@@ -37,16 +37,16 @@
 <th width="100%" align="center">GNOME Library Reference Manual</th>
 <td><a accesskey="n" href="libgnome-gnome-triggers.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2673402" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2601714" class="shortcut">Top</a>
                   &#160;|&#160;
-                  <a href="#id2673520" class="shortcut">Description</a></nobr></td></tr>
+                  <a href="#id2601832" class="shortcut">Description</a></nobr></td></tr>
 </table>
 <div class="refentry" lang="en">
 <a name="libgnome-gnome-sound"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>
-<a name="id2673402"></a><span class="refentrytitle">gnome-sound</span>
+<a name="id2601714"></a><span class="refentrytitle">gnome-sound</span>
 </h2>
 <p>gnome-sound &#8212; Sound playing routines.</p>
 </td>
@@ -68,7 +68,7 @@
 </pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2673520"></a><h2>Description</h2>
+<a name="id2601832"></a><h2>Description</h2>
 <p>
 This module provides wrapper functions for playing sound samples. Currently it
 just wraps the esound daemon, but the API is flexible enough that other sound
@@ -81,11 +81,11 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2673546"></a><h2>Details</h2>
+<a name="id2601857"></a><h2>Details</h2>
 <div class="refsect2" lang="en">
-<a name="id2673556"></a><h3>
+<a name="id2601867"></a><h3>
 <a name="gnome-sound-init"></a>gnome_sound_init ()</h3>
-<a class="indexterm" name="id2673569"></a><pre class="programlisting">void                gnome_sound_init                    (const char *hostname);</pre>
+<a class="indexterm" name="id2601880"></a><pre class="programlisting">void                gnome_sound_init                    (const char *hostname);</pre>
 <p>
 Initialize the esd connection.</p>
 <p>
@@ -102,9 +102,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2673620"></a><h3>
+<a name="id2601931"></a><h3>
 <a name="gnome-sound-shutdown"></a>gnome_sound_shutdown ()</h3>
-<a class="indexterm" name="id2673632"></a><pre class="programlisting">void                gnome_sound_shutdown                (void);</pre>
+<a class="indexterm" name="id2601944"></a><pre class="programlisting">void                gnome_sound_shutdown                (void);</pre>
 <p>
 Shuts down the gnome sound support.</p>
 <p>
@@ -113,9 +113,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2673658"></a><h3>
+<a name="id2601969"></a><h3>
 <a name="gnome-sound-play"></a>gnome_sound_play ()</h3>
-<a class="indexterm" name="id2673670"></a><pre class="programlisting">void                gnome_sound_play                    (const char *filename);</pre>
+<a class="indexterm" name="id2601982"></a><pre class="programlisting">void                gnome_sound_play                    (const char *filename);</pre>
 <p>
 Plays the audio stored in <em class="parameter"><code>filename</code></em>, if possible. Fail quietly if playing is
 not possible (due to missing sound support or for other reasons).</p>
@@ -133,9 +133,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2673729"></a><h3>
+<a name="id2602040"></a><h3>
 <a name="gnome-sound-sample-load"></a>gnome_sound_sample_load ()</h3>
-<a class="indexterm" name="id2673741"></a><pre class="programlisting">int                 gnome_sound_sample_load             (const char *sample_name,
+<a class="indexterm" name="id2602053"></a><pre class="programlisting">int                 gnome_sound_sample_load             (const char *sample_name,
                                                          const char *filename);</pre>
 <p>
 Loads the audio from <em class="parameter"><code>filename</code></em> and load it into the esd cache for later
@@ -168,9 +168,9 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
-<a name="id2673854"></a><h3>
+<a name="id2602166"></a><h3>
 <a name="gnome-sound-connection-get"></a>gnome_sound_connection_get ()</h3>
-<a class="indexterm" name="id2673868"></a><pre class="programlisting">int                 gnome_sound_connection_get          (void);</pre>
+<a class="indexterm" name="id2602179"></a><pre class="programlisting">int                 gnome_sound_connection_get          (void);</pre>
 <p>
 Rarely needed to by programs directly, this function may be useful if a
 program has cached a sample with <a class="link" href="libgnome-gnome-sound.html#gnome-sound-sample-load"><code class="function">gnome_sound_sample_load()</code></a> and now wishes to
@@ -190,9 +190,9 @@
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2673944"></a><div class="refsect2" lang="en"><a name="id2673945"></a></div>
+<a name="id2602255"></a><div class="refsect2" lang="en"><a name="id2602256"></a></div>
 <hr>
-<div class="refsect2" lang="en"><a name="id2673946"></a></div>
+<div class="refsect2" lang="en"><a name="id2602257"></a></div>
 </div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ch03.html
+++ libgnome-2.21.90/doc/reference/html/ch03.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2661141"></a>Displaying Help and External Info</h2></div></div></div>
+<a name="id2589451"></a>Displaying Help and External Info</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libgnome-gnome-help.html">gnome-help</a></span><span class="refpurpose"> &#8212; Display application and GNOME system help.</span>
--- libgnome-2.21.90.orig/doc/reference/html/ch06.html
+++ libgnome-2.21.90/doc/reference/html/ch06.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2675227"></a>Deprecated Modules</h2></div></div></div>
+<a name="id2603539"></a>Deprecated Modules</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libgnome-gnome-config.html">gnome-config</a></span><span class="refpurpose"> &#8212; Access to configuration files.</span>
--- libgnome-2.21.90.orig/doc/reference/html/ix06.html
+++ libgnome-2.21.90/doc/reference/html/ix06.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691930"></a>Index of new symbols in 2.8</h2></div></div></div>
+<a name="id2620242"></a>Index of new symbols in 2.8</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/doc/reference/html/ix04.html
+++ libgnome-2.21.90/doc/reference/html/ix04.html
@@ -38,7 +38,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2691913"></a>Index of new symbols in 2.4</h2></div></div></div>
+<a name="id2620224"></a>Index of new symbols in 2.4</h2></div></div></div>
 <div class="index"></div>
 </div>
 </body>
--- libgnome-2.21.90.orig/debian/libgnome2-common.gconf-defaults
+++ libgnome-2.21.90/debian/libgnome2-common.gconf-defaults
@@ -0,0 +1,11 @@
+/desktop/gnome/background/picture_options	stretched
+/desktop/gnome/background/picture_filename	/usr/share/backgrounds/warty-final-ubuntu.png
+/desktop/gnome/interface/file_chooser_backend	gio
+/desktop/gnome/interface/gtk_theme	Human
+/desktop/gnome/interface/icon_theme	Human
+/desktop/gnome/font_rendering/dpi	96.0
+/desktop/gnome/applications/browser/exec	firefox
+/desktop/gnome/sound/enable_esd		true
+/desktop/gnome/sound/event_sounds	true
+/desktop/gnome/background/primary_color		#4E3E29
+/desktop/gnome/peripherals/mouse/cursor_theme	Human
--- libgnome-2.21.90.orig/debian/patches/00_as-needed.patch
+++ libgnome-2.21.90/debian/patches/00_as-needed.patch
@@ -0,0 +1,32 @@
+Index: nautilus-2.18.1/ltmain.sh
+===================================================================
+--- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
++++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
+@@ -1794,6 +1794,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;      
++
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2134,6 +2139,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
--- libgnome-2.21.90.orig/debian/patches/12_touchpad_schemas.patch
+++ libgnome-2.21.90/debian/patches/12_touchpad_schemas.patch
@@ -0,0 +1,61 @@
+diff -Nur -x '*.orig' -x '*~' libgnome-2.21.90/schemas/desktop_gnome_peripherals_mouse.schemas.in libgnome-2.21.90.new/schemas/desktop_gnome_peripherals_mouse.schemas.in
+--- libgnome-2.21.90/schemas/desktop_gnome_peripherals_mouse.schemas.in	2008-02-14 08:08:22.000000000 +0000
++++ libgnome-2.21.90.new/schemas/desktop_gnome_peripherals_mouse.schemas.in	2008-02-14 08:10:44.000000000 +0000
+@@ -123,5 +123,57 @@
+ 	</long>
+       </locale>
+     </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/peripherals/mouse/touchpad_enabled</key>
++      <applyto>/desktop/gnome/peripherals/mouse/touchpad_enabled</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++	<short>Touchpad Enabled</short>
++	<long>
++	  Enable the touchpad
++	</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/peripherals/mouse/tap_to_click</key>
++      <applyto>/desktop/gnome/peripherals/mouse/tap_to_click</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++	<short>Tap to Click</short>
++	<long>
++	  Tap on the trackpad to perform a mouse click
++	</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/peripherals/mouse/pad_horiz_scroll</key>
++      <applyto>/desktop/gnome/peripherals/mouse/pad_horiz_scroll</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++	<short>Touchpad horizontal scrolling</short>
++	<long>
++	  Use the bottom edge of the touchpad to perform horizontal scrolling
++	</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/peripherals/mouse/pad_vert_scroll</key>
++      <applyto>/desktop/gnome/peripherals/mouse/pad_vert_scroll</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++	<short>Touchpad vertical scrolling</short>
++	<long>
++	  Use the right edge of the touchpad to perform vertical scrolling
++	</long>
++      </locale>
++    </schema>
+   </schemalist>
+ </gconfschemafile>
--- libgnome-2.21.90.orig/debian/patches/08_dont_force_a11y_activation.patch
+++ libgnome-2.21.90/debian/patches/08_dont_force_a11y_activation.patch
@@ -0,0 +1,36 @@
+diff -Nur -x '*.orig' -x '*~' libgnome-2.21.90/configure.in libgnome-2.21.90.new/configure.in
+--- libgnome-2.21.90/configure.in	2008-01-28 16:24:23.000000000 +0100
++++ libgnome-2.21.90.new/configure.in	2008-01-28 17:50:07.000000000 +0100
+@@ -197,13 +197,7 @@
+ AC_CHECK_LIB(popt, poptStrippedArgv,, AC_MSG_ERROR([popt 1.5 or newer is required to build
+ libgnome. You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/]))
+ 
+-LIBGNOME_MINOR_VERSION=libgnome_minor_version
+-if test $(( $(echo $LIBGNOME_MINOR_VERSION) %2)) = "1"; then
+-	A11Y_ENABLED=true
+-else
+-	A11Y_ENABLED=false
+-fi
+-
++A11Y_ENABLED=false
+ AC_SUBST(A11Y_ENABLED)
+ 
+ AC_CONFIG_FILES([
+diff -Nur -x '*.orig' -x '*~' libgnome-2.21.90/configure libgnome-2.21.90.new/configure
+--- libgnome-2.21.90/configure	2008-01-28 16:30:20.000000000 +0100
++++ libgnome-2.21.90.new/configure	2008-01-28 17:50:07.000000000 +0100
+@@ -24124,13 +24124,7 @@
+ fi
+ 
+ 
+-LIBGNOME_MINOR_VERSION=21
+-if test $(( $(echo $LIBGNOME_MINOR_VERSION) %2)) = "1"; then
+-	A11Y_ENABLED=true
+-else
+-	A11Y_ENABLED=false
+-fi
+-
++A11Y_ENABLED=false
+ 
+ 
+ ac_config_files="$ac_config_files Makefile libgnome-zip po/Makefile.in libgnome/Makefile monikers/Makefile schemas/Makefile schemas/desktop_gnome_interface.schemas.in gnome-data/Makefile libgnome/libgnome-2.0.pc libgnome/libgnome-2.0-uninstalled.pc doc/Makefile doc/reference/Makefile doc/reference/version.xml"
--- libgnome-2.21.90.orig/debian/patches/10_sounds_event_list.patch
+++ libgnome-2.21.90/debian/patches/10_sounds_event_list.patch
@@ -0,0 +1,50 @@
+diff -Nur libgnome-2.13.90/gnome-data/gnome-2.soundlist.in libgnome-2.13.90.new/gnome-data/gnome-2.soundlist.in
+--- libgnome-2.13.90/gnome-data/gnome-2.soundlist.in	2003-07-11 21:49:10.000000000 +0200
++++ libgnome-2.13.90.new/gnome-data/gnome-2.soundlist.in	2006-03-03 16:04:28.000000000 +0100
+@@ -10,21 +10,21 @@
+ _description=Log out
+ 
+ [info]
+-file=info.wav
++file=
+ _description=Informational message
+ 
+ [warning]
+-file=warning.wav
++file=
+ _description=Warning message
+ 
+ [error]
+-file=error.wav
++file=
+ _description=Error message
+ 
+ [question]
+-file=question.wav
++file=
+ _description=Question dialog
+ 
+ [generic]
+-file=generic.wav
++file=
+ _description=Miscellaneous message
+diff -Nur libgnome-2.13.90/gnome-data/gtk-events-2.soundlist.in libgnome-2.13.90.new/gnome-data/gtk-events-2.soundlist.in
+--- libgnome-2.13.90/gnome-data/gtk-events-2.soundlist.in	2003-07-11 21:49:10.000000000 +0200
++++ libgnome-2.13.90.new/gnome-data/gtk-events-2.soundlist.in	2006-03-03 16:04:18.000000000 +0100
+@@ -2,13 +2,13 @@
+ _description=User interface events
+ 
+ [clicked]
+-file=gtk-events/clicked.wav
++file=
+ _description=Click on command button
+ 
+ [activate]
+-file=gtk-events/activate.wav
++file=
+ _description=Choose menu item
+ 
+ [toggled]
+-file=gtk-events/toggled.wav
++file=
+ _description=Select check box
--- libgnome-2.21.90.orig/debian/patches/02_path_max.patch
+++ libgnome-2.21.90/debian/patches/02_path_max.patch
@@ -0,0 +1,13 @@
+--- libgnome-2.10.0/libgnome/gnome-program.c.orig	2005-06-08 00:56:37.044243608 +0200
++++ libgnome-2.10.0/libgnome/gnome-program.c	2005-06-08 00:57:11.757966320 +0200
+@@ -54,6 +54,10 @@
+ #include "gnome-i18n.h"
+ #include "gnome-url.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ struct _GnomeProgramPrivate {
+     enum {
+ 	APP_UNINIT=0,
--- libgnome-2.21.90.orig/debian/changelog
+++ libgnome-2.21.90/debian/changelog
@@ -0,0 +1,907 @@
+libgnome (2.21.90-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/12_touchpad_schemas.patch:
+    - Add schema entry for enabling/disabling the touchpad.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 14 Feb 2008 07:47:39 +0000
+
+libgnome (2.21.90-0ubuntu1) hardy; urgency=low
+
+  * New upstream development release; no API change.
+    - Upstream NEWS:
+      . Set sound as enabled by default
+      . Remove unused popt stuff
+      . Fix the toolbar icon size schema type (#401030)
+      . SElinux fixes
+      . Warning fixes
+      . Translation updates
+    - Update patches 08_dont_force_a11y_activation and 11_aplay_fallback to
+      apply against the new release.
+  * Drop patch 11_aplay_fallback, not needed anymore.
+  * Set the default /desktop/gnome/interface/file_chooser_backend to gio via
+    the GConf defaults mechanism.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 28 Jan 2008 17:44:34 +0100
+
+libgnome (2.20.1.1-1ubuntu3) hardy; urgency=low
+
+  * Merge gutsy changelog entries to keep references to bug reports; thanks
+    Martin Pitt.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 21 Nov 2007 09:56:30 +0100
+
+libgnome (2.20.1.1-1ubuntu2) hardy; urgency=low
+
+  * debian/patches/04_gnome-score.c.patch:
+    - dropped, fixed with the new upstream version
+  * debian/patches/12_touchpad_schemas.patch:
+    - touchpad schemas definition
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 20 Nov 2007 13:59:53 +0100
+
+libgnome (2.20.1.1-1ubuntu1) hardy; urgency=low
+
+  * Sync with Debian; remaining Ubuntu changes:
+    - Set Maintainer to Ubuntu Desktop Team.
+    - Set misc GConf defaults for Ubuntu via
+      debian/libgnome2-common.gconf-defaults.
+    - Add patch 08_dont_force_a11y_activation, avoids forcing a11y activation.
+    - Add patch 10_sounds_event_list, enables only the login sound by default.
+    - Add patch 11_aplay_fallback, falls back to aplay if esd isn't available
+      to avoid recommending esound by default.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 13 Nov 2007 18:05:51 +0100
+
+libgnome (2.20.1.1-1) unstable; urgency=low
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release, many translation updates.
+
+  [ Loic Minier ]
+  * New upstream stable release; no API change; upstream packaging fix.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 20 Oct 2007 16:11:03 +0200
+
+libgnome (2.20.0-1ubuntu4) gutsy; urgency=low
+
+  * Completely rewrite debian/patches/11_aplay_fallback.patch to make it
+    work for sound events from gnome-session (like login/logout sounds), too.
+    gnome_sound_sample_load() now keeps a map of sound name -> sound file, so
+    that gnome_triggers_play_sound() has a chance to find the file name to
+    call aplay on.
+    
+    This still does not repair general sound events for all applications
+    (since gnome-session preloads the sound events into esd usually, which we
+    cannot do without esd), but for Gutsy purposes this is an unintrusive
+    workaround. In Hardy we should either switch to pulse by default, or get
+    upstream to drop this esound abdomination altogether. (LP: #129029)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Sat, 06 Oct 2007 11:54:27 +0200
+
+libgnome (2.20.0-1ubuntu3) gutsy; urgency=low
+
+  * Add default values for the touchpad schema entries
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Fri, 21 Sep 2007 01:32:39 +0100
+
+libgnome (2.20.0-1ubuntu2) gutsy; urgency=low
+
+  * debian/libgnome2-common.gconf-defaults:
+    - the dpi number is a float not an int (LP: #140540)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 18 Sep 2007 09:49:34 +0200
+
+libgnome (2.20.0-1ubuntu1) gutsy; urgency=low
+
+  * debian/libgnome2-common.gconf-defaults:
+    - set dpi to 96 rather than fonts to 11 (LP: #118745)
+  * Sync with Debian
+  * debian/control.in:
+    - package maintained by the Ubuntu Desktop Team
+    - updated maintainer information
+  * debian/libgnome2-common.gconf-defaults:
+    - changes to default configuration for Ubuntu 
+  * debian/patches/04_gnome-score.c.patch:
+    - dropped, it's not required with the new version
+  * debian/patches/08_dont_force_a11y_activation.patch:
+    - don't force a11y activation
+  * debian/patches/10_sounds_event_list.patch:
+    - no sound event out of the login one for the default configuration
+  * debian/patches/11_aplay_fallback.patch: Change gnome_sound_play() to
+    fall back to aplay if esd is not available. This finally allows us to not
+    install esound by default any more.
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 17 Sep 2007 15:55:06 +0200
+libgnome (2.20.0-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Use epiphany-browser as the default browser instead of epiphany.
+
+  [ Sebastian Dröge ]
+  * New upstream release, no API changes:
+    + debian/patches/00_as-needed.patch:
+      - Updated.
+    + debian/patches/40_set-prgname.patch:
+      - Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 17 Sep 2007 15:13:01 +0200
+
+libgnome (2.18.0-4) unstable; urgency=medium
+
+  * Build-depend on docbook-xml for the doc build in case it's turned on.
+  * Drop --enable-gtk-doc from build flags.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 12 Apr 2007 16:55:26 +0200
+
+libgnome (2.18.0-3) unstable; urgency=low
+
+  * Upload to unstable; drop check-dist include.
+  * Fix license in copyright.
+  * Wrap build-deps and deps.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 11 Apr 2007 14:31:50 +0200
+
+libgnome (2.18.0-2) experimental; urgency=low
+
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * New patch, 40_set-prgname, fixes program name which is particularly useful
+    to bug-buddy; GNOME #424949.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 31 Mar 2007 23:30:38 +0200
+
+libgnome (2.18.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Build-depend on libaudiofile-dev (>= 0.2.3).
+  * libgnome2-0.shlibs: bump to 2.17.3.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 19 Mar 2007 20:48:33 +0100
+
+libgnome (2.16.0-3) experimental; urgency=low
+
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Add comment in patch 03_gnome-terminal.
+  * Fix URL in copyright.
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-depend
+    on cdbs >= 0.4.41.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 19 Mar 2007 10:19:13 +0100
+
+libgnome (2.16.0-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * libgnome2-common.gconf-defaults: remove the background settings,
+    they are set by desktop-base now.
+
+  [ Loic Minier ]
+  * Upload to unstable.
+  * Add CDBS' utils.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 19 Oct 2006 11:28:12 +0200
+
+libgnome (2.16.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Correct build-dependency on libesd.
+  * Use clean-la.mk and gnome-version.mk.
+  * Use ${gnome:(Next)Version} for the libgnome2-common dependency.
+  * Build-depend on gnome-pkg-tools 0.7.
+  * Remove lots of unneeded build-dependencies (libxslt, zlib, libbz2, 
+    libxml).
+  * Require intltool 0.35.0.
+
+ -- Josselin Mouette <joss@debian.org>  Sat,  9 Sep 2006 14:08:15 +0200
+
+libgnome (2.15.2-1) experimental; urgency=low
+
+  * New upstream development releases; no API changes.
+    - Target at experimental.
+    - Drop 05_Makefile.in.in, seems fixed.
+
+ -- Loic Minier <lool@dooz.org>  Wed,  9 Aug 2006 21:55:22 +0200
+
+libgnome (2.14.1-3) unstable; urgency=low
+
+  * Fix watch file.
+  * Use ${binary:Version} instead of ${Source-Version}.
+  * Add more ${misc:Depends}.
+  * Drop useless libgnome2-dbg.dirs.
+  * Bump Debhelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org>  Wed,  9 Aug 2006 20:30:11 +0200
+
+libgnome (2.14.1-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Make the package binNMU-safe.
+    + Build-depend on dpkg-dev 1.13.19.
+    + Use ${source:Version}.
+
+  [ Loic Minier ]
+  * Bump shlibs to 2.14.1 to follow upstream's age bumping.
+    [debian/libgnome2-0.shlibs]
+  * Bump Standards-Version to 3.7.2.
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Mon,  8 May 2006 22:00:00 +0200
+
+libgnome (2.14.1-1) unstable; urgency=low
+
+  * New upstream release (bugfixes and updated translations).
+  * [debian/patches/05_Makefile.in.in.patch] Added: switch back to 2.14.0's
+    Makefile.in.in so that the translations get built.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 21 Apr 2006 12:51:28 +0200
+
+libgnome (2.14.0-2) unstable; urgency=low
+
+  * Rebuild against the latest libgnomevfs2-dev to remove the references 
+    to libhowl.
+  * 00_as-needed.patch: make --as-needed work despite libtool's argument 
+    reordering.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 29 Mar 2006 16:08:40 +0200
+
+libgnome (2.14.0-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Make the default wallpaper stretched.
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Update build-depends (gtk-doc-tools, glib2 >= 2.8 and bonobo2 >= 2.13)
+  * Updated watch file
+  * Add --enable-gtk-doc to DEB_CONFIGURE_EXTRA_FLAGS
+
+  [ Ondřej Surý ]
+  * Upload to unstable
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 20 Mar 2006 11:26:14 +0100
+
+libgnome (2.12.0.1-5) unstable; urgency=high
+
+  * Depend on ${misc:Depends}.
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  1 Feb 2006 09:50:54 +0100
+
+libgnome (2.12.0.1-4) unstable; urgency=low
+
+  * 01_default_background.patch,05_sensible-browser.patch: removed.
+  * libgnome2-common.gconf-defaults: set the defaults here.
+  * Build-depend on debhelper 5.0.13.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  8 Jan 2006 11:48:18 +0100
+
+libgnome (2.12.0.1-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Fri,  6 Jan 2006 21:34:38 +0100
+
+libgnome (2.12.0.1-2) experimental; urgency=low
+
+  * 01_default_background.patch: use debian-background.svg as the
+    default background.
+  * Suggest the corresponding desktop-base version.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  9 Oct 2005 23:00:21 +0200
+
+libgnome (2.12.0.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Build-depend on debhelper 4.1 (for cdbs).
+  * Freshen dependencies, remove old conflicts and use misc:Depends.
+  * rules: use --as-needed, and cleanup a few unnecessary things.
+  * watch: update to 2.12.
+  * 04_gnome-score.c.patch: update to make patch apply cleanly.
+
+ -- Josselin Mouette <joss@debian.org>  Sat,  8 Oct 2005 23:36:45 +0200
+
+libgnome (2.10.1-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * New upstream release.
+    - Drop GCC 4 compatibility patch, merged upstream.
+      [debian/patches/06_gcc4build.patch]
+  * Fix typos in gnome-options.7 manual page. (Closes: #311455)
+    [debian/gnome-options.7]
+  * Bump Standard-Versions to 3.6.2. [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Mon,  4 Jul 2005 18:19:07 +0200
+
+libgnome (2.10.0-3) unstable; urgency=low
+
+  * Add PATH_MAX patch to fix FTBFS on hurd (Closes: #312377)
+    - courtesy of Michael Banck <mbanck@debian.org>
+
+ -- Ondřej Surý <ondrej@sury.org>  Wed,  8 Jun 2005 08:42:44 +0200
+
+libgnome (2.10.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@sury.org>  Tue,  7 Jun 2005 15:50:18 +0200
+
+libgnome (2.10.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in, debian/rules:
+    - no need to build the html files, they are include in the tarball.
+  * debian/patches/02_va_list_type.patch:
+    - fixed in the new version.
+  * debian/patches/06_gcc4build.patch:
+    - fix the build with gcc4 (Closes: #300873).
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 22 Mar 2005 23:38:47 +0100
+
+libgnome (2.8.1-2) unstable; urgency=low
+
+  * debian/patches/02_va_list_type.patch:
+    - new version of this patch, fix the ftbfs.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 24 Feb 2005 19:23:46 +0100
+
+libgnome (2.8.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Ondřej Surý <ondrej@sury.org>  Thu, 24 Feb 2005 13:16:48 +0100
+
+libgnome (2.8.0-6) unstable; urgency=medium
+
+  * 01_default_background.patch: patch the .in file as well. Fixes empty
+    background by default.
+  * 05_sensible-browser.patch:
+    + Patch the .in as well.
+    + The default is now epiphany (closes: #241716).
+  * 03_gnome-terminal.patch: disabled.
+
+ -- Josselin Mouette <joss@debian.org>  Fri,  3 Dec 2004 15:32:42 +0100
+
+libgnome (2.8.0-5) unstable; urgency=low
+
+  * This time make proper fix using dummy va_list args.
+
+ -- Ondřej Surý <ondrej@sury.org>  Tue, 23 Nov 2004 16:01:07 +0100
+
+libgnome (2.8.0-4) unstable; urgency=medium
+
+  * debian/patches/02_va_list_type.patch: patch to fix FTBFS on alpha (Closes: #282529)
+
+ -- Ondřej Surý <ondrej@sury.org>  Tue, 23 Nov 2004 11:32:32 +0100
+
+libgnome (2.8.0-3) unstable; urgency=low
+
+  * debian/libgnome2-0.shlibs:
+    - updated.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 22 Nov 2004 12:56:01 +0100
+
+libgnome (2.8.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 18 Nov 2004 21:22:13 +0100
+
+libgnome (2.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 13 Sep 2004 19:18:00 +0200
+
+libgnome (2.7.92-1) experimental; urgency=low
+
+  * New upstream development release.
+  * [debian/control.in] Bumped gnome-vfs2 dependencies (for the
+    shared-mime-info transition); bumped gconf2 dependencies, just in case.
+    Corrected gconf2 build dependency to the -dev package.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 30 Aug 2004 18:03:38 +0200
+
+libgnome (2.7.91-1) experimental; urgency=low
+
+  * New upstream development release.
+  * [debian/patches/00_symbol_resolution.patch] Removed; has been integrated
+    upstream.
+  * [debian/rules] Build -Wl,-z,defs on all architectures.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 19 Aug 2004 21:55:00 +0200
+
+libgnome (2.7.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * [debian/rules] Configure --enable-gtk-doc to get a proper -doc package.
+  * [debian/control.in] Bumped gnome-vfs2 dependencies.
+  * [debian/patches/00_symbol_resolution.patch] New.
+  * [debian/patches/01_default_background.patch,
+    debian/patches/03_gnome-terminal.patch,
+    debian/patches/05_sensible-browser.patch] Patch the template files instead
+    of the generated files.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Wed, 11 Aug 2004 23:54:26 +0200
+
+libgnome (2.7.1-2) experimental; urgency=low
+
+  * 01_default_background.patch:
+    - added to 2.7 branch.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 24 Jun 2004 15:21:53 +0200
+
+libgnome (2.6.1-6) unstable; urgency=low
+
+  * 01_default_background.patch:
+    + properly use desktop-base's background when it is available.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 24 Jun 2004 13:48:50 +0200
+
+libgnome (2.7.1-1) experimental; urgency=low
+
+  * GNOME Team Upload.
+  * New (development) upstream release.
+  * debian/patches:
+    * Updated where needed
+    * Removed 06_sound_events.patch (integrated upstream)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 20 Jun 2004 16:48:56 +0200
+
+libgnome (2.6.1-5) unstable; urgency=medium
+
+  * Gnome Team Upload.
+  * debian/rules:
+    + used DEB_BUILD_ARCH instead of ARCH, should really fix the alpha/ia64 
+      problem (Closes: #253375).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 10 Jun 2004 18:45:21 +0200
+
+libgnome (2.6.1-4) unstable; urgency=low
+
+  * Gnome Team Upload.
+  * debian/rules:
+    - don't use "LDFLAGS += -Wl,-z,defs" on alpha and ia64 (Closes: #253375).
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed,  9 Jun 2004 19:48:36 +0200
+
+libgnome (2.6.1-3) unstable; urgency=low
+
+  * Apply patch to fix sound events (Closes: #252119)
+   - Thanks to Silvestre Zabala for providing superb bug report.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed,  2 Jun 2004 08:54:20 +0200
+
+libgnome (2.6.1-2) unstable; urgency=low
+
+  J.H.M. Dassen (Ray) <jdassen@debian.org>:
+  * [debian/rules] Ensure at build time that the library has no dependencies
+    on undefined symbols; speed up loading by having the linker put in a bit
+    more effort.
+  Ondřej Surý <ondrej@debian.org>:
+  * Upload for unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Sun, 25 Apr 2004 09:49:44 +0200
+
+libgnome (2.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Ondřej Surý <ondrej@debian.org>  Tue, 20 Apr 2004 10:12:42 +0200
+
+libgnome (2.6.0-5) experimental; urgency=low
+
+  * Fix type in debian/rules so gnome-options man page is installed
+    again.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 14 Apr 2004 12:01:21 +0200
+
+libgnome (2.6.0-4) experimental; urgency=low
+
+  * GNOME team upload.
+  * debian/libgnome2-0.shlibs: added, put back updated shlibs information.
+
+ -- Jordi Mallach <jordi@debian.org>  Tue,  6 Apr 2004 14:37:33 +0200
+
+libgnome (2.6.0-3) experimental; urgency=low
+
+  * Put gnome-open binary back.
+
+ -- Ondřej Surý <ondrej@debian.org>  Fri,  2 Apr 2004 16:29:25 +0200
+
+libgnome (2.6.0-2) experimental; urgency=low
+
+  * Add dependency on docbook-xml and gtk-doc-tools.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 24 Mar 2004 16:26:42 +0100
+
+libgnome (2.6.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 24 Mar 2004 14:41:37 +0100
+
+libgnome (2.4.0-7) unstable; urgency=low
+
+  * New maintainer (Closes: #238893)
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 24 Mar 2004 13:03:24 +0100
+
+libgnome (2.4.0-6) unstable; urgency=low
+
+  * Orphaned package.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 19 Mar 2004 16:12:29 +0100
+
+libgnome (2.4.0-5) unstable; urgency=low
+
+  * debian/prerm Unregister schemas files from the database.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  9 Jan 2004 15:44:58 +0100
+
+libgnome (2.4.0-4) unstable; urgency=low
+
+  * Build against latest gnome-vfs 2.4.1-4 and update Build-Depends
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 25 Oct 2003 10:45:01 +0200
+
+libgnome (2.4.0-3) unstable; urgency=low
+
+  * Install gnome-options.7 (Closes: #183132)
+  * Run libtoolize -f -c
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 23 Oct 2003 14:09:41 +0200
+
+libgnome (2.4.0-2) unstable; urgency=low
+
+  * debian/control Remove libbonobo-activation-dev from Build-Depends and
+    update libbonobo2-dev version to 2.4.1
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 18 Oct 2003 00:05:34 +0200
+
+libgnome (2.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove 01_python patch, included by upstream.
+  * Move 02_gnome-customization.xsl patch to yelp
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 14 Oct 2003 10:52:08 +0200
+
+libgnome (2.2.3-3) unstable; urgency=low
+
+  * Remove liblinc-dev from build-depends (Closes: #214821)
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  8 Oct 2003 22:39:54 +0200
+
+libgnome (2.2.3-2) unstable; urgency=low
+
+  * Patch from cvs to fix python bug (Closes: #194657)
+
+ -- Christian Marillat <marillat@debian.org>  Sun,  3 Aug 2003 11:23:52 +0200
+
+libgnome (2.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 15 Jul 2003 15:09:03 +0200
+
+libgnome (2.2.2-2) unstable; urgency=low
+
+  * Use x-terminal-emulator in schemas file as default (Closes: #199197)
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  5 Jul 2003 10:28:33 +0200
+
+libgnome (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 10 Jun 2003 03:08:56 +0200
+
+libgnome (2.2.1-2) unstable; urgency=low
+
+  * Add a versioned libpopt-dev Build-dependcy
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  3 Jun 2003 19:28:01 +0200
+
+libgnome (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed configure and helpers patches.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 24 May 2003 19:15:23 +0200
+
+libgnome (2.2.0.1-2) unstable; urgency=low
+
+  * Add a versioned depends for libgnome2-common in libgnome2-0 (Closes: #182392)
+  * Update section
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  1 Apr 2003 18:53:36 +0200
+
+libgnome (2.2.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove gtk-doc-tools dependency
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 23 Jan 2003 15:33:14 +0100
+
+libgnome (2.2.0-3) unstable; urgency=low
+
+  * Repeat after me "I love mipsel" (Closes: #177887)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 22 Jan 2003 15:00:23 +0100
+
+libgnome (2.2.0-2) unstable; urgency=low
+
+  * Add libesd0-dev depends for the -dev package (Closes: #177404)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 22 Jan 2003 11:48:19 +0100
+
+libgnome (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 22 Jan 2003 11:38:44 +0100
+
+libgnome (2.1.90-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  8 Jan 2003 15:39:52 +0100
+
+libgnome (2.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.5.8
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  7 Jan 2003 19:51:59 +0100
+
+libgnome (2.0.6-3) unstable; urgency=low
+
+  * Set sensible-browser as the default browser.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 26 Dec 2002 22:45:27 +0100
+
+libgnome (2.0.6-2) unstable; urgency=low
+
+  * debian/control Change libgnome2-doc section to doc.
+  * Apply Roderich's patches to fix help-converters bugs
+    (Closes: #173412, #173414, #172864)
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 20 Dec 2002 14:01:59 +0100
+
+libgnome (2.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 21 Nov 2002 18:52:05 +0100
+
+libgnome (2.0.5-2) unstable; urgency=low
+
+  * Move documenationin a new -doc package (Closes: #165736)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 23 Oct 2002 17:39:39 +0200
+
+libgnome (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  9 Sep 2002 15:06:59 +0200
+
+libgnome (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  5 Sep 2002 18:19:16 +0200
+
+libgnome (2.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 29 Aug 2002 19:35:22 +0200
+
+libgnome (2.0.2-2) unstable; urgency=low
+
+  * Patch to use SCORE_PATH = /var/games instead of /var/lib/games
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 13 Aug 2002 16:23:48 +0200
+
+libgnome (2.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Binaries are now in /usr/lib/<package>, then the libgnome2-bin package has
+    been removed.
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  7 Aug 2002 10:32:56 +0200
+
+libgnome (2.0.1-7) unstable; urgency=low
+
+  * Build against the latest libgnomevfs2-dev 2.0.2-1 to remove libssl
+    dependency.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  2 Aug 2002 16:59:40 +0200
+
+libgnome (2.0.1-6) unstable; urgency=low
+
+  * debian/control Add replaces nautilus (<= 1.0.6-4) for libgnome2-common
+    (Closes: #152122)
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 11 Jul 2002 14:59:03 +0200
+
+libgnome (2.0.1-5) unstable; urgency=low
+
+  * Default terminal in x-terminal-emulator instead of gnome-terminal.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 29 Jun 2002 16:32:26 +0200
+
+libgnome (2.0.1-4) unstable; urgency=low
+
+  * libgnome2-common should depends on gconf2 (Closes: #150277)
+  * Compiled with sound support.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 18 Jun 2002 18:41:55 +0200
+
+libgnome (2.0.1-3) unstable; urgency=low
+
+  * Build against libesd0 0.2.23
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 14 Jun 2002 14:10:56 +0200
+
+libgnome (2.0.1-2) unstable; urgency=low
+
+  * libgnome2-common don't need to depends on gconf2 (Closes: #149930)
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 14 Jun 2002 08:08:36 +0200
+
+libgnome (2.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 10 Jun 2002 18:20:23 +0200
+
+libgnome (2.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  7 Jun 2002 09:11:43 +0200
+
+libgnome (1.117.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/libgnome2-common.postinst check if schemas files are present
+    before calling gconftool-2 (Closes: #148121)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 27 May 2002 19:12:03 +0200
+
+libgnome (1.117.1-2) unstable; urgency=low
+
+  * libgnome2-common should depends on gconf2 (Closes: #148096, #148121)
+  * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 25 May 2002 17:09:33 +0200
+
+libgnome (1.117.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Move *.mo files in libgnome2-common package.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 21 May 2002 11:53:48 +0200
+
+libgnome (1.117.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS
+  * Move binaries in the libgnome2-bin package.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 15 May 2002 19:07:37 +0200
+
+libgnome (1.116.0-2) unstable; urgency=low
+
+  * Fix typo in build-depends (Closes: #146092)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  7 May 2002 09:08:39 +0200
+
+libgnome (1.116.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 29 Apr 2002 18:09:33 +0200
+
+libgnome (1.115.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 22 Apr 2002 18:58:56 +0200
+
+libgnome (1.114.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 30 Mar 2002 23:07:16 +0100
+
+libgnome (1.113.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 24 Mar 2002 00:31:44 +0100
+
+libgnome (1.112.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  5 Mar 2002 14:16:43 +0100
+
+libgnome (1.112.0-2) unstable; urgency=low
+
+  * Build (again) against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 25 Feb 2002 14:33:26 +0100
+
+libgnome (1.112.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Call docbook.xsl (in gnome-customization.xsl) localy instead of
+    downloading this file by http. Update shlibs for this reason.
+  * Build against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 23 Feb 2002 11:10:51 +0100
+
+libgnome (1.111.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 14 Feb 2002 14:25:52 +0100
+
+libgnome (1.110.0-2) unstable; urgency=low
+
+  * Build against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 10 Feb 2002 14:55:24 +0100
+
+libgnome (1.110.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Improve the depends filed for libgnome2-dev
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  2 Feb 2002 14:35:04 +0100
+
+libgnome (1.109.1-2) unstable; urgency=low
+
+  * Build against libatk9
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 22 Jan 2002 23:55:13 +0100
+
+libgnome (1.109.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 20 Jan 2002 14:59:07 +0100
+
+libgnome (1.109.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 14 Jan 2002 10:50:12 +0100
+
+libgnome (1.108.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 31 Dec 2001 17:51:33 +0100
+
+libgnome (1.107.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 31 Dec 2001 17:48:10 +0100
+
+libgnome (1.105.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 19 Nov 2001 20:15:01 +0100
+
+Local variables:
+mode: debian-changelog
+End:
--- libgnome-2.21.90.orig/debian/disabled_patches/03_gnome-terminal.patch
+++ libgnome-2.21.90/debian/disabled_patches/03_gnome-terminal.patch
@@ -0,0 +1,61 @@
+Disabled because if konsole is installed, it might run instead of a GNOME-ish
+emulator.
+
+--- libgnome/gnome-exec.c.orig	Sat Jun 29 16:07:48 2002
++++ libgnome/libgnome/gnome-exec.c	Sat Jun 29 16:09:17 2002
+@@ -417,12 +417,12 @@
+ 		term_argc = 2;
+ 		term_argv = g_new0 (char *, 3);
+ 
+-		check = g_find_program_in_path ("gnome-terminal");
++		check = g_find_program_in_path ("x-terminal-emulator");
+ 		if (check != NULL) {
+ 			term_argv[0] = check;
+ 			/* Note that gnome-terminal takes -x and
+ 			 * as -e in gnome-terminal is broken we use that. */
+-			term_argv[1] = g_strdup ("-x");
++			term_argv[1] = g_strdup ("-e");
+ 		} else {
+ 			if (check == NULL)
+ 				check = g_find_program_in_path ("nxterm");
+
+--- schemas/desktop_gnome_applications_terminal.schemas.orig	2003-07-05 10:25:02.000000000 +0200
++++ libgnome/schemas/desktop_gnome_applications_terminal.schemas	2003-07-05 10:25:25.000000000 +0200
+@@ -6,7 +6,7 @@
+       <applyto>/desktop/gnome/applications/terminal/exec</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>gnome-terminal</default>
++      <default>x-terminal-emulator</default>
+       <locale name="C">
+         <short>Terminal application</short>
+         <long>Terminal program to use when starting applications that require one</long>
+@@ -197,7 +197,7 @@
+       <applyto>/desktop/gnome/applications/terminal/exec_arg</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>-x</default>
++      <default>-e</default>
+       <locale name="C">
+         <short>Exec Arguments</short>
+         <long>Argument used to execute programs in the terminal defined
+--- schemas/desktop_gnome_applications_terminal.schemas.in.orig	2003-07-05 10:25:02.000000000 +0200
++++ libgnome/schemas/desktop_gnome_applications_terminal.schemas.in	2003-07-05 10:25:25.000000000 +0200
+@@ -6,7 +6,7 @@
+       <applyto>/desktop/gnome/applications/terminal/exec</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>gnome-terminal</default>
++      <default>x-terminal-emulator</default>
+       <locale name="C">
+         <short>Terminal application</short>
+         <long>Terminal program to use when starting applications that require one</long>
+@@ -197,7 +197,7 @@
+       <applyto>/desktop/gnome/applications/terminal/exec_arg</applyto>
+       <owner>gnome</owner>
+       <type>string</type>
+-      <default>-x</default>
++      <default>-e</default>
+       <locale name="C">
+         <short>Exec Arguments</short>
+         <long>Argument used to execute programs in the terminal defined
--- libgnome-2.21.90.orig/debian/watch
+++ libgnome-2.21.90/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/libgnome/([\d\.]+)[02468]/ \
+	libgnome-(.*)\.tar\.gz \
+	debian uupdate
--- libgnome-2.21.90.orig/debian/libgnome2-doc.doc-base
+++ libgnome-2.21.90/debian/libgnome2-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libgnome2-doc
+Title: Libgnome 2 Manual
+Author: gtk-doc-tools package
+Abstract: Reference manual for the GNOME 2 Library.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgnome2-doc/html/index.html
+Files: /usr/share/doc/libgnome2-doc/html/*.html
--- libgnome-2.21.90.orig/debian/libgnome2-0.install
+++ libgnome-2.21.90/debian/libgnome2-0.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/libgnome-2.so.*
+debian/tmp/usr/lib/bonobo/monikers/libmoniker_extra_2.so
+debian/tmp/usr/lib/bonobo/servers/
+debian/tmp/usr/bin/
--- libgnome-2.21.90.orig/debian/control
+++ libgnome-2.21.90/debian/control
@@ -0,0 +1,71 @@
+Source: libgnome
+Section: devel
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ondřej Surý <ondrej@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.13),
+               libgnomevfs2-dev (>= 2.7.91-3),
+               libbonobo2-dev (>= 2.13.0),
+               libpopt-dev,
+               intltool (>= 0.35.0),
+               libgconf2-dev (>= 2.7.92),
+               libesd0-dev (>= 0.2.26),
+               libaudiofile-dev (>= 0.2.3),
+               libglib2.0-dev (>= 2.8.0),
+               cdbs (>= 0.4.41),
+               gnome-pkg-tools (>= 0.10),
+               dpkg-dev (>= 1.13.19),
+               gtk-doc-tools (>= 1.0),
+               docbook-xml
+
+Package: libgnome2-0
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnome2-common (>= ${gnome:Version}),
+         libgnome2-common (<< ${gnome:NextVersion})
+Description: The GNOME 2 library - runtime files
+ This package contains the shared library for the base GNOME library
+ functions.
+
+Package: libgnome2-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome2-0 (= ${binary:Version}),
+         libbonobo2-dev (>= 2.6.0),
+         libgconf2-dev (>= 2.7.92),
+         libgnomevfs2-dev (>= 2.7.91-3),
+         libglib2.0-dev (>= 2.8.0),
+         libesd0-dev
+Suggests: libgnome2-doc
+Description: The GNOME 2 library - development files
+ This package contains the shared library for the base GNOME library
+ functions.
+
+Package: libgnome2-common
+Architecture: all
+Section: libs
+Replaces: libgnome2-0 (<= 1.117.0-1),
+          nautilus (<= 1.0.6-4)
+Depends: ${misc:Depends}
+Conflicts: libgnome2-0 (<= 1.117.0-1)
+Suggests: desktop-base (>= 0.3.16)
+Description: The GNOME 2 library - common files
+ This package contains internationalization files for the base GNOME
+ library functions.
+
+Package: libgnome2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Replaces: libgnome2-0 (<= 1.117.0-1),
+          nautilus (<= 1.0.6-4),
+          libgnome2-dev (<= 2.0.5-1)
+Conflicts: libgnome2-0 (<= 1.117.0-1)
+Description: The GNOME 2 library - documentation files
+ This package contains documentation files for the base GNOME library
+ functions.
--- libgnome-2.21.90.orig/debian/libgnome2-dev.install
+++ libgnome-2.21.90/debian/libgnome2-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libgnome-2.a
+debian/tmp/usr/lib/libgnome-2.la
+debian/tmp/usr/lib/libgnome-2.so
--- libgnome-2.21.90.orig/debian/libgnome2-doc.install
+++ libgnome-2.21.90/debian/libgnome2-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/gtk-doc/html/libgnome/* usr/share/doc/libgnome2-doc/html/
--- libgnome-2.21.90.orig/debian/libgnome2-0.shlibs
+++ libgnome-2.21.90/debian/libgnome2-0.shlibs
@@ -0,0 +1 @@
+libgnome-2 0 libgnome2-0 (>= 2.17.3)
--- libgnome-2.21.90.orig/debian/copyright
+++ libgnome-2.21.90/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Christian Marillat <marillat@debian.org> on
+Mon, 19 Nov 2001 20:15:01 +0100.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgnome
+
+Copyright: 1998,99,2000,01,2002 Free Software Foundation, Inc.
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
--- libgnome-2.21.90.orig/debian/control.in
+++ libgnome-2.21.90/debian/control.in
@@ -0,0 +1,71 @@
+Source: libgnome
+Section: devel
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ondřej Surý <ondrej@debian.org>
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.13),
+               libgnomevfs2-dev (>= 2.7.91-3),
+               libbonobo2-dev (>= 2.13.0),
+               libpopt-dev,
+               intltool (>= 0.35.0),
+               libgconf2-dev (>= 2.7.92),
+               libesd0-dev (>= 0.2.26),
+               libaudiofile-dev (>= 0.2.3),
+               libglib2.0-dev (>= 2.8.0),
+               cdbs (>= 0.4.41),
+               gnome-pkg-tools (>= 0.10),
+               dpkg-dev (>= 1.13.19),
+               gtk-doc-tools (>= 1.0),
+               docbook-xml
+
+Package: libgnome2-0
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnome2-common (>= ${gnome:Version}),
+         libgnome2-common (<< ${gnome:NextVersion})
+Description: The GNOME 2 library - runtime files
+ This package contains the shared library for the base GNOME library
+ functions.
+
+Package: libgnome2-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome2-0 (= ${binary:Version}),
+         libbonobo2-dev (>= 2.6.0),
+         libgconf2-dev (>= 2.7.92),
+         libgnomevfs2-dev (>= 2.7.91-3),
+         libglib2.0-dev (>= 2.8.0),
+         libesd0-dev
+Suggests: libgnome2-doc
+Description: The GNOME 2 library - development files
+ This package contains the shared library for the base GNOME library
+ functions.
+
+Package: libgnome2-common
+Architecture: all
+Section: libs
+Replaces: libgnome2-0 (<= 1.117.0-1),
+          nautilus (<= 1.0.6-4)
+Depends: ${misc:Depends}
+Conflicts: libgnome2-0 (<= 1.117.0-1)
+Suggests: desktop-base (>= 0.3.16)
+Description: The GNOME 2 library - common files
+ This package contains internationalization files for the base GNOME
+ library functions.
+
+Package: libgnome2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Replaces: libgnome2-0 (<= 1.117.0-1),
+          nautilus (<= 1.0.6-4),
+          libgnome2-dev (<= 2.0.5-1)
+Conflicts: libgnome2-0 (<= 1.117.0-1)
+Description: The GNOME 2 library - documentation files
+ This package contains documentation files for the base GNOME library
+ functions.
--- libgnome-2.21.90.orig/debian/libgnome2-doc.links
+++ libgnome-2.21.90/debian/libgnome2-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libgnome2-doc/html/ usr/share/gtk-doc/html/libgnome
--- libgnome-2.21.90.orig/debian/rules
+++ libgnome-2.21.90/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+
+DEB_INSTALL_MANPAGES_libgnome2-common += debian/gnome-options.7
+
+clean::
+	dh_clean intltool-extract intltool-merge intltool-update \
+	po/.intltool-merge-cache
--- libgnome-2.21.90.orig/debian/gnome-options.7
+++ libgnome-2.21.90/debian/gnome-options.7
@@ -0,0 +1,81 @@
+.\" gnome-options.7 - Standard Command Line Options for Gnome Programs
+.\" Copyright 2002, 2003  Jochen Voss <voss@debian.org>
+.\" You may redistribute and modify this manual page
+.\" under the terms of the GPL.
+.TH gnome-options 7 "2003-10-20" "GNOME 2.2" "Gnome User's Manual"
+.SH NAME
+gnome-options \- Standard Command Line Options for GNOME 2 Programs
+.SH SYNOPSIS
+.IR "program " [ "standard options" "] [" "specific options" "] " arguments
+.SH DESCRIPTION
+This manual page describes the command line options, which are common
+to all Gnome applications.
+.SH OPTIONS
+.SS Help options
+.TP
+\fB-?\fR, \fB\-\-help\fR
+Show the application's help message.
+.TP
+\fB\-\-usage\fR
+Display a brief usage message.
+.TP
+\fB\-\-version\fR
+Show the application's version information.
+.SS Bonobo Activation support
+.TP
+\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR
+File descriptor to print IOR on
+.TP
+\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR
+IID to activate
+.TP
+\fB\-\-oaf\-private\fR
+Prevent registering of server with OAF
+.SS GNOME library options
+.TP
+\fB\-\-disable\-sound\fR
+Disable sound server usage
+.TP
+\fB\-\-enable\-sound\fR
+Enable sound server usage
+.TP
+\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT
+.IR Host : port
+on which the
+.B esd
+sound server to use is running.  This is useful if you simultaneously
+run programs on several machines.
+.SS GNOME GUI options
+.TP
+\fB\-\-disable\-crash\-dialog\fR
+Disable the crash dialog, which is normally shown when the application
+segfaults.
+.SS Session management options
+.TP
+\fB\-\-sm\-client\-id\fR=\fIID\fR
+Specify session management ID.  Only used by the session manager itself
+while restarting the application.
+.TP
+\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR
+Specify prefix of saved configuration.
+.TP
+\fB\-\-sm\-disable\fR
+Disable connection to session manager.
+.SS Other options
+.TP
+\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,...
+Dynamic modules to load
+.SH "SEE ALSO"
+.BR gtk\-options (7)
+
+For most GNOME programs there will be additional command line options,
+which are specific to the program.  These will be explained in the
+.I Application options
+section of the
+.I --help
+output and in the application's online help.
+.SH AUTHOR
+This manual page was written by Jochen Voss <voss@debian.org>.  A
+first version was generated with the help of the
+.I help2man
+program.  The program's output was manually edited later.
--- libgnome-2.21.90.orig/debian/compat
+++ libgnome-2.21.90/debian/compat
@@ -0,0 +1 @@
+5
--- libgnome-2.21.90.orig/debian/libgnome2-common.install
+++ libgnome-2.21.90/debian/libgnome2-common.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/locale
+debian/tmp/etc
--- libgnome-2.21.90.orig/libgnome/stamp-libgnometypebuiltins.h
+++ libgnome-2.21.90/libgnome/stamp-libgnometypebuiltins.h
@@ -0,0 +1 @@
+timestamp