Validation updates to Samba3 By Example

(This used to be commit 71a7e0df4ceb5ff106fc5a32b094eebb4febab91)

15 files changed, 80 insertions, 82 deletions

diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index bf8b636c92..429ac4065a 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.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="primer">
   <title>Networking Primer</title>
 
@@ -242,11 +242,11 @@
 		<para>
 		Click the following: 
 		<orderedlist>
-		<listitem>Update list of packets in real time</listitem>
-		<listitem>Automatic scrolling in live capture</listitem>
-		<listitem>Enable MAC name resolution </listitem>
-		<listitem>Enable network name resolution </listitem>
-		<listitem>Enable transport name resolution</listitem>
+		<listitem><para>Update list of packets in real time</para></listitem>
+		<listitem><para>Automatic scrolling in live capture</para></listitem>
+		<listitem><para>Enable MAC name resolution</para></listitem>
+		<listitem><para>Enable network name resolution</para></listitem>
+		<listitem><para>Enable transport name resolution</para></listitem>
 		</orderedlist>
 		Click <guibutton>OK</guibutton>.
 		</para></step>
@@ -277,8 +277,8 @@
 		</para>
 
 		<image id="pktcap01">
-			<imagefile scale="40">WINREPRESSME-Capture</imagefile>
 			<imagedescription>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</imagedescription>
+			<imagefile scale="40">WINREPRESSME-Capture</imagefile>
 		</image>
 
 		<image id="pktcap02">
@@ -453,11 +453,11 @@
 		<para>
 		Click: 
 		<orderedlist>
-		<listitem>Update list of packets in real time</listitem>
-		<listitem>Automatic scrolling in live capture</listitem>
-		<listitem>Enable MAC name resolution </listitem>
-		<listitem>Enable network name resolution </listitem>
-		<listitem>Enable transport name resolution</listitem>
+			<listitem><para>Update list of packets in real time</para></listitem>
+			<listitem><para>Automatic scrolling in live capture</para></listitem>
+			<listitem><para>Enable MAC name resolution</para></listitem>
+			<listitem><para>Enable network name resolution</para></listitem>
+			<listitem><para>Enable transport name resolution</para></listitem>
 		</orderedlist>
 		Click <guibutton>OK</guibutton>.
 		</para></step>
@@ -586,12 +586,12 @@
 		dissection of a Host Announcement is given in <link linkend="hostannounce"/>.
 		</para>
 
-		</sect3>
 
 		<image id="hostannounce">
 			<imagedescription>Typical Windows 9x/Me Host Announcement</imagedescription>
 			<imagefile scale="41">HostAnnouncment</imagefile>
 		</image>
+		</sect3>
 
 	</sect2>
 
@@ -682,7 +682,7 @@
 
 	  	<para>
 		<indexterm><primary>IPC$</primary></indexterm>
-		The <constant>IPC$</constant> share serves a vital purpose<footnote>TOSHARG, Sect 4.5.1</footnote> 
+		The <constant>IPC$</constant> share serves a vital purpose<footnote><para>TOSHARG, Sect 4.5.1</para></footnote> 
 		in SMB/CIFS based networking.  A Windows client connects to this resource to obtain the list of 
 		resources that are available on the server. The server responds with the shares and print queues that
 		are available. In most but not all cases, the connection is made with a <constant>NULL</constant>
@@ -795,11 +795,11 @@
                 <para>
                 Click:
                 <orderedlist>
-                <listitem>Update list of packets in real time</listitem>
-                <listitem>Automatic scrolling in live capture</listitem>
-                <listitem>Enable MAC name resolution </listitem>
-                <listitem>Enable network name resolution </listitem>
-                <listitem>Enable transport name resolution</listitem>
+				<listitem><para>Update list of packets in real time</para></listitem>
+				<listitem><para>Automatic scrolling in live capture</para></listitem>
+				<listitem><para>Enable MAC name resolution</para></listitem>
+				<listitem><para>Enable network name resolution</para></listitem>
+				<listitem><para>Enable transport name resolution</para></listitem>
                 </orderedlist>
                 Click <guibutton>OK</guibutton>.
 		</para></step>
