Fix some warnings

diff --git a/docs/Makefile b/docs/Makefile
index 7f4ffde695cb896c65d263b74ad47ba61e2841b2..f117b34b69062fc69d02a12f0ebf6e888a6e8594 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -105,8 +105,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
        $(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 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
 
 # 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 
 

diff --git a/docs/Samba-Developers-Guide/index.xml b/docs/Samba-Developers-Guide/index.xml
index 82baa05cc5cb27efc80d74341059ea827bffb932..1917c675e61a49b98d976fad516183f477bcf4f2 100644 (file)
--- a/docs/Samba-Developers-Guide/index.xml
+++ b/docs/Samba-Developers-Guide/index.xml
@@ -39,7 +39,10 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 </abstract>
 
 </bookinfo>
-<xi:include href="../Samba-Developers-Guide-attributions.xml"/>
+
+<xi:include href="../Samba-Developers-Guide-attributions.xml">
+       <xi:fallback/>
+</xi:include>
 
 <!-- Contents -->
 <toc/>

diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index fefc72c014eac08a1ee9d2baffa97dca2437819f..484d14781475fe2c2eb8feac353cb7152a7d6c49 100644 (file)
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -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 ?>
 

diff --git a/docs/xslt/extract-examples.xsl b/docs/xslt/extract-examples.xsl
index f31e13eec644c9f1235065a701cd60a472a76c89..d99bee5f11dbd860924ced8db9009395f0e32096 100644 (file)
--- a/docs/xslt/extract-examples.xsl
+++ b/docs/xslt/extract-examples.xsl
@@ -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"

diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl
index a6e7f98e16fbaa6032f2c6bc09d3cf1adac8785f..95650cfb7763db76e43079584810ca7b294a54ae 100644 (file)
--- a/docs/xslt/generate-attributions.xsl
+++ b/docs/xslt/generate-attributions.xsl
@@ -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">