More validation fixes; building FO-PDF versions of the HOWTO and

the Guide work now!
(This used to be commit 2192c44663d3031cd6c0f228aea4a8cdd2a29a82)

11 files changed, 123 insertions, 124 deletions

diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index a22b3825e3..66ffae6eb7 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.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="simple">
   <title>No Frills Samba Servers</title>
 
@@ -192,11 +192,11 @@
 <smbconfexample id="draft-smbconf">
 <title>Drafting Office &smb.conf; File</title>
 <smbconfcomment>Global Parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MIDEARTH</smbconfoption>
 <smbconfoption name="security">SHARE</smbconfoption>
 
-<smbconfsection>[Plans]</smbconfsection>
+<smbconfsection name="[Plans]"/>
 <smbconfoption name="path">/plans</smbconfoption>
 <smbconfoption name="read only">Yes</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -669,7 +669,7 @@ application/octet-stream
 <smbconfexample id="charity-smbconf">
 <title>Charity Administration Office &smb.conf; File</title>
 <smbconfcomment>Global Parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MIDEARTH</smbconfoption>
 <smbconfoption name="security">SHARE</smbconfoption>
 <smbconfoption name="printing">CUPS</smbconfoption>
@@ -678,7 +678,7 @@ application/octet-stream
 <smbconfoption name="show add printer wizard">No</smbconfoption>
 <smbconfoption name="wins support">yes</smbconfoption>
 
-<smbconfsection>[FTMFILES]</smbconfsection>
+<smbconfsection name="[FTMFILES]"/>
 <smbconfoption name="comment">Funds Tracking &amp; Management Files</smbconfoption>
 <smbconfoption name="path">/data/ftmfiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -687,7 +687,7 @@ application/octet-stream
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="nt acl support">No</smbconfoption>
 
-<smbconfsection>[office]</smbconfsection>
+<smbconfsection name="[office]"/>
 <smbconfoption name="comment">General Office Files</smbconfoption>
 <smbconfoption name="path">/data/officefiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -696,7 +696,7 @@ application/octet-stream
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="nt acl support">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
@@ -1282,26 +1282,26 @@ application/octet-stream
 <smbconfexample id="acctconf">
 <title>Accounting Office Network &smb.conf; File</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">BILLMORE</smbconfoption>
 <smbconfoption name="printing">CUPS</smbconfoption>
 <smbconfoption name="printcap name">CUPS</smbconfoption>
 <smbconfoption name="disable spoolss">Yes</smbconfoption>
 <smbconfoption name="show add printer wizard">No</smbconfoption>
 
-<smbconfsection>[files]</smbconfsection>
+<smbconfsection name="[files]"/>
 <smbconfoption name="comment">Work area files</smbconfoption>
 <smbconfoption name="path">/data/%U</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[master]</smbconfsection>
+<smbconfsection name="[master]"/>
 <smbconfoption name="comment">Master work area files</smbconfoption>
 <smbconfoption name="path">/data</smbconfoption>
 <smbconfoption name="valid users">alan</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index 4b007acde2..fde9d71c1d 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.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="small">
   <title>Small Office Networking</title>
 
@@ -642,7 +642,7 @@ hosts:	files wins
 <smbconfexample id="acct2conf">
 <title>Accounting Office Network &smb.conf; File &smbmdash; [globals] Section</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<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>
@@ -669,13 +669,13 @@ hosts:	files wins
 
 <smbconfexample id="acct3conf">
 <title>Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section</title>
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
@@ -683,19 +683,19 @@ hosts:	files wins
 <smbconfoption name="use client driver">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network Logon Service</smbconfoption>
 <smbconfoption name="path">/data/%U</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 <smbconfoption name="comment">Accounting Files</smbconfoption>
 <smbconfoption name="path">/data/accounts</smbconfoption>
 <smbconfoption name="valid users">%G</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[finsvcs]</smbconfsection>
+<smbconfsection name="[finsvcs]"/>
 <smbconfoption name="comment">Financial Service Files</smbconfoption>
 <smbconfoption name="path">/data/finsvcs</smbconfoption>
 <smbconfoption name="valid users">%G</smbconfoption>
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index acbb25d03f..1ea6df9d2a 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.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="secure">
   <title>Secure Office Networking</title>
 
