Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- Makefile.am	11 May 2002 06:37:46 -0000	1.16
+++ Makefile.am	26 Jun 2003 19:22:19 -0000
@@ -16,7 +16,7 @@ OBJSCAN_OPTIONS=--nogtkinit
 SCAN_OPTIONS=--deprecated-guards="GCONF_ENABLE_BROKEN|GCONF_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode
+MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../glib/html
@@ -114,7 +114,7 @@ tmpl.stamp: tmpl-build.stamp
 sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
 	@echo '*** Building SGML ***'
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) 
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -139,7 +139,7 @@ clean-local:
 	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -168,10 +168,10 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/sgml
+	mkdir $(distdir)/xml
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	-cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local
Index: gconf.sgml
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/gconf.sgml,v
retrieving revision 1.33
diff -u -p -r1.33 gconf.sgml
--- gconf.sgml	30 Sep 2002 02:08:37 -0000	1.33
+++ gconf.sgml	26 Jun 2003 19:22:20 -0000
@@ -1,16 +1,18 @@
-<!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity GConfClient SYSTEM "sgml/gconf-client.sgml">
-<!entity gconf-gconf-backend SYSTEM "sgml/gconf-backend.sgml">
-<!entity gconf-gconf-engine SYSTEM "sgml/gconf-engine.sgml">
-<!entity gconf-gconf-error SYSTEM "sgml/gconf-error.sgml">
-<!entity gconf-gconf-internals SYSTEM "sgml/gconf-internals.sgml">
-<!entity gconf-gconf-listeners SYSTEM "sgml/gconf-listeners.sgml">
-<!entity gconf-gconf-schema SYSTEM "sgml/gconf-schema.sgml">
-<!entity gconf-gconf-sources SYSTEM "sgml/gconf-sources.sgml">
-<!entity gconf-gconf-value SYSTEM "sgml/gconf-value.sgml">
-<!entity gconf-gconf SYSTEM "sgml/gconf.sgml">
-<!entity gconf-gconf-locale SYSTEM "sgml/gconf-locale.sgml">
-<!entity gconf-gconf-changeset SYSTEM "sgml/gconf-changeset.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY GConfClient SYSTEM "xml/gconf-client.xml">
+<!ENTITY gconf-gconf-backend SYSTEM "xml/gconf-backend.xml">
+<!ENTITY gconf-gconf-engine SYSTEM "xml/gconf-engine.xml">
+<!ENTITY gconf-gconf-error SYSTEM "xml/gconf-error.xml">
+<!ENTITY gconf-gconf-internals SYSTEM "xml/gconf-internals.xml">
+<!ENTITY gconf-gconf-listeners SYSTEM "xml/gconf-listeners.xml">
+<!ENTITY gconf-gconf-schema SYSTEM "xml/gconf-schema.xml">
+<!ENTITY gconf-gconf-sources SYSTEM "xml/gconf-sources.xml">
+<!ENTITY gconf-gconf-value SYSTEM "xml/gconf-value.xml">
+<!ENTITY gconf-gconf SYSTEM "xml/gconf.xml">
+<!ENTITY gconf-gconf-locale SYSTEM "xml/gconf-locale.xml">
+<!ENTITY gconf-gconf-changeset SYSTEM "xml/gconf-changeset.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -68,7 +70,7 @@
       This chapter introduces GConf, including the basic terms and
       concepts. After reading it, if you're a GNOME programmer looking
       to dive in quickly, you might skip to <xref
-      linkend="gconfclient-example">. If you want to have
+      linkend="gconfclient-example"/>. If you want to have
       comprehensive knowledge of GConf, you might want to read the
       whole manual.
     </para>
@@ -163,7 +165,7 @@
           <firstterm>key</firstterm>.  Characters in a path should be
           alphanumeric or underscore. Path components may not start with a
           period. You should follow the conventions outlined in 
-         <xref linkend="conventions"> when choosing what names to use
+         <xref linkend="conventions"/> when choosing what names to use
           for your keys.
         </para>
       </sect2>
@@ -369,7 +371,7 @@
     <para>
       Note that this is only a brief tutorial-style introduction to
       the client library; have a look at <xref
-      linkend="gconf-reference"> for a complete reference.
+      linkend="gconf-reference"/> for a complete reference.
     </para>
 
     <!-- Error Handling -->
@@ -521,7 +523,7 @@
       <para>
         <structname>GConfClient</structname> should be used instead of 
         <structname>GConfEngine</structname> in most applications.
