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

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

1 files changed, 132 insertions, 132 deletions

diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml
index b02bab0d52..7a71168b49 100644
--- a/docs/Samba-HOWTO-Collection/Printing.xml
+++ b/docs/Samba-HOWTO-Collection/Printing.xml
@@ -190,14 +190,14 @@ However, in many environments these are enough to provide a valid
 <smbconfexample id="simpleprc">
 <title>Simple configuration with BSD printing</title>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>printing</name><value>bsd</value></smbconfoption>
-<smbconfoption><name>load printers</name><value>yes</value></smbconfoption>
+<smbconfoption name="printing">bsd</smbconfoption>
+<smbconfoption name="load printers">yes</smbconfoption>
 
 <smbconfsection>[printers]</smbconfsection>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>printable</name><value>yes</value></smbconfoption>
-<smbconfoption><name>public</name><value>yes</value></smbconfoption>
-<smbconfoption><name>writable</name><value>no</value></smbconfoption>
+<smbconfoption name="path">/var/spool/samba</smbconfoption>
+<smbconfoption name="printable">yes</smbconfoption>
+<smbconfoption name="public">yes</smbconfoption>
+<smbconfoption name="writable">no</smbconfoption>
 </smbconfexample></para>
 
 <para>
@@ -215,8 +215,8 @@ so you may want to pipe it through a pager program.
 The syntax for the configuration file is easy to grasp. You should
 know that  is not very picky about its syntax. As has been explained
 elsewhere in this document, Samba tolerates some spelling errors (such
-as <smbconfoption><name>browseable</name></smbconfoption> instead of
-<smbconfoption><name>browseable</name></smbconfoption>), and spelling is
+as <smbconfoption name="browseable"/> instead of
+<smbconfoption name="browseable"/>), and spelling is
 case-insensitive. It is permissible to use <parameter>Yes/No</parameter>
 or <parameter>True/False</parameter> for Boolean settings. Lists of names
 may be separated by commas, spaces or tabs.
@@ -294,7 +294,7 @@ configuration used, add the <quote>-v</quote> parameter to testparm.</para></not
 Should you need to troubleshoot at any stage, please always come back
 to this point first and verify if <command>testparm</command> shows the parameters you
 expect. To give you a warning from personal experience,
-try to just comment out the <smbconfoption><name>load printers</name></smbconfoption>
+try to just comment out the <smbconfoption name="load printers"/>
 parameter. If your 2.2.x system behaves like mine, you'll see this:
 </para>
 
@@ -327,7 +327,7 @@ the reason. But I am no longer fooled ... at least not by this.
 
 <para>
 Only when the parameter is explicitly set to
-<smbconfoption><name>load printers</name><value>No</value></smbconfoption>
+<smbconfoption name="load printers">No</smbconfoption>
 would Samba conform with my intentions. So, my strong advice is:
 </para>
 
@@ -417,7 +417,7 @@ This means that a line consisting of, for example:
 
 <para><smbconfblock>
 <smbconfcomment>This defines LPRng as the printing system</smbconfcomment>
-<smbconfoption><name>printing</name><value> lprng</value></smbconfoption>
+<smbconfoption name="printing"> lprng</smbconfoption>
 </smbconfblock></para>
 
 <para>
@@ -449,35 +449,35 @@ file to remove all parameters that are set at default.
 <para><smbconfexample id="extbsdpr">
 	<title>Extended BSD Printing Configuration</title>
 <smbconfsection>[global]</smbconfsection>
-<smbconfoption><name>printing</name><value>bsd</value></smbconfoption>
-<smbconfoption><name>load printers</name><value>yes</value></smbconfoption>
-<smbconfoption><name>show add printer wizard</name><value>yes</value></smbconfoption>
-<smbconfoption><name>printcap name</name><value>/etc/printcap</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>@ntadmin, root</value></smbconfoption>
-<smbconfoption><name>max print jobs</name><value>100</value></smbconfoption>
-<smbconfoption><name>lpq cache time</name><value>20</value></smbconfoption>
-<smbconfoption><name>use client driver</name><value>no</value></smbconfoption>
+<smbconfoption name="printing">bsd</smbconfoption>
+<smbconfoption name="load printers">yes</smbconfoption>
+<smbconfoption name="show add printer wizard">yes</smbconfoption>
+<smbconfoption name="printcap name">/etc/printcap</smbconfoption>
+<smbconfoption name="printer admin">@ntadmin, root</smbconfoption>
+<smbconfoption name="max print jobs">100</smbconfoption>
+<smbconfoption name="lpq cache time">20</smbconfoption>
+<smbconfoption name="use client driver">no</smbconfoption>
 
 <smbconfsection>[printers]</smbconfsection>
