Fix validation for the developers guide.

diff --git a/Makefile b/Makefile
index 39ca5f38a6ee16cee5a5399d2e77aa5b5823d970..8be60d90e5b1b8ee233430771ae3b69947ccb769 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR
 html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS))
 html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
 htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
-validate: $(patsubst $(DOCBOOKDIR)/%.xml,$(VALIDATEDIR)/%.report,$(MAIN_DOCS))
+validate: $(patsubst $(DOCBOOKDIR)/%.xml,%-validate,$(MAIN_DOCS))
 
 # Intermediate docbook docs
 
@@ -225,9 +225,8 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
        -$(XMLLINT) --valid --noout $< 2> $@
 
 # Validation verification
-$(VALIDATEDIR)/%.report: %/index.xml
-       mkdir -p $(@D)
-       -$(XMLLINT) --xinclude --postvalid --noout $< 2> $@
+%-validate: %/index.xml
+       -$(XMLLINT) --xinclude --noent --postvalid --noout $<
 
 # Find undocumented parameters
 undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl

diff --git a/Makefile.settings.in b/Makefile.settings.in
index f4a3dca2b4de1aea1647e102cf138bbf5cb1f7af..8d210e712169d8c6500ce8de6bf29116f4299df5 100644 (file)
--- a/Makefile.settings.in
+++ b/Makefile.settings.in
@@ -41,7 +41,6 @@ PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
 FODIR = $(OUTPUTDIR)
 HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp
-VALIDATEDIR = $(OUTPUTDIR)/validate
 PEARSONDIR = $(OUTPUTDIR)/pearson
 TXTDIR = $(OUTPUTDIR)/textdocs
 HTMLDIR=$(OUTPUTDIR)/htmldocs

diff --git a/Samba-Developers-Guide/CodingSuggestions.xml b/Samba-Developers-Guide/CodingSuggestions.xml
index 09d842639ebcd2bc966c4cdf92459b6196da9f77..caf93d84ad0d69b55c729361a54b1c493a9e96db 100644 (file)
--- a/Samba-Developers-Guide/CodingSuggestions.xml
+++ b/Samba-Developers-Guide/CodingSuggestions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="CodingSuggestions">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/NetBIOS.xml b/Samba-Developers-Guide/NetBIOS.xml
index d1fdd217371f0f16f4c0c38e79b8b44b1e47f541..04eaecd4ab21810b99a461035a47e789e1d83eb4 100644 (file)
--- a/Samba-Developers-Guide/NetBIOS.xml
+++ b/Samba-Developers-Guide/NetBIOS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="netbios">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/Tracing.xml b/Samba-Developers-Guide/Tracing.xml
index 7586f3c4c5325262e404e2084303486202fdfa3e..3eaab6373ec18f0f878e69e53d2ab79559b90998 100644 (file)
--- a/Samba-Developers-Guide/Tracing.xml
+++ b/Samba-Developers-Guide/Tracing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="tracing">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/architecture.xml b/Samba-Developers-Guide/architecture.xml
index da276ca91e5f13ee497fd7ead6a5ba7f32f5c261..bb0f29981b48e52fbc15a4aaa3b06fcab59838bf 100644 (file)
--- a/Samba-Developers-Guide/architecture.xml
+++ b/Samba-Developers-Guide/architecture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="architecture">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/cifsntdomain.xml b/Samba-Developers-Guide/cifsntdomain.xml
index fd19205adae54b9e63f18f5d98a68dc87ab80e61..2626c8fc13cdb27151f58c4820e7c140081c5238 100644 (file)
--- a/Samba-Developers-Guide/cifsntdomain.xml
+++ b/Samba-Developers-Guide/cifsntdomain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="ntdomain">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/contributing.xml b/Samba-Developers-Guide/contributing.xml
index acb8085cbe8b37eda46145f417fac2eb276b6a0a..01e6fb2863022f1d89e68b29f18fe352f18fe893 100644 (file)
--- a/Samba-Developers-Guide/contributing.xml
+++ b/Samba-Developers-Guide/contributing.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+
 <chapter id="contributing">
 <chapterinfo>
        &author.jelmer;

diff --git a/Samba-Developers-Guide/debug.xml b/Samba-Developers-Guide/debug.xml
index 5ffc0cbc746f20ca6d88d606925d3842a4bb7861..a55facedff48baad64f8d84815d2543170ea7619 100644 (file)
--- a/Samba-Developers-Guide/debug.xml
+++ b/Samba-Developers-Guide/debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="debug">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/encryption.xml b/Samba-Developers-Guide/encryption.xml
index 5ab711014b2913030a158a8593607124d2b0e338..be00beba5d70f5aecc2374498bc13b5113e9abf6 100644 (file)
--- a/Samba-Developers-Guide/encryption.xml
+++ b/Samba-Developers-Guide/encryption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="pwencrypt">
 
 

