diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-10 20:27:44 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:46:13 -0500 |
| commit | b40cdb07f91d16b54ddf11401b5de8de3ca5f665 (patch) | |
| tree | 5a3b7374b153bf419cb1de4809feffe7dc717879 | |
| parent | fce3e0803b6e04a32516bd2ce2ef128e71a5df79 (diff) | |
| download | samba-b40cdb07f91d16b54ddf11401b5de8de3ca5f665.tar.gz samba-b40cdb07f91d16b54ddf11401b5de8de3ca5f665.tar.bz2 samba-b40cdb07f91d16b54ddf11401b5de8de3ca5f665.zip | |
Fix some warnings
(This used to be commit 20b8daa76827754e7622141ec6b1dcc65d4764e3)
| -rw-r--r-- | docs/Makefile | 7 | ||||
| -rw-r--r-- | docs/Samba-Developers-Guide/index.xml | 5 | ||||
| -rw-r--r-- | docs/Samba-HOWTO-Collection/index.xml | 4 | ||||
| -rw-r--r-- | docs/xslt/extract-examples.xsl | 2 | ||||
| -rw-r--r-- | docs/xslt/generate-attributions.xsl | 3 |
5 files changed, 13 insertions, 8 deletions
diff --git a/docs/Makefile b/docs/Makefile index 7f4ffde695..f117b34b69 100644 --- 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 82baa05cc5..1917c675e6 100644 --- 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 fefc72c014..484d147814 100644 --- 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 f31e13eec6..d99bee5f11 100644 --- 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 a6e7f98e16..95650cfb77 100644 --- 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> <</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"> |