From cda2111bd2a12fc246c6e7973ae7fae4ff779bca Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Wed, 23 Jul 2008 23:42:17 -0400
Subject: fix the includes

---
 doc/ConsoleKit.xml.in            | 23 +++++++----------------
 doc/dbus-introspect-docs.dtd     | 32 ++++++++++++++++++++++++++++++++
 doc/xml/Makefile.am              |  6 +++---
 doc/xml/dbus-introspect-docs.dtd | 32 --------------------------------
 4 files changed, 42 insertions(+), 51 deletions(-)
 create mode 100644 doc/dbus-introspect-docs.dtd
 delete mode 100644 doc/xml/dbus-introspect-docs.dtd

diff --git a/doc/ConsoleKit.xml.in b/doc/ConsoleKit.xml.in
index 294c34c..93ad9a9 100644
--- a/doc/ConsoleKit.xml.in
+++ b/doc/ConsoleKit.xml.in
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY dbus-Manager SYSTEM "xml/ref-ck-manager.xml">
-<!ENTITY dbus-Seat SYSTEM "xml/ref-ck-seat.xml">
-<!ENTITY dbus-Session SYSTEM "xml/ref-ck-session.xml">
-<!ENTITY Intro SYSTEM "xml/ck-introduction.xml">
-<!ENTITY Terms SYSTEM "xml/ck-terms.xml">
-<!ENTITY Design SYSTEM "xml/ck-design.xml">
 ]>
 
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>ConsoleKit @VERSION@ Documentation</title>
     <releaseinfo>Version @VERSION@</releaseinfo>
@@ -34,10 +28,9 @@
 
   <part>
     <title>Concepts</title>
-
-    &Intro;
-    &Terms;
-    &Design;
+    <xi:include href="xml/ck-introduction.xml"/>
+    <xi:include href="xml/ck-terms.xml"/>
+    <xi:include href="xml/ck-design.xml"/>
   </part>
 
   <part>
@@ -59,11 +52,9 @@
         This API is not yet stable and is likely to change in the future.
         </para>
       </partintro>
-
-      &dbus-Manager;
-      &dbus-Seat;
-      &dbus-Session;
-
+      <xi:include href="xml/org.freedesktop.ConsoleKit.Manager.ref.xml"/>
+      <xi:include href="xml/org.freedesktop.ConsoleKit.Seat.ref.xml"/>
+      <xi:include href="xml/org.freedesktop.ConsoleKit.Session.ref.xml"/>
     </reference>
   </part>
 
diff --git a/doc/dbus-introspect-docs.dtd b/doc/dbus-introspect-docs.dtd
new file mode 100644
index 0000000..5fe508e
--- /dev/null
+++ b/doc/dbus-introspect-docs.dtd
@@ -0,0 +1,32 @@
+<!-- DTD for D-Bus Introspection Documentation -->
+
+<!ELEMENT doc (summary?,description?,errors?,permission?,since?,deprecated,seealso?)>
+
+<!ELEMENT summary (#PCDATA|ref)*>
+<!ELEMENT description (#PCDATA|para|example)*>
+<!ELEMENT errors (error)*>
+<!ELEMENT permission (#PCDATA|ref|para)*>
+<!ELEMENT since EMPTY>
+<!ATTLIST since version CDATA #REQUIRED>
+<!ELEMENT deprecated (#PCDATA|ref)>
+<!ATTLIST deprecated version CDATA #REQUIRED>
+<!ATTLIST deprecated instead CDATA #REQUIRED>
+<!ELEMENT seealso (ref+)>
+
+<!ELEMENT error (#PCDATA|para)*>
+<!ATTLIST error name CDATA #REQUIRED>
+<!ELEMENT para (#PCDATA|example|code|list|ref)*>
+<!ELEMENT example (#PCDATA|para|code|ref)*>
+<!ATTLIST language (c|glib|python|shell) #REQUIRED>
+<!ATTLIST title CDATA #IMPLIED>
+<!ELEMENT list (listheader?, item*)>
+<!ATTLIST list type (bullet|number|table) #REQUIRED>
+<!ELEMENT item (term|definition)*>
+<!ELEMENT term (#PCDATA|ref)*>
+<!ELEMENT definition (#PCDATA|para)*>
+
+<!ELEMENT code (#PCDATA)>
+<!ATTLIST code lang CDATA #IMPLIED>
+<!ELEMENT ref CDATA>
+<!ATTLIST ref type (parameter|arg|signal|method|interface) #REQUIRED>
+<!ATTLIST ref to CDATA #REQUIRED>
diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
index 88037a1..2f5f12f 100644
--- a/doc/xml/Makefile.am
+++ b/doc/xml/Makefile.am
@@ -4,13 +4,13 @@ all : org.freedesktop.ConsoleKit.Manager.ref.xml org.freedesktop.ConsoleKit.Seat
 
 org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
+	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 org.freedesktop.ConsoleKit.Seat.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Seat.xml spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
+	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 org.freedesktop.ConsoleKit.Session.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Session.xml spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
+	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
 EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
 
diff --git a/doc/xml/dbus-introspect-docs.dtd b/doc/xml/dbus-introspect-docs.dtd
deleted file mode 100644
index 5fe508e..0000000
--- a/doc/xml/dbus-introspect-docs.dtd
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- DTD for D-Bus Introspection Documentation -->
-
-<!ELEMENT doc (summary?,description?,errors?,permission?,since?,deprecated,seealso?)>
-
-<!ELEMENT summary (#PCDATA|ref)*>
-<!ELEMENT description (#PCDATA|para|example)*>
-<!ELEMENT errors (error)*>
-<!ELEMENT permission (#PCDATA|ref|para)*>
-<!ELEMENT since EMPTY>
-<!ATTLIST since version CDATA #REQUIRED>
-<!ELEMENT deprecated (#PCDATA|ref)>
-<!ATTLIST deprecated version CDATA #REQUIRED>
-<!ATTLIST deprecated instead CDATA #REQUIRED>
-<!ELEMENT seealso (ref+)>
-
-<!ELEMENT error (#PCDATA|para)*>
-<!ATTLIST error name CDATA #REQUIRED>
-<!ELEMENT para (#PCDATA|example|code|list|ref)*>
-<!ELEMENT example (#PCDATA|para|code|ref)*>
-<!ATTLIST language (c|glib|python|shell) #REQUIRED>
-<!ATTLIST title CDATA #IMPLIED>
-<!ELEMENT list (listheader?, item*)>
-<!ATTLIST list type (bullet|number|table) #REQUIRED>
-<!ELEMENT item (term|definition)*>
-<!ELEMENT term (#PCDATA|ref)*>
-<!ELEMENT definition (#PCDATA|para)*>
-
-<!ELEMENT code (#PCDATA)>
-<!ATTLIST code lang CDATA #IMPLIED>
-<!ELEMENT ref CDATA>
-<!ATTLIST ref type (parameter|arg|signal|method|interface) #REQUIRED>
-<!ATTLIST ref to CDATA #REQUIRED>
-- 
cgit