-<smbconfoption><name>comment</name><value>All Printers</value></smbconfoption>
-<smbconfoption><name>printable</name><value>yes</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>no</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>
-<smbconfoption><name>public</name><value>yes</value></smbconfoption>
-<smbconfoption><name>read only</name><value>yes</value></smbconfoption>
-<smbconfoption><name>writable</name><value>no       </value></smbconfoption>
+<smbconfoption name="comment">All Printers</smbconfoption>
+<smbconfoption name="printable">yes</smbconfoption>
+<smbconfoption name="path">/var/spool/samba</smbconfoption>
+<smbconfoption name="browseable">no</smbconfoption>
+<smbconfoption name="guest ok">yes</smbconfoption>
+<smbconfoption name="public">yes</smbconfoption>
+<smbconfoption name="read only">yes</smbconfoption>
+<smbconfoption name="writable">no       </smbconfoption>
 
 <smbconfsection>[my_printer_name]</smbconfsection>
-<smbconfoption><name>comment</name><value>Printer with Restricted Access</value></smbconfoption>
-<smbconfoption><name>path</name><value>/var/spool/samba_my_printer</value></smbconfoption>
-<smbconfoption><name>printer admin</name><value>kurt</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>yes</value></smbconfoption>
-<smbconfoption><name>printable</name><value>yes</value></smbconfoption>
-<smbconfoption><name>writable</name><value>no</value></smbconfoption>
-<smbconfoption><name>hosts allow</name><value>0.0.0.0</value></smbconfoption>
-<smbconfoption><name>hosts deny</name><value>turbo_xp, 10.160.50.23, 10.160.51.60</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>no</value></smbconfoption>
+<smbconfoption name="comment">Printer with Restricted Access</smbconfoption>
+<smbconfoption name="path">/var/spool/samba_my_printer</smbconfoption>
+<smbconfoption name="printer admin">kurt</smbconfoption>
+<smbconfoption name="browseable">yes</smbconfoption>
+<smbconfoption name="printable">yes</smbconfoption>
+<smbconfoption name="writable">no</smbconfoption>
+<smbconfoption name="hosts allow">0.0.0.0</smbconfoption>
+<smbconfoption name="hosts deny">turbo_xp, 10.160.50.23, 10.160.51.60</smbconfoption>
+<smbconfoption name="guest ok">no</smbconfoption>
 </smbconfexample></para>
 
 <para>
@@ -513,23 +513,23 @@ share settings and specify other values).
 </para>
 
 <variablelist>
-	<varlistentry><term><smbconfoption><name>printing</name><value>bsd </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printing">bsd </smbconfoption></term>
 		<listitem><para>Causes Samba to use default print commands
 		applicable for the BSD (also known as RFC 1179 style or LPR/LPD) printing
 		system. In general, the <parameter>printing</parameter> parameter informs Samba about the
 		print subsystem it should expect. Samba supports CUPS, LPD, LPRNG,
 		SYSV, HPUX, AIX, QNX, and PLP. Each of these systems defaults to a
-		different <smbconfoption><name>print command</name></smbconfoption> (and other queue control
+		different <smbconfoption name="print command"/> (and other queue control
 		commands).</para>
 
-		<caution><para>The <smbconfoption><name>printing</name></smbconfoption> parameter is
+		<caution><para>The <smbconfoption name="printing"/> parameter is
 		normally a service level parameter. Since it is included here in the
 		<smbconfsection>[global]</smbconfsection> section, it will take effect for all
 		printer shares that are not defined differently. Samba-3 no longer
 		supports the SOFTQ printing system.</para></caution>
 	</listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>load printers</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="load printers">yes </smbconfoption></term>
 		<listitem><para>Tells Samba to create automatically all
 		available printer shares. Available printer shares are discovered by
 		scanning the printcap file. All created printer shares are also loaded
@@ -542,7 +542,7 @@ share settings and specify other values).
 		publicly visible and available).</para>
 	</listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>show add printer wizard</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="show add printer wizard">yes </smbconfoption></term>
 		<listitem><para>Setting is normally enabled by default (even if the parameter is not specified in &smb.conf;).
 		It causes the <guiicon>Add Printer Wizard</guiicon> icon to appear
 		in the <guiicon>Printers</guiicon> folder of the Samba host's
@@ -556,7 +556,7 @@ share settings and specify other values).
 		uploaded driver.</para>
 	</listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>max print jobs</name><value>100 </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="max print jobs">100 </smbconfoption></term>
 		<listitem><para>Sets the upper limit to 100 print jobs
 		being active on the Samba server at any one time. Should a client
 		submit a job that exceeds this number, a <quote>no more space
@@ -565,31 +565,31 @@ share settings and specify other values).
 		<emphasis>no</emphasis> limit at all.
 	</para></listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>printcap name</name><value>/etc/printcap </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printcap name">/etc/printcap </smbconfoption></term>
 		<listitem><para>Tells Samba where to look for a list of
 		available printer names. Where CUPS is used, make sure that a printcap
 		file is written. This is controlled by the <constant>Printcap</constant> directive in the 
 		<filename>cupsd.conf</filename> file.
 	</para></listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>printer admin</name><value>@ntadmin </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printer admin">@ntadmin </smbconfoption></term>
 		<listitem><para>Members of the ntadmin group should be able to add
 		drivers and set printer properties (<constant>ntadmin</constant> is only an example name,
 		it needs to be a valid UNIX group name); root is implicitly always a