@@ -990,7 +990,7 @@
 	Windows networking.
 	</para>
 
-	<qandaset defaultlabel="chap01qa" type="number">
+	<qandaset defaultlabel="chap01qa">
 	<qandaentry>
 	<question>
 
@@ -1160,8 +1160,7 @@
 		The use of WINS reduces network broadcast traffic. The reduction is greatest when all network 
 		clients are configured to operate in <parameter>Hybrid Mode</parameter>. This can be effected through 
 		use of DHCP to set the NetBIOS node type to type 8 for all network clients. Additionally, it is 
-		beneficial to configure Samba to use <smbconfoption><name>name resolve order</name><value>wins host 
-		bcast</value></smbconfoption>.
+		beneficial to configure Samba to use <smbconfoption name="name resolve order"/>wins host cast</smbconfoption>.
 		</para>
 
 		<note><para>
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 66ffae6eb7..0b641702f7 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -14,10 +14,10 @@
 	<para>
 	This chapter lays the groundwork for understanding the basics of Samba operation. 
 	Instead of a bland technical discussion, each principle is demonstrated by way of a 
-	real-world scenario for which a working solution<footnote>The examples given mirror those documented
+	real-world scenario for which a working solution<footnote><para>The examples given mirror those documented
 	in TOSHARG Chapter 2, Section 2.3.1. You may gain additional insight from the Stand-alone server
 	configurations covered in TOSHARG sections 2.3.1.2 through 2.3.1.4.
-	</footnote> is fully described.
+	</para></footnote> is fully described.
 	</para>
 
 	<para>
@@ -75,10 +75,8 @@
 	Anyone should be able to access the plans at any time and without barriers or difficulty.
 	</para>
 
-	<para><indexterm>
-	    <primary>Red Hat</primary>
-	    <primary>Fedora</primary>
-	  </indexterm>
+	<para><indexterm><primary>Red Hat</primary></indexterm>
+		<indexterm><primary>Fedora</primary></indexterm>
 	Mr. Bob Jordan has asked you to install the new server as economically as possible. The central
 	server has a Pentium-IV 1.6GHz CPU, 768MB RAM, a 20GB IDE boot drive, a 160GB IDE second disk
 	to store plans, and a 100-base-T Ethernet card. You have already installed Red Hat Fedora Core2 and
@@ -114,11 +112,11 @@
 
 		<para>
 		It is not necessary to have specific users on the server. The site has a method for storing
-		all design files (plans). Each plan is stored in a directory that is named YYYYWW<footnote>
+		all design files (plans). Each plan is stored in a directory that is named YYYYWW<footnote><para>
 		This information is given purely as an example of how data may be stored in such a way that it
 		will be easy to locate records at a later date. The example is not meant to imply any instructions
 		that may be construed as essential to the design of the solution, this is something you will almost
-		certainly want to determine for yourself.</footnote>, where
+		certainly want to determine for yourself.</para></footnote>, where
 		YYYY is the year, and WW is the week of the year. This arrangement allows work to be stored
 		by week of year to preserve the filing technique the site is familiar with.
 		There is another customer directory that is alphabetically listed. At the top level are 26
@@ -785,6 +783,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 				On each Windows Me workstation, configure a network drive mapping to drive <filename>G:</filename>
 				that redirects to the uniform naming convention (UNC) resource 
 				<filename>\\server\office</filename>. Make this a permanent drive connection as follows:
+				</para>
 					<procedure>
 						<step><para>
 							<menuchoice>
@@ -808,11 +807,12 @@ C:\WINDOWS: regedit ME-dpwc.reg
 						</para></step>
 
 					</procedure>
-				</para></step>
+				</step>
 
 				<step><para>
 				On each workstation, install the Funds Tracking and Management software following the
 				manufacturer's instructions.
+				</para>
 					<procedure>
 					<step><para>
 					During installation, you are prompted for the name of the Windows 98
@@ -829,7 +829,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 					continue. The software now completes the installation.
 					</para></step>
 					</procedure>
-				</para></step>
+				</step>
 
 				<step><para>
 				Install an office automation software package of the customer's choice. Either Microsoft
