Re: Patch for doctype and faq
Jeff Martin <[email protected]> Fri, 08 Apr 2005 17:29:05 +0100
| Newsgroups | gmane.editors.conglomerate.devel |
|---|---|
| Message-ID | <[email protected]> |
Okay here we go again. My good friend Michèle has just pointed out that I'd forgotten to fix the dtd in conglomerate.xml. So here's today's final attempt at a patch. I shall be no more patches from me today as I'm now off to a restaurant to drink to much sake. -- Jeff Martin Memetic Engineer http://www.custommonkey.org/ _______________________________________________ Conglomerate-devel mailing list [email protected] http://lists.copyleft.no/mailman/listinfo/conglomerate-devel
faq.patch
(text/x-patch, 2.7 KB)
Index: doc/C/Makefile.am =================================================================== RCS file: /cvs/gnome/conglomerate/doc/C/Makefile.am,v retrieving revision 1.6 diff -u -p -r1.6 Makefile.am --- doc/C/Makefile.am 15 Oct 2004 23:09:06 -0000 1.6 +++ doc/C/Makefile.am 8 Apr 2005 16:22:36 -0000 @@ -1,3 +1,7 @@ +# temporary hack until yelp support qanda sets +faq.xml: faq.xml.orig + xsltproc --output $@ faq-hack.xsl $< + more_C_docs = \ conglomerate-refentry.xml manpage.make conglomerate.1 \ faq.xml Index: doc/C/ChangeLog =================================================================== RCS file: /cvs/gnome/conglomerate/doc/C/ChangeLog,v retrieving revision 1.24 diff -u -p -r1.24 ChangeLog --- doc/C/ChangeLog 1 Feb 2005 17:45:53 -0000 1.24 +++ doc/C/ChangeLog 8 Apr 2005 16:22:36 -0000 @@ -1,3 +1,11 @@ +2005-04-08 Jeff Martin <[email protected]> + + * Makefile.am, faq-hack.xsl, faq.xml, conglomerate.xml, global.ent + + Added temporary transform to replace qanda sets in docbook with sections + Added faq to main conglomerate manual + Fixed conglomerate.xml dtd + 2005-02-01 Geert Stappers <[email protected]> * conglomerate.xml Index: doc/C/conglomerate.xml =================================================================== RCS file: /cvs/gnome/conglomerate/doc/C/conglomerate.xml,v retrieving revision 1.4 diff -u -p -r1.4 conglomerate.xml --- doc/C/conglomerate.xml 1 Feb 2005 17:45:53 -0000 1.4 +++ doc/C/conglomerate.xml 8 Apr 2005 16:22:36 -0000 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ <!ENTITY % global_entities SYSTEM "global.ent"> %global_entities; @@ -1336,7 +1336,7 @@ <title id="dump_xds.title">Dump a Display Spec</title> <para>text</para> </sect1> - </chapter> &doctype_supp; &xds_ele_ref; &xds_dtd_def; <glossary role="auto"> + </chapter> &faq; &doctype_supp; &xds_ele_ref; &xds_dtd_def; <glossary role="auto"> <glossentry> <glossterm>Dummy</glossterm> <glossdef> Index: doc/C/global.ent =================================================================== RCS file: /cvs/gnome/conglomerate/doc/C/global.ent,v retrieving revision 1.1 diff -u -p -r1.1 global.ent --- doc/C/global.ent 13 Jan 2004 18:33:56 -0000 1.1 +++ doc/C/global.ent 8 Apr 2005 16:22:36 -0000 @@ -17,6 +17,7 @@ <!ENTITY noticefdl SYSTEM "notice_fdl.xml"> <!ENTITY noticegpl SYSTEM "notice_gpl.xml"> <!ENTITY conventions SYSTEM "conventions.xml"> + <!ENTITY faq SYSTEM "faq.xml"> <!-- end resources --> <!-- start reusable instances -->