@@ -862,7 +862,7 @@ echo -e "\nNAT firewall done.\n"
 <smbconfexample id="promisnet">
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">PROMISES</smbconfoption>
 <smbconfoption name="netbios name">DIAMOND</smbconfoption>
 <smbconfoption name="interfaces">eth1, eth2, lo</smbconfoption>
@@ -907,18 +907,18 @@ echo -e "\nNAT firewall done.\n"
 
 <smbconfexample id="promisnetsvca">
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A</title>
-<smbconfsection>[IPC$]</smbconfsection>
+<smbconfsection name="[IPC$]"/>
 <smbconfoption name="path">/tmp</smbconfoption>
 <smbconfoption name="hosts allow">192.168.1.0/24, 192.168.2.0/24, 127.0.0.1</smbconfoption>
 <smbconfoption name="hosts deny">0.0.0.0/0</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -927,7 +927,7 @@ echo -e "\nNAT firewall done.\n"
 <smbconfoption name="default devmode">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network Logon Service</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -936,23 +936,23 @@ echo -e "\nNAT firewall done.\n"
 
 <smbconfexample id="promisnetsvcb">
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B</title>
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 <smbconfoption name="comment">Profile Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 <smbconfoption name="comment">Accounting Files</smbconfoption>
 <smbconfoption name="path">/data/accounts</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[service]</smbconfsection>
+<smbconfsection name="[service]"/>
 <smbconfoption name="comment">Financial Services Files</smbconfoption>
 <smbconfoption name="path">/data/service</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[apps]</smbconfsection>
+<smbconfsection name="[apps]"/>
 <smbconfoption name="comment">Application Files</smbconfoption>
 <smbconfoption name="path">/apps</smbconfoption>
 <smbconfoption name="read only">Yes</smbconfoption>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index b904d64393..74645bccb7 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.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="Big500users">
   <title>The 500-User Office</title>
 
@@ -938,7 +938,7 @@ hosts:      files dns wins
 <smbconfexample id="ch5-massivesmb">
 <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename></title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MEGANET</smbconfoption>
 <smbconfoption name="netbios name">MASSIVE</smbconfoption>
 <smbconfoption name="interfaces">eth1, lo</smbconfoption>
@@ -955,22 +955,22 @@ hosts:      files dns wins
 <smbconfoption name="wins support">Yes</smbconfoption>
 <smbconfoption name="include">/etc/samba/dc-common.conf</smbconfoption>
 
-<smbconfsection>[IPC$]</smbconfsection>
+<smbconfsection name="[IPC$]"/>
 <smbconfoption name="path">/tmp</smbconfoption>
 <smbconfoption name="hosts allow">172.16.0.0/16, 127.0.0.1</smbconfoption>
 <smbconfoption name="hosts deny">0.0.0.0/0</smbconfoption>
 
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 <smbconfoption name="comment">Accounting Files</smbconfoption>
 <smbconfoption name="path">/data/accounts</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[service]</smbconfsection>
+<smbconfsection name="[service]"/>
 <smbconfoption name="comment">Financial Services Files</smbconfoption>
 <smbconfoption name="path">/data/service</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[pidata]</smbconfsection>
+<smbconfsection name="[pidata]"/>
 <smbconfoption name="comment">Property Insurance Files</smbconfoption>
 <smbconfoption name="path">/data/pidata</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -980,7 +980,7 @@ hosts:      files dns wins
 <smbconfexample id="ch5-dc-common">
 <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename></title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <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>
@@ -991,19 +991,19 @@ hosts:      files dns wins
 <smbconfoption name="preferred master">Yes</smbconfoption>
 <smbconfoption name="include">/etc/samba/common.conf</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network Logon Service</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="locking">No</smbconfoption>
 
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 <smbconfoption name="comment">Profile Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -1013,7 +1013,7 @@ hosts:      files dns wins
 <!-- Three -->
 <smbconfexample id="ch5-commonsmb">
 <title>Common Samba Configuration File: <filename>/etc/samba/common.conf</filename></title>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
 <smbconfoption name="syslog">0</smbconfoption>
@@ -1034,7 +1034,7 @@ hosts:      files dns wins
 <smbconfoption name="include"> </smbconfoption>
 
 <smbconfcomment>Share and Service Definitions are common to all servers</smbconfcomment>
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -1043,7 +1043,7 @@ hosts:      files dns wins
 <smbconfoption name="default devmode">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[apps]</smbconfsection>
