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

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

8 files changed, 34 insertions, 34 deletions

diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml
index 2bd5385d8b..c7366fcea8 100644
--- a/docs/manpages/nmbd.8.xml
+++ b/docs/manpages/nmbd.8.xml
@@ -54,7 +54,7 @@
 	specified it will respond with the IP number of the host it 
 	is running on.  Its "own NetBIOS name" is by
 	default the primary DNS name of the host it is running on, 
-	but this can be overridden by the <smbconfoption><name>netbios name</name></smbconfoption>
+	but this can be overridden by the <smbconfoption name="netbios name"/>
 	in &smb.conf;. Thus <command>nmbd</command> will 
 	reply to broadcast queries for its own name(s). Additional
 	names for <command>nmbd</command> to respond on can be set 
@@ -129,7 +129,7 @@
 		<listitem><para>NetBIOS lmhosts file.  The lmhosts 
 		file is a list of NetBIOS names to IP addresses that 
 		is loaded by the nmbd server and used via the name 
-		resolution mechanism <smbconfoption><name>name resolve order</name></smbconfoption> described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
+		resolution mechanism <smbconfoption name="name resolve order"/> described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
 		<manvolnum>5</manvolnum></citerefentry> to resolve any 
 		NetBIOS name queries needed by the server. Note 
 		that the contents of this file are <emphasis>NOT</emphasis> 
@@ -201,7 +201,7 @@
 		and <filename>/etc/samba/smb.conf</filename>.</para>
 
 		<para>When run as a WINS server (see the
-			<smbconfoption><name>wins support</name></smbconfoption>
+			<smbconfoption name="wins support"/>
 		parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
 		<manvolnum>5</manvolnum></citerefentry> man page),
 		<command>nmbd</command>
@@ -210,7 +210,7 @@
 		wherever Samba was configured to install itself.</para>
 
 		<para>If <command>nmbd</command> is acting as a <emphasis>