-        See <xref linkend="gconf-client">. Because libgnome uses
+        See <xref linkend="gconf-client"/>. Because libgnome uses
         <structname>GConfClient</structname>, apps using libgnome 
         <emphasis>MUST</emphasis> use
         <structname>GConfClient</structname>.
@@ -559,7 +561,7 @@
           <funcdef>GConfEngine*
             <function>gconf_engine_get_default</function>
           </funcdef>
-          <void>
+          <void/>
         </funcsynopsis>        
         <funcsynopsis>
           <funcsynopsisinfo>#include &lt;gconf/gconf.h&gt;</funcsynopsisinfo>
@@ -940,10 +942,10 @@ print_value(GConfValue* value)
       This chapter covers the mechanics of writing and installing the
       GConf schema files. Schema files describe your configuration
       data and provide default values for it. See <xref
-      linkend="concepts-schemas"> for an explanation of schemas.  The
+      linkend="concepts-schemas"/> for an explanation of schemas.  The
       schema file is not understood by the GConf client library;
       rather, <application>gconftool</application> (see <xref
-      linkend="gconftool">) knows how to parse it, and then uses the GConf
+      linkend="gconftool"/>) knows how to parse it, and then uses the GConf
       client library to install the information in the GConf database.
     </para>
 
@@ -1038,14 +1040,14 @@ print_value(GConfValue* value)
         Here are the fields of the <literal>&lt;schema&gt;</literal>
         element:
 
-<informaltable pgwide=1 frame="none">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
 <entry>&lt;key&gt;</entry>
 <entry>The key <emphasis>where the schema will be stored</emphasis>;
-                  see <xref linkend="conventions"> for naming
+                  see <xref linkend="conventions"/> for naming
                   conventions. There may be only one key per schema.
 </entry>
 
@@ -1056,7 +1058,7 @@ print_value(GConfValue* value)
 
 <entry>A key <emphasis>the schema will be applied to</emphasis>; that
                   is, this schema <emphasis>describes</emphasis> this
-                  key.  See <xref linkend="conventions"> for naming
+                  key.  See <xref linkend="conventions"/> for naming
                   conventions. There may be multiple &lt;applyto&gt;
                   elements.</entry>
 
@@ -1127,8 +1129,8 @@ element, if the default should be locali
         A <literal>&lt;locale&gt;</literal> element can contain 
 a locale-specific <literal>&lt;default&gt;</literal>, and may also 
 contain short and long descriptions as follows:
-<informaltable pgwide=1 frame="none">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
Index: tmpl/gconf-backend.sgml
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/tmpl/gconf-backend.sgml,v
retrieving revision 1.6
diff -u -p -r1.6 gconf-backend.sgml
--- tmpl/gconf-backend.sgml	27 Mar 2003 01:41:14 -0000	1.6
+++ tmpl/gconf-backend.sgml	26 Jun 2003 19:22:20 -0000
@@ -25,8 +25,8 @@ called gconf_backend_get_vtable() that r
 <para>
 Here are the methods the backend must implement, and their specification:
 
-<informaltable pgwide=1 frame="none">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
Index: tmpl/gconf-engine.sgml
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/tmpl/gconf-engine.sgml,v
retrieving revision 1.8
diff -u -p -r1.8 gconf-engine.sgml
--- tmpl/gconf-engine.sgml	17 Sep 2000 00:55:00 -0000	1.8
+++ tmpl/gconf-engine.sgml	26 Jun 2003 19:22:20 -0000
@@ -39,7 +39,7 @@ function assumes one reference count, an
 gconf_engine_unref() at some point. It's fairly important to unref the
 #GConfEngine, to cleanly close the connection to
 <application>gconfd</application>. So if possible close the connection
-before exiting your application.
+before exiting your application. see ? printf() <function>printf()</function>
 </para>
 
 @Returns: the default #GConfEngine.
Index: tmpl/gconf.sgml
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/tmpl/gconf.sgml,v
retrieving revision 1.14
diff -u -p -r1.14 gconf.sgml
--- tmpl/gconf.sgml	17 Sep 2000 00:55:00 -0000	1.14
+++ tmpl/gconf.sgml	26 Jun 2003 19:22:20 -0000
@@ -430,8 +430,8 @@ objects. gconf_engine_get_list() automat
 types. Thus, the list-&gt;data fields in the returned list 
 contain:
  
-<informaltable pgwide=1 frame="none">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -495,8 +495,8 @@ gconf_engine_get_pair() stores the two f
 pointed to by @car_retloc and @cdr_retloc. The type of these pointers
 depends on the corresponding @car_type and @cdr_type:
  
-<informaltable pgwide=1 frame="none">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