@@ -839,6 +839,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 
 				<step><para>
 				Install a printer on each using the following steps:
+				</para>
 
 					<procedure>
 						<step><para>
@@ -872,8 +873,8 @@ C:\WINDOWS: regedit ME-dpwc.reg
 						dialog panel. Right-click <menuchoice>
 							<guiicon>HP LaserJet 5/5M Postscript</guiicon>
 							<guimenuitem>Properties</guimenuitem>
-							<guimenusub>Details (Tab)</guimenusub>
-							<guimenubutton>Add Port</guimenubutton>
+							<guisubmenu>Details (Tab)</guisubmenu>
+							<guimenuitem>Add Port</guimenuitem>
 							</menuchoice>.
 						</para></step>
 
@@ -894,7 +895,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 
 					</procedure>
 
-				</para></step>
+				</step>
 
 			</procedure>
 
@@ -1123,10 +1124,10 @@ C:\WINDOWS: regedit ME-dpwc.reg
 			</para></step>
 
 			<step><para>
-			Install the &smb.conf; file shown<footnote>This example makes use of the 
+					Install the &smb.conf; file shown<footnote><para>This example makes use of the 
 			<parameter>smbpasswd</parameter> file. It does so in an obtuse way since the use of 
 			the <parameter>passdb backend</parameter> has not been specified in the &smb.conf; 
-			file. This means that you are depending on correct default behavior.</footnote> 
+			file. This means that you are depending on correct default behavior.</para></footnote> 
 			in <link linkend="acctconf"/>.
 			</para></step>
 
@@ -1225,6 +1226,7 @@ application/octet-stream
 			On Alan's workstation, use Windows explorer to migrate the files from the old server
 			to the new server. The new server should appear in the <guimenu>Network Neighborhood</guimenu>
 			with the name of the old server (<constant>CASHPOOL</constant>).
+			</para>
 
 				<procedure>
 
@@ -1250,7 +1252,7 @@ application/octet-stream
 					</para></step>
 
 				</procedure>
-			</para></step>
+			</step>
 
 			<step><para>
 			Verify that the files are being copied correctly from the Windows NT4 machine to the Samba-3 server.
@@ -1323,7 +1325,7 @@ application/octet-stream
 	is to expose some of the hidden implications.
 	</para>
 
-	<qandaset defaultlabel="chap02qa" type="number">
+	<qandaset defaultlabel="chap02qa">
 	<qandaentry>
 	<question>
 
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index fde9d71c1d..ee68508934 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -644,8 +644,7 @@ hosts:	files wins
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">BILLMORE</smbconfoption>
-<smbconfoption name="passwd chat">*New*Password* \</smbconfoption>
-<member><parameter>%n\n*Re-enter*new*password* %n\n *Password*changed*</parameter></member>
+<smbconfoption name="passwd chat">*New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed*</smbconfoption>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="syslog">0</smbconfoption>
 <smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
@@ -656,8 +655,7 @@ hosts:	files wins
 <smbconfoption name="add group script">/usr/sbin/groupadd '%g'</smbconfoption>
 <smbconfoption name="delete group script">/usr/sbin/groupdel '%g'</smbconfoption>
 <smbconfoption name="add user to group script">/usr/sbin/usermod -G '%g' '%u'</smbconfoption>
-<smbconfoption name="add machine script">/usr/sbin/useradd \</smbconfoption>
-<member><parameter>-s /bin/false -d /var/lib/nobody '%u'</parameter></member>
+<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</smbconfoption>
 <smbconfoption name="logon script">scripts\login.bat</smbconfoption>
 <smbconfoption name="logon path"> </smbconfoption>
 <smbconfoption name="logon drive">X:</smbconfoption>
@@ -902,6 +900,7 @@ smb: \> q
 
 		<step><para>
 		Install a printer on each using the following steps:
+		</para>
 
 			<procedure>
 				<step><para>
@@ -935,8 +934,8 @@ smb: \> q
 				dialog panel. Right-click <menuchoice>
 					<guiicon>HP LaserJet 4</guiicon>
 					<guimenuitem>Properties</guimenuitem>
