From d3adf582d6498e0c8ee04b30d80dda031aad564d Mon Sep 17 00:00:00 2001
From: padraigo <padraigo@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Tue, 29 Apr 2003 13:47:28 +0000
Subject: [PATCH] 2003-04-29  Padraig O'Briain <padraig.obriain@sun.com>

	* docs/reference/cspi/Makefile.am, docs/reference/idl/Makefile.am:
	Add MKDB_OPTIONS=--outtput-format=xml

	* docs/reference/cspi/at-spi-cspi-docs.sgml
	docs/reference/idl/at-spi-idl-docs.sgml:
	Convert to Docbook XML.

	This fixes bug #111793.


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@424 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 ChangeLog                                 | 11 +++++++++
 docs/reference/cspi/Makefile.am           |  3 +++
 docs/reference/cspi/at-spi-cspi-docs.sgml | 38 ++++++++++++++++---------------
 docs/reference/idl/Makefile.am            |  3 +++
 docs/reference/idl/at-spi-idl-docs.sgml   | 12 ++++++----
 5 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b90aef..a243e16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-29  Padraig O'Briain <padraig.obriain@sun.com>
+
+	* docs/reference/cspi/Makefile.am, docs/reference/idl/Makefile.am:
+	Add MKDB_OPTIONS=--outtput-format=xml
+
+	* docs/reference/cspi/at-spi-cspi-docs.sgml
+	docs/reference/idl/at-spi-idl-docs.sgml:
+	Convert to Docbook XML.
+
+	This fixes bug #111793.
+
 2003-04-25  Padraig O'Briain <padraig.obriain@sun.com>
 
 	* cspi/spi-listener.h: Add documentation for AccessibleDeviceEventType,
diff --git a/docs/reference/cspi/Makefile.am b/docs/reference/cspi/Makefile.am
index 5f7c1af..a21eab9 100644
--- a/docs/reference/cspi/Makefile.am
+++ b/docs/reference/cspi/Makefile.am
@@ -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
diff --git a/docs/reference/cspi/at-spi-cspi-docs.sgml b/docs/reference/cspi/at-spi-cspi-docs.sgml
index e5275c1..7823af5 100644
--- a/docs/reference/cspi/at-spi-cspi-docs.sgml
+++ b/docs/reference/cspi/at-spi-cspi-docs.sgml
@@ -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>
diff --git a/docs/reference/idl/Makefile.am b/docs/reference/idl/Makefile.am
index 3f3c20f..f5ad384 100644
--- a/docs/reference/idl/Makefile.am
+++ b/docs/reference/idl/Makefile.am
@@ -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
diff --git a/docs/reference/idl/at-spi-idl-docs.sgml b/docs/reference/idl/at-spi-idl-docs.sgml
index 3f1ee00..03fdd43 100644
--- a/docs/reference/idl/at-spi-idl-docs.sgml
+++ b/docs/reference/idl/at-spi-idl-docs.sgml
@@ -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>
-- 
2.7.4