-		<smbconfoption><name>printer admin</name></smbconfoption>. The @ sign precedes group names in the
+		<smbconfoption name="printer admin"/>. The @ sign precedes group names in the
 		<filename>/etc/group</filename>. A printer admin can do anything to
 		printers via the remote administration interfaces offered by MS-RPC
-		(see below). In larger installations, the <smbconfoption><name>printer admin</name></smbconfoption>
+		(see below). In larger installations, the <smbconfoption name="printer admin"/>
 		parameter is normally a per-share parameter. This permits different groups to administer each printer share.
 	</para></listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>lpq cache time</name><value>20 </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="lpq cache time">20 </smbconfoption></term>
 		<listitem><para>Controls the cache time for the results of the
 		lpq command. It prevents the lpq command being called too often and
 		reduces the load on a heavily used print server.
 	</para></listitem></varlistentry>
 
-	<varlistentry><term><smbconfoption><name>use client driver</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="use client driver">no </smbconfoption></term>
 		<listitem><para>If set to <constant>yes</constant>, only 
 		takes effect for Windows NT/200x/XP clients (and not for Win 95/98/ME). Its
 		default value is <constant>No</constant> (or <constant>False</constant>).
@@ -617,26 +617,26 @@ man page.) Settings inside this container must be Share Level parameters.
 </para>
 
 <variablelist>
-	<varlistentry><term><smbconfoption><name>comment</name><value>All printers </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="comment">All printers </smbconfoption></term>
 		<listitem><para>
-		The <smbconfoption><name>comment</name></smbconfoption> is shown next to the share if
+		The <smbconfoption name="comment"/> is shown next to the share if
 		a client queries the server, either via <guiicon>Network Neighborhood</guiicon> or with
 		the <command>net view</command> command to list available shares.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>printable</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printable">yes </smbconfoption></term>
 		<listitem><para>
 		The <smbconfsection>[printers]</smbconfsection> service <emphasis>must</emphasis>
 		be declared as printable. If you specify otherwise, smbd will refuse to load  at
 		startup. This parameter allows connected clients to open, write to and submit spool files
-		into the directory specified with the <smbconfoption><name>path</name></smbconfoption>
+		into the directory specified with the <smbconfoption name="path"/>
 		parameter for this service. It is used by Samba to differentiate printer shares from
 		file shares. 
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>path</name><value>/var/spool/samba </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="path">/var/spool/samba </smbconfoption></term>
 		<listitem><para>
 		Must point to a directory used by Samba to spool incoming print files. <emphasis>It
 		must not be the same as the spool directory specified in the configuration of your UNIX
@@ -645,21 +645,21 @@ man page.) Settings inside this container must be Share Level parameters.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>browseable</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="browseable">no </smbconfoption></term>
 		<listitem><para>
 		Is always set to <constant>no</constant> if
-		<smbconfoption><name>printable</name><value>yes</value></smbconfoption>. It makes
+		<smbconfoption name="printable">yes</smbconfoption>. It makes
 		the <smbconfsection>[printer]</smbconfsection> share itself invisible in the list of
 		available shares in a <command>net view</command> command or in the Explorer browse
 		list. (You will of course see the individual printers).
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>guest ok</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="guest ok">yes </smbconfoption></term>
 		<listitem><para>
 		If this parameter is set to <constant>yes</constant>, no password is required to
 		connect to the printer's service. Access will be granted with the privileges of the
-		<smbconfoption><name>guest account</name></smbconfoption>. On many systems the guest
+		<smbconfoption name="guest account"/>. On many systems the guest
 		account will map to a user named <quote>nobody</quote>. This user will usually be found
 		in the UNIX passwd file with an empty password, but with no valid UNIX login. (On some
 		systems the guest account might not have the privilege to be able to print. Test this
@@ -672,10 +672,10 @@ man page.) Settings inside this container must be Share Level parameters.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>public</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="public">yes </smbconfoption></term>
 		<listitem><para>
-		Is a synonym for <smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>.
-		Since we have <smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>, it
+		Is a synonym for <smbconfoption name="guest ok">yes</smbconfoption>.
+		Since we have <smbconfoption name="guest ok">yes</smbconfoption>, it
 		really does not need to be here. (This leads to the interesting question: <quote>What if I
 		by accident have two contradictory settings for the same share?</quote> The answer is the
 		last one encountered by Samba wins. Testparm does not complain about different settings
@@ -685,7 +685,7 @@ man page.) Settings inside this container must be Share Level parameters.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>read only</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="read only">yes </smbconfoption></term>
 		<listitem><para>
 		Normally (for other types of shares) prevents users from creating or modifying files
 		in the service's directory. However, in a <quote>printable</quote> service, it is
