Some random updates.

(This used to be commit 57d0cc9fcdc1c790a601f6dcf7071188448a5f58)

5 files changed, 18 insertions, 20 deletions

diff --git a/docs/smbdotconf/browse/domainmaster.xml b/docs/smbdotconf/browse/domainmaster.xml
index 54f97caf37..d946ced7e6 100644
--- a/docs/smbdotconf/browse/domainmaster.xml
+++ b/docs/smbdotconf/browse/domainmaster.xml
@@ -8,9 +8,9 @@
 	<manvolnum>8</manvolnum></citerefentry> to enable WAN-wide browse list
 	collation. Setting this option causes <command moreinfo="none">nmbd</command> to
 	claim a special domain specific NetBIOS name that identifies 
-	it as a domain master browser for its given <link linkend="WORKGROUP">
-	<parameter moreinfo="none">workgroup</parameter></link>. Local master browsers 
-	in the same <parameter moreinfo="none">workgroup</parameter> on broadcast-isolated 
+	it as a domain master browser for its given 
+		<smbconfoption name="workgroup"/>. Local master browsers 
+		in the same <smbconfoption name="workgroup"/> on broadcast-isolated 
 	subnets will give this <command moreinfo="none">nmbd</command> their local browse lists, 
 	and then ask <citerefentry><refentrytitle>smbd</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry> for a complete copy of the browse 
@@ -19,20 +19,19 @@
 	instead of just the list for their broadcast-isolated subnet.</para>
 
 	<para>Note that Windows NT Primary Domain Controllers expect to be 
-	able to claim this <parameter moreinfo="none">workgroup</parameter> specific special 
+		able to claim this <smbconfoption name="workgroup"/> specific special 
 	NetBIOS name that identifies them as domain master browsers for 
-	that <parameter moreinfo="none">workgroup</parameter> by default (i.e. there is no 
+	that <smbconfoption name="workgroup"/> by default (i.e. there is no 
 	way to prevent a Windows NT PDC from attempting to do this). This 
 	means that if this parameter is set and <command moreinfo="none">nmbd</command> claims 
-	the special name for a <parameter moreinfo="none">workgroup</parameter> before a Windows 
+	the special name for a <smbconfoption name="workgroup"/> before a Windows 
 	NT PDC is able to do so then cross subnet browsing will behave 
 	strangely and may fail.</para>
 		
-	<para>If <link linkend="DOMAINLOGONS"><command moreinfo="none">domain logons = yes</command>
-	</link>, then the default behavior is to enable the <parameter moreinfo="none">domain 
-	master</parameter> parameter.  If <parameter moreinfo="none">domain logons</parameter> is 
-	not enabled (the default setting), then neither will <parameter moreinfo="none">domain 
-	master</parameter> be enabled by default.</para>
+<para>If <smbconfoption name="domain logons">yes</smbconfoption>
+	, then the default behavior is to enable the <smbconfoption name="domain 
+		master"/> parameter.  If <smbconfoption name="domain logons"/> is 
+	not enabled (the default setting), then neither will <smbconfoption name="domain master"/> be enabled by default.</para>
 
 </description>
 <value type="default">auto</value>
diff --git a/docs/smbdotconf/browse/lmannounce.xml b/docs/smbdotconf/browse/lmannounce.xml
index d29f0e623d..92365d8e50 100644
--- a/docs/smbdotconf/browse/lmannounce.xml
+++ b/docs/smbdotconf/browse/lmannounce.xml
@@ -13,11 +13,11 @@
 	If set to <constant>no</constant> Samba will never produce these 
 	broadcasts. If set to <constant>yes</constant> Samba will produce 
 	Lanman announce broadcasts at a frequency set by the parameter 
-	<parameter moreinfo="none">lm interval</parameter>. If set to <constant>auto</constant> 
+	<smbconfoption name="lm interval"/>. If set to <constant>auto</constant> 
 	Samba will not send Lanman announce broadcasts by default but will 
 	listen for them. If it hears such a broadcast on the wire it will 
 	then start sending them at a frequency set by the parameter 
-	<parameter moreinfo="none">lm interval</parameter>.</para>
+	<smbconfoption name="lm interval"/>.</para>
 </description>
 
 <related>lm interval</related>
diff --git a/docs/smbdotconf/browse/lminterval.xml b/docs/smbdotconf/browse/lminterval.xml
index abe80bc8fb..4f38165147 100644
--- a/docs/smbdotconf/browse/lminterval.xml
+++ b/docs/smbdotconf/browse/lminterval.xml
@@ -5,11 +5,11 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>If Samba is set to produce Lanman announce 
-	broadcasts needed by OS/2 clients (see the <link linkend="LMANNOUNCE">
-	<parameter moreinfo="none">lm announce</parameter></link> parameter) then this 
+	broadcasts needed by OS/2 clients (see the 
+		<smbconfoption name="lm announce"/> parameter) then this 
 	parameter defines the frequency in seconds with which they will be 
 	made.  If this is set to zero then no Lanman announcements will be 
-	made despite the setting of the <parameter moreinfo="none">lm announce</parameter> 
+	made despite the setting of the <smbconfoption name="lm announce"/> 
 	parameter.</para>
 </description>
 <related>lm announce</related>
diff --git a/docs/smbdotconf/browse/oslevel.xml b/docs/smbdotconf/browse/oslevel.xml
index e379d5053b..487b165604 100644
--- a/docs/smbdotconf/browse/oslevel.xml
+++ b/docs/smbdotconf/browse/oslevel.xml
@@ -8,8 +8,7 @@
 	advertises itself as for browse elections. The value of this 
 	parameter determines whether <citerefentry><refentrytitle>nmbd</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry> 
-	has a chance of becoming a local master browser for the <parameter moreinfo="none">
-	WORKGROUP</parameter> in the local broadcast area.</para>
+has a chance of becoming a local master browser for the <smbconfoption name="workgroup"/> in the local broadcast area.</para>
 		
 	<para><emphasis>Note :</emphasis>By default, Samba will win 
 	a local master browsing election over all Microsoft operating 
diff --git a/docs/smbdotconf/browse/preferredmaster.xml b/docs/smbdotconf/browse/preferredmaster.xml
index 8a6d8706c3..009aac3d3d 100644
--- a/docs/smbdotconf/browse/preferredmaster.xml
+++ b/docs/smbdotconf/browse/preferredmaster.xml
@@ -13,8 +13,8 @@
 	<para>If this is set to <constant>yes</constant>, on startup, <command moreinfo="none">nmbd</command> 
 	will force an election, and it will have a slight advantage in 
 	winning the election.  It is recommended that this parameter is 
-	used in conjunction with <command moreinfo="none"><link linkend="DOMAINMASTER">
-	<parameter moreinfo="none">domain master</parameter></link> = yes</command>, so 
+	used in conjunction with 
+			<smbconfoption name="domain master">yes</smbconfoption>, so 
 	that <command moreinfo="none">nmbd</command> can guarantee becoming a domain master.</para>
 		
 	<para>Use this option with caution, because if there are several