-					<guimenusub>Details (Tab)</guimenusub>
-					<guimenubutton>Add Port</guimenubutton>
+					<guisubmenu>Details (Tab)</guisubmenu>
+					<guimenuitem>Add Port</guimenuitem>
 					</menuchoice>.
 				</para></step>
 
@@ -954,7 +953,7 @@ smb: \> q
 				as well as for the QMS Magicolor XXXX laser printer.
 				</para></step>
 			</procedure>
-		</para></step>
+		</step>
 	</procedure>
 
 	<sect2>
@@ -1028,7 +1027,7 @@ smb: \> q
 	may help.
 	</para>
 
-	<qandaset defaultlabel="chap03qa" type="number">
+	<qandaset>
 	<qandaentry>
 	<question>
 
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 1ea6df9d2a..41e18a475d 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -512,8 +512,7 @@ Given 500 Users and 2 years:
 	      <primary>name resolve order</primary>
 	    </indexterm>
 		WINS serving is enabled by the <smbconfoption name="wins support">Yes</smbconfoption>,
-		and name resolution is set to use it by means of the <smbconfoption><name>name resolve order</name>
-		<value>wins bcast hosts</value></smbconfoption> entry.
+		and name resolution is set to use it by means of the <smbconfoption name="name resolve order">wins bcast hosts</smbconfoption> entry.
 		</para></listitem>
 
 	<listitem><para><indexterm>
@@ -554,9 +553,9 @@ Given 500 Users and 2 years:
 	      <primary>User Mode</primary>
 	    </indexterm>
 		The &smb.conf; file specifies that the Samba server will operate in (default) <parameter>
-		security = user</parameter> mode<footnote>See <emphasis>TOSHARG</emphasis>, Chapter 3. This is necessary
+			security = user</parameter> mode<footnote><para>See <emphasis>TOSHARG</emphasis>, Chapter 3. This is necessary
 		so that Samba can act as a Domain Controller (PDC); see <emphasis>TOSHARG</emphasis>, Chapter 4 for 
-		additional information.</footnote> (User Mode).
+		additional information.</para></footnote> (User Mode).
 		</para></listitem>
 
 	<listitem><para><indexterm>
@@ -575,8 +574,7 @@ Given 500 Users and 2 years:
 	    </indexterm><indexterm>
 	      <primary>profile share</primary>
 	    </indexterm>
-		Roaming profiles are enabled through the specification of the parameter, <smbconfoption><name>logon path</name>
-		<value>\\%L\profiles\%U</value></smbconfoption>. The value of this parameter translates the
+		Roaming profiles are enabled through the specification of the parameter, <smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>. The value of this parameter translates the
 		<constant>%L</constant> to the name by which the Samba server is called by the client (for this
 		configuration, it translates to the name <constant>DIAMOND</constant>), and the <constant>%U</constant>
 		will translate to the name of the user within the context of the connection made to the profile share.
@@ -728,8 +726,8 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 </screen>
 		To ensure that your kernel is capable of IP forwarding during configuration, you may 
 		wish to execute that command manually also. This setting permits the Linux system to 
-		act as a router.<footnote>ED NOTE: You may want to do the echo command last and include 
-		"0" in the init scripts since it opens up your network for a short time.</footnote>
+		act as a router.<footnote><para>ED NOTE: You may want to do the echo command last and include 
+				"0" in the init scripts since it opens up your network for a short time.</para></footnote>
 		</para></step>
 
 	  <step><para><indexterm>
@@ -869,8 +867,7 @@ echo -e "\nNAT firewall done.\n"
 <smbconfoption name="bind interfaces only">Yes</smbconfoption>
 <smbconfoption name="passdb backend">tdbsam</smbconfoption>
 <smbconfoption name="pam password change">Yes</smbconfoption>
