docs-common/packaging bookinfo.xsl,1.14,1.15

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997/packaging

Modified Files:
	bookinfo.xsl 
Log Message:
This makes everything work out nicely, PROVIDED that doc authors don't use &FDP-INFO; any more, and instead use a standard XInclude statement.  Shouldn't cause much pain at all.


Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bookinfo.xsl	4 Feb 2006 04:11:46 -0000	1.14
+++ bookinfo.xsl	12 Feb 2006 21:58:55 -0000	1.15
@@ -1,12 +1,15 @@
 <!-- Transform rpm-info.xml into either "bookinfo" or "articleinfo" -->
 <xsl:stylesheet version="1.0" xml:space="preserve" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="yes" standalone="no" version="1.0"/>
-
   <xsl:param name="lang" select="'en'"/>
   <xsl:param name="doctype" select="'bookinfo'"/>
   <xsl:param name="who" select="''"/>
 
+  <xsl:output encoding="UTF-8" indent="yes" method="xml"
+    omit-xml-declaration="no" version="1.0"
+    doctype-public="-//OASIS//DTD DocBook XML V4.4//EN"
+    doctype-system="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" />
+
   <xsl:template match="/">
     <xsl:comment>
 	Warning! Warning! Danger, Will Robinson!
@@ -65,10 +68,11 @@
       </xsl:element>
       <xsl:choose>
 	<xsl:when test="/rpm-info/license/rights='OPL'">
-	  <xsl:text disable-output-escaping="yes">&LEGALNOTICE-OPL;</xsl:text>
+	  <xsl:text disable-output-escaping="yes"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../docs-common/common/legalnotice-opl-en.xml"/></xsl:text>
 	</xsl:when>
 	<xsl:otherwise> <!-- assume FDL for now -->
-	  <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
+	  <xsl:text disable-output-escaping="yes"><xi:include
+	  xmlns:xi="http://www.w3.org/2001/XInclude" href="../../docs-common/common/legalnotice-en.xml"/></xsl:text>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:element>