@@ -694,9 +694,9 @@ man page.) Settings inside this container must be Share Level parameters.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>writable</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="writable">no </smbconfoption></term>
 		<listitem><para>
-		Is a synonym for <smbconfoption><name>read only</name><value>yes</value></smbconfoption>.
+		Is a synonym for <smbconfoption name="read only">yes</smbconfoption>.
 		</para></listitem>
 	</varlistentry>
 </variablelist>
@@ -707,7 +707,7 @@ man page.) Settings inside this container must be Share Level parameters.
 
 <para>
 If a section appears in the &smb.conf; file, which when given the parameter
-<smbconfoption><name>printable</name><value>yes</value></smbconfoption> causes Samba to configure it
+<smbconfoption name="printable">yes</smbconfoption> causes Samba to configure it
 as a printer share. Windows 9x/Me clients may have problems with connecting or loading printer drivers
 if the share name has more than eight characters. Do not name a printer share with a name that may conflict
 with an existing user or file share name. On Client connection requests, Samba always tries to find file
@@ -716,20 +716,20 @@ to a printer with the same name!
 </para>
 
 <variablelist>
-	<varlistentry><term><smbconfoption><name>comment</name><value>Printer with Restricted Access </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="comment">Printer with Restricted Access </smbconfoption></term>
 		<listitem><para>
 		The comment says it all.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>path</name><value>/var/spool/samba_my_printer </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="path">/var/spool/samba_my_printer </smbconfoption></term>
 		<listitem><para>
 		Sets the spooling area for this printer to a directory other than the default. It is not
 		necessary to set it differently, but the option is available.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>printer admin</name><value>kurt </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printer admin">kurt </smbconfoption></term>
 		<listitem><para>
 		The printer admin definition is different for this explicitly defined printer share from the general
 		<smbconfsection>[printers]</smbconfsection> share. It is not a requirement; we
@@ -737,42 +737,42 @@ to a printer with the same name!
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>browseable</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="browseable">yes </smbconfoption></term>
 		<listitem><para>
 		This makes the printer browseable so the clients may conveniently find it when browsing the
 		<guiicon>Network Neighborhood</guiicon>.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>printable</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="printable">yes </smbconfoption></term>
 		<listitem><para>
 		See <link linkend="ptrsect">The [printers] Section</link>.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>writable</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="writable">no </smbconfoption></term>
 		<listitem><para>
 		See <link linkend="ptrsect">The [printers] Section</link>.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>hosts allow</name><value>10.160.50.,10.160.51. </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="hosts allow">10.160.50.,10.160.51. </smbconfoption></term>
 		<listitem><para>
-		Here we exercise a certain degree of access control by using the <smbconfoption><name>hosts allow</name></smbconfoption> and <smbconfoption><name>hosts deny</name></smbconfoption>
+		Here we exercise a certain degree of access control by using the <smbconfoption name="hosts allow"/> and <smbconfoption name="hosts deny"/>
 		parameters. This is not by any means a safe bet. It is not a way to secure your
 		printers. This line accepts all clients from a certain subnet in a first evaluation of
 		access control.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>hosts deny</name><value>turbo_xp,10.160.50.23,10.160.51.60 </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="hosts deny">turbo_xp,10.160.50.23,10.160.51.60 </smbconfoption></term>
 		<listitem><para>
 		All listed hosts are not allowed here (even if they belong to the allowed subnets). As
 		you can see, you could name IP addresses as well as NetBIOS hostnames here.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>guest ok</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="guest ok">no </smbconfoption></term>
 		<listitem><para>
 		This printer is not open for the guest account.
 		</para></listitem>
@@ -787,7 +787,7 @@ to a printer with the same name!
 In each section defining a printer (or in the <smbconfsection>[printers]</smbconfsection> section),
 a <parameter>print command</parameter> parameter may be defined. It sets a command to process the files
 that have been placed into the Samba print spool directory for that printer. (That spool directory was,
-if you remember, set up with the <smbconfoption><name>path</name></smbconfoption> parameter). Typically,
+if you remember, set up with the <smbconfoption name="path"/> parameter). Typically,
 this command will submit the spool file to the Samba host's print subsystem, using the suitable system
 print command. But there is no requirement that this needs to be the case. For debugging or
 some other reason, you may want to do something completely different than print the file. An example is a
@@ -804,8 +804,8 @@ your hard disk may soon suffer from shortage of free space.
 <para>
 You learned earlier on that Samba, in most cases, uses its built-in settings for many parameters
 if it cannot find an explicitly stated one in its configuration file. The same is true for the
-<smbconfoption><name>print command</name></smbconfoption>. The default print command varies depending
-on the <smbconfoption><name>printing</name></smbconfoption> parameter setting. In the commands listed
+<smbconfoption name="print command"/>. The default print command varies depending
+on the <smbconfoption name="printing"/> parameter setting. In the commands listed
 below, you will notice some parameters of the form <emphasis>%X</emphasis> where <emphasis>X</emphasis> is
 <emphasis>p, s, J</emphasis>, and so on. These letters stand for printer name, spool-file and job ID, respectively.
 They are explained in more detail further below. <link linkend="printOptions">Next table</link> presents an overview of key