+<smbconfsection name="[apps]"/>
 <smbconfoption name="comment">Application Files</smbconfoption>
 <smbconfoption name="path">/apps</smbconfoption>
 <smbconfoption name="admin users">bjordan</smbconfoption>
@@ -1054,7 +1054,7 @@ hosts:      files dns wins
 <smbconfexample id="ch5-bldg1-smb">
 <title>Server: BLDG1 (Member), File: smb.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MEGANET</smbconfoption>
 <smbconfoption name="netbios name">BLDG1</smbconfoption>
 <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption>
@@ -1064,7 +1064,7 @@ hosts:      files dns wins
 <smbconfexample id="ch5-bldg2-smb">
 <title>Server: BLDG2 (Member), File: smb.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MEGANET</smbconfoption>
 <smbconfoption name="netbios name">BLDG2</smbconfoption>
 <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption>
@@ -1074,7 +1074,7 @@ hosts:      files dns wins
 <smbconfexample id="ch5-dommem-smb">
 <title>Common Domain Member Include File: dom-mem.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption>
 <smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption>
 <smbconfoption name="preferred master">Yes</smbconfoption>
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index 55da147007..780f343b1d 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.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="happy">
   <title>Making Happy Users</title>
 
@@ -1847,7 +1847,7 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765
 <smbconfexample id="ch6-massive-smbconfa">
 <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 	<smbconfoption name="unix charset">LOCALE</smbconfoption>
 	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
 	<smbconfoption name="netbios name">MASSIVE</smbconfoption>
@@ -3206,7 +3206,7 @@ smb: \> q
 <smbconfexample id="ch6-bldg1-smbconf">
 <title>LDAP Based &smb.conf; File, Server: BLDG1</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 	<smbconfoption name="unix charset">LOCALE</smbconfoption>
 	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
 	<smbconfoption name="netbios name">BLDG1</smbconfoption>
@@ -3244,7 +3244,7 @@ smb: \> q
 <smbconfexample id="ch6-bldg2-smbconf">
 <title>LDAP Based &smb.conf; File, Server: BLDG2</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 	<smbconfoption name="unix charset">LOCALE</smbconfoption>
 	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
 	<smbconfoption name="netbios name">BLDG2</smbconfoption>
@@ -3281,28 +3281,28 @@ smb: \> q
 
 <smbconfexample id="ch6-shareconfa">
 <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A</title>
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 	<smbconfoption name="comment">Accounting Files</smbconfoption>
 	<smbconfoption name="path">/data/accounts</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[service]</smbconfsection>
+<smbconfsection name="[service]"/>
 	<smbconfoption name="comment">Financial Services Files</smbconfoption>
 	<smbconfoption name="path">/data/service</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[pidata]</smbconfsection>
+<smbconfsection name="[pidata]"/>
 	<smbconfoption name="comment">Property Insurance Files</smbconfoption>
 	<smbconfoption name="path">/data/pidata</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 	<smbconfoption name="comment">Home Directories</smbconfoption>
 	<smbconfoption name="valid users">%S</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 	<smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 	<smbconfoption name="comment">SMB Print Spool</smbconfoption>
 	<smbconfoption name="path">/var/spool/samba</smbconfoption>
 	<smbconfoption name="guest ok">Yes</smbconfoption>
@@ -3312,31 +3312,31 @@ smb: \> q
 
 <smbconfexample id="ch6-shareconfb">
 <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B</title>
-<smbconfsection>[apps]</smbconfsection>
+<smbconfsection name="[apps]"/>
 	<smbconfoption name="comment">Application Files</smbconfoption>
 	<smbconfoption name="path">/apps</smbconfoption>
 	<smbconfoption name="admin users">bjordan</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 	<smbconfoption name="comment">Network Logon Service</smbconfoption>
 	<smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption>
 	<smbconfoption name="guest ok">Yes</smbconfoption>
 	<smbconfoption name="locking">No</smbconfoption>
 
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 	<smbconfoption name="comment">Profile Share</smbconfoption>
 	<smbconfoption name="path">/var/lib/samba/profiles</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 	<smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[profdata]</smbconfsection>
