Remove redundant attributes

diff --git a/guide/guide-main.xml b/guide/guide-main.xml
index fb1238baf77fc0d994047d55c0e451016e989fbb..1288db26f136ee91c94d47a3e247c4c5efd4b572 100644 (file)
--- a/guide/guide-main.xml
+++ b/guide/guide-main.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0"?>\r
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [\r
 \r
-  <!-- Stuff for xincludes -->\r
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">\r
-  %xinclude;\r
-\r
   <!-- entities files to use -->\r
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>\r
   %global_entities;\r
 \r
 ]>\r
-<book id="S3bE">\r
+<book id="S3bE"\r
+       xmlns:xi="http://www.w3.org/2003/XInclude">\r
        <title>Samba-3 by Example</title>\r
        <subtitle>Practical Exercises in Successful Samba Deployment</subtitle>\r
        <bookinfo>\r
@@ -26,10 +23,10 @@
        <para>boo</para>\r
        <?latex \clearpage ?>\r
        <para>boo</para>\r
-       <xi:include href="inside-cover.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="acknowledgements.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="foreword.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
+       <xi:include href="inside-cover.xml"/>\r
+       <xi:include href="acknowledgements.xml"/>\r
+       <xi:include href="foreword.xml"/>\r
+       <xi:include href="preface.xml"/>\r
        <?latex \cleardoublepage ?>\r
        <toc/>\r
        <?latex \cleardoublepage ?>\r
@@ -37,20 +34,20 @@
        <?latex \cleardoublepage ?>\r
        <lot/>\r
        <!-- Chapters -->\r
-       <xi:include href="Chap01-WindowsNetworkingPrimer.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap02-SimpleOfficeServer.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap03-TheSmallOffice.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap04-SecureOfficeServer.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap05-500UserNetwork.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap06-MakingHappyUsers.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap07-2000UserNetwork.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap08-MigrateNT4Samba3.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap09-AddingUNIXClients.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap10-KerberosFastStart.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap10b-DomainAppsSupport.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap11-HighAvailability.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
-       <xi:include href="Chap12-Appendix.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
+       <xi:include href="Chap01-WindowsNetworkingPrimer.xml"/>\r
+       <xi:include href="Chap02-SimpleOfficeServer.xml"/>\r
+       <xi:include href="Chap03-TheSmallOffice.xml"/>\r
+       <xi:include href="Chap04-SecureOfficeServer.xml"/>\r
+       <xi:include href="Chap05-500UserNetwork.xml"/>\r
+       <xi:include href="Chap06-MakingHappyUsers.xml"/>\r
+       <xi:include href="Chap07-2000UserNetwork.xml"/>\r
+       <xi:include href="Chap08-MigrateNT4Samba3.xml"/>\r
+       <xi:include href="Chap09-AddingUNIXClients.xml"/>\r
+       <xi:include href="Chap10-KerberosFastStart.xml"/>\r
+       <xi:include href="Chap10b-DomainAppsSupport.xml"/>\r
+       <xi:include href="Chap11-HighAvailability.xml"/>\r
+       <xi:include href="Chap12-Appendix.xml"/>\r
        <?latex \include{gpl}?>\r
-       <xi:include href="glossary.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>\r
+       <xi:include href="glossary.xml"/>\r
        <index/>\r
 </book>\r

diff --git a/xslt/generate-attributions.xsl b/xslt/generate-attributions.xsl
index d358f1c59e14213f6734544afc4b38ef20846717..6f182fd753ac7b8420aacc845182f8340d59f3d5 100644 (file)
--- a/xslt/generate-attributions.xsl
+++ b/xslt/generate-attributions.xsl
@@ -35,7 +35,7 @@
        </xsl:choose>
 </xsl:template>
 
-<xsl:template match="author">
+<xsl:template match="chapterinfo/author">
        <xsl:choose>
        <xsl:when test="firstname != ''">
        <xsl:text>&#9;</xsl:text>