-				browse master</emphasis> (see the <smbconfoption><name>local master</name></smbconfoption>
+				browse master</emphasis> (see the <smbconfoption name="local master"/>
 		parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
 	<manvolnum>5</manvolnum></citerefentry> man page, <command>nmbd</command>
 		will store the browsing database in the file <filename>browse.dat
diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml
index 84799ee75d..85052fb71a 100644
--- a/docs/manpages/ntlm_auth.1.xml
+++ b/docs/manpages/ntlm_auth.1.xml
@@ -160,7 +160,7 @@
 		  <term>Username</term>
 		  
                 <listitem><para>The username, expected to be in
-                Samba's <smbconfoption><name>unix charset</name></smbconfoption>.
+                Samba's <smbconfoption name="unix charset"/>.
                 </para>
 
 		      <para><example>Username: bob</example></para>
@@ -170,7 +170,7 @@
 		  <varlistentry>
 		  <term>Username</term>
                 <listitem><para>The user's domain, expected to be in
-                Samba's <smbconfoption><name>unix charset</name></smbconfoption>.
+                Samba's <smbconfoption name="unix charset"/>.
                 </para>
 
 		      <para><example>Domain: WORKGROUP</example></para>
@@ -182,7 +182,7 @@
                 <listitem><para>The fully qualified username, expected to be in
                 Samba's <smbconfoption><name>unix
                 charset</name></smbconfoption> and qualified with the
-                <smbconfoption><name>winbind separator</name></smbconfoption>.
+                <smbconfoption name="winbind separator"/>.
                 </para>
 
 		      <para><example>Full-Username: WORKGROUP\bob</example></para>
diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml
index ecb70d917a..041cc75b98 100644
--- a/docs/manpages/pdbedit.8.xml
+++ b/docs/manpages/pdbedit.8.xml
@@ -257,7 +257,7 @@ retype new password
 </para>
 
 		<note><para>pdbedit does not call the unix password syncronisation 
-				script if <smbconfoption><name>unix password sync</name></smbconfoption>
+				script if <smbconfoption name="unix password sync"/>
 				has been set. It only updates the data in the Samba 
 				user database. 
 			</para>
diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml
index 00448dc5bb..1c19878de0 100644
--- a/docs/manpages/rpcclient.1.xml
+++ b/docs/manpages/rpcclient.1.xml
@@ -54,7 +54,7 @@
 		<term>server</term>
 		<listitem><para>NetBIOS name of Server to which to connect. 
 		The server can be  any SMB/CIFS server.  The name is 
-		resolved using the <smbconfoption><name>name resolve order</name></smbconfoption> line from <citerefentry><refentrytitle>smb.conf</refentrytitle>
+		resolved using the <smbconfoption name="name resolve order"/> line from <citerefentry><refentrytitle>smb.conf</refentrytitle>
 	<manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 	</varlistentry>
 
diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages/smb.conf.5.xml
index 149ea3d382..57a5d62bc0 100644
--- a/docs/manpages/smb.conf.5.xml
+++ b/docs/manpages/smb.conf.5.xml
@@ -105,8 +105,8 @@
 
 <smbconfexample>
 	<smbconfsection>[foo]</smbconfsection>
-	<smbconfoption><name>path</name><value>/home/bar</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>read only = no</value></smbconfoption>
+	<smbconfoption name="path">/home/bar</smbconfoption>
+	<smbconfoption name="read only">read only = no</smbconfoption>
 </smbconfexample>
 
 	<para>The following sample section defines a printable share. 
@@ -118,10 +118,10 @@
 
 <smbconfexample>
 	<smbconfsection>[aprinter]</smbconfsection>
-	<smbconfoption><name>path</name><value>/usr/spool/public</value></smbconfoption>
-	<smbconfoption><name>read only</name><value>yes</value></smbconfoption>
-	<smbconfoption><name>printable</name><value>yes</value></smbconfoption>
-	<smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>
+	<smbconfoption name="path">/usr/spool/public</smbconfoption>
+	<smbconfoption name="read only">yes</smbconfoption>
+	<smbconfoption name="printable">yes</smbconfoption>
+	<smbconfoption name="guest ok">yes</smbconfoption>
 </smbconfexample>
 </refsect1>
 
@@ -188,7 +188,7 @@
 
 	<smbconfexample>
 		<smbconfsection>[homes]</smbconfsection>
-		<smbconfoption><name>read only</name><value>no</value></smbconfoption>
+		<smbconfoption name="read only">no</smbconfoption>
 	</smbconfexample>
 	
 		<para>An important point is that if guest access is specified 
@@ -250,9 +250,9 @@
 
 	<smbconfexample>
 		<smbconfsection>[printers]</smbconfsection>
-		<smbconfoption><name>path</name><value>/usr/spool/public</value></smbconfoption>
-		<smbconfoption><name>guest ok</name><value>yes</value></smbconfoption>
-		<smbconfoption><name>printable</name><value>yes</value></smbconfoption>
+		<smbconfoption name="path">/usr/spool/public</smbconfoption>
+		<smbconfoption name="guest ok">yes</smbconfoption>
+		<smbconfoption name="printable">yes</smbconfoption>
 	</smbconfexample>
 
 		<para>All aliases given for a printer in the printcap file 
diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml
index 8b7007b1be..3f5755c2da 100644
--- a/docs/manpages/smbd.8.xml
+++ b/docs/manpages/smbd.8.xml
@@ -136,7 +136,7 @@
 		<term>-p &lt;port number(s)&gt;</term>
 		<listitem><para><replaceable>port number(s)</replaceable> is a 
 		space or comma-separated list of TCP ports smbd should listen on.
-		The default value is taken from the <smbconfoption><name>ports</name></smbconfoption> parameter in &smb.conf;</para>
+		The default value is taken from the <smbconfoption name="ports"/> parameter in &smb.conf;</para>
 
 		<para>The default ports are 139 (used for SMB over NetBIOS over TCP)
 			and port 445 (used for plain SMB over TCP).
@@ -225,7 +225,7 @@
 	<para>Samba uses PAM for authentication (when presented with a plaintext 
 	password), for account checking (is this account disabled?) and for
 	session management.  The degree too which samba supports PAM is restricted
-	by the limitations of the SMB protocol and the <smbconfoption><name>obey pam restrictions</name></smbconfoption> <citerefentry><refentrytitle>smb.conf</refentrytitle>
+	by the limitations of the SMB protocol and the <smbconfoption name="obey pam restrictions"/> <citerefentry><refentrytitle>smb.conf</refentrytitle>
 	<manvolnum>5</manvolnum></citerefentry> paramater.  When this is set, the following restrictions apply:
 	</para>
 
diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml
index 0e41ae9410..fa2ed9e9b8 100644
--- a/docs/manpages/smbpasswd.8.xml
+++ b/docs/manpages/smbpasswd.8.xml
@@ -313,7 +313,7 @@
 		<listitem><para>This parameter is only available if Samba
 		has been compiled with LDAP support. The <parameter>-w</parameter> 
 		switch is used to specify the password to be used with the 
-		<smbconfoption><name>ldap admin dn</name></smbconfoption>.  Note that the password is stored in
+		<smbconfoption name="ldap admin dn"/>.  Note that the password is stored in
 		the <filename>secrets.tdb</filename> and is keyed off 
 		of the admin's DN.  This means that if the value of <parameter>ldap
 		admin dn</parameter> ever changes, the password will need to be 
diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml
index dd98cfd8e5..1ad8a6ff1e 100644
--- a/docs/manpages/winbindd.8.xml
+++ b/docs/manpages/winbindd.8.xml
@@ -42,8 +42,8 @@
     service to <command>smbd</command>, <command>ntlm_auth</command>
     and the <command>pam_winbind.so</command> PAM module, by managing connections to
     domain controllers.  In this configuraiton the
-    <smbconfoption><name>idmap uid</name></smbconfoption> and
-    <smbconfoption><name>idmap gid</name></smbconfoption>
+    <smbconfoption name="idmap uid"/> and
+    <smbconfoption name="idmap gid"/>
     parameters are not required. (This is known as `netlogon proxy only mode'.)</para>
 
         <para> The Name Service Switch allows user 
@@ -229,25 +229,25 @@ hosts:		files wins
 
 	<itemizedlist>
 		<listitem><para>
-		<smbconfoption><name>winbind separator</name></smbconfoption></para></listitem>
+		<smbconfoption name="winbind separator"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>idmap uid</name></smbconfoption></para></listitem>
+		<smbconfoption name="idmap uid"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>idmap gid</name></smbconfoption></para></listitem>
+		<smbconfoption name="idmap gid"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>idmap backend</name></smbconfoption></para></listitem>
+		<smbconfoption name="idmap backend"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>winbind cache time</name></smbconfoption></para></listitem>
+		<smbconfoption name="winbind cache time"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>winbind enum users</name></smbconfoption></para></listitem>
+		<smbconfoption name="winbind enum users"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>winbind enum groups</name></smbconfoption></para></listitem>
+		<smbconfoption name="winbind enum groups"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>template homedir</name></smbconfoption></para></listitem>
+		<smbconfoption name="template homedir"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>template shell</name></smbconfoption></para></listitem>
+		<smbconfoption name="template shell"/></para></listitem>
 		<listitem><para>
-		<smbconfoption><name>winbind use default domain</name></smbconfoption></para></listitem>
+		<smbconfoption name="winbind use default domain"/></para></listitem>
 	</itemizedlist>
 </refsect1>