Removal of CRUFT. 50 lashes to those who created CRUFT. Argh.

(This used to be commit 555e174de5d390cdc744b8bcbecbeccc31079a23)

4 files changed, 10 insertions, 12 deletions

diff --git a/docs/smbdotconf/protocol/maxwinsttl.xml b/docs/smbdotconf/protocol/maxwinsttl.xml
index 20461b7a49..09935cdd9b 100644
--- a/docs/smbdotconf/protocol/maxwinsttl.xml
+++ b/docs/smbdotconf/protocol/maxwinsttl.xml
@@ -5,8 +5,8 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
-    <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server (<link linkend="WINSSUPPORT">
-    <parameter moreinfo="none">wins support = yes</parameter></link>) what the maximum
+    <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server
+	(<smbconfoption name="wins support">yes</smbconfoption>) what the maximum
     'time to live' of NetBIOS names that <command moreinfo="none">nmbd</command> 
     will grant will be (in seconds). You should never need to change this
 	parameter.  The default is 6 days (518400 seconds).</para>
diff --git a/docs/smbdotconf/protocol/minprotocol.xml b/docs/smbdotconf/protocol/minprotocol.xml
index a1480756bd..0bec282467 100644
--- a/docs/smbdotconf/protocol/minprotocol.xml
+++ b/docs/smbdotconf/protocol/minprotocol.xml
@@ -6,15 +6,14 @@
 <description>
     <para>The value of the parameter (a string) is the 
     lowest SMB protocol dialect than Samba will support.  Please refer
-    to the <link linkend="MAXPROTOCOL"><parameter moreinfo="none">max protocol</parameter></link>
+    to the <smbconfoption name="max protocol"/>
     parameter for a list of valid protocol names and a brief description
     of each.  You may also wish to refer to the C source code in
     <filename moreinfo="none">source/smbd/negprot.c</filename> for a listing of known protocol
     dialects supported by clients.</para>
 		
     <para>If you are viewing this parameter as a security measure, you should
-    also refer to the <link linkend="LANMANAUTH"><parameter moreinfo="none">lanman 
-    auth</parameter></link> parameter.  Otherwise, you should never need 
+    also refer to the <smbconfoption name="lanman auth"/> parameter.  Otherwise, you should never need 
     to change this parameter.</para>
 </description>
 
diff --git a/docs/smbdotconf/protocol/minwinsttl.xml b/docs/smbdotconf/protocol/minwinsttl.xml
index 9c308d8b73..38fbd7b0eb 100644
--- a/docs/smbdotconf/protocol/minwinsttl.xml
+++ b/docs/smbdotconf/protocol/minwinsttl.xml
@@ -6,8 +6,7 @@
 <description>
     <para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
     <manvolnum>8</manvolnum></citerefentry>
-    when acting as a WINS server (<link linkend="WINSSUPPORT"><parameter moreinfo="none">
-    wins support = yes</parameter></link>) what the minimum 'time to live' 
+    when acting as a WINS server (<smbconfoption name="wins support">yes</smbconfoption>) what the minimum 'time to live' 
     of NetBIOS names that <command moreinfo="none">nmbd</command> will grant will be (in 
     seconds). You should never need to change this parameter.  The default 
     is 6 hours (21600 seconds).</para>
diff --git a/docs/smbdotconf/protocol/nameresolveorder.xml b/docs/smbdotconf/protocol/nameresolveorder.xml
index a3637a3ee0..d8bbb39589 100644
--- a/docs/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs/smbdotconf/protocol/nameresolveorder.xml
@@ -18,8 +18,8 @@
 	<listitem>
 	    <para><constant>lmhosts</constant> : Lookup an IP 
 	    address in the Samba lmhosts file. If the line in lmhosts has 
-	    no name type attached to the NetBIOS name (see the <ulink 
-            noescape="1" url="lmhosts.5.html">lmhosts(5)</ulink> for details) then
+	    no name type attached to the NetBIOS name (see the <usmbconfoption 
+            noescape="1" url="lmhosts.5.html">lmhosts(5)</usmbconfoption> for details) then
 	    any name type matches for lookup.</para>
 	</listitem>
 
@@ -37,14 +37,14 @@
 
 	<listitem>
 	    <para><constant>wins</constant> : Query a name with 
-	    the IP address listed in the <link linkend="WINSSERVER"><parameter moreinfo="none">
-	    wins server</parameter></link> parameter.  If no WINS server has
+	    the IP address listed in the <smbconfoption name="WINSSERVER"><parameter moreinfo="none">
+	    wins server</parameter></smbconfoption> parameter.  If no WINS server has
 	    been specified this method will be ignored.</para>
 	</listitem>
 
 	<listitem>
 	    <para><constant>bcast</constant> : Do a broadcast on 
-	    each of the known local interfaces listed in the <link linkend="INTERFACES"><parameter moreinfo="none">interfaces</parameter></link> 
+	    each of the known local interfaces listed in the <smbconfoption name="interfaces"/> 
 	    parameter. This is the least reliable of the name resolution 
 	    methods as it depends on the target host being on a locally 
 	    connected subnet.</para>