diff --git a/Samba-Developers-Guide/gencache.xml b/Samba-Developers-Guide/gencache.xml
index 7def6f21d25af7b71ccf18a1dbb245ead543453a..7e8475c192bec4282a31fc949f9f0bdf3d30b138 100644 (file)
--- a/Samba-Developers-Guide/gencache.xml
+++ b/Samba-Developers-Guide/gencache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="gencache">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/index.xml b/Samba-Developers-Guide/index.xml
index 9d3cc9aea7974f1cfeda049caa149784c61f2d92..c02e30fdce66e9231f3686aa2a320fa270e0bc7b 100644 (file)
--- a/Samba-Developers-Guide/index.xml
+++ b/Samba-Developers-Guide/index.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
+<!ATTLIST book 
+       xmlns:xi CDATA #FIXED "http://www.w3.org/2003/XInclude">
+]>
 
 <book id="Samba-Developers-Guide"
        xmlns:xi="http://www.w3.org/2003/XInclude">

diff --git a/Samba-Developers-Guide/internals.xml b/Samba-Developers-Guide/internals.xml
index a6d6435ac7af28e06f4cfb36bd1bf246ff130b35..617802860095252e9fb88610cc609b249ca3ccd7 100644 (file)
--- a/Samba-Developers-Guide/internals.xml
+++ b/Samba-Developers-Guide/internals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="internals">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/modules.xml b/Samba-Developers-Guide/modules.xml
index 30768e47ed49a1dd985f513b7c159b2dc1b5bf68..a74c17684438166473c418149bd04245b59a30d2 100644 (file)
--- a/Samba-Developers-Guide/modules.xml
+++ b/Samba-Developers-Guide/modules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="modules">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/packagers.xml b/Samba-Developers-Guide/packagers.xml
index 470e1e8288741cbb4cee39c0255625f82fa3489b..5c834b09fe7e972e0512809939b9f9f9d5e8d164 100644 (file)
--- a/Samba-Developers-Guide/packagers.xml
+++ b/Samba-Developers-Guide/packagers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="Packaging">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/parsing.xml b/Samba-Developers-Guide/parsing.xml
index 1b3df637cd4eb264da404396ec3b4b33355b9427..d695f9313cf06a2542bce2b6d006389313856f29 100644 (file)
--- a/Samba-Developers-Guide/parsing.xml
+++ b/Samba-Developers-Guide/parsing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="parsing">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/printing.xml b/Samba-Developers-Guide/printing.xml
index d41bc22ddfdcbce30842fc6541737ffe28a5763d..fc0a1ee4b79cded8289ca3bb3b63e1efc6630802 100644 (file)
--- a/Samba-Developers-Guide/printing.xml
+++ b/Samba-Developers-Guide/printing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="printing">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/registry.xml b/Samba-Developers-Guide/registry.xml
index 62925c62f4d6dfa5d5fa62c81a3010bb0a815d96..bc394d71b7f6b61798848d590d2f47965abca722 100644 (file)
--- a/Samba-Developers-Guide/registry.xml
+++ b/Samba-Developers-Guide/registry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="registry">
        <chapterinfo>
                &author.jelmer;

diff --git a/Samba-Developers-Guide/rpc_plugin.xml b/Samba-Developers-Guide/rpc_plugin.xml
index dc91129f3812807a81c43a2f4d9c1168621c7f06..cc263ffc3e6f5ac0be7cf8797df062bfda639bc8 100644 (file)
--- a/Samba-Developers-Guide/rpc_plugin.xml
+++ b/Samba-Developers-Guide/rpc_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="rpc-plugin">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/unix-smb.xml b/Samba-Developers-Guide/unix-smb.xml
index 3c63c74dfdde992b2b7e1db298efed0d04392ee3..b700dfc9dc405a6388f1c6042fc66c1928b63728 100644 (file)
--- a/Samba-Developers-Guide/unix-smb.xml
+++ b/Samba-Developers-Guide/unix-smb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="unix-smb">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/vfs.xml b/Samba-Developers-Guide/vfs.xml
index 652bc61eb91ab081ffd031f54447b89c40b52915..25a45b68753a2cec9ef5c6f793754afe4759bd8a 100644 (file)
--- a/Samba-Developers-Guide/vfs.xml
+++ b/Samba-Developers-Guide/vfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="vfs">
 <chapterinfo>
        <author>