+<smbconfsection name="[profdata]"/>
 	<smbconfoption name="comment">Profile Data Share</smbconfoption>
 	<smbconfoption name="path">/var/lib/samba/profdata</smbconfoption>
 	<smbconfoption name="read only">No</smbconfoption>
 	<smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 	<smbconfoption name="comment">Printer Drivers</smbconfoption>
 	<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
 	<smbconfoption name="browseable">yes</smbconfoption>
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index c349fa3ef7..5b036b5219 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.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="2000users">
   <title>A Distributed 2000 User Network</title>
 
@@ -1151,7 +1151,7 @@ index default               sub
 <smbconfexample id="ch7-massmbconfA">
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">MEGANET2</smbconfoption>
 <smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption>
@@ -1199,31 +1199,31 @@ index default               sub
 
 <smbconfexample id="ch7-massmbconfB">
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part B</title>
-<smbconfsection>[IPC$]</smbconfsection>
+<smbconfsection name="[IPC$]"/>
 <smbconfoption name="path">/tmp</smbconfoption>
 
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 <smbconfoption name="comment">Accounting Files</smbconfoption>
 <smbconfoption name="path">/data/accounts</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[service]</smbconfsection>
+<smbconfsection name="[service]"/>
 <smbconfoption name="comment">Financial Services Files</smbconfoption>
 <smbconfoption name="path">/data/service</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[pidata]</smbconfsection>
+<smbconfsection name="[pidata]"/>
 <smbconfoption name="comment">Property Insurance Files</smbconfoption>
 <smbconfoption name="path">/data/pidata</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -1233,32 +1233,32 @@ index default               sub
 
 <smbconfexample id="ch7-massmbconfC">
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part C</title>
-<smbconfsection>[apps]</smbconfsection>
+<smbconfsection name="[apps]"/>
 <smbconfoption name="comment">Application Files</smbconfoption>
 <smbconfoption name="path">/apps</smbconfoption>
 <smbconfoption name="admin users">bjones</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network Logon Service</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption>
 <smbconfoption name="admin users">root, Administrator</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="locking">No</smbconfoption>
 
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 <smbconfoption name="comment">Profile Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[profdata]</smbconfsection>
+<smbconfsection name="[profdata]"/>
 <smbconfoption name="comment">Profile Data Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 <smbconfoption name="comment">Printer Drivers</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
 <smbconfoption name="write list">root</smbconfoption>
@@ -1268,7 +1268,7 @@ index default               sub
 <smbconfexample id="ch7-slvsmbocnfA">
 <title>Backup Domain Controller &smb.conf; File &smbmdash; Part A</title>
 <smbconfcomment># Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">MEGANET2</smbconfoption>
 <smbconfoption name="netbios name">BLDG1</smbconfoption>
@@ -1301,12 +1301,12 @@ index default               sub
 <smbconfoption name="idmap gid">10000-20000</smbconfoption>
 <smbconfoption name="printing">cups</smbconfoption>
 
-<smbconfsection>[accounts]</smbconfsection>
+<smbconfsection name="[accounts]"/>
 <smbconfoption name="comment">Accounting Files</smbconfoption>
 <smbconfoption name="path">/data/accounts</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[service]</smbconfsection>
+<smbconfsection name="[service]"/>
 <smbconfoption name="comment">Financial Services Files</smbconfoption>
 <smbconfoption name="path">/data/service</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -1314,43 +1314,43 @@ index default               sub
 
 <smbconfexample id="ch7-slvsmbocnfB">
 <title>Backup Domain Controller &smb.conf; File &smbmdash; Part B</title>
-<smbconfsection>[pidata]</smbconfsection>
+<smbconfsection name="[pidata]"/>
 <smbconfoption name="comment">Property Insurance Files</smbconfoption>
 <smbconfoption name="path">/data/pidata</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[apps]</smbconfsection>
+<smbconfsection name="[apps]"/>
 <smbconfoption name="comment">Application Files</smbconfoption>
 <smbconfoption name="path">/apps</smbconfoption>
 <smbconfoption name="admin users">bjones</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network Logon Service</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/netlogon</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="locking">No</smbconfoption>
 
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 <smbconfoption name="comment">Profile Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="profile acls">Yes</smbconfoption>
 
-<smbconfsection>[profdata]</smbconfsection>
+<smbconfsection name="[profdata]"/>
 <smbconfoption name="comment">Profile Data Share</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
