Index: docs/reference/cspi/Makefile.am
===================================================================
RCS file: /cvs/gnome/at-spi/docs/reference/cspi/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- docs/reference/cspi/Makefile.am	11 Mar 2002 22:36:03 -0000	1.2
+++ docs/reference/cspi/Makefile.am	29 Apr 2003 09:35:56 -0000
@@ -14,6 +14,9 @@ DOC_MAIN_SGML_FILE=at-spi-cspi-docs.sgml
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../../../cspi 
 
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--output-format=xml
+
 INSTALLDIR=$(prefix)/share/gtk-doc
 
 HTML_DIR = ${datadir}/gtk-doc/html
Index: docs/reference/cspi/at-spi-cspi-docs.sgml
===================================================================
RCS file: /cvs/gnome/at-spi/docs/reference/cspi/at-spi-cspi-docs.sgml,v
retrieving revision 1.1
diff -u -p -r1.1 at-spi-cspi-docs.sgml
--- docs/reference/cspi/at-spi-cspi-docs.sgml	21 Nov 2001 17:16:55 -0000	1.1
+++ docs/reference/cspi/at-spi-cspi-docs.sgml	29 Apr 2003 09:35:56 -0000
@@ -1,21 +1,23 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity at-spi-spi-main SYSTEM "sgml/spi_main.sgml">
-<!entity at-spi-spi-event SYSTEM "sgml/spi_event.sgml">
-<!entity at-spi-spi-registry SYSTEM "sgml/spi_registry.sgml">
-<!entity at-spi-spi-application SYSTEM "sgml/spi_application.sgml">
-<!entity at-spi-spi-accessible SYSTEM "sgml/spi_accessible.sgml">
-<!entity at-spi-spi-action SYSTEM "sgml/spi_action.sgml">
-<!entity at-spi-spi-component SYSTEM "sgml/spi_component.sgml">
-<!entity at-spi-spi-editabletext SYSTEM "sgml/spi_editabletext.sgml">
-<!entity at-spi-spi-hypertext SYSTEM "sgml/spi_hypertext.sgml">
-<!entity at-spi-spi-image SYSTEM "sgml/spi_image.sgml">
-<!entity at-spi-spi-selection SYSTEM "sgml/spi_selection.sgml">
-<!entity at-spi-spi-table SYSTEM "sgml/spi_table.sgml">
-<!entity at-spi-spi-text SYSTEM "sgml/spi_text.sgml">
-<!entity at-spi-spi-value SYSTEM "sgml/spi_value.sgml">
-<!entity at-spi-spi-hyperlink SYSTEM "sgml/spi_hyperlink.sgml">
-<!entity at-spi-spi-relation SYSTEM "sgml/spi_relation.sgml">
-<!entity at-spi-spi-stateset SYSTEM "sgml/spi_stateset.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY at-spi-spi-main SYSTEM "xml/spi_main.xml">
+<!ENTITY at-spi-spi-event SYSTEM "xml/spi_event.xml">
+<!ENTITY at-spi-spi-registry SYSTEM "xml/spi_registry.xml">
+<!ENTITY at-spi-spi-application SYSTEM "xml/spi_application.xml">
+<!ENTITY at-spi-spi-accessible SYSTEM "xml/spi_accessible.xml">
+<!ENTITY at-spi-spi-action SYSTEM "xml/spi_action.xml">
+<!ENTITY at-spi-spi-component SYSTEM "xml/spi_component.xml">
+<!ENTITY at-spi-spi-editabletext SYSTEM "xml/spi_editabletext.xml">
+<!ENTITY at-spi-spi-hypertext SYSTEM "xml/spi_hypertext.xml">
+<!ENTITY at-spi-spi-image SYSTEM "xml/spi_image.xml">
+<!ENTITY at-spi-spi-selection SYSTEM "xml/spi_selection.xml">
+<!ENTITY at-spi-spi-table SYSTEM "xml/spi_table.xml">
+<!ENTITY at-spi-spi-text SYSTEM "xml/spi_text.xml">
+<!ENTITY at-spi-spi-value SYSTEM "xml/spi_value.xml">
+<!ENTITY at-spi-spi-hyperlink SYSTEM "xml/spi_hyperlink.xml">
+<!ENTITY at-spi-spi-relation SYSTEM "xml/spi_relation.xml">
+<!ENTITY at-spi-spi-stateset SYSTEM "xml/spi_stateset.xml">
 ]>
 
 <book>
Index: docs/reference/idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/at-spi/docs/reference/idl/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- docs/reference/idl/Makefile.am	21 Nov 2001 18:48:20 -0000	1.1
+++ docs/reference/idl/Makefile.am	29 Apr 2003 09:35:57 -0000
@@ -14,6 +14,9 @@ DOC_MAIN_SGML_FILE=at-spi-idl-docs.sgml
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../../../idl
 
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--output-format=xml
+
 INSTALLDIR=$(prefix)/share/gtk-doc
 
 HTML_DIR = ${datadir}/gtk-doc/html
Index: docs/reference/idl/at-spi-idl-docs.sgml
===================================================================
RCS file: /cvs/gnome/at-spi/docs/reference/idl/at-spi-idl-docs.sgml,v
retrieving revision 1.1
diff -u -p -r1.1 at-spi-idl-docs.sgml
--- docs/reference/idl/at-spi-idl-docs.sgml	22 Nov 2001 11:55:47 -0000	1.1
+++ docs/reference/idl/at-spi-idl-docs.sgml	29 Apr 2003 09:35:57 -0000
@@ -1,8 +1,10 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity at-spi-idl-accessible SYSTEM "sgml/Accessible.sgml">
-<!entity at-spi-idl-registry SYSTEM "sgml/Registry.sgml">
-<!entity at-spi-idl-application SYSTEM "sgml/Application.sgml">
-<!entity at-spi-idl-action SYSTEM "sgml/Action.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY at-spi-idl-accessible SYSTEM "xml/Accessible.xml">
+<!ENTITY at-spi-idl-registry SYSTEM "xml/Registry.xml">
+<!ENTITY at-spi-idl-application SYSTEM "xml/Application.xml">
+<!ENTITY at-spi-idl-action SYSTEM "xml/Action.xml">
 ]>
 
 <book>
