Some more validation updates.

(This used to be commit ceef479118fcf47b55c62de495224c4ec587f054)

46 files changed, 56 insertions, 56 deletions

diff --git a/docs/Samba-HOWTO-Collection/AccessControls.xml b/docs/Samba-HOWTO-Collection/AccessControls.xml
index decce45403..590b9a94ad 100644
--- a/docs/Samba-HOWTO-Collection/AccessControls.xml
+++ b/docs/Samba-HOWTO-Collection/AccessControls.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="AccessControls">
 <chapterinfo>
@@ -352,7 +352,7 @@ drwsrwsrwx    2 maryo   gnomes       48 2003-05-12 22:29 muchado08
 	An overview of the permissions field can be found in <link linkend="access1">Overview of UNIX permissions field</link>.
 	</para>
 
-	<image id="access1" scale="40"><imagedescription>Overview of UNIX permissions field.</imagedescription><imagefile>access1</imagefile></image>
+	<image id="access1"><imagedescription>Overview of UNIX permissions field.</imagedescription><imagefile scale="40">access1</imagefile></image>
 
 	<para>
 	Any bit flag may be unset. An unset bit flag is the equivalent of <quote>cannot</quote> and is represented as a <quote>-</quote> character.
@@ -942,7 +942,7 @@ Before using any of the following options, please refer to the man page for &smb
 		</para>
 
 		<para>
-		<command><quote>SERVER\user (Long name)</quote></command>
+			<constant>SERVER\user (Long name)</constant>
 		</para>
 
 		<para>
@@ -1097,10 +1097,10 @@ Before using any of the following options, please refer to the man page for &smb
 		These are:
 
 		<itemizedlist>
-			<listitem><smbconfoption name="security mask"/></listitem>
-			<listitem><smbconfoption name="force security mode"/></listitem>
-			<listitem><smbconfoption name="directory security mask"/></listitem>
-			<listitem><smbconfoption name="force directory security mode"/></listitem>
+			<listitem><para><smbconfoption name="security mask"/></para></listitem>
+			<listitem><para><smbconfoption name="force security mode"/></para></listitem>
+			<listitem><para><smbconfoption name="directory security mask"/></para></listitem>
+			<listitem><para><smbconfoption name="force directory security mode"/></para></listitem>
 		</itemizedlist>
 
 		</para>
@@ -1257,13 +1257,13 @@ are examples taken from the mailing list in recent times.
 </screen>
 			</para>
 
-			<note><para>
+			<note>
 				<para>This is the same as doing:</para>
 <screen>
 &prompt;<userinput>chown jack /foodbar</userinput>
 &prompt;<userinput>chgrp engr /foodbar</userinput>
 </screen>
-			</para></note>
+			</note>
 		</step>
 		<step>
 			<para>Now type: 
diff --git a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
index 4582932f93..3904fd1708 100644
--- a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
+++ b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.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="AdvancedNetworkManagement">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml
index cc9e9bcf16..dab3e15fbc 100644
--- a/docs/Samba-HOWTO-Collection/BDC.xml
+++ b/docs/Samba-HOWTO-Collection/BDC.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="samba-bdc">
 
 <chapterinfo>
@@ -306,8 +306,7 @@ server that the PDC queries. It therefore gives an error message on the client m
 not being able to set up account credentials. The machine account is created on the LDAP server
 but the password fields will be empty.  Unfortunately, some sites are
 unable to avoid such configurations, and these sites should review the
-<smbconfoption><name>ldap replication
-sleep</name></smbconfoption> parameter, intended to slow down Samba sufficiently
+<smbconfoption name="ldap replication sleep"/> parameter, intended to slow down Samba sufficiently
 for the replication to catch up.  This is a kludge, and one that the
 administrator must manually duplicate in any scripts (such as the
 <smbconfoption name="add machine script"/>) that