index 63994d84e8..3b4bedee8f 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.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="nw4migration">
   <title>Migrating NetWare 4.11 Server to Samba-3</title>
 
@@ -532,7 +532,7 @@ shadow:   files ldap
 <smbconfexample id="ch8smbconf">
 <title>Samba Configuration File &smbmdash; smb.conf Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">MEGANET2</smbconfoption>
 <smbconfoption name="netbios name">MASSIVE</smbconfoption>
 <smbconfoption name="server string">Corp File Server</smbconfoption>
@@ -575,13 +575,13 @@ shadow:   files ldap
 
 <smbconfexample id="ch8smbconf2">
 <title>Samba Configuration File &smbmdash; smb.conf Part B</title>
-<smbconfsection>[netlogon]</smbconfsection>
+<smbconfsection name="[netlogon]"/>
 <smbconfoption name="comment">Network logon service</smbconfoption>
 <smbconfoption name="path">/data/samba/netlogon</smbconfoption>
 <smbconfoption name="write list">"@Domain Admins"</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 
-<smbconfsection>[profiles]</smbconfsection>
+<smbconfsection name="[profiles]"/>
 <smbconfoption name="comment">Roaming Profile Share</smbconfoption>
 <smbconfoption name="path">/data/samba/profiles/</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -589,7 +589,7 @@ shadow:   files ldap
 <smbconfoption name="veto files">desktop.ini</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
@@ -598,18 +598,18 @@ shadow:   files ldap
 <smbconfoption name="hide files">desktop.ini</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[software]</smbconfsection>
+<smbconfsection name="[software]"/>
 <smbconfoption name="comment">Software for %a computers</smbconfoption>
 <smbconfoption name="path">/data/samba/shares/software/%a</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 
-<smbconfsection>[public]</smbconfsection>
+<smbconfsection name="[public]"/>
 <smbconfoption name="comment">Public Files</smbconfoption>
 <smbconfoption name="path">/data/samba/shares/public</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 
-<smbconfsection>[PDF]</smbconfsection>
+<smbconfsection name="[PDF]"/>
 <smbconfoption name="comment">Location of documents printed to PDFCreator printer</smbconfoption>
 <smbconfoption name="path">/data/samba/shares/pdf</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
@@ -617,31 +617,31 @@ shadow:   files ldap
 
 <smbconfexample id="ch8smbconf3">
 <title>Samba Configuration File &smbmdash; smb.conf Part C</title>
-<smbconfsection>[EVERYTHING]</smbconfsection>
+<smbconfsection name="[EVERYTHING]"/>
 <smbconfoption name="comment">All shares</smbconfoption>
 <smbconfoption name="path">/data/samba</smbconfoption>
 <smbconfoption name="valid users">"@Domain Admins"</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[CDROM]</smbconfsection>
+<smbconfsection name="[CDROM]"/>
 <smbconfoption name="comment">CD-ROM on MASSIVE</smbconfoption>
 <smbconfoption name="path">/mnt</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 <smbconfoption name="comment">Printer Drivers Share</smbconfoption>
 <smbconfoption name="path">/data/samba/drivers</smbconfoption>
 <smbconfoption name="write list">root</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">All Printers</smbconfoption>
 <smbconfoption name="path">/data/samba/spool</smbconfoption>
 <smbconfoption name="create mask">0644</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[acct_hp8500]</smbconfsection>
+<smbconfsection name="[acct_hp8500]"/>
 <smbconfoption name="comment">"Accounting Color Laser Printer"</smbconfoption>
 <smbconfoption name="path">/data/samba/spool/private</smbconfoption>
 <smbconfoption name="valid users">@acct, @acct_admin, @hr, "@Domain Admins",\</smbconfoption>
@@ -650,7 +650,7 @@ shadow:   files ldap
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="copy">printers</smbconfoption>
 
-<smbconfsection>[plotter]</smbconfsection>
+<smbconfsection name="[plotter]"/>
 <smbconfoption name="comment">Engineering Plotter</smbconfoption>
 <smbconfoption name="path">/data/samba/spool</smbconfoption>
 <smbconfoption name="create mask">0644</smbconfoption>