@@ -825,63 +825,63 @@ printing options but excludes the special case of CUPS that is discussed in <lin
 	</thead>
 	<tbody>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>bsd|aix|lprng|plp</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">bsd|aix|lprng|plp</smbconfoption></entry>
 		<entry>print command is <command>lpr -r -P%p %s</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>sysv|hpux</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">sysv|hpux</smbconfoption></entry>
 		<entry>print command is <command>lp -c -P%p %s; rm %s</command></entry>
 		</row>
 		<row>
-		<entry> <smbconfoption><name>printing</name><value>qnx</value></smbconfoption></entry>
+		<entry> <smbconfoption name="printing">qnx</smbconfoption></entry>
 		<entry>print command is <command>lp -r -P%p -s %s</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>bsd|aix|lprng|plp</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">bsd|aix|lprng|plp</smbconfoption></entry>
 		<entry>lpq command is <command>lpq -P%p</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>sysv|hpux</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">sysv|hpux</smbconfoption></entry>
 		<entry>lpq command is <command>lpstat -o%p</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>qnx</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">qnx</smbconfoption></entry>
 		<entry>lpq command is <command>lpq -P%p</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>bsd|aix|lprng|plp</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">bsd|aix|lprng|plp</smbconfoption></entry>
 		<entry>lprm command is <command>lprm -P%p %j</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>sysv|hpux</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">sysv|hpux</smbconfoption></entry>
 		<entry>lprm command is <command>cancel %p-%j</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>qnx</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">qnx</smbconfoption></entry>
 		<entry>lprm command is <command>cancel %p-%j</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>bsd|aix|lprng|plp</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">bsd|aix|lprng|plp</smbconfoption></entry>
 		<entry>lppause command is <command>lp -i %p-%j -H hold</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>sysv|hpux</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">sysv|hpux</smbconfoption></entry>
 		<entry>lppause command   (...is empty)</entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>qnx</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">qnx</smbconfoption></entry>
 		<entry>lppause command   (...is empty)</entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>bsd|aix|lprng|plp</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">bsd|aix|lprng|plp</smbconfoption></entry>
 		<entry>lpresume command is <command>lp -i %p-%j -H resume</command></entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>sysv|hpux</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">sysv|hpux</smbconfoption></entry>
 		<entry>lpresume command   (...is empty)</entry>
 		</row>
 		<row>
-		<entry><smbconfoption><name>printing</name><value>qnx</value></smbconfoption></entry>
+		<entry><smbconfoption name="printing">qnx</smbconfoption></entry>
 		<entry>lpresume command   (...is empty)</entry>
 		</row>
 	</tbody>
@@ -891,7 +891,7 @@ printing options but excludes the special case of CUPS that is discussed in <lin
 <para>
 We excluded the special case of CUPS here, because it is discussed in the next chapter. For
 <parameter>printing = CUPS</parameter>, if Samba is compiled against libcups, it uses the CUPS API to submit
