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

(This used to be commit 555e174de5d390cdc744b8bcbecbeccc31079a23)

12 files changed, 35 insertions, 35 deletions

diff --git a/docs/smbdotconf/misc/addsharecommand.xml b/docs/smbdotconf/misc/addsharecommand.xml
index c1eecd5930..a351044e18 100644
--- a/docs/smbdotconf/misc/addsharecommand.xml
+++ b/docs/smbdotconf/misc/addsharecommand.xml
@@ -47,8 +47,7 @@
 		
 	<para>
 	This parameter is only used for add file shares.  To add printer shares, 
-	see the <link linkend="ADDPRINTERCOMMAND"><parameter moreinfo="none">addprinter 
-	command</parameter></link>.
+	see the <smbconfoption name="addprinter command"/>.
 	</para>
 </description>
 
diff --git a/docs/smbdotconf/misc/defaultservice.xml b/docs/smbdotconf/misc/defaultservice.xml
index f7a6c0234d..ca986d460a 100644
--- a/docs/smbdotconf/misc/defaultservice.xml
+++ b/docs/smbdotconf/misc/defaultservice.xml
@@ -14,14 +14,12 @@
 	parameter is not given, attempting to connect to a nonexistent 
 	service results in an error.</para>
 
-	<para>Typically the default service would be a <link linkend="GUESTOK">
-	<parameter moreinfo="none">guest ok</parameter></link>, <link linkend="READONLY">
-	<parameter moreinfo="none">read-only</parameter></link> service.</para>
-
-	<para>Also note that the apparent service name will be changed 
-	to equal that of the requested service, this is very useful as it 
-	allows you to use macros like <parameter moreinfo="none">%S</parameter> to make 
-	a wildcard service.</para>
+	<para>
+	Typically the default service would be a <smbconfoption name="guest ok"/>, <smbconfoption
+	name="read-only"/> service.</para> <para>Also note that the apparent service name will be changed to equal
+	that of the requested service, this is very useful as it allows you to use macros like <parameter
+	moreinfo="none">%S</parameter> to make a wildcard service.
+	</para>
 
 	<para>Note also that any &quot;_&quot; characters in the name of the service 
 	used in the default service will get mapped to a &quot;/&quot;. This allows for
diff --git a/docs/smbdotconf/misc/deletesharecommand.xml b/docs/smbdotconf/misc/deletesharecommand.xml
index 1489a4136d..1afce2fd24 100644
--- a/docs/smbdotconf/misc/deletesharecommand.xml
+++ b/docs/smbdotconf/misc/deletesharecommand.xml
@@ -35,8 +35,7 @@
 		
 	<para>
 	This parameter is only used to remove file shares.  To delete printer shares, 
-	see the <link linkend="DELETEPRINTERCOMMAND"><parameter moreinfo="none">deleteprinter 
-	command</parameter></link>.
+	see the <smbconfoption name="deleteprinter command"/>.
 	</para>
 </description>
 
diff --git a/docs/smbdotconf/misc/homedirmap.xml b/docs/smbdotconf/misc/homedirmap.xml
index 4e4e0d9fe5..3459928b58 100644
--- a/docs/smbdotconf/misc/homedirmap.xml
+++ b/docs/smbdotconf/misc/homedirmap.xml
@@ -4,8 +4,8 @@
 		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
-	<para>If<link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir
-	</parameter></link> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
+	<para>If <smbconfoption name="nis homedir"/> is <constant>yes</constant>,
+	and <citerefentry><refentrytitle>smbd</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry> is also acting 
 	as a Win95/98 <parameter moreinfo="none">logon server</parameter> then this parameter 
 	specifies the NIS (or YP) map from which the server for the user's 
diff --git a/docs/smbdotconf/misc/lockdirectory.xml b/docs/smbdotconf/misc/lockdirectory.xml
index a0abf8cf97..d96351a4fb 100644
--- a/docs/smbdotconf/misc/lockdirectory.xml
+++ b/docs/smbdotconf/misc/lockdirectory.xml
@@ -7,8 +7,8 @@
 <description>
 	<para>This option specifies the directory where lock 
 	files will be placed.  The lock files are used to implement the 
-	<link linkend="MAXCONNECTIONS"><parameter moreinfo="none">max connections</parameter>
-</link> option.</para>
+	<smbconfoption name="max connections"/> option.
+	</para>
 </description>
 
 <value type="default">${prefix}/var/locks</value>
diff --git a/docs/smbdotconf/misc/magicoutput.xml b/docs/smbdotconf/misc/magicoutput.xml
index 1e41a9ff55..ed0cb0b21c 100644
--- a/docs/smbdotconf/misc/magicoutput.xml
+++ b/docs/smbdotconf/misc/magicoutput.xml
@@ -3,10 +3,11 @@
 		 type="string"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter specifies the name of a file 
+	<para>
+	This parameter specifies the name of a file 
 	which will contain output created by a magic script (see the 
-	<link linkend="MAGICSCRIPT"><parameter moreinfo="none">magic script</parameter></link>
-	parameter below).</para>
+	<smbconfoption name="magic script"/> parameter below).
+	</para>
 
 <warning><para>If two clients use the same <parameter moreinfo="none">magic script
 	</parameter> in the same directory the output file content