@@ -661,12 +661,12 @@ shadow:   files ldap
 
 <smbconfexample id="ch8smbconf4">
 <title>Samba Configuration File &smbmdash; smb.conf Part D</title>
-<smbconfsection>[APPS]</smbconfsection>
+<smbconfsection name="[APPS]"/>
 <smbconfoption name="path">/data/samba/shares/Apps</smbconfoption>
 <smbconfoption name="force group">"Domain Users"</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection>[ACCT]</smbconfsection>
+<smbconfsection name="[ACCT]"/>
 <smbconfoption name="path">/data/samba/shares/Accounting</smbconfoption>
 <smbconfoption name="valid users">@acct, "@Domain Admins"</smbconfoption>
 <smbconfoption name="force group">acct</smbconfoption>
@@ -674,24 +674,24 @@ shadow:   files ldap
 <smbconfoption name="create mask">0660</smbconfoption>
 <smbconfoption name="directory mask">0770</smbconfoption>
 
-<smbconfsection>[ACCT_ADMIN]</smbconfsection>
+<smbconfsection name="[ACCT_ADMIN]"/>
 <smbconfoption name="path">/data/samba/shares/Acct_Admin</smbconfoption>
 <smbconfoption name="valid users">@”acct_admin”</smbconfoption>
 <smbconfoption name="force group">acct_admin</smbconfoption>
 
-<smbconfsection>[HR_PR]</smbconfsection>
+<smbconfsection name="[HR_PR]"/>
 <smbconfoption name="path">/data/samba/shares/HR_PR</smbconfoption>
 <smbconfoption name="valid users">@hr, @acct_admin</smbconfoption>
 <smbconfoption name="force group">hr</smbconfoption>
 
-<smbconfsection>[ENGR]</smbconfsection>
+<smbconfsection name="[ENGR]"/>
 <smbconfoption name="path">/data/samba/shares/Engr</smbconfoption>
 <smbconfoption name="valid users">@engr, @receptionist, @truss, "@Domain Admins", cheri</smbconfoption>
 <smbconfoption name="force group">engr</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="create mask">0770</smbconfoption>
 
-<smbconfsection>[DATA]</smbconfsection>
+<smbconfsection name="[DATA]"/>
 <smbconfoption name="path">/data/samba/shares/DATA</smbconfoption>
 <smbconfoption name="valid users">@engr, @receptionist, @truss, "@Domain Admins", cheri</smbconfoption>
 <smbconfoption name="force group">engr</smbconfoption>
@@ -702,7 +702,7 @@ shadow:   files ldap
 
 <smbconfexample id="ch8smbconf5">
 <title>Samba Configuration File &smbmdash; smb.conf Part E</title>
-<smbconfsection>[X]</smbconfsection>
+<smbconfsection name="[X]"/>
 <smbconfoption name="path">/data/samba/shares/X</smbconfoption>
 <smbconfoption name="valid users">@engr, @acct</smbconfoption>
 <smbconfoption name="force group">engr</smbconfoption>
@@ -710,18 +710,18 @@ shadow:   files ldap
 <smbconfoption name="create mask">0770</smbconfoption>
 <smbconfoption name="copy">engr</smbconfoption>
 
-<smbconfsection>[NETWORK]</smbconfsection>
+<smbconfsection name="[NETWORK]"/>
 <smbconfoption name="path">/data/samba/shares/network</smbconfoption>
 <smbconfoption name="valid users">"@Domain Users"</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="create mask">0770</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 
-<smbconfsection>[UTILS]</smbconfsection>
+<smbconfsection name="[UTILS]"/>
 <smbconfoption name="path">/data/samba/shares/Utils</smbconfoption>
 <smbconfoption name="write list">"@Domain Admins"</smbconfoption>
 
-<smbconfsection>[SYS]</smbconfsection>
+<smbconfsection name="[SYS]"/>
 <smbconfoption name="path">/data/samba/shares/SYS</smbconfoption>
 <smbconfoption name="valid users">chad</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index c09849f9d7..a4827426fc 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.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="unixclients">
   <title>Adding UNIX/LINUX Servers and Clients</title>
 
@@ -671,7 +671,7 @@ Joined domain MEGANET2.
 <smbconfexample id="ch9-sdmsdc">
 <title>Samba Domain Member in Samba Domain Control Context &smbmdash; &smb.conf; File</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">MEGANET2</smbconfoption>
 <smbconfoption name="security">DOMAIN</smbconfoption>
