Use new definition of <smbconfoption>, fixes a bunch of

validity errors.
(This used to be commit 3eb5c35e47951f320f7c2f4cd478a95f6d48236e)

12 files changed, 804 insertions, 804 deletions

diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index f3d39ad04c..bf8b636c92 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -704,7 +704,7 @@
 	    </indexterm>
 	    <indexterm><primary>nobody</primary></indexterm>
 		Samba has a special name for the <constant>NULL</constant>, or empty, user account.
-		It calls that the <smbconfoption><name>guest account</name></smbconfoption>. The
+		It calls that the <smbconfoption name="guest account"/>. The
 		default value of this parameter is <constant>nobody</constant>; however, this can be
 		changed to map the function of the guest account to any other UNIX identity. Some
 		UNIX administrators prefer to map this account to the system default anonymous
@@ -1128,7 +1128,7 @@
 		It should be noted that the <parameter>guest account</parameter> is essential to
 		Samba operation. Either the operating system must have an account called <constant>nobody</constant>
 		or there must be an entry in the &smb.conf; file with a valid UNIX account. For example,
-		<smbconfoption><name>guest account</name><value>ftp</value></smbconfoption>.
+		<smbconfoption name="guest account">ftp</smbconfoption>.
 		</para>
 
 	</answer>
@@ -1238,7 +1238,7 @@
 	<question>
 
 		<para>
-		Is it necessary to specify <smbconfoption><name>encrypt passwords</name><value>Yes</value></smbconfoption>
+		Is it necessary to specify <smbconfoption name="encrypt passwords">Yes</smbconfoption>
 		when Samba-3 is configured as a Domain Member?
 		</para>
 
@@ -1266,7 +1266,7 @@
 		<para>
 		Yes. This is a local function on the server. The default setting is to use the UNIX account
 		<constant>nobody</constant>. If this account does not exist on the UNIX server, then it is
-		necessary to provide a <smbconfoption><name>guest account</name><value>an_account</value></smbconfoption>,
+		necessary to provide a <smbconfoption name="guest account">an_account</smbconfoption>,
 		where <constant>an_account</constant> is a valid local UNIX user account.
 		</para>
 
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 9b39685ce0..a22b3825e3 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -193,13 +193,13 @@
 <title>Drafting Office &smb.conf; File</title>
 <smbconfcomment>Global Parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MIDEARTH</value></smbconfoption>
-<smbconfoption><name>security</name><value>SHARE</value></smbconfoption>
+<smbconfoption name="workgroup">MIDEARTH</smbconfoption>
+<smbconfoption name="security">SHARE</smbconfoption>
 
 <smbconfsection>[Plans]</smbconfsection>
-<smbconfoption><name>path</name><value>/plans</value></smbconfoption>
-<smbconfoption><name>read only</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<smbconfoption name="path">/plans</smbconfoption>
+<smbconfoption name="read only">Yes</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
 </smbconfexample>
 			</para></step>
 
@@ -670,39 +670,39 @@ application/octet-stream
 <title>Charity Administration Office &smb.conf; File</title>
 <smbconfcomment>Global Parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MIDEARTH</value></smbconfoption>
-<smbconfoption><name>security</name><value>SHARE</value></smbconfoption>
-<smbconfoption><name>printing</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>disable spoolss</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>yes</value></smbconfoption>
+<smbconfoption name="workgroup">MIDEARTH</smbconfoption>
+<smbconfoption name="security">SHARE</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>
+<smbconfoption name="wins support">yes</smbconfoption>
 
 <smbconfsection>[FTMFILES]</smbconfsection>
-<smbconfoption><name>comment</name><value>Funds Tracking &amp; Management Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/ftmfiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>force user</name><value>abmas</value></smbconfoption>
-<smbconfoption><name>force group</name><value>office</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>nt acl support</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Funds Tracking &amp; Management Files</smbconfoption>
+<smbconfoption name="path">/data/ftmfiles</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="force user">abmas</smbconfoption>
+<smbconfoption name="force group">office</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
+<smbconfoption name="nt acl support">No</smbconfoption>
 
 <smbconfsection>[office]</smbconfsection>
-<smbconfoption><name>comment</name><value>General Office Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/officefiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>force user</name><value>abmas</value></smbconfoption>
-<smbconfoption><name>force group</name><value>office</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>nt acl support</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">General Office Files</smbconfoption>
+<smbconfoption name="path">/data/officefiles</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="force user">abmas</smbconfoption>
+<smbconfoption name="force group">office</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
+<smbconfoption name="nt acl support">No</smbconfoption>
 
 <smbconfsection>[printers]</smbconfsection>
-<smbconfoption><name>comment</name><value>Print Temporary Spool Configuration</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption>
+<smbconfoption name="path">/var/spool/samba</smbconfoption>
+<smbconfoption name="printable">Yes</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
+<smbconfoption name="use client driver">Yes</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 </smbconfexample>
 
 			<procedure>
@@ -1283,31 +1283,31 @@ application/octet-stream
 <title>Accounting Office Network &smb.conf; File</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>BILLMORE</value></smbconfoption>
-<smbconfoption><name>printing</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>disable spoolss</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Work area files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/%U</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Master work area files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>alan</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Print Temporary Spool Configuration</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Print Temporary Spool Configuration</smbconfoption>
+<smbconfoption name="path">/var/spool/samba</smbconfoption>
+<smbconfoption name="printable">Yes</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
+<smbconfoption name="use client driver">Yes</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 </smbconfexample>
 
 		</sect3>
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index d700a1850c..4b007acde2 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -643,63 +643,63 @@ hosts:	files wins
 <title>Accounting Office Network &smb.conf; File &smbmdash; [globals] Section</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>BILLMORE</value></smbconfoption>
-<smbconfoption><name>passwd chat</name><value>*New*Password* \</value></smbconfoption>
+<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>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>add user script</name><value>/usr/sbin/useradd -m '%u'</value></smbconfoption>
-<smbconfoption><name>delete user script</name><value>/usr/sbin/userdel -r '%u'</value></smbconfoption>
-<smbconfoption><name>add group script</name><value>/usr/sbin/groupadd '%g'</value></smbconfoption>
-<smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel '%g'</value></smbconfoption>
-<smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G '%g' '%u'</value></smbconfoption>
-<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd \</value></smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="show add printer wizard">No</smbconfoption>
+<smbconfoption name="add user script">/usr/sbin/useradd -m '%u'</smbconfoption>
+<smbconfoption name="delete user script">/usr/sbin/userdel -r '%u'</smbconfoption>
+<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>logon script</name><value>scripts\login.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value> </value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printing</name><value>CUPS</value></smbconfoption>
+<smbconfoption name="logon script">scripts\login.bat</smbconfoption>
+<smbconfoption name="logon path"> </smbconfoption>
+<smbconfoption name="logon drive">X:</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="preferred master">Yes</smbconfoption>
+<smbconfoption name="wins support">Yes</smbconfoption>
+<smbconfoption name="printing">CUPS</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="acct3conf">
 <title>Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section</title>
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">SMB Print Spool</smbconfoption>
+<smbconfoption name="path">/var/spool/samba</smbconfoption>
+<smbconfoption name="printable">Yes</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
+<smbconfoption name="use client driver">Yes</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 
 <smbconfsection>[netlogon]</smbconfsection>
-<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/%U</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%G</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Financial Service Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/finsvcs</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%G</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Financial Service Files</smbconfoption>
+<smbconfoption name="path">/data/finsvcs</smbconfoption>
+<smbconfoption name="valid users">%G</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 </smbconfexample>
 
 		<sect2>
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 20103e0904..acbb25d03f 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -511,7 +511,7 @@ Given 500 Users and 2 years:
 	    </indexterm><indexterm>
 	      <primary>name resolve order</primary>
 	    </indexterm>
-		WINS serving is enabled by the <smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>,
+		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.
 		</para></listitem>
@@ -531,8 +531,8 @@ Given 500 Users and 2 years:
 	    </indexterm>
 		Samba is configured to directly interface with CUPS via the direct internal interface
 		that is provided by CUPS libraries. This is achieved with the 
-		<smbconfoption><name>printing</name><value>CUPS</value></smbconfoption> as well as the
-		<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption> entries.
+		<smbconfoption name="printing">CUPS</smbconfoption> as well as the
+		<smbconfoption name="printcap name">CUPS</smbconfoption> entries.
 		</para></listitem>
 
 	<listitem><para><indexterm>
@@ -863,100 +863,100 @@ echo -e "\nNAT firewall done.\n"
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>PROMISES</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>DIAMOND</value></smbconfoption>
-<smbconfoption><name>interfaces</name><value>eth1, eth2, lo</value></smbconfoption>
-<smbconfoption><name>bind interfaces only</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>passdb backend</name><value>tdbsam</value></smbconfoption>
-<smbconfoption><name>pam password change</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>passwd chat</name><value>*New*Password* %n\n *Re-enter*new*password*</value></smbconfoption>
+<smbconfoption name="workgroup">PROMISES</smbconfoption>
+<smbconfoption name="netbios name">DIAMOND</smbconfoption>
+<smbconfoption name="interfaces">eth1, eth2, lo</smbconfoption>
+<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>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>unix password sync</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>time server</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>add user script</name><value>/usr/sbin/useradd -m '%u'</value></smbconfoption>
-<smbconfoption><name>delete user script</name><value>/usr/sbin/userdel -r '%u'</value></smbconfoption>
-<smbconfoption><name>add group script</name><value>/usr/sbin/groupadd '%g'</value></smbconfoption>
-<smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel '%g'</value></smbconfoption>
-<smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G '%g' '%u'</value></smbconfoption>
-<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd</value></smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="unix password sync">Yes</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="time server">Yes</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="show add printer wizard">No</smbconfoption>
+<smbconfoption name="add user script">/usr/sbin/useradd -m '%u'</smbconfoption>
+<smbconfoption name="delete user script">/usr/sbin/userdel -r '%u'</smbconfoption>
+<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>shutdown script</name><value>/var/lib/samba/scripts/shutdown.sh</value></smbconfoption>
-<smbconfoption><name>abort shutdown script</name><value>/sbin/shutdown -c</value></smbconfoption>
-<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-<smbconfoption><name>logon home</name><value>\\%L\%U</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>utmp</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>map acl inherit</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
-<smbconfoption><name>veto files</name><value>/*.eml/*.nws/*.{*}/</value></smbconfoption>
-<smbconfoption><name>veto oplock files</name><value>/*.doc/*.xls/*.mdb/</value></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>
+<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+<smbconfoption name="logon drive">X:</smbconfoption>
+<smbconfoption name="logon home">\\%L\%U</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="preferred master">Yes</smbconfoption>
+<smbconfoption name="wins support">Yes</smbconfoption>
+<smbconfoption name="utmp">Yes</smbconfoption>
+<smbconfoption name="map acl inherit">Yes</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
+<smbconfoption name="veto files">/*.eml/*.nws/*.{*}/</smbconfoption>
+<smbconfoption name="veto oplock files">/*.doc/*.xls/*.mdb/</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="promisnetsvca">
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A</title>
 <smbconfsection>[IPC$]</smbconfsection>
-<smbconfoption><name>path</name><value>/tmp</value></smbconfoption>
-<smbconfoption><name>hosts allow</name><value>192.168.1.0/24, 192.168.2.0/24, 127.0.0.1</value></smbconfoption>
-<smbconfoption><name>hosts deny</name><value>0.0.0.0/0</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>default devmode</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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="use client driver">Yes</smbconfoption>
+<smbconfoption name="default devmode">Yes</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 
 <smbconfsection>[netlogon]</smbconfsection>
-<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/netlogon</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>locking</name><value>No</value></smbconfoption>
+<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>
 </smbconfexample>
 
 <smbconfexample id="promisnetsvcb">
 <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B</title>
 <smbconfsection>[profiles]</smbconfsection>
-<smbconfoption><name>comment</name><value>Profile Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Accounting Files</smbconfoption>
+<smbconfoption name="path">/data/accounts</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[service]</smbconfsection>
-<smbconfoption><name>comment</name><value>Financial Services Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/service</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Financial Services Files</smbconfoption>
+<smbconfoption name="path">/data/service</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[apps]</smbconfsection>
-<smbconfoption><name>comment</name><value>Application Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/apps</value></smbconfoption>
-<smbconfoption><name>read only</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>bjordan</value></smbconfoption>
+<smbconfoption name="comment">Application Files</smbconfoption>
+<smbconfoption name="path">/apps</smbconfoption>
+<smbconfoption name="read only">Yes</smbconfoption>
+<smbconfoption name="admin users">bjordan</smbconfoption>
 </smbconfexample>
 		</para></step>
 
@@ -2579,7 +2579,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 	<question>
 
 		<para>
-		Why does the &smb.conf; file in this exercise include an entry for <smbconfoption><name>smb ports</name></smbconfoption>?
+		Why does the &smb.conf; file in this exercise include an entry for <smbconfoption name="smb ports"/>?
 		</para>
 
 	</question>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 47d1b21d5a..b904d64393 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -939,41 +939,41 @@ hosts:      files dns wins
 <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename></title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MEGANET</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>MASSIVE</value></smbconfoption>
-<smbconfoption><name>interfaces</name><value>eth1, lo</value></smbconfoption>
-<smbconfoption><name>bind interfaces only</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>passdb backend</name><value>tdbsam</value></smbconfoption>
-<smbconfoption><name>add user script</name><value>/usr/sbin/useradd -m '%u'</value></smbconfoption>
-<smbconfoption><name>delete user script</name><value>/usr/sbin/userdel -r '%u'</value></smbconfoption>
-<smbconfoption><name>add group script</name><value>/usr/sbin/groupadd '%g'</value></smbconfoption>
-<smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel '%g'</value></smbconfoption>
-<smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G '%g' '%u'</value></smbconfoption>
-<smbconfoption><name>add machine script</name><value>/usr/sbin/</value></smbconfoption>
+<smbconfoption name="workgroup">MEGANET</smbconfoption>
+<smbconfoption name="netbios name">MASSIVE</smbconfoption>
+<smbconfoption name="interfaces">eth1, lo</smbconfoption>
+<smbconfoption name="bind interfaces only">Yes</smbconfoption>
+<smbconfoption name="passdb backend">tdbsam</smbconfoption>
+<smbconfoption name="add user script">/usr/sbin/useradd -m '%u'</smbconfoption>
+<smbconfoption name="delete user script">/usr/sbin/userdel -r '%u'</smbconfoption>
+<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/</smbconfoption>
 <member><parameter>useradd -s /bin/false -d /var/lib/nobody '%u'</parameter></member>
-<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>include</name><value>/etc/samba/dc-common.conf</value></smbconfoption>
+<smbconfoption name="preferred master">Yes</smbconfoption>
+<smbconfoption name="wins support">Yes</smbconfoption>
+<smbconfoption name="include">/etc/samba/dc-common.conf</smbconfoption>
 
 <smbconfsection>[IPC$]</smbconfsection>
-<smbconfoption><name>path</name><value>/tmp</value></smbconfoption>
-<smbconfoption><name>hosts allow</name><value>172.16.0.0/16, 127.0.0.1</value></smbconfoption>
-<smbconfoption><name>hosts deny</name><value>0.0.0.0/0</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Accounting Files</smbconfoption>
+<smbconfoption name="path">/data/accounts</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[service]</smbconfsection>
-<smbconfoption><name>comment</name><value>Financial Services Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/service</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Financial Services Files</smbconfoption>
+<smbconfoption name="path">/data/service</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[pidata]</smbconfsection>
-<smbconfoption><name>comment</name><value>Property Insurance Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/pidata</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Property Insurance Files</smbconfoption>
+<smbconfoption name="path">/data/pidata</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 </smbconfexample>
 
 <!-- Two -->
@@ -981,73 +981,73 @@ hosts:      files dns wins
 <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename></title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>shutdown script</name><value>/var/lib/samba/scripts/shutdown.sh</value></smbconfoption>
-<smbconfoption><name>abort shutdown script</name><value>/sbin/shutdown -c</value></smbconfoption>
-<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value>\%L\profiles\%U</value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-<smbconfoption><name>logon home</name><value>\%L\%U</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>include</name><value>/etc/samba/common.conf</value></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>
+<smbconfoption name="logon path">\%L\profiles\%U</smbconfoption>
+<smbconfoption name="logon drive">X:</smbconfoption>
+<smbconfoption name="logon home">\%L\%U</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="preferred master">Yes</smbconfoption>
+<smbconfoption name="include">/etc/samba/common.conf</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/netlogon</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>locking</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Profile Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
 </smbconfexample>
 
 <!-- Three -->
 <smbconfexample id="ch5-commonsmb">
 <title>Common Samba Configuration File: <filename>/etc/samba/common.conf</filename></title>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>time server</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>shutdown script</name><value>/var/lib/samba/scripts/shutdown.sh</value></smbconfoption>
-<smbconfoption><name>abort shutdown script</name><value>/sbin/shutdown -c</value></smbconfoption>
-<smbconfoption><name>utmp</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>map acl inherit</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
-<smbconfoption><name>veto files</name><value>/*.eml/*.nws/*.{*}/</value></smbconfoption>
-<smbconfoption><name>veto oplock files</name><value>/*.doc/*.xls/*.mdb/</value></smbconfoption>
-<smbconfoption><name>include</name><value> </value></smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="time server">Yes</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="show add printer wizard">No</smbconfoption>
+<smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption>
+<smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption>
+<smbconfoption name="utmp">Yes</smbconfoption>
+<smbconfoption name="map acl inherit">Yes</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
+<smbconfoption name="veto files">/*.eml/*.nws/*.{*}/</smbconfoption>
+<smbconfoption name="veto oplock files">/*.doc/*.xls/*.mdb/</smbconfoption>
+<smbconfoption name="include"> </smbconfoption>
 
 <smbconfcomment>Share and Service Definitions are common to all servers</smbconfcomment>
 <smbconfsection>[printers]</smbconfsection>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>default devmode</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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="use client driver">Yes</smbconfoption>
+<smbconfoption name="default devmode">Yes</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 
 <smbconfsection>[apps]</smbconfsection>
-<smbconfoption><name>comment</name><value>Application Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/apps</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>bjordan</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Application Files</smbconfoption>
+<smbconfoption name="path">/apps</smbconfoption>
+<smbconfoption name="admin users">bjordan</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 </smbconfexample>
 
 <!-- Four -->
@@ -1055,9 +1055,9 @@ hosts:      files dns wins
 <title>Server: BLDG1 (Member), File: smb.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MEGANET</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>BLDG1</value></smbconfoption>
-<smbconfoption><name>include</name><value>/etc/samba/dom-mem.conf</value></smbconfoption>
+<smbconfoption name="workgroup">MEGANET</smbconfoption>
+<smbconfoption name="netbios name">BLDG1</smbconfoption>
+<smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption>
 </smbconfexample>
 
 <!-- Five -->
@@ -1065,9 +1065,9 @@ hosts:      files dns wins
 <title>Server: BLDG2 (Member), File: smb.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MEGANET</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>BLDG2</value></smbconfoption>
-<smbconfoption><name>include</name><value>/etc/samba/dom-mem.conf</value></smbconfoption>
+<smbconfoption name="workgroup">MEGANET</smbconfoption>
+<smbconfoption name="netbios name">BLDG2</smbconfoption>
+<smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption>
 </smbconfexample>
 
 <!-- Six -->
@@ -1075,13 +1075,13 @@ hosts:      files dns wins
 <title>Common Domain Member Include File: dom-mem.conf</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>shutdown script</name><value>/var/lib/samba/scripts/shutdown.sh</value></smbconfoption>
-<smbconfoption><name>abort shutdown script</name><value>/sbin/shutdown -c</value></smbconfoption>
-<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins server</name><value>172.16.0.1</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>15000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>15000-20000</value></smbconfoption>
-<smbconfoption><name>include</name><value>/etc/samba/common.conf</value></smbconfoption>
+<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>
+<smbconfoption name="wins server">172.16.0.1</smbconfoption>
+<smbconfoption name="idmap uid">15000-20000</smbconfoption>
+<smbconfoption name="idmap gid">15000-20000</smbconfoption>
+<smbconfoption name="include">/etc/samba/common.conf</smbconfoption>
 </smbconfexample>
 
 <!-- Seven -->
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index b3df50ef87..55da147007 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -1848,56 +1848,56 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765
 <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-	<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-	<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-	<smbconfoption><name>netbios name</name><value>MASSIVE</value></smbconfoption>
-	<smbconfoption><name>interfaces</name><value>eth1, lo</value></smbconfoption>
-	<smbconfoption><name>bind interfaces only</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>enable privileges</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-	<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-	<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-	<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-	<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-	<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-	<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-	<smbconfoption><name>time server</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-	<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-	<smbconfoption><name>add user script</name><value>/opt/IDEALX/sbin/smbldap-useradd -m "%u"</value></smbconfoption>
-	<smbconfoption><name>delete user script</name><value>/opt/IDEALX/sbin/smbldap-userdel "%u"</value></smbconfoption>
-	<smbconfoption><name>add group script</name><value>/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</value></smbconfoption>
-	<smbconfoption><name>delete group script</name><value>/opt/IDEALX/sbin/smbldap-groupdel "%g"</value></smbconfoption>
-	<smbconfoption><name>add user to group script</name><value>/opt/IDEALX/sbin/</value></smbconfoption>
+	<smbconfoption name="unix charset">LOCALE</smbconfoption>
+	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+	<smbconfoption name="netbios name">MASSIVE</smbconfoption>
+	<smbconfoption name="interfaces">eth1, lo</smbconfoption>
+	<smbconfoption name="bind interfaces only">Yes</smbconfoption>
+	<smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="enable privileges">Yes</smbconfoption>
+	<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+	<smbconfoption name="log level">1</smbconfoption>
+	<smbconfoption name="syslog">0</smbconfoption>
+	<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+	<smbconfoption name="max log size">50</smbconfoption>
+	<smbconfoption name="smb ports">139 445</smbconfoption>
+	<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+	<smbconfoption name="time server">Yes</smbconfoption>
+	<smbconfoption name="printcap name">CUPS</smbconfoption>
+	<smbconfoption name="show add printer wizard">No</smbconfoption>
+	<smbconfoption name="add user script">/opt/IDEALX/sbin/smbldap-useradd -m "%u"</smbconfoption>
+	<smbconfoption name="delete user script">/opt/IDEALX/sbin/smbldap-userdel "%u"</smbconfoption>
+	<smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</smbconfoption>
+	<smbconfoption name="delete group script">/opt/IDEALX/sbin/smbldap-groupdel "%g"</smbconfoption>
+	<smbconfoption name="add user to group script">/opt/IDEALX/sbin/</smbconfoption>
 <member><parameter>smbldap-groupmod -m "%u" "%g"</parameter></member>
-	<smbconfoption><name>delete user from group script</name><value>/opt/IDEALX/sbin/</value></smbconfoption>
+	<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/</smbconfoption>
 <member><parameter>smbldap-groupmod -x "%u" "%g"</parameter></member>
-	<smbconfoption><name>set primary group script</name><value>/opt/IDEALX/sbin/</value></smbconfoption>
+	<smbconfoption name="set primary group script">/opt/IDEALX/sbin/</smbconfoption>
 <member><parameter>smbldap-usermod -g "%g" "%u"</parameter></member>
-	<smbconfoption><name>add machine script</name><value>/opt/IDEALX/sbin/smbldap-useradd -w "%u"</value></smbconfoption>
+	<smbconfoption name="add machine script">/opt/IDEALX/sbin/smbldap-useradd -w "%u"</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch6-massive-smbconfb">
 <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part B</title>
-	<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-	<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-	<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-	<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-	<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-	<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>idmap backend</name><value>ldap:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>map acl inherit</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
-	<smbconfoption><name>printer admin</name><value>root, chrisr</value></smbconfoption>
+	<smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
+	<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+	<smbconfoption name="logon drive">X:</smbconfoption>
+	<smbconfoption name="domain logons">Yes</smbconfoption>
+	<smbconfoption name="preferred master">Yes</smbconfoption>
+	<smbconfoption name="wins support">Yes</smbconfoption>
+	<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+	<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+	<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="idmap backend">ldap:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+	<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+	<smbconfoption name="map acl inherit">Yes</smbconfoption>
+	<smbconfoption name="printing">cups</smbconfoption>
+	<smbconfoption name="printer admin">root, chrisr</smbconfoption>
 </smbconfexample>
 
 	</sect2>
@@ -3207,37 +3207,37 @@ smb: \> q
 <title>LDAP Based &smb.conf; File, Server: BLDG1</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-	<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-	<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-	<smbconfoption><name>netbios name</name><value>BLDG1</value></smbconfoption>
-	<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>enable privileges</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-	<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-	<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-	<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-	<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-	<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-	<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-	<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-	<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-	<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-	<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-	<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-	<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>domain master</name><value>No</value></smbconfoption>
-	<smbconfoption><name>wins server</name><value>172.16.0.1</value></smbconfoption>
-	<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-	<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-	<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>idmap backend</name><value>ldap:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
-	<smbconfoption><name>printer admin</name><value>root, chrisr</value></smbconfoption>
+	<smbconfoption name="unix charset">LOCALE</smbconfoption>
+	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+	<smbconfoption name="netbios name">BLDG1</smbconfoption>
+	<smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="enable privileges">Yes</smbconfoption>
+	<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+	<smbconfoption name="log level">1</smbconfoption>
+	<smbconfoption name="syslog">0</smbconfoption>
+	<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+	<smbconfoption name="max log size">50</smbconfoption>
+	<smbconfoption name="smb ports">139 445</smbconfoption>
+	<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+	<smbconfoption name="printcap name">CUPS</smbconfoption>
+	<smbconfoption name="show add printer wizard">No</smbconfoption>
+	<smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
+	<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+	<smbconfoption name="logon drive">X:</smbconfoption>
+	<smbconfoption name="domain logons">Yes</smbconfoption>
+	<smbconfoption name="domain master">No</smbconfoption>
+	<smbconfoption name="wins server">172.16.0.1</smbconfoption>
+	<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+	<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+	<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="idmap backend">ldap:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+	<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+	<smbconfoption name="printing">cups</smbconfoption>
+	<smbconfoption name="printer admin">root, chrisr</smbconfoption>
 </smbconfexample>
 
 
@@ -3245,104 +3245,104 @@ smb: \> q
 <title>LDAP Based &smb.conf; File, Server: BLDG2</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-	<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-	<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-	<smbconfoption><name>netbios name</name><value>BLDG2</value></smbconfoption>
-	<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>enable privileges</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-	<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-	<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-	<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-	<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-	<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-	<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-	<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-	<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-	<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-	<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-	<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-	<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>domain master</name><value>No</value></smbconfoption>
-	<smbconfoption><name>wins server</name><value>172.16.0.1</value></smbconfoption>
-	<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-	<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-	<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-	<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-	<smbconfoption><name>idmap backend</name><value>ldap:ldap://massive.abmas.biz</value></smbconfoption>
-	<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-	<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
-	<smbconfoption><name>printer admin</name><value>root, chrisr</value></smbconfoption>
+	<smbconfoption name="unix charset">LOCALE</smbconfoption>
+	<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+	<smbconfoption name="netbios name">BLDG2</smbconfoption>
+	<smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="enable privileges">Yes</smbconfoption>
+	<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+	<smbconfoption name="log level">1</smbconfoption>
+	<smbconfoption name="syslog">0</smbconfoption>
+	<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+	<smbconfoption name="max log size">50</smbconfoption>
+	<smbconfoption name="smb ports">139 445</smbconfoption>
+	<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+	<smbconfoption name="printcap name">CUPS</smbconfoption>
+	<smbconfoption name="show add printer wizard">No</smbconfoption>
+	<smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
+	<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+	<smbconfoption name="logon drive">X:</smbconfoption>
+	<smbconfoption name="domain logons">Yes</smbconfoption>
+	<smbconfoption name="domain master">No</smbconfoption>
+	<smbconfoption name="wins server">172.16.0.1</smbconfoption>
+	<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+	<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+	<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+	<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+	<smbconfoption name="idmap backend">ldap:ldap://massive.abmas.biz</smbconfoption>
+	<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+	<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+	<smbconfoption name="printing">cups</smbconfoption>
+	<smbconfoption name="printer admin">root, chrisr</smbconfoption>
 </smbconfexample>
 
 
 <smbconfexample id="ch6-shareconfa">
 <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A</title>
 <smbconfsection>[accounts]</smbconfsection>
-	<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+	<smbconfoption name="comment">Accounting Files</smbconfoption>
+	<smbconfoption name="path">/data/accounts</smbconfoption>
+	<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[service]</smbconfsection>
-	<smbconfoption><name>comment</name><value>Financial Services Files</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/data/service</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+	<smbconfoption name="comment">Financial Services Files</smbconfoption>
+	<smbconfoption name="path">/data/service</smbconfoption>
+	<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[pidata]</smbconfsection>
-	<smbconfoption><name>comment</name><value>Property Insurance Files</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/data/pidata</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+	<smbconfoption name="comment">Property Insurance Files</smbconfoption>
+	<smbconfoption name="path">/data/pidata</smbconfoption>
+	<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-	<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-	<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-	<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+	<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>
-	<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-	<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+	<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>
 </smbconfexample>
 
 <smbconfexample id="ch6-shareconfb">
 <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B</title>
 <smbconfsection>[apps]</smbconfsection>
-	<smbconfoption><name>comment</name><value>Application Files</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/apps</value></smbconfoption>
-	<smbconfoption><name>admin users</name><value>bjordan</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+	<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>
-	<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/var/lib/samba/netlogon</value></smbconfoption>
-	<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-	<smbconfoption><name>locking</name><value>No</value></smbconfoption>
+	<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>
-	<smbconfoption><name>comment</name><value>Profile Share</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/var/lib/samba/profiles</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-	<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+	<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>
-	<smbconfoption><name>comment</name><value>Profile Data Share</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/var/lib/samba/profdata</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-	<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+	<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>
-	<smbconfoption><name>comment</name><value>Printer Drivers</value></smbconfoption>
-	<smbconfoption><name>path</name><value>/var/lib/samba/drivers</value></smbconfoption>
-	<smbconfoption><name>browseable</name><value>yes</value></smbconfoption>
-	<smbconfoption><name>guest ok</name><value>no</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>yes</value></smbconfoption>
-	<smbconfoption><name>write list</name><value>root, chrisr</value></smbconfoption>
+	<smbconfoption name="comment">Printer Drivers</smbconfoption>
+	<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
+	<smbconfoption name="browseable">yes</smbconfoption>
+	<smbconfoption name="guest ok">no</smbconfoption>
+	<smbconfoption name="read only">yes</smbconfoption>
+	<smbconfoption name="write list">root, chrisr</smbconfoption>
 </smbconfexample>
 
 <example id="ch6-ldifadd">
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 68457abaf3..c349fa3ef7 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -1152,209 +1152,209 @@ index default               sub
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://massive.abmas.biz</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>0</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>time server</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>add user script</name><value>/var/lib/samba/sbin/smbldap-useradd.pl -m '%u'</value></smbconfoption>
-<smbconfoption><name>delete user script</name><value>/var/lib/samba/sbin/smbldap-userdel.pl '%u'</value></smbconfoption>
-<smbconfoption><name>add group script</name><value>/var/lib/samba/sbin/smbldap-groupadd.pl -p '%g'</value></smbconfoption>
-<smbconfoption><name>delete group script</name><value>/var/lib/samba/sbin/smbldap-groupdel.pl '%g'</value></smbconfoption>
-<smbconfoption><name>add user to group script</name><value>/var/lib/samba/sbin/</value></smbconfoption>
+<smbconfoption name="unix charset">LOCALE</smbconfoption>
+<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+<smbconfoption name="passdb backend">ldapsam:ldap://massive.abmas.biz</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">0</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="time server">Yes</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="add user script">/var/lib/samba/sbin/smbldap-useradd.pl -m '%u'</smbconfoption>
+<smbconfoption name="delete user script">/var/lib/samba/sbin/smbldap-userdel.pl '%u'</smbconfoption>
+<smbconfoption name="add group script">/var/lib/samba/sbin/smbldap-groupadd.pl -p '%g'</smbconfoption>
+<smbconfoption name="delete group script">/var/lib/samba/sbin/smbldap-groupdel.pl '%g'</smbconfoption>
+<smbconfoption name="add user to group script">/var/lib/samba/sbin/</smbconfoption>
 <member><parameter>smbldap-groupmod.pl -m '%g' '%u'</parameter></member>
-<smbconfoption><name>delete user from group script</name><value>/var/lib/samba/sbin/</value></smbconfoption>
+<smbconfoption name="delete user from group script">/var/lib/samba/sbin/</smbconfoption>
 <member><parameter>smbldap-groupmod.pl -x '%g' '%u'</parameter></member>
-<smbconfoption><name>set primary group script</name><value>/var/lib/samba/sbin/</value></smbconfoption>
+<smbconfoption name="set primary group script">/var/lib/samba/sbin/</smbconfoption>
 <member><parameter>smbldap-usermod.pl -g '%g' '%u'</parameter></member>
-<smbconfoption><name>add machine script</name><value>/var/lib/samba/sbin/</value></smbconfoption>
+<smbconfoption name="add machine script">/var/lib/samba/sbin/</smbconfoption>
 <member><parameter>smbldap-useradd.pl -w '%u'</parameter></member>
-<smbconfoption><name>shutdown script</name><value>/var/lib/samba/scripts/shutdown.sh</value></smbconfoption>
-<smbconfoption><name>abort shutdown script</name><value>/sbin/shutdown -c</value></smbconfoption>
-<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>domain master</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>idmap backend</name><value>ldap://massive.abmas.biz</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>root</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></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>
+<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+<smbconfoption name="logon drive">X:</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="domain master">Yes</smbconfoption>
+<smbconfoption name="wins support">Yes</smbconfoption>
+<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="idmap backend">ldap://massive.abmas.biz</smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+<smbconfoption name="printer admin">root</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch7-massmbconfB">
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part B</title>
 <smbconfsection>[IPC$]</smbconfsection>
-<smbconfoption><name>path</name><value>/tmp</value></smbconfoption>
+<smbconfoption name="path">/tmp</smbconfoption>
 
 <smbconfsection>[accounts]</smbconfsection>
-<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Accounting Files</smbconfoption>
+<smbconfoption name="path">/data/accounts</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[service]</smbconfsection>
-<smbconfoption><name>comment</name><value>Financial Services Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/service</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Financial Services Files</smbconfoption>
+<smbconfoption name="path">/data/service</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[pidata]</smbconfsection>
-<smbconfoption><name>comment</name><value>Property Insurance Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/pidata</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Property Insurance Files</smbconfoption>
+<smbconfoption name="path">/data/pidata</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
 </smbconfexample>
 
 <smbconfexample id="ch7-massmbconfC">
 <title>Primary Domain Controller &smb.conf; File &smbmdash; Part C</title>
 <smbconfsection>[apps]</smbconfsection>
-<smbconfoption><name>comment</name><value>Application Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/apps</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>bjones</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/netlogon</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, Administrator</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>locking</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Profile Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Profile Data Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profdata</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Printer Drivers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/drivers</value></smbconfoption>
-<smbconfoption><name>write list</name><value>root</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, Administrator</value></smbconfoption>
+<smbconfoption name="comment">Printer Drivers</smbconfoption>
+<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
+<smbconfoption name="write list">root</smbconfoption>
+<smbconfoption name="admin users">root, Administrator</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch7-slvsmbocnfA">
 <title>Backup Domain Controller &smb.conf; File &smbmdash; Part A</title>
 <smbconfcomment># Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>BLDG1</value></smbconfoption>
-<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://lapdc.abmas.biz</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value>\\%L\profiles\%U</value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>os level</name><value>63</value></smbconfoption>
-<smbconfoption><name>domain master</name><value>No</value></smbconfoption>
-<smbconfoption><name>wins server</name><value>192.168.2.1</value></smbconfoption>
-<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>utmp</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>idmap backend</name><value>ldap://massive.abmas.biz</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
+<smbconfoption name="unix charset">LOCALE</smbconfoption>
+<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+<smbconfoption name="netbios name">BLDG1</smbconfoption>
+<smbconfoption name="passdb backend">ldapsam:ldap://lapdc.abmas.biz</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="show add printer wizard">No</smbconfoption>
+<smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
+<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
+<smbconfoption name="logon drive">X:</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="os level">63</smbconfoption>
+<smbconfoption name="domain master">No</smbconfoption>
+<smbconfoption name="wins server">192.168.2.1</smbconfoption>
+<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="utmp">Yes</smbconfoption>
+<smbconfoption name="idmap backend">ldap://massive.abmas.biz</smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
 
 <smbconfsection>[accounts]</smbconfsection>
-<smbconfoption><name>comment</name><value>Accounting Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/accounts</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Accounting Files</smbconfoption>
+<smbconfoption name="path">/data/accounts</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[service]</smbconfsection>
-<smbconfoption><name>comment</name><value>Financial Services Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/service</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Financial Services Files</smbconfoption>
+<smbconfoption name="path">/data/service</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch7-slvsmbocnfB">
 <title>Backup Domain Controller &smb.conf; File &smbmdash; Part B</title>
 <smbconfsection>[pidata]</smbconfsection>
-<smbconfoption><name>comment</name><value>Property Insurance Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/pidata</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Property Insurance Files</smbconfoption>
+<smbconfoption name="path">/data/pidata</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Application Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/apps</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>bjones</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Network Logon Service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/netlogon</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>locking</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Profile Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profiles</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Profile Data Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/profdata</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
+<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>
 </smbconfexample>
 
 	<sect2>
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 4611fc6187..eb1553bf4d 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -416,7 +416,7 @@
 		<primary>BDC</primary>
 	      </indexterm>
 		Edit the &smb.conf; file to temporarily change the parameter 
-		<smbconfoption><name>domain master</name><value>No</value></smbconfoption> so
+		<smbconfoption name="domain master">No</smbconfoption> so
 		the Samba server functions as a BDC for the purpose of migration. Also, temporarily
 		(only during domain account migration) comment out the lines that specify deletion
 		scripts (delete user script, etc.).
@@ -597,7 +597,7 @@ SAM_DELTA_DOMAIN_INFO not handled
 		<primary>PDC</primary>
 	      </indexterm>
 		Edit the &smb.conf; file to  reset the parameter 
-		<smbconfoption><name>domain master</name><value>Yes</value></smbconfoption> so that
+		<smbconfoption name="domain master">Yes</smbconfoption> so that
 		the Samba server functions as a PDC for the purpose of migration.
                 </para></step>
 	</procedure>
@@ -664,7 +664,7 @@ gidNumber: 1000
 		<primary>BDC</primary>
 	      </indexterm>
 		Edit the &smb.conf; file to temporarily change the parameter 
-		<smbconfoption><name>domain master</name><value>No</value></smbconfoption> so
+		<smbconfoption name="domain master">No</smbconfoption> so
 		the Samba server functions as a BDC for the purpose of migration.
                 </para></step>
 
@@ -824,7 +824,7 @@ Users                 Ordinary users
 		<primary>PDC</primary>
 	      </indexterm>
 		Edit the &smb.conf; file to  reset the parameter 
-		<smbconfoption><name>domain master</name><value>Yes</value></smbconfoption> so
+		<smbconfoption name="domain master">Yes</smbconfoption> so
 		the Samba server functions as a PDC for the purpose of migration.
                 </para></step>
 	</procedure>
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
index 0f3eefd99c..63994d84e8 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
@@ -533,199 +533,199 @@ shadow:   files ldap
 <title>Samba Configuration File &smbmdash; smb.conf Part A</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>MASSIVE</value></smbconfoption>
-<smbconfoption><name>server string</name><value>Corp File Server</value></smbconfoption>
-<smbconfoption><name>passdb backend</name><value>ldapsam:ldap://localhost</value></smbconfoption>
-<smbconfoption><name>pam password change</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/data/samba/log/%m.log</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins host bcast</value></smbconfoption>
-<smbconfoption><name>time server</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>cups</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
-<smbconfoption><name>add user script</name><value>/opt/IDEALX/sbin/smbldap-useradd -m "%u"</value></smbconfoption>
-<smbconfoption><name>add group script</name><value>/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</value></smbconfoption>
-<smbconfoption><name>add user to group script</name><value></value></smbconfoption>
+<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+<smbconfoption name="netbios name">MASSIVE</smbconfoption>
+<smbconfoption name="server string">Corp File Server</smbconfoption>
+<smbconfoption name="passdb backend">ldapsam:ldap://localhost</smbconfoption>
+<smbconfoption name="pam password change">Yes</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="log file">/data/samba/log/%m.log</smbconfoption>
+<smbconfoption name="name resolve order">wins host bcast</smbconfoption>
+<smbconfoption name="time server">Yes</smbconfoption>
+<smbconfoption name="printcap name">cups</smbconfoption>
+<smbconfoption name="show add printer wizard">No</smbconfoption>
+<smbconfoption name="add user script">/opt/IDEALX/sbin/smbldap-useradd -m "%u"</smbconfoption>
+<smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</smbconfoption>
+<smbconfoption name="add user to group script"></smbconfoption>
 <member><parameter>/opt/IDEALX/sbin/smbldap-groupmod -m "%u" "%g"</parameter></member>
-<smbconfoption><name>delete user from group script</name><value></value></smbconfoption>
+<smbconfoption name="delete user from group script"></smbconfoption>
 <member><parameter>/opt/IDEALX/sbin/smbldap-groupmod -x "%u" "%g"</parameter></member>
-<smbconfoption><name>set primary group script</name><value></value></smbconfoption>
+<smbconfoption name="set primary group script"></smbconfoption>
 <member><parameter>/opt/IDEALX/sbin/smbldap-usermod -g "%g" "%u"</parameter></member>
-<smbconfoption><name>add machine script</name><value>/usr/local/sbin/smbldap-useradd -w "%m"</value></smbconfoption>
-<smbconfoption><name>logon script</name><value>logon.bat</value></smbconfoption>
-<smbconfoption><name>logon path</name><value>\\%L\profiles\%U\%a</value></smbconfoption>
-<smbconfoption><name>logon drive</name><value>H:</value></smbconfoption>
-<smbconfoption><name>logon home</name><value>\\%L\%U</value></smbconfoption>
-<smbconfoption><name>domain logons</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-<smbconfoption><name>ldap idmap suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap passwd sync</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>ldap suffix</name><value>ou=MEGANET2,dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>ldap ssl</name><value>no</value></smbconfoption>
-<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, "@Domain Admins"</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>"@Domain Admins"</value></smbconfoption>
-<smbconfoption><name>force printername</name><value>Yes</value></smbconfoption>
+<smbconfoption name="add machine script">/usr/local/sbin/smbldap-useradd -w "%m"</smbconfoption>
+<smbconfoption name="logon script">logon.bat</smbconfoption>
+<smbconfoption name="logon path">\\%L\profiles\%U\%a</smbconfoption>
+<smbconfoption name="logon drive">H:</smbconfoption>
+<smbconfoption name="logon home">\\%L\%U</smbconfoption>
+<smbconfoption name="domain logons">Yes</smbconfoption>
+<smbconfoption name="wins support">Yes</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+<smbconfoption name="ldap idmap suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap passwd sync">Yes</smbconfoption>
+<smbconfoption name="ldap suffix">ou=MEGANET2,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap ssl">no</smbconfoption>
+<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+<smbconfoption name="admin users">root, "@Domain Admins"</smbconfoption>
+<smbconfoption name="printer admin">"@Domain Admins"</smbconfoption>
+<smbconfoption name="force printername">Yes</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch8smbconf2">
 <title>Samba Configuration File &smbmdash; smb.conf Part B</title>
 <smbconfsection>[netlogon]</smbconfsection>
-<smbconfoption><name>comment</name><value>Network logon service</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/netlogon</value></smbconfoption>
-<smbconfoption><name>write list</name><value>"@Domain Admins"</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Roaming Profile Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/profiles/</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>profile acls</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>veto files</name><value>desktop.ini</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Roaming Profile Share</smbconfoption>
+<smbconfoption name="path">/data/samba/profiles/</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="profile acls">Yes</smbconfoption>
+<smbconfoption name="veto files">desktop.ini</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0770</value></smbconfoption>
-<smbconfoption><name>veto files</name><value>desktop.ini</value></smbconfoption>
-<smbconfoption><name>hide files</name><value>desktop.ini</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="comment">Home Directories</smbconfoption>
+<smbconfoption name="valid users">%S</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="create mask">0770</smbconfoption>
+<smbconfoption name="veto files">desktop.ini</smbconfoption>
+<smbconfoption name="hide files">desktop.ini</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 
 <smbconfsection>[software]</smbconfsection>
-<smbconfoption><name>comment</name><value>Software for %a computers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/shares/software/%a</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Public Files</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/shares/public</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Location of documents printed to PDFCreator printer</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/shares/pdf</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<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>
 </smbconfexample>
 
 <smbconfexample id="ch8smbconf3">
 <title>Samba Configuration File &smbmdash; smb.conf Part C</title>
 <smbconfsection>[EVERYTHING]</smbconfsection>
-<smbconfoption><name>comment</name><value>All shares</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>"@Domain Admins"</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>CD-ROM on MASSIVE</value></smbconfoption>
-<smbconfoption><name>path</name><value>/mnt</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<smbconfoption name="comment">CD-ROM on MASSIVE</smbconfoption>
+<smbconfoption name="path">/mnt</smbconfoption>
+<smbconfoption name="guest ok">Yes</smbconfoption>
 
 <smbconfsection>[print$]</smbconfsection>
-<smbconfoption><name>comment</name><value>Printer Drivers Share</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/drivers</value></smbconfoption>
-<smbconfoption><name>write list</name><value>root</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>All Printers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/spool</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0644</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>"Accounting Color Laser Printer"</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/spool/private</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@acct, @acct_admin, @hr, "@Domain Admins",\</value></smbconfoption>
+<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>
 <member><parameter>@Receptionist, dwayne, terri, danae, jerry</parameter></member>
-<smbconfoption><name>create mask</name><value>0644</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>copy</name><value>printers</value></smbconfoption>
+<smbconfoption name="create mask">0644</smbconfoption>
+<smbconfoption name="printable">Yes</smbconfoption>
+<smbconfoption name="copy">printers</smbconfoption>
 
 <smbconfsection>[plotter]</smbconfsection>
-<smbconfoption><name>comment</name><value>Engineering Plotter</value></smbconfoption>
-<smbconfoption><name>path</name><value>/data/samba/spool</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0644</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>copy</name><value>printers</value></smbconfoption>
+<smbconfoption name="comment">Engineering Plotter</smbconfoption>
+<smbconfoption name="path">/data/samba/spool</smbconfoption>
+<smbconfoption name="create mask">0644</smbconfoption>
+<smbconfoption name="printable">Yes</smbconfoption>
+<smbconfoption name="use client driver">Yes</smbconfoption>
+<smbconfoption name="copy">printers</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch8smbconf4">
 <title>Samba Configuration File &smbmdash; smb.conf Part D</title>
 <smbconfsection>[APPS]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/Apps</value></smbconfoption>
-<smbconfoption><name>force group</name><value>"Domain Users"</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
+<smbconfoption name="path">/data/samba/shares/Apps</smbconfoption>
+<smbconfoption name="force group">"Domain Users"</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection>[ACCT]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/Accounting</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@acct, "@Domain Admins"</value></smbconfoption>
-<smbconfoption><name>force group</name><value>acct</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0660</value></smbconfoption>
-<smbconfoption><name>directory mask</name><value>0770</value></smbconfoption>
+<smbconfoption name="path">/data/samba/shares/Accounting</smbconfoption>
+<smbconfoption name="valid users">@acct, "@Domain Admins"</smbconfoption>
+<smbconfoption name="force group">acct</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="create mask">0660</smbconfoption>
+<smbconfoption name="directory mask">0770</smbconfoption>
 
 <smbconfsection>[ACCT_ADMIN]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/Acct_Admin</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@”acct_admin”</value></smbconfoption>
-<smbconfoption><name>force group</name><value>acct_admin</value></smbconfoption>
+<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>
-<smbconfoption><name>path</name><value>/data/samba/shares/HR_PR</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@hr, @acct_admin</value></smbconfoption>
-<smbconfoption><name>force group</name><value>hr</value></smbconfoption>
+<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>
-<smbconfoption><name>path</name><value>/data/samba/shares/Engr</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@engr, @receptionist, @truss, "@Domain Admins", cheri</value></smbconfoption>
-<smbconfoption><name>force group</name><value>engr</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0770</value></smbconfoption>
+<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>
-<smbconfoption><name>path</name><value>/data/samba/shares/DATA</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@engr, @receptionist, @truss, "@Domain Admins", cheri</value></smbconfoption>
-<smbconfoption><name>force group</name><value>engr</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0770</value></smbconfoption>
-<smbconfoption><name>copy</name><value>engr</value></smbconfoption>
+<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>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="create mask">0770</smbconfoption>
+<smbconfoption name="copy">engr</smbconfoption>
 </smbconfexample>
 
 <smbconfexample id="ch8smbconf5">
 <title>Samba Configuration File &smbmdash; smb.conf Part E</title>
 <smbconfsection>[X]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/X</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>@engr, @acct</value></smbconfoption>
-<smbconfoption><name>force group</name><value>engr</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0770</value></smbconfoption>
-<smbconfoption><name>copy</name><value>engr</value></smbconfoption>
+<smbconfoption name="path">/data/samba/shares/X</smbconfoption>
+<smbconfoption name="valid users">@engr, @acct</smbconfoption>
+<smbconfoption name="force group">engr</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="create mask">0770</smbconfoption>
+<smbconfoption name="copy">engr</smbconfoption>
 
 <smbconfsection>[NETWORK]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/network</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>"@Domain Users"</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>create mask</name><value>0770</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
+<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>
-<smbconfoption><name>path</name><value>/data/samba/shares/Utils</value></smbconfoption>
-<smbconfoption><name>write list</name><value>"@Domain Admins"</value></smbconfoption>
+<smbconfoption name="path">/data/samba/shares/Utils</smbconfoption>
+<smbconfoption name="write list">"@Domain Admins"</smbconfoption>
 
 <smbconfsection>[SYS]</smbconfsection>
-<smbconfoption><name>path</name><value>/data/samba/shares/SYS</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>chad</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<smbconfoption name="path">/data/samba/shares/SYS</smbconfoption>
+<smbconfoption name="valid users">chad</smbconfoption>
+<smbconfoption name="read only">No</smbconfoption>
+<smbconfoption name="browseable">No</smbconfoption>
 </smbconfexample>
 
 	<para>
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 5cfc48d684..c09849f9d7 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -201,7 +201,7 @@
 		      <primary>mapping</primary>
 		    </indexterm>
 				If the parameter 
-			<smbconfoption><name>idmap backend</name><value>ldap:ldap://myserver.domain</value></smbconfoption>
+			<smbconfoption name="idmap backend">ldap:ldap://myserver.domain</smbconfoption>
 				was specified and the LDAP server has been configured with a container in which it may
 				store the IDMAP entries, all Domain Members may share a common mapping.
 				</para></listitem>
@@ -230,7 +230,7 @@
 	      </indexterm>
 			If you wish to make use of accounts (users and/or groups) that are local to (i.e., capable
 			of being resolved using) the name service switch (NSS) facility, it is imperative to use the 
-			<smbconfoption><name>winbind enable local accounts</name><value>Yes</value></smbconfoption>
+			<smbconfoption name="winbind enable local accounts">Yes</smbconfoption>
 			in the &smb.conf; file. This parameter specifically applies only to Domain Controllers, 
 			not to Domain Member servers.
 			</para></listitem>
@@ -278,7 +278,7 @@
 	  </indexterm>
 		In the situation where UNIX accounts are held on the Domain Member server itself, the only effective
 		way to use them involves the &smb.conf; entry 
-		<smbconfoption><name>winbind trusted domains only</name><value>Yes</value></smbconfoption>. This forces 
+		<smbconfoption name="winbind trusted domains only">Yes</smbconfoption>. This forces 
 		Samba (<command>smbd</command>) to perform a <command>getpwnam()</command> system call that can
 		then be controlled via <filename>/etc/nsswitch.conf</filename> file settings. The use of this parameter
 		disables the use of Samba with Trusted Domains (i.e., External Domains).
@@ -672,49 +672,49 @@ Joined domain MEGANET2.
 <title>Samba Domain Member in Samba Domain Control Context &smbmdash; &smb.conf; File</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-<smbconfoption><name>security</name><value>DOMAIN</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>10</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>wins server</name><value>192.168.2.1</value></smbconfoption>
-<smbconfoption><name>ldap suffix</name><value>dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>ldap machine suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap user suffix</name><value>ou=People</value></smbconfoption>
-<smbconfoption><name>ldap group suffix</name><value>ou=Groups</value></smbconfoption>
-<smbconfoption><name>ldap idmap suffix</name><value>ou=Idmap</value></smbconfoption>
-<smbconfoption><name>ldap admin dn</name><value>cn=Manager,dc=abmas,dc=biz</value></smbconfoption>
-<smbconfoption><name>idmap backend</name><value>ldap:ldap://lapdc.abmas.biz</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>winbind trusted domains only</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>root</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
+<smbconfoption name="unix charset">LOCALE</smbconfoption>
+<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+<smbconfoption name="security">DOMAIN</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">10</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="wins server">192.168.2.1</smbconfoption>
+<smbconfoption name="ldap suffix">dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap machine suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap user suffix">ou=People</smbconfoption>
+<smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
+<smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="idmap backend">ldap:ldap://lapdc.abmas.biz</smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+<smbconfoption name="winbind trusted domains only">Yes</smbconfoption>
+<smbconfoption name="printer admin">root</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Printer Drivers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/drivers</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, Administrator</value></smbconfoption>
-<smbconfoption><name>write list</name><value>root</value></smbconfoption>
+<smbconfoption name="comment">Printer Drivers</smbconfoption>
+<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
+<smbconfoption name="admin users">root, Administrator</smbconfoption>
+<smbconfoption name="write list">root</smbconfoption>
 </smbconfexample>
 
 <example id="ch9-ldifadd">
@@ -970,45 +970,45 @@ MEGANET2+PIOps:x:10005:
 <title>Samba Domain Member Server &smb.conf; File for NT4 Domain</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-<smbconfoption><name>workgroup</name><value>MEGANET2</value></smbconfoption>
-<smbconfoption><name>security</name><value>DOMAIN</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>0</value></smbconfoption>
-<smbconfoption><name>smb ports</name><value>139 445</value></smbconfoption>
-<smbconfoption><name>name resolve order</name><value>wins bcast hosts</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>wins server</name><value>192.168.2.1</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>template primary group</name><value>"Domain Users"</value></smbconfoption>
-<smbconfoption><name>template shell</name><value>/bin/bash</value></smbconfoption>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>root</value></smbconfoption>
-<smbconfoption><name>hosts allow</name><value>192.168.2., 192.168.3., 127.</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
+<smbconfoption name="unix charset">LOCALE</smbconfoption>
+<smbconfoption name="workgroup">MEGANET2</smbconfoption>
+<smbconfoption name="security">DOMAIN</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">0</smbconfoption>
+<smbconfoption name="smb ports">139 445</smbconfoption>
+<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="wins server">192.168.2.1</smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+<smbconfoption name="template primary group">"Domain Users"</smbconfoption>
+<smbconfoption name="template shell">/bin/bash</smbconfoption>
+<smbconfoption name="winbind separator">+</smbconfoption>
+<smbconfoption name="printer admin">root</smbconfoption>
+<smbconfoption name="hosts allow">192.168.2., 192.168.3., 127.</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Printer Drivers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/drivers</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, Administrator</value></smbconfoption>
-<smbconfoption><name>write list</name><value>root</value></smbconfoption>
+<smbconfoption name="comment">Printer Drivers</smbconfoption>
+<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
+<smbconfoption name="admin users">root, Administrator</smbconfoption>
+<smbconfoption name="write list">root</smbconfoption>
 </smbconfexample>
 
 <example id="ch9-nsswbnd">
@@ -1642,43 +1642,43 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
 <title>Samba Domain Member &smb.conf; File for Active Directory Membership</title>
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>unix charset</name><value>LOCALE</value></smbconfoption>
-<smbconfoption><name>workgroup</name><value>LONDON</value></smbconfoption>
-<smbconfoption><name>realm</name><value>LONDON.ABMAS.BIZ</value></smbconfoption>
-<smbconfoption><name>server string</name><value>Samba 3.0.12</value></smbconfoption>
-<smbconfoption><name>security</name><value>ADS</value></smbconfoption>
-<smbconfoption><name>username map</name><value>/etc/samba/smbusers</value></smbconfoption>
-<smbconfoption><name>log level</name><value>1</value></smbconfoption>
-<smbconfoption><name>syslog</name><value>0</value></smbconfoption>
-<smbconfoption><name>log file</name><value>/var/log/samba/%m</value></smbconfoption>
-<smbconfoption><name>max log size</name><value>50</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>CUPS</value></smbconfoption>
-<smbconfoption><name>ldap ssl</name><value>no</value></smbconfoption>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
-<smbconfoption><name>template primary group</name><value>"Domain Users"</value></smbconfoption>
-<smbconfoption><name>template shell</name><value>/bin/bash</value></smbconfoption>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
-<smbconfoption><name>printing</name><value>cups</value></smbconfoption>
+<smbconfoption name="unix charset">LOCALE</smbconfoption>
+<smbconfoption name="workgroup">LONDON</smbconfoption>
+<smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption>
+<smbconfoption name="server string">Samba 3.0.12</smbconfoption>
+<smbconfoption name="security">ADS</smbconfoption>
+<smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
+<smbconfoption name="log level">1</smbconfoption>
+<smbconfoption name="syslog">0</smbconfoption>
+<smbconfoption name="log file">/var/log/samba/%m</smbconfoption>
+<smbconfoption name="max log size">50</smbconfoption>
+<smbconfoption name="printcap name">CUPS</smbconfoption>
+<smbconfoption name="ldap ssl">no</smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
+<smbconfoption name="template primary group">"Domain Users"</smbconfoption>
+<smbconfoption name="template shell">/bin/bash</smbconfoption>
+<smbconfoption name="winbind separator">+</smbconfoption>
+<smbconfoption name="printing">cups</smbconfoption>
 
 <smbconfsection>[homes]</smbconfsection>
-<smbconfoption><name>comment</name><value>Home Directories</value></smbconfoption>
-<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>
-<smbconfoption><name>read only</name><value>No</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>SMB Print Spool</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>Yes</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>No</value></smbconfoption>
+<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>
-<smbconfoption><name>comment</name><value>Printer Drivers</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/lib/samba/drivers</value></smbconfoption>
-<smbconfoption><name>admin users</name><value>root, Administrator</value></smbconfoption>
-<smbconfoption><name>write list</name><value>root</value></smbconfoption>
+<smbconfoption name="comment">Printer Drivers</smbconfoption>
+<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
+<smbconfoption name="admin users">root, Administrator</smbconfoption>
+<smbconfoption name="write list">root</smbconfoption>
 </smbconfexample>
 
 	</sect2>
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 02650ebb69..50be790e20 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
@@ -1188,7 +1188,7 @@
 	      </indexterm>
 	On Domain Member servers and clients, even when the <parameter>winbind use default domain</parameter> has
 	been specified, the use of Domain accounts in security controls requires fully qualified Domain specification,
-	for example, <smbconfoption><name>valid users</name><value>@"MEGANET\Northern Engineers"</value></smbconfoption>. 
+	for example, <smbconfoption name="valid users">@"MEGANET\Northern Engineers"</smbconfoption>. 
 	Note the necessity to use the double quotes to avoid having the space in the Windows group name interpreted as a
 	delimiter. 
 	</para></note>
@@ -1953,7 +1953,7 @@ other::r-x
 	      </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:
-		<smbconfoption><name>valid users</name><value>%S</value></smbconfoption>.
+		<smbconfoption name="valid users">%S</smbconfoption>.
 		</para>
 
 	</answer>
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index cd2894ec02..76dec83d14 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
@@ -698,25 +698,25 @@ password: XXXXXXXX
 <smbconfexample id="ch10-smbconf">
 <title>Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename></title>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>workgroup</name><value>LONDON</value></smbconfoption>
-<smbconfoption><name>netbios name</name><value>W2K3S</value></smbconfoption>
-<smbconfoption><name>realm</name><value>LONDON.ABMAS.BIZ</value></smbconfoption>
-<smbconfoption><name>security</name><value>ads</value></smbconfoption>
-<smbconfoption><name>encrypt passwords</name><value>yes</value></smbconfoption>
-<smbconfoption><name>password server</name><value>w2k3s.london.abmas.biz</value></smbconfoption>
+<smbconfoption name="workgroup">LONDON</smbconfoption>
+<smbconfoption name="netbios name">W2K3S</smbconfoption>
+<smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption>
+<smbconfoption name="security">ads</smbconfoption>
+<smbconfoption name="encrypt passwords">yes</smbconfoption>
+<smbconfoption name="password server">w2k3s.london.abmas.biz</smbconfoption>
 
 <smbconfcomment>separate domain and username with '/', like DOMAIN/username</smbconfcomment>
-<smbconfoption><name>winbind separator</name><value>/</value></smbconfoption>
+<smbconfoption name="winbind separator">/</smbconfoption>
 
 <smbconfcomment>use UIDs from 10000 to 20000 for domain users</smbconfcomment>
-<smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
+<smbconfoption name="idmap uid">10000-20000</smbconfoption>
 # use GIDs from 10000 to 20000 for domain groups
-<smbconfoption><name>idmap gid</name><value>10000-20000</value></smbconfoption>
+<smbconfoption name="idmap gid">10000-20000</smbconfoption>
 
 <smbconfcomment>allow enumeration of winbind users and groups</smbconfcomment>
-<smbconfoption><name>winbind enum users</name><value>yes</value></smbconfoption>
-<smbconfoption><name>winbind enum groups</name><value>yes</value></smbconfoption>
-<smbconfoption><name>winbind user default domain</name><value>yes</value></smbconfoption>
+<smbconfoption name="winbind enum users">yes</smbconfoption>
+<smbconfoption name="winbind enum groups">yes</smbconfoption>
+<smbconfoption name="winbind user default domain">yes</smbconfoption>
 </smbconfexample>
 
 <example id="ch10-etcnsscfg">