summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-07-23 23:42:17 -0400
committerWilliam Jon McCann <jmccann@redhat.com>2008-07-23 23:42:17 -0400
commitcda2111bd2a12fc246c6e7973ae7fae4ff779bca (patch)
tree1c5966c8933e1240e8c2d707e9b68aa796e44d00 /doc
parent460d6c9e42e84d3d66bfcadfbaa77a0e059caae7 (diff)
fix the includes
Diffstat (limited to 'doc')
-rw-r--r--doc/ConsoleKit.xml.in23
-rw-r--r--doc/dbus-introspect-docs.dtd (renamed from doc/xml/dbus-introspect-docs.dtd)0
-rw-r--r--doc/xml/Makefile.am6
3 files changed, 10 insertions, 19 deletions
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/xml/dbus-introspect-docs.dtd b/doc/dbus-introspect-docs.dtd
index 5fe508e..5fe508e 100644
--- a/doc/xml/dbus-introspect-docs.dtd
+++ b/doc/dbus-introspect-docs.dtd
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