@@ -697,20 +697,20 @@ Joined domain MEGANET2.
 <smbconfoption name="printer admin">root</smbconfoption>
 <smbconfoption name="printing">cups</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 <smbconfoption name="comment">Printer Drivers</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
 <smbconfoption name="admin users">root, Administrator</smbconfoption>
@@ -969,7 +969,7 @@ MEGANET2+PIOps:x:10005:
 <smbconfexample id="ch0-NT4DSDM">
 <title>Samba Domain Member Server &smb.conf; File for NT4 Domain</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">MEGANET2</smbconfoption>
 <smbconfoption name="security">DOMAIN</smbconfoption>
@@ -991,20 +991,20 @@ MEGANET2+PIOps:x:10005:
 <smbconfoption name="hosts allow">192.168.2., 192.168.3., 127.</smbconfoption>
 <smbconfoption name="printing">cups</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 <smbconfoption name="comment">Printer Drivers</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
 <smbconfoption name="admin users">root, Administrator</smbconfoption>
@@ -1641,7 +1641,7 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
 <smbconfexample id="ch9-adssdm">
 <title>Samba Domain Member &smb.conf; File for Active Directory Membership</title>
 <smbconfcomment>Global parameters</smbconfcomment>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">LONDON</smbconfoption>
 <smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption>
@@ -1661,20 +1661,20 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
 <smbconfoption name="winbind separator">+</smbconfoption>
 <smbconfoption name="printing">cups</smbconfoption>
 
-<smbconfsection>[homes]</smbconfsection>
+<smbconfsection name="[homes]"/>
 <smbconfoption name="comment">Home Directories</smbconfoption>
 <smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[printers]</smbconfsection>
+<smbconfsection name="[printers]"/>
 <smbconfoption name="comment">SMB Print Spool</smbconfoption>
 <smbconfoption name="path">/var/spool/samba</smbconfoption>
 <smbconfoption name="guest ok">Yes</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="browseable">No</smbconfoption>
 
-<smbconfsection>[print$]</smbconfsection>
+<smbconfsection name="[print$]"/>
 <smbconfoption name="comment">Printer Drivers</smbconfoption>
 <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
 <smbconfoption name="admin users">root, Administrator</smbconfoption>
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 50be790e20..bcd00dbd86 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.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="kerberos">
   <title>Active Directory, Kerberos, and Security</title>
 
@@ -1941,7 +1941,7 @@ other::r-x
 	    <para><indexterm>
 		<primary>valid users</primary>
 	      </indexterm>
-		The <parameter>valid users</parameter> did not work on the <smbconfsection>[homes]</smbconfsection>.
+		The <parameter>valid users</parameter> did not work on the <smbconfsection name="[homes]"/>.
 		Has this functionality been restored yet?
 		</para>
 
@@ -1952,7 +1952,7 @@ other::r-x
 		<primary>meta-service</primary>
 	      </indexterm>
 		Yes. This was fixed in Samba-3.0.2. The use of this parameter is strongly recommended as a safeguard
-		on the <smbconfsection>[homes]</smbconfsection> meta-service. The correct way to specify this is:
+		on the <smbconfsection name="[homes]"/> meta-service. The correct way to specify this is:
 		<smbconfoption name="valid users">%S</smbconfoption>.
 		</para>
 
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index 76dec83d14..7079cc718b 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.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="DomApps">
   <title>Integrating Additional Services</title>
@@ -697,7 +697,7 @@ password: XXXXXXXX
 
 <smbconfexample id="ch10-smbconf">
 <title>Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename></title>
-<smbconfsection>[global]</smbconfsection>
+<smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">LONDON</smbconfoption>
 <smbconfoption name="netbios name">W2K3S</smbconfoption>
 <smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption>
diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml
index bb72a62cea..9b578b68f0 100644
--- a/docs/Samba-Guide/index.xml
+++ b/docs/Samba-Guide/index.xml
@@ -10,7 +10,6 @@
 			<author>&person.jht;</author>

 		</authorgroup>

 		<pubdate>March 4, 2005</pubdate>

-		<version>20050304</version>

 	</bookinfo>

 	<?latex \clearpage ?>

 <!--- Leave the commented out lines they are needed for book production.