diff --git a/docs/smbdotconf/misc/magicscript.xml b/docs/smbdotconf/misc/magicscript.xml
index 143576e7bd..b621f00c38 100644
--- a/docs/smbdotconf/misc/magicscript.xml
+++ b/docs/smbdotconf/misc/magicscript.xml
@@ -13,8 +13,8 @@
 	of privilege and the file permissions allow the deletion.</para>
 
 	<para>If the script generates output, output will be sent to 
-	the file specified by the <link linkend="MAGICOUTPUT"><parameter moreinfo="none">
-	magic output</parameter></link> parameter (see above).</para>
+	the file specified by the <smbconfoption name="magic output"/>
+	parameter (see above).</para>
 
 	<para>Note that some shells are unable to interpret scripts 
 	containing CR/LF instead of CR as 
diff --git a/docs/smbdotconf/misc/nishomedir.xml b/docs/smbdotconf/misc/nishomedir.xml
index a1bfd947b6..45c451197e 100644
--- a/docs/smbdotconf/misc/nishomedir.xml
+++ b/docs/smbdotconf/misc/nishomedir.xml
@@ -21,8 +21,8 @@
 	long as a Samba daemon is running on the home directory server, 
 	it will be mounted on the Samba client directly from the directory 
 	server. When Samba is returning the home share to the client, it 
-	will consult the NIS map specified in <link linkend="HOMEDIRMAP">
-	<parameter moreinfo="none">homedir map</parameter></link> and return the server 
+	will consult the NIS map specified in
+	<smbconfoption name="homedir map"/> and return the server 
 	listed there.</para>
 
 	<para>Note that for this option to work there must be a working 
diff --git a/docs/smbdotconf/misc/preexec.xml b/docs/smbdotconf/misc/preexec.xml
index 001f9c2b42..6608c83050 100644
--- a/docs/smbdotconf/misc/preexec.xml
+++ b/docs/smbdotconf/misc/preexec.xml
@@ -12,13 +12,16 @@
 	message every time they log in. Maybe a message of the day? Here 
 	is an example:</para>
 
-	<para><command moreinfo="none">preexec = csh -c 'echo \&quot;Welcome to %S!\&quot; | /usr/local/samba/bin/smbclient -M %m -I %I' &amp; </command></para>
+	<para>
+	<command moreinfo="none">preexec = csh -c 'echo \&quot;Welcome to %S!\&quot; |
+	/usr/local/samba/bin/smbclient -M %m -I %I' &amp; </command>
+	</para>
 
 	<para>Of course, this could get annoying after a while :-)</para>
 
-	<para>See also <link linkend="PREEXECCLOSE"><parameter moreinfo="none">preexec close</parameter></link> and <link 
-	linkend="POSTEXEC"><parameter moreinfo="none">postexec
-	</parameter></link>.</para>
+	<para>
+	See also <smbconfoption name="preexec close"/> and <smbconfoption name="postexec"/>.
+	</para>
 </description>
 
 <value type="default"></value>
diff --git a/docs/smbdotconf/misc/preexecclose.xml b/docs/smbdotconf/misc/preexecclose.xml
index a557a58a36..c616ad7f07 100644
--- a/docs/smbdotconf/misc/preexecclose.xml
+++ b/docs/smbdotconf/misc/preexecclose.xml
@@ -5,8 +5,7 @@
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This boolean option controls whether a non-zero 
-	return code from <link linkend="PREEXEC"><parameter moreinfo="none">preexec
-</parameter></link> should close the service being connected to.</para>
+	return code from <smbconfoption name="preexec"/> should close the service being connected to.</para>
 </description>
 
 <value type="default">no</value>
diff --git a/docs/smbdotconf/misc/preload.xml b/docs/smbdotconf/misc/preload.xml
index 70b5b2968b..94905a67ef 100644
--- a/docs/smbdotconf/misc/preload.xml
+++ b/docs/smbdotconf/misc/preload.xml
@@ -10,9 +10,11 @@
 	for homes and printers services that would otherwise not be 
 	visible.</para>
 
-	<para>Note that if you just want all printers in your 
-	printcap file loaded then the <link linkend="LOADPRINTERS">
-	<parameter moreinfo="none">load printers</parameter></link> option is easier.</para>
+	<para>
+	Note that if you just want all printers in your 
+	printcap file loaded then the <smbconfoption name="load printers"/>
+	 option is easier.
+	</para>
 </description>
 
 <value type="default"></value>
diff --git a/docs/smbdotconf/misc/remoteannounce.xml b/docs/smbdotconf/misc/remoteannounce.xml
index 891790327d..fc46a46e89 100644
--- a/docs/smbdotconf/misc/remoteannounce.xml
+++ b/docs/smbdotconf/misc/remoteannounce.xml
@@ -21,14 +21,13 @@
 	<para>the above line would cause <command moreinfo="none">nmbd</command> to announce itself 
 	to the two given IP addresses using the given workgroup names. 
 	If you leave out the workgroup name then the one given in 
-	the <link linkend="WORKGROUP"><parameter moreinfo="none">workgroup</parameter></link> 
-	parameter is used instead.</para>
+	the <smbconfoption name="workgroup"/> parameter is used instead.</para>
 
 	<para>The IP addresses you choose would normally be the broadcast 
 	addresses of the remote networks, but can also be the IP addresses 
 	of known browse masters if your network config is that stable.</para>
 
-<para>See <link linkend="NetworkBrowsing"/>.</para>
+<para>See <smbconfoption name="NetworkBrowsing"/>.</para>
 </description>
 
 <value type="default"></value>