svn commit: samba-docs r358 - in trunk: . Samba-Developers-Guide Samba-HOWTO-Collection xslt

[jelmer at samba.org]

Author: jelmer
Date: 2005-02-10 20:27:44 +0000 (Thu, 10 Feb 2005)
New Revision: 358

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=358

Log:
Fix some warnings

Modified:
   trunk/Makefile
   trunk/Samba-Developers-Guide/index.xml
   trunk/Samba-HOWTO-Collection/index.xml
   trunk/xslt/extract-examples.xsl
   trunk/xslt/generate-attributions.xsl


Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-02-10 18:50:51 UTC (rev 357)
+++ trunk/Makefile	2005-02-10 20:27:44 UTC (rev 358)
@@ -105,8 +105,7 @@
 	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 %-attributions.xml: 
-	echo "<para/>" > $@
-	$(XSLTPROC) --xinclude xslt/generate-attributions.xsl $*/index.xml > $@
+	$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml 
 
 clobber: clean
 	rm Makefile.settings settings.xsl config.status config.log configure
@@ -228,9 +227,9 @@
 
 # Validation verification
 
-$(VALIDATEDIR)/%.report.html: $(DOCBOOKDIR)/%.xml
+$(VALIDATEDIR)/%.report.html: %/index.xml
 	mkdir -p $(@D)
-	$(XMLLINT) --valid --noout --htmlout $< 2> $@
+	$(XMLLINT) --xinclude --postvalid --noout --htmlout $< 2> $@
 
 validate: $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html 
 

Modified: trunk/Samba-Developers-Guide/index.xml
===================================================================
--- trunk/Samba-Developers-Guide/index.xml	2005-02-10 18:50:51 UTC (rev 357)
+++ trunk/Samba-Developers-Guide/index.xml	2005-02-10 20:27:44 UTC (rev 358)
@@ -39,8 +39,11 @@
 </abstract>
 
 </bookinfo>
-<xi:include href="../Samba-Developers-Guide-attributions.xml"/>
 
+<xi:include href="../Samba-Developers-Guide-attributions.xml">
+	<xi:fallback/>
+</xi:include>
+
 <!-- Contents -->
 <toc/>
 

Modified: trunk/Samba-HOWTO-Collection/index.xml
===================================================================
--- trunk/Samba-HOWTO-Collection/index.xml	2005-02-10 18:50:51 UTC (rev 357)
+++ trunk/Samba-HOWTO-Collection/index.xml	2005-02-10 20:27:44 UTC (rev 358)
@@ -19,7 +19,9 @@
 
 <?latex \setcounter{page}{5} ?>
 
-<xi:include href="../Samba-HOWTO-Collection-attributions.xml"/>
+<xi:include href="../Samba-HOWTO-Collection-attributions.xml">
+	<xi:fallback/>
+</xi:include>
 
 <?latex \cleardoublepage ?>
 

Modified: trunk/xslt/extract-examples.xsl
===================================================================
--- trunk/xslt/extract-examples.xsl	2005-02-10 18:50:51 UTC (rev 357)
+++ trunk/xslt/extract-examples.xsl	2005-02-10 20:27:44 UTC (rev 358)
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!--
-	Extract examples out of XML file
+Extract examples out of DocBook/XML file
 	(C) Jelmer Vernooij	2003
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: trunk/xslt/generate-attributions.xsl
===================================================================
--- trunk/xslt/generate-attributions.xsl	2005-02-10 18:50:51 UTC (rev 357)
+++ trunk/xslt/generate-attributions.xsl	2005-02-10 20:27:44 UTC (rev 358)
@@ -4,6 +4,7 @@
 	(C) Jelmer Vernooij 2003
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
 				version="1.1">
 
 <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
@@ -56,7 +57,7 @@
 				<xsl:when test="affiliation/address/email != ''">
 					<xsl:text> &lt;</xsl:text>
 					<xsl:element name="ulink">
-						<xsl:attribute name="noescape">
+						<xsl:attribute name="samba:noescape">
 						<xsl:text>1</xsl:text>
 						</xsl:attribute>
 						<xsl:attribute name="url">