diff --git a/docs/Samba-HOWTO-Collection/Backup.xml b/docs/Samba-HOWTO-Collection/Backup.xml
index c42ee95f3c..7844fb13f2 100644
--- a/docs/Samba-HOWTO-Collection/Backup.xml
+++ b/docs/Samba-HOWTO-Collection/Backup.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="Backup">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml
index 2fd313c257..4fe03c983b 100644
--- a/docs/Samba-HOWTO-Collection/Bugs.xml
+++ b/docs/Samba-HOWTO-Collection/Bugs.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="bugreport">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
index c842917225..21784ef2d6 100644
--- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml
+++ b/docs/Samba-HOWTO-Collection/CUPS-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="CUPS-printing">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml
index e882a65086..9fbadfb661 100644
--- a/docs/Samba-HOWTO-Collection/Compiling.xml
+++ b/docs/Samba-HOWTO-Collection/Compiling.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="compiling">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
index 74f6124865..d693c7edf6 100644
--- a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
+++ b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.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="DNSDHCP">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml
index 2f55626683..ffc79c7dcc 100644
--- a/docs/Samba-HOWTO-Collection/Diagnosis.xml
+++ b/docs/Samba-HOWTO-Collection/Diagnosis.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="diagnosis">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml
index 208c7cf235..1523db98a9 100644
--- a/docs/Samba-HOWTO-Collection/DomainMember.xml
+++ b/docs/Samba-HOWTO-Collection/DomainMember.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="domain-member">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml
index 01ae9822c8..2c20292670 100644
--- a/docs/Samba-HOWTO-Collection/FastStart.xml
+++ b/docs/Samba-HOWTO-Collection/FastStart.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="FastStart">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Further-Resources.xml b/docs/Samba-HOWTO-Collection/Further-Resources.xml
index 001ec6a077..0a9d7d1cd5 100644
--- a/docs/Samba-HOWTO-Collection/Further-Resources.xml
+++ b/docs/Samba-HOWTO-Collection/Further-Resources.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="Further-Resources">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
index 7f4495cd5a..57b4398769 100644
--- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/Group-Mapping.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="groupmapping">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/HighAvailability.xml b/docs/Samba-HOWTO-Collection/HighAvailability.xml
index 3f0186c373..385646d91f 100644
--- a/docs/Samba-HOWTO-Collection/HighAvailability.xml
+++ b/docs/Samba-HOWTO-Collection/HighAvailability.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="SambaHA">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/IDMAP.xml b/docs/Samba-HOWTO-Collection/IDMAP.xml
index a90902a70f..33d8b899a1 100644
--- a/docs/Samba-HOWTO-Collection/IDMAP.xml
+++ b/docs/Samba-HOWTO-Collection/IDMAP.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="idmapper">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml
index f3c589577b..04630a111a 100644
--- a/docs/Samba-HOWTO-Collection/Install.xml
+++ b/docs/Samba-HOWTO-Collection/Install.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="install">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
index d979b2baee..0fa90c9cb2 100644
--- a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
+++ b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.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="integrate-ms-networks">
  
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
index 8082002909..eade579a29 100644
--- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
+++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.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="InterdomainTrusts">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml
index 44fde8301c..59e90bd1b7 100644
--- a/docs/Samba-HOWTO-Collection/IntroSMB.xml
+++ b/docs/Samba-HOWTO-Collection/IntroSMB.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">
 <preface id="IntroSMB">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/LargeFile.xml b/docs/Samba-HOWTO-Collection/LargeFile.xml
index f0b73820a2..44f054236e 100644
--- a/docs/Samba-HOWTO-Collection/LargeFile.xml
+++ b/docs/Samba-HOWTO-Collection/LargeFile.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="largefile">
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml
index 699c0e8a01..0eca02eb5f 100644
--- a/docs/Samba-HOWTO-Collection/NT4Migration.xml
+++ b/docs/Samba-HOWTO-Collection/NT4Migration.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="NT4Migration">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index 42da719334..7f7aff8988 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.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="NetworkBrowsing">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml
index 17d503b344..5d3e565f59 100644
--- a/docs/Samba-HOWTO-Collection/Other-Clients.xml
+++ b/docs/Samba-HOWTO-Collection/Other-Clients.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="Other-Clients">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml
index e9983766bc..4a09e808b4 100644
--- a/docs/Samba-HOWTO-Collection/PAM.xml
+++ b/docs/Samba-HOWTO-Collection/PAM.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="pam">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index e512270460..1a225c8cd7 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.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="samba-pdc">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index 07afbae0be..944a4e3c22 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.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="passdb">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
index e1b33e0916..32c2226c72 100644
--- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.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="PolicyMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Portability.xml b/docs/Samba-HOWTO-Collection/Portability.xml
index 8dd3c28ac8..a5455a6c67 100644
--- a/docs/Samba-HOWTO-Collection/Portability.xml
+++ b/docs/Samba-HOWTO-Collection/Portability.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="Portability">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml
index 7a71168b49..97ff8f6d0c 100644
--- a/docs/Samba-HOWTO-Collection/Printing.xml
+++ b/docs/Samba-HOWTO-Collection/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>
diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml
index c7b8f9df90..441a5840b0 100644
--- a/docs/Samba-HOWTO-Collection/Problems.xml
+++ b/docs/Samba-HOWTO-Collection/Problems.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="problems">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
index 9bd0db83f4..4046b86ff8 100644
--- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.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="ProfileMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
index 83d4ed1896..b7c8882151 100644
--- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
+++ b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.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="rights">
 <chapterinfo>
         &author.jerry;
diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml
index 5eef115bfa..a56c6016bd 100644
--- a/docs/Samba-HOWTO-Collection/SWAT.xml
+++ b/docs/Samba-HOWTO-Collection/SWAT.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="SWAT">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml
index 94cfb5f411..1157dcf599 100644
--- a/docs/Samba-HOWTO-Collection/Securing.xml
+++ b/docs/Samba-HOWTO-Collection/Securing.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="securing-samba">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml
index efb37202ab..cd7f578cc0 100644
--- a/docs/Samba-HOWTO-Collection/ServerType.xml
+++ b/docs/Samba-HOWTO-Collection/ServerType.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="ServerType">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/Speed.xml b/docs/Samba-HOWTO-Collection/Speed.xml
index 2501d2bb85..1e74a22396 100644
--- a/docs/Samba-HOWTO-Collection/Speed.xml
+++ b/docs/Samba-HOWTO-Collection/Speed.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="speed">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
index bb3f81d464..1505765297 100644
--- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml
+++ b/docs/Samba-HOWTO-Collection/StandAloneServer.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="StandAloneServer">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml
index 169bfdb5c3..7d6abc659c 100644
--- a/docs/Samba-HOWTO-Collection/Unicode.xml
+++ b/docs/Samba-HOWTO-Collection/Unicode.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="unicode">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml
index d448d14c53..5ee603564f 100644
--- a/docs/Samba-HOWTO-Collection/VFS.xml
+++ b/docs/Samba-HOWTO-Collection/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.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index fdb17e6e7b..2edf8c6946 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.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="winbind">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
index f521896a71..5d4b8fc40f 100644
--- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
+++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.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="ClientConfig">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
index c89a7a9e28..760ef8e826 100644
--- a/docs/Samba-HOWTO-Collection/foreword-tridge.xml
+++ b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
@@ -1,4 +1,5 @@
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <preface>
 	<title>Foreword</title>
 
diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml
index 8aac554782..94ed8df46e 100644
--- a/docs/Samba-HOWTO-Collection/glossary.xml
+++ b/docs/Samba-HOWTO-Collection/glossary.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">
 <glossary>
 	<title>Glossary</title>
 
diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml
index d3b8e99501..f6a729ccea 100644
--- a/docs/Samba-HOWTO-Collection/locking.xml
+++ b/docs/Samba-HOWTO-Collection/locking.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="locking">
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml
index c6ad6dfa46..49a9dc3563 100644
--- a/docs/Samba-HOWTO-Collection/msdfs.xml
+++ b/docs/Samba-HOWTO-Collection/msdfs.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="msdfs">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
index d0e2ecdf0d..f3ce457be7 100644
--- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
+++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.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="upgrading-to-3.0">
 <chapterinfo>
 	&author.jelmer;