diff --git a/Samba-Developers-Guide/windows-debug.xml b/Samba-Developers-Guide/windows-debug.xml
index e04ccd3797ebf67a42c4e1ffec1e1b63f5995c53..db0560c6e12a2dfd24389e70f62464ebe4d9ae82 100644 (file)
--- a/Samba-Developers-Guide/windows-debug.xml
+++ b/Samba-Developers-Guide/windows-debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="windows-debug">
        <chapterinfo>
                &author.jelmer;

diff --git a/Samba-Developers-Guide/wins.xml b/Samba-Developers-Guide/wins.xml
index 7793160b032b58bc1b208e012a00cf91d5336dea..df29627bfdf10d633285ea6d5e8edfd94d85e20f 100644 (file)
--- a/Samba-Developers-Guide/wins.xml
+++ b/Samba-Developers-Guide/wins.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="wins">
 <chapterinfo>
        <author>

diff --git a/Samba-HOWTO-Collection/Group-Mapping.xml b/Samba-HOWTO-Collection/Group-Mapping.xml
index c09d9e860b2de2bda04130a5ac1fe2529e427ea2..7f4495cd5aafb8537885ac7f6f6d7af879fddf19 100644 (file)
--- a/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/Samba-HOWTO-Collection/Group-Mapping.xml
@@ -57,11 +57,12 @@
        </para>
 
        <image id="idmap-sid2gid">
-               <description>IDMAP: group SID to GID resolution.</description>
+               <imagedescription>IDMAP: group SID to GID resolution.</imagedescription>
                <imagefile scale="50">idmap-sid2gid</imagefile>
        </image>
 
-       <image id="idmap-gid2sid"><description>IDMAP: GID resolution to matching SID.</description>
+       <image id="idmap-gid2sid">
+               <imagedescription>IDMAP: GID resolution to matching SID.</imagedescription>
        <imagefile scale="50">idmap-gid2sid</imagefile>
        </image>
 
@@ -73,8 +74,9 @@
        used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>.
        </para>
 
-       <image id="idmap-store-gid2sid"><description>IDMAP storing group mappings.</description>
-       <imagefile scale="50">idmap-store-gid2sid</imagefile>
+       <image id="idmap-store-gid2sid">
+               <imagedescription>IDMAP storing group mappings.</imagedescription>
+               <imagefile scale="50">idmap-store-gid2sid</imagefile>
        </image>
 
        <para>

diff --git a/Samba-HOWTO-Collection/PDC.xml b/Samba-HOWTO-Collection/PDC.xml
index 2e25646822cbe1fe25ba37cd9487eb1eba5705e9..e512270460f743a14627c65b48cdb97056ae98b4 100644 (file)
--- a/Samba-HOWTO-Collection/PDC.xml
+++ b/Samba-HOWTO-Collection/PDC.xml
@@ -33,8 +33,9 @@ network environment. Workstations A, B and C are representative of many physical
 network clients.
 </para>
 
-<image id="domain-example"><description>An Example Domain.</description>
-<imagefile scale="50">domain</imagefile>
+<image id="domain-example">
+       <imagedescription>An Example Domain.</imagedescription>
+       <imagefile scale="50">domain</imagefile>
 </image>
 
 <?latex \newpage ?>

diff --git a/smbdotconf/base/interfaces.xml b/smbdotconf/base/interfaces.xml
index f2ccfe36ad992c3f223cc219dc6547857d96280b..1a3af3bb23440828e3257b5701edd28de57ba48d 100644 (file)
--- a/smbdotconf/base/interfaces.xml
+++ b/smbdotconf/base/interfaces.xml
@@ -36,6 +36,7 @@
        the OS's normal hostname resolution mechanisms.</para>
 
 </description>
+<related>bind interfaces only</related>
 
 <value type="example">
        <comment>This would configure three network interfaces corresponding 
@@ -44,6 +45,5 @@
        eth0 192.168.2.10/24 192.168.3.10/255.255.255.0
 </value>
 
-<related>bind interfaces only</related>
 <value type="default"><comment>all active interfaces except 127.0.0.1 that are broadcast capable</comment></value>
 </samba:parameter>

diff --git a/xslt/generate-attributions.xsl b/xslt/generate-attributions.xsl
index a6e7f98e16fbaa6032f2c6bc09d3cf1adac8785f..fed7325c9b65ddb19546e136b4c6ee3b78bee2df 100644 (file)
--- a/xslt/generate-attributions.xsl
+++ b/xslt/generate-attributions.xsl
@@ -6,7 +6,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                                version="1.1">
 
-<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+                               <xsl:output method="xml" doctype-public="-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" doctype-system="http://www.samba.org/samba/DTD/samba-doc" omit-xml-declaration="yes" indent="yes"/>
 
 <!-- Remove all character data -->
 <xsl:template match="@*|node()">