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

(This used to be commit 555e174de5d390cdc744b8bcbecbeccc31079a23)

5 files changed, 9 insertions, 13 deletions

diff --git a/docs/smbdotconf/locking/fakeoplocks.xml b/docs/smbdotconf/locking/fakeoplocks.xml
index 069cdaa95e..fa004d7497 100644
--- a/docs/smbdotconf/locking/fakeoplocks.xml
+++ b/docs/smbdotconf/locking/fakeoplocks.xml
@@ -15,8 +15,7 @@
 	<refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum></citerefentry> will
 	always grant oplock requests no matter how many clients are using the file.</para>
 
-	<para>It is generally much better to use the real <link linkend="OPLOCKS">
-	<parameter moreinfo="none">oplocks</parameter></link> support rather 
+	<para>It is generally much better to use the real <smbconfoption name="oplocks"/> support rather 
 	than this parameter.</para>
 		
 	<para>If you enable this option on all read-only shares or 
diff --git a/docs/smbdotconf/locking/kerneloplocks.xml b/docs/smbdotconf/locking/kerneloplocks.xml
index a89f6b4d80..c4f12b9bd4 100644
--- a/docs/smbdotconf/locking/kerneloplocks.xml
+++ b/docs/smbdotconf/locking/kerneloplocks.xml
@@ -3,8 +3,7 @@
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>For UNIXes that support kernel based <link linkend="OPLOCKS">
-	<parameter moreinfo="none">oplocks</parameter></link>
+	<para>For UNIXes that support kernel based <smbconfoption name="oplocks"/>
 	(currently only IRIX and the Linux 2.4 kernel), this parameter 
 	allows the use of them to be turned on or off.</para>
 
diff --git a/docs/smbdotconf/locking/level2oplocks.xml b/docs/smbdotconf/locking/level2oplocks.xml
index 96a855c45a..496701b188 100644
--- a/docs/smbdotconf/locking/level2oplocks.xml
+++ b/docs/smbdotconf/locking/level2oplocks.xml
@@ -26,11 +26,11 @@
 
 	<para>For more discussions on level2 oplocks see the CIFS spec.</para>
 
-	<para>Currently, if <link linkend="KERNELOPLOCKS"><parameter moreinfo="none">kernel 
-	oplocks</parameter></link> are supported then level2 oplocks are 
-	not granted (even if this parameter is set to <constant>yes</constant>). 
-	Note also, the <link linkend="OPLOCKS"><parameter moreinfo="none">oplocks</parameter>
-	</link> parameter must be set to <constant>yes</constant> on this share in order for 
+	<para>
+	Currently, if <smbconfoption name="kernel oplocks"/> are supported then
+	level2 oplocks are not granted (even if this parameter is set to
+	<constant>yes</constant>).  Note also, the <smbconfoption name="oplocks"/>
+	parameter must be set to <constant>yes</constant> on this share in order for 
 	this parameter to have any effect.</para>
 </description>
 
diff --git a/docs/smbdotconf/locking/lockspintime.xml b/docs/smbdotconf/locking/lockspintime.xml
index 172e854894..c2e5501f07 100644
--- a/docs/smbdotconf/locking/lockspintime.xml
+++ b/docs/smbdotconf/locking/lockspintime.xml
@@ -5,8 +5,7 @@
 <description>
 	<para>The time in microseconds that smbd should 
 	pause before attempting to gain a failed lock.  See
-	<link linkend="LOCKSPINCOUNT"><parameter moreinfo="none">lock spin 
-			count</parameter></link> for more details.</para>
+	<smbconfoption name="lock spin count"/> for more details.</para>
 </description>
 <value type="default">10</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/locking/oplocks.xml b/docs/smbdotconf/locking/oplocks.xml
index d7f453c561..3ce70a7883 100644
--- a/docs/smbdotconf/locking/oplocks.xml
+++ b/docs/smbdotconf/locking/oplocks.xml
@@ -14,8 +14,7 @@
 	directory.</para>
 
 	<para>Oplocks may be selectively turned off on certain files with a 
-	share. See the <link linkend="VETOOPLOCKFILES"><parameter moreinfo="none">
-	veto oplock files</parameter></link> parameter. On some systems 
+	share. See the <smbconfoption name="veto oplock files"/> parameter. On some systems 
 	oplocks are recognized by the underlying operating system. This 
 	allows data synchronization between all access to oplocked files, 
 	whether it be via Samba or NFS or a local UNIX process. See the