Clean up XSL

diff --git a/Makefile.in b/Makefile.in
index d3993e44ae29f0763adae77de403c2514132c53b..f7e91d0183bfc0f298681ea336fe8c1ec301a449 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,7 +157,6 @@ clean:
        rm -f Samba-Developers-Guide.*
        rm -f Samba-Guide.*
        rm -f $(IMAGEPROJDIR)/*.eps $(MANPAGEDIR)/smb.conf.5.xml
-       rm -f $(PLUCKERDIR)/*.pdb
 
 # Text files
 $(TXTDIR):

diff --git a/xslt/expand-sambadoc.xsl b/xslt/expand-sambadoc.xsl
index 8db39b56e8c3eeb696a316ba4e73e177206e04f4..dfdc2401808f3ab0c6209b893215ab0e898b95e6 100644 (file)
--- a/xslt/expand-sambadoc.xsl
+++ b/xslt/expand-sambadoc.xsl
@@ -14,7 +14,7 @@
 
        <xsl:import href="../settings.xsl"/>
 
-       <xsl:output method="xml"/>
+       <xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
 
        <xsl:param name="xmlSambaNsUri" select="'http://samba.org/common'"/>
 
@@ -70,20 +70,6 @@
                </xsl:element>
        </xsl:template>
 
-       <xsl:template match="/node()">
-               <xsl:text disable-output-escaping="yes">
-                       &lt;!DOCTYPE </xsl:text><xsl:value-of select="name(.)"/><xsl:text disable-output-escaping="yes"> PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                       "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-                       &lt;!ENTITY % globalentities SYSTEM 'entities/global.entities'> %globalentities;
-                       ]>
-               </xsl:text>
-               <xsl:copy>
-                       <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-                       <xsl:apply-templates/>
-               </xsl:copy>
-       </xsl:template>
-
 
        <!-- This is needed to copy content unchanged -->
        <xsl:template match="@*|node()">

diff --git a/xslt/generate-attributions.xsl b/xslt/generate-attributions.xsl
index 79bf9425044acc8e1b0433399badbf43912aec4e..d358f1c59e14213f6734544afc4b38ef20846717 100644 (file)
--- a/xslt/generate-attributions.xsl
+++ b/xslt/generate-attributions.xsl
@@ -9,7 +9,7 @@
                                version="1.1"
                 extension-element-prefixes="exsl">
 
-<xsl:output method="xml" omit-xml-declaration="yes"/>
+<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
 
 <!-- Remove all character data -->
 <xsl:template match="@*|node()">