-<smbconfoption name="passwd chat">*New*Password* %n\n *Re-enter*new*password*</smbconfoption>
-<member><parameter> %n\n *Password*changed*</parameter></member>
+<smbconfoption name="passwd chat">*New*Password* %n\n *Re-enter*new*password*%n\n *Password*changed*</smbconfoption>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="unix password sync">Yes</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
@@ -887,8 +884,7 @@ echo -e "\nNAT firewall done.\n"
 <smbconfoption name="add group script">/usr/sbin/groupadd '%g'</smbconfoption>
 <smbconfoption name="delete group script">/usr/sbin/groupdel '%g'</smbconfoption>
 <smbconfoption name="add user to group script">/usr/sbin/usermod -G '%g' '%u'</smbconfoption>
-<smbconfoption name="add machine script">/usr/sbin/useradd</smbconfoption>
-<member><parameter>-s /bin/false -d /tmp '%u'</parameter></member>
+<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /tmp '%u'</smbconfoption>
 <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption>
 <smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption>
 <smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
@@ -1282,7 +1278,7 @@ subnet 123.45.67.64 netmask 255.255.255.252 {
 		<step><para>
 		Create the files shown in their directories as follows:
 
-			<table if="namedrscfiles">
+			<table id="namedrscfiles">
 				<title>DNS (named) Resource Files</title>
 				<tgroup cols="2">
 					<colspec align="left"/>
@@ -1960,10 +1956,10 @@ $rootprompt; ps ax | grep winbind
 14295 ?        S     0:00 /usr/sbin/winbindd -B
 </screen>
 			The <command>winbindd</command> daemon is running in split mode (normal), so there are also
-			two instances<footnote>For more information regarding winbindd, see <emphasis>TOSHARG</emphasis>, 
+			two instances<footnote><para>For more information regarding winbindd, see <emphasis>TOSHARG</emphasis>, 
 			Chapter 22, Section 22.3. The single instance of <command>smbd</command> is normal. One additional
 			<command>smbd</command> slave process is spawned for each SMB/CIFS client 
-			connection.</footnote> of it.
+			connection.</para></footnote> of it.
 			</para></step>
 	
 			<step><para>
@@ -2332,6 +2328,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 		include the Accounting department HP LaserJet 6 and Minolta QMS Magicolor printers. You will
 		also configure identical printers that are located in the financial services department.
 		Install printers on each machine using the following steps:
+		</para>
 
 			<procedure>
 				<step><para>
@@ -2365,8 +2362,8 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 				dialog panel. Right-click <menuchoice>
 					<guiicon>HP LaserJet 6</guiicon>
 					<guimenuitem>Properties</guimenuitem>
-					<guimenusub>Details (Tab)</guimenusub>
-					<guimenubutton>Add Port</guimenubutton>
+					<guisubmenu>Details (Tab)</guisubmenu>
+					<guimenuitem>Add Port</guimenuitem>
 					</menuchoice>.
 				</para></step>
 
@@ -2384,7 +2381,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 				as well as for both QMS Magicolor laser printers.
 				</para></step>
 			</procedure>
-		</para></step>
+		</step>
 
 	  <step><para><indexterm>
 		<primary>defragmentation</primary>
@@ -2477,7 +2474,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 	<para>
 	</para>
 
-	<qandaset defaultlabel="chap04qa" type="number">
+	<qandaset>
 	<qandaentry>
 	<question>
 
@@ -2511,8 +2508,8 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 		in the tdbsam backend to 250. This is the point at which most networks tend to want backup domain
 		controllers (BDCs). Samba-3 does not provide a mechanism for replicating tdbsam data so it can be used
 		by a BDC. The limitation of 250 users per tdbsam is predicated only on the need for replication
-		not on the limits<footnote>Bench tests have shown that tdbsam is a very effective database technology.
-		There is surprisingly little performance loss even with over 4000 users.</footnote> of the tdbsam backend itself. 
+		not on the limits<footnote><para>Bench tests have shown that tdbsam is a very effective database technology.
+				There is surprisingly little performance loss even with over 4000 users.</para></footnote> of the tdbsam backend itself. 
 		</para>
 
 	</answer>
@@ -2682,8 +2679,8 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 		means <constant>top level domain</constant>. A FQDN is a long hand but easy to remember
 		expression that may be up to 1024 characters in length and that represents an IP address. 
 		A NetBIOS name is always 16 characters long. The 16<superscript>th</superscript> character
-		is a name type indicator. A specific name type is registered<footnote>
-		See <emphasis>TOSHARG</emphasis>, Chapter 9 for more information.</footnote> for each 
+		is a name type indicator. A specific name type is registered<footnote><para>
+				See <emphasis>TOSHARG</emphasis>, Chapter 9 for more information.</para></footnote> for each 
 		type of service that is provided by the Windows server or client and that may be registered
 		where a WINS server is in use.
 		</para>
@@ -2704,7 +2701,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 
 		<para>
 		Windows 200x Active Directory requires the registration in the DNS zone for the domain it 
-		controls of service locator<footnote>See TOSHARG, Chapter 9, Section 9.3.3</footnote> records 
+		controls of service locator<footnote><para>See TOSHARG, Chapter 9, Section 9.3.3</para></footnote> records 
 		that Windows clients and servers will use to locate Kerberos and LDAP services. ADS also 
 		requires the registration of special records that are called global catalog (GC) entries 
 		and site entries by which domain controllers and other essential ADS servers may be located. 
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index eb1553bf4d..7e9764419b 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.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="migration">
   <title>Migrating NT4 Domain to Samba-3</title>
 
diff --git a/docs/Samba-Guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
index 60b1ef8ad1..61990592be 100644
--- a/docs/Samba-Guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/Chap11-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="HA">
   <title>Performance, Reliability, and Availability</title>
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index 3ce6739c66..362f873a32 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.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 appendix PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <appendix id="appendix">
   <title>Appendix: A Collection of Useful Tid-bits</title>
diff --git a/docs/Samba-Guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
index edc72ca03e..2d02ed3795 100644
--- a/docs/Samba-Guide/acknowledgements.xml
+++ b/docs/Samba-Guide/acknowledgements.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 preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <preface lang="en-US">
 <title>Acknowledgments</title>
diff --git a/docs/Samba-Guide/conventions.xml b/docs/Samba-Guide/conventions.xml
index 82763d5369..d4bbde8f85 100644
--- a/docs/Samba-Guide/conventions.xml
+++ b/docs/Samba-Guide/conventions.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 sect1 PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
   <sect1>
     <title>Conventions Used</title>
diff --git a/docs/Samba-Guide/foreword.xml b/docs/Samba-Guide/foreword.xml
index 20060a8701..38770d7e9b 100644
--- a/docs/Samba-Guide/foreword.xml
+++ b/docs/Samba-Guide/foreword.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 preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <preface lang="en-US">
 <title>Foreword</title>
diff --git a/docs/Samba-Guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
index 93f542e5b8..1afd6cd14b 100644
--- a/docs/Samba-Guide/front-matter.xml
+++ b/docs/Samba-Guide/front-matter.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 preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <preface lang="en-US">
 <title>Front Matter</title>
diff --git a/docs/Samba-Guide/glossary.xml b/docs/Samba-Guide/glossary.xml
index 54e72f681b..3968e24c31 100644
--- a/docs/Samba-Guide/glossary.xml
+++ b/docs/Samba-Guide/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 glossary 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-Guide/gpl.xml b/docs/Samba-Guide/gpl.xml
index 2084034c7b..8f3b8b40e4 100644
--- a/docs/Samba-Guide/gpl.xml
+++ b/docs/Samba-Guide/gpl.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 appendix PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <appendix>
   <appendixinfo>
     <title>GNU General Public License</title>
diff --git a/docs/Samba-Guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
index 877d01a334..b55a333f9e 100644
--- a/docs/Samba-Guide/inside-cover.xml
+++ b/docs/Samba-Guide/inside-cover.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 preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <preface lang="en-US">
 <title>About the Cover Artwork</title>
 
diff --git a/docs/Samba-Guide/preface.xml b/docs/Samba-Guide/preface.xml
index 04bc17bd72..49b2e5c377 100644
--- a/docs/Samba-Guide/preface.xml
+++ b/docs/Samba-Guide/preface.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 preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <preface id="preface">
   <title>Preface</title>