-jobs. (It is a good idea also to set <smbconfoption><name>printcap</name><value>cups</value></smbconfoption>
+jobs. (It is a good idea also to set <smbconfoption name="printcap">cups</smbconfoption>
 in case your <filename>cupsd.conf</filename> is set to write its auto-generated printcap file to an
 unusual place). Otherwise, Samba maps to the System V printing commands with the -oraw option for printing,
 i.e., it uses <command>lp -c -d%p -oraw; rm %s</command>. With <parameter>printing = cups</parameter>,
@@ -904,7 +904,7 @@ and if Samba is compiled against libcups, any manually set print command will be
 <title>Custom Print Commands</title>
 
 <para>
-After a print job has finished spooling to a service, the <smbconfoption><name>print command</name></smbconfoption>
+After a print job has finished spooling to a service, the <smbconfoption name="print command"/>
  will be used by Samba via a <emphasis>system()</emphasis> call to process the
 spool file. Usually the command specified will submit the spool file to the host's printing subsystem. But
 there is no requirement at all that this must be the case. The print subsystem may not remove the spool
@@ -957,25 +957,25 @@ You can form quite complex print commands. You need to realize that print comman
 passed to a UNIX shell. The shell is able to expand the included environment variables as
 usual. (The syntax to include a UNIX environment variable <parameter>$variable</parameter>
 in the Samba print command is <parameter>%$variable</parameter>.) To give you a working
-<smbconfoption><name>print command</name></smbconfoption> example, the following will log a print job
+<smbconfoption name="print command"/> example, the following will log a print job
 to <filename>/tmp/print.log</filename>, print the file, then remove it. The semicolon (<quote>;</quote>
 is the usual separator for commands in shell scripts:
 </para>
 
 <para><smbconfblock>
-<smbconfoption><name>print command</name><value>echo Printing %s &gt;&gt; \</value></smbconfoption>
+<smbconfoption name="print command">echo Printing %s &gt;&gt; \</smbconfoption>
 <member><parameter>/tmp/print.log; lpr -P %p %s; rm %s</parameter></member>
 </smbconfblock></para>
 
 <para>
 You may have to vary your own command considerably from this example depending on how you normally print
-files on your system. The default for the <smbconfoption><name>print command</name></smbconfoption>
-parameter varies depending on the setting of the <smbconfoption><name>printing</name></smbconfoption>
+files on your system. The default for the <smbconfoption name="print command"/>
+parameter varies depending on the setting of the <smbconfoption name="printing"/>
 parameter. Another example is:
 </para>
 
 <para><smbconfblock>
-<smbconfoption><name>print command</name><value>/usr/local/samba/bin/myprintscript %p %s</value></smbconfoption>
+<smbconfoption name="print command">/usr/local/samba/bin/myprintscript %p %s</smbconfoption>
 </smbconfblock></para>
 </sect3>
 </sect2>
@@ -1138,7 +1138,7 @@ service of exactly this name if they want to retrieve printer driver files.
 <para>
 You should modify the server's file to add the global parameters and create the
 <smbconfsection>[print$]</smbconfsection> file share (of course, some of the parameter values, such
-as <smbconfoption><name>path</name></smbconfoption> are arbitrary and should be replaced with appropriate values for your
+as <smbconfoption name="path"/> are arbitrary and should be replaced with appropriate values for your
 site). See <link linkend="prtdollar">next example</link>.
 </para>
 
@@ -1148,23 +1148,23 @@ site). See <link linkend="prtdollar">next example</link>.
 <smbconfsection>[global]</smbconfsection>
 <smbconfcomment>members of the ntadmin group should be able to add drivers and set</smbconfcomment>
 <smbconfcomment>printer properties. root is implicitly always a 'printer admin'.</smbconfcomment>
-<smbconfoption><name>printer admin</name><value>@ntadmin</value></smbconfoption>
+<smbconfoption name="printer admin">@ntadmin</smbconfoption>
 <member>...</member>
 <smbconfsection>[printers]</smbconfsection>
 <member>...</member>
 <smbconfsection>[print$]</smbconfsection>
-<smbconfoption><name>comment</name><value>Printer Driver Download Area</value></smbconfoption>
-<smbconfoption><name>path</name><value>/etc/samba/drivers</value></smbconfoption>
-<smbconfoption><name>browseable</name><value>yes</value></smbconfoption>
-<smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>
-<smbconfoption><name>read only</name><value>yes</value></smbconfoption>
-<smbconfoption><name>write list</name><value>@ntadmin, root</value></smbconfoption>
+<smbconfoption name="comment">Printer Driver Download Area</smbconfoption>
+<smbconfoption name="path">/etc/samba/drivers</smbconfoption>
+<smbconfoption name="browseable">yes</smbconfoption>
+<smbconfoption name="guest ok">yes</smbconfoption>
+<smbconfoption name="read only">yes</smbconfoption>
+<smbconfoption name="write list">@ntadmin, root</smbconfoption>
 </smbconfexample>
 </para>
 
 <para>
 Of course, you also need to ensure that the directory named by the
-<smbconfoption><name>path</name></smbconfoption> parameter exists on the UNIX file system.
+<smbconfoption name="path"/> parameter exists on the UNIX file system.
 </para>
 
 </sect2>
@@ -1179,7 +1179,7 @@ The following parameters are frequently needed in this share section:
 </para>
 
 <variablelist>
-	<varlistentry><term><smbconfoption><name>comment</name><value>Printer Driver Download Area </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="comment">Printer Driver Download Area </smbconfoption></term>
 		<listitem><para>
 		The comment appears next to the share name if it is listed in a share list (usually Windows
 		clients will not see it, but it will also appear up in a <command>smbclient -L sambaserver
@@ -1187,13 +1187,13 @@ The following parameters are frequently needed in this share section:
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>path</name><value>/etc/samba/printers </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="path">/etc/samba/printers </smbconfoption></term>
 		<listitem><para>
 		Is the path to the location of the Windows driver file deposit from the UNIX point of view.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>browseable</name><value>no </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="browseable">no </smbconfoption></term>
 		<listitem><para>
 		Makes the <smbconfsection>[print$]</smbconfsection> share invisible to clients from the
 		<guimenu>Network Neighborhood</guimenu>. However, you can still mount it from any client
@@ -1202,7 +1202,7 @@ The following parameters are frequently needed in this share section:
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>guest ok</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="guest ok">yes </smbconfoption></term>
 		<listitem><para>
 		Gives read-only access to this share for all guest users. Access may be granted to
 		download and install printer drivers on clients. The requirement for <parameter>guest ok
@@ -1223,14 +1223,14 @@ The following parameters are frequently needed in this share section:
 		</listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>read only</name><value>yes </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="read only">yes </smbconfoption></term>
 		<listitem><para>
 		Because we do not want everybody to upload driver files (or even change driver settings),
 		we tagged this share as not writable.
 		</para></listitem>
 	</varlistentry>
 
-	<varlistentry><term><smbconfoption><name>write list</name><value>@ntadmin, root </value></smbconfoption></term>
+	<varlistentry><term><smbconfoption name="write list">@ntadmin, root </smbconfoption></term>
 		<listitem><para>
 		The <smbconfsection>[print$]</smbconfsection> was made read-only by the previous
 		setting so we should create a <parameter>write list</parameter> entry also. UNIX
@@ -1239,7 +1239,7 @@ The following parameters are frequently needed in this share section:
 		update files on the share. Normally, you will want to only name administrative-level user
 		account in this setting. Check the file system permissions to make sure these accounts
 		can copy files to the share. If this is a non-root account, then the account should also
-		be mentioned in the global <smbconfoption><name>printer admin</name></smbconfoption>
+		be mentioned in the global <smbconfoption name="printer admin"/>
 		parameter. See the &smb.conf; man page for more information on configuring file shares.
 		</para></listitem>
 	</varlistentry>
@@ -1253,7 +1253,7 @@ The following parameters are frequently needed in this share section:
 <para>
 In order for a Windows NT print server to support the downloading of driver files by multiple client
 architectures, you must create several subdirectories within the <smbconfsection>[print$]</smbconfsection>
-service (i.e., the UNIX directory named by the <smbconfoption><name>path</name></smbconfoption>
+service (i.e., the UNIX directory named by the <smbconfoption name="path"/>
 parameter). These correspond to each of the supported client architectures. Samba follows this model as
 well. Just like the name of the <smbconfsection>[print$]</smbconfsection> share itself, the subdirectories
 must be exactly the names listed below (you may leave out the subdirectories of architectures you do
@@ -1381,7 +1381,7 @@ to a printer is open to us. You now have the choice of:
 <para>
 Once the APW is started, the procedure is exactly the same as the one you are familiar with in Windows (we
 assume here that you are familiar with the printer driver installations procedure on Windows NT). Make sure
-your connection is, in fact, setup as a user with <smbconfoption><name>printer admin</name></smbconfoption>
+your connection is, in fact, setup as a user with <smbconfoption name="printer admin"/>
 privileges (if in doubt, use <command>smbstatus</command> to check for this). If you wish to install
 printer drivers for client operating systems other than <application>Windows NT x86</application>,
 you will need to use the <guilabel>Sharing</guilabel> tab of the printer properties dialog.
@@ -1389,7 +1389,7 @@ you will need to use the <guilabel>Sharing</guilabel> tab of the printer propert
 
 <para>
 Assuming you have connected with an administrative (or root) account (as named by the
-<smbconfoption><name>printer admin</name></smbconfoption> parameter), you will also be able to modify
+<smbconfoption name="printer admin"/> parameter), you will also be able to modify
 other printer properties such as ACLs and default device settings using this dialog. For the default
 device settings, please consider the advice given further in <link linkend="inst-rpc">Installing Print Drivers Using <command>rpcclient</command></link>.
 </para>
@@ -1963,7 +1963,7 @@ user</emphasis> nobody. In a DOS box type:
 <para><userinput>net use \\<replaceable>SAMBA-SERVER</replaceable>\print$ /user:root</userinput></para>
 
 <para>
-Replace root, if needed, by another valid <smbconfoption><name>printer admin</name></smbconfoption> user as given in
+Replace root, if needed, by another valid <smbconfoption name="printer admin"/> user as given in
 the definition. Should you already be connected as a different user, you will get an error message. There
 is no easy way to get rid of that connection, because Windows does not seem to know a concept of logging
 off from a share connection (do not confuse this with logging off from the local workstation; that is
@@ -2056,7 +2056,7 @@ in the following paragraphs.
 
 <para>
 Be aware that a valid Device Mode can only be initiated by a
-<smbconfoption><name>printer admin</name></smbconfoption>, or root
+<smbconfoption name="printer admin"/>, or root
 (the reason should be obvious). Device Modes can only be correctly
 set by executing the printer driver program itself. Since Samba cannot execute this Win32 platform driver
 code, it sets this field initially to NULL (which is not a valid setting for clients to use). Fortunately,
@@ -2172,7 +2172,7 @@ command...</guimenuitem> field from the <guimenu>Start</guimenu> menu.
 <para>
 After you installed the driver on the Samba server (in its <smbconfsection>[print$]</smbconfsection>
 share, you should always make sure that your first client installation completes correctly. Make it a
-habit for yourself to build the very first connection from a client as <smbconfoption><name>printer admin</name></smbconfoption>. This is to make sure that:
+habit for yourself to build the very first connection from a client as <smbconfoption name="printer admin"/>. This is to make sure that:
 </para>
 
 <itemizedlist>
@@ -2207,7 +2207,7 @@ To connect as root to a Samba printer, try this command from a Windows 200x/XP D
 You will be prompted for root's Samba-password; type it, wait a few
 seconds, click on <guibutton>Printing
 Defaults</guibutton>, and proceed to set the job options that should be used as defaults by all
-clients. Alternately, instead of root you can name one other member of the <smbconfoption><name>printer admin</name></smbconfoption> from the setting.
+clients. Alternately, instead of root you can name one other member of the <smbconfoption name="printer admin"/> from the setting.
 </para>
 
 <para>
@@ -2315,7 +2315,7 @@ The following list needs periods after the letters and numbers:::::::::
 Do you see any difference in the two settings dialogs? I do not either. However, only the last one, which
 you arrived at with steps C.1 through 6 will permanently save any settings which will then become the defaults
 for new users. If you want all clients to have the same defaults, you need to conduct these steps as
-administrator (<smbconfoption><name>printer admin</name></smbconfoption> in ) before
+administrator (<smbconfoption name="printer admin"/> in ) before
 a client downloads the driver (the clients can later set their own per-user defaults
 by following procedures A or B above). Windows 200x/XP allow per-user default settings and the ones the
 administrator gives them, before they set up their own. The parents of the identically-looking dialogs have a slight difference in their window names; one is called <computeroutput>Default Print
@@ -2457,7 +2457,7 @@ folder. Also located in this folder is the Windows NT Add Printer Wizard icon. T
 <itemizedlist>
 	<listitem><para>
 	The connected user is able to successfully execute an <command>OpenPrinterEx(\\server)</command> with
-	administrative privileges (i.e., root or <smbconfoption><name>printer admin</name></smbconfoption>).
+	administrative privileges (i.e., root or <smbconfoption name="printer admin"/>).
 	</para>
 
 	<tip><para> Try this from a Windows 200x/XP DOS box command prompt:
@@ -2472,7 +2472,7 @@ folder. Also located in this folder is the Windows NT Add Printer Wizard icon. T
 	</para></tip></listitem>
 
 	<listitem><para>... contains the setting
-	<smbconfoption><name>show add printer wizard</name><value>yes</value></smbconfoption> (the
+	<smbconfoption name="show add printer wizard">yes</smbconfoption> (the
 	default).</para></listitem>
 </itemizedlist>
 
@@ -2495,25 +2495,25 @@ The APW can do various things:
 
 	<listitem><para>
 	Add an entirely new printer to the Samba host (only in conjunction with a working
-	<smbconfoption><name>add printer command</name></smbconfoption>. A corresponding
-	<smbconfoption><name>delete printer command</name></smbconfoption> for removing entries from the
+	<smbconfoption name="add printer command"/>. A corresponding
+	<smbconfoption name="delete printer command"/> for removing entries from the
 	<guiicon>Printers</guiicon> folder may also be provided).
 	</para></listitem>
 </itemizedlist>
 
 <para>
 The last one (add a new printer) requires more effort than the previous ones. To use
-the APW to successfully add a printer to a Samba server, the <smbconfoption><name>add printer command</name></smbconfoption> must have a defined value. The program hook must successfully
+the APW to successfully add a printer to a Samba server, the <smbconfoption name="add printer command"/> must have a defined value. The program hook must successfully
 add the printer to the UNIX print system (i.e., to <filename>/etc/printcap</filename>,
 <filename>/etc/cups/printers.conf</filename> or other appropriate files) and to &smb.conf; if necessary.
 </para>
 
 <para>
 When using the APW from a client, if the named printer share does not exist, smbd will execute the
-<smbconfoption><name>add printer command</name></smbconfoption> and re-parse to the to attempt to locate the new printer
+<smbconfoption name="add printer command"/> and re-parse to the to attempt to locate the new printer
 share. If the share is still not defined, an error of <errorname>Access Denied</errorname> is returned to
-the client. The <smbconfoption><name>add printer command</name></smbconfoption> is executed
-under the context of the connected user, not necessarily a root account. A <smbconfoption><name>map to guest</name><value>bad user</value></smbconfoption> may have connected you unwittingly under the wrong
+the client. The <smbconfoption name="add printer command"/> is executed
+under the context of the connected user, not necessarily a root account. A <smbconfoption name="map to guest">bad user</smbconfoption> may have connected you unwittingly under the wrong
 privilege. You should check it by using the <command>smbstatus</command> command.
 </para>
 
@@ -2735,7 +2735,7 @@ Pooling assigns a logical printer to multiple ports as a form of load balancing
 
 <para>
 If you require multiple ports be defined for some reason or another (my users and my boss should not know
-that they are working with Samba), configure <smbconfoption><name>enumports command</name></smbconfoption>
+that they are working with Samba), configure <smbconfoption name="enumports command"/>
 which can be used to define an external program that generates a listing of ports on a system.
 </para>
 </sect2>