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

(This used to be commit 555e174de5d390cdc744b8bcbecbeccc31079a23)

7 files changed, 17 insertions, 24 deletions

diff --git a/docs/smbdotconf/logon/abortshutdownscript.xml b/docs/smbdotconf/logon/abortshutdownscript.xml
index b9084897ff..f1ac6183dc 100644
--- a/docs/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs/smbdotconf/logon/abortshutdownscript.xml
@@ -6,8 +6,7 @@
 <description>
 	<para>This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry> that
-	should stop a shutdown procedure issued by the <link linkend="SHUTDOWNSCRIPT">
-	<parameter moreinfo="none">shutdown script</parameter></link>.</para>
+	should stop a shutdown procedure issued by the <smbconfoption name="shutdown script"/>.</para>
 		
 	<para>If the connected user posseses the <constant>SeRemoteShutdownPrivilege</constant>,
 	right, this command will be run as user.</para>
diff --git a/docs/smbdotconf/logon/adduserscript.xml b/docs/smbdotconf/logon/adduserscript.xml
index 568c054a1a..1dd71b3867 100644
--- a/docs/smbdotconf/logon/adduserscript.xml
+++ b/docs/smbdotconf/logon/adduserscript.xml
@@ -38,11 +38,10 @@
 	already existed. In this way, UNIX users are dynamically created to
 	match existing Windows NT accounts.</para>
 
-	<para>See also <link linkend="SECURITY"><parameter moreinfo="none">
-	security</parameter></link>, <link linkend="PASSWORDSERVER">
-	<parameter moreinfo="none">password server</parameter></link>, 
-	<link linkend="DELETEUSERSCRIPT"><parameter moreinfo="none">delete user 
-	script</parameter></link>.</para>
+	<para>
+	See also <smbconfoption name="security"/>, <smbconfoption name="password server"/>,
+	<smbconfoption name="delete user script"/>.
+	</para>
 </description>
 
 <value type="default"/>
diff --git a/docs/smbdotconf/logon/domainlogons.xml b/docs/smbdotconf/logon/domainlogons.xml
index 7c432221d0..d274faa18b 100644
--- a/docs/smbdotconf/logon/domainlogons.xml
+++ b/docs/smbdotconf/logon/domainlogons.xml
@@ -7,8 +7,7 @@
 	<para>
 	If set to <constant>yes</constant>, the Samba server will
 	provide the netlogon service for Windows 9X network logons for the
-	<link linkend="WORKGROUP">
-	<parameter moreinfo="none">workgroup</parameter></link> it is in.
+	<smbconfoption name="workgroup"/> it is in.
 	This will also cause the Samba server to act as a domain
 	controller for NT4 style domain services. For more details on
 	setting up this feature see the Domain Control chapter of the
diff --git a/docs/smbdotconf/logon/logondrive.xml b/docs/smbdotconf/logon/logondrive.xml
index a37c2e760b..2b8f016ece 100644
--- a/docs/smbdotconf/logon/logondrive.xml
+++ b/docs/smbdotconf/logon/logondrive.xml
@@ -5,8 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the local path to 
-	which the home directory will be connected (see <link linkend="LOGONHOME">
-	<parameter moreinfo="none">logon home</parameter></link>) 
+	which the home directory will be connected (see <smbconfoption name="logon home"/>) 
 	and is only used by NT Workstations. </para>
 
 	<para>Note that this option is only useful if Samba is set up as a
diff --git a/docs/smbdotconf/logon/logonhome.xml b/docs/smbdotconf/logon/logonhome.xml
index 8d07550c30..5939902625 100644
--- a/docs/smbdotconf/logon/logonhome.xml
+++ b/docs/smbdotconf/logon/logonhome.xml
@@ -29,8 +29,7 @@
 	\\server\share when a user does <command moreinfo="none">net use /home</command>
 	but use the whole string when dealing with profiles.</para>
 
-	<para>Note that in prior versions of Samba, the <link linkend="LOGONPATH">
-	<parameter moreinfo="none">logon path</parameter></link> was returned rather than 
+	<para>Note that in prior versions of Samba, the <smbconfoption name="logon path"/> was returned rather than 
 	<parameter moreinfo="none">logon home</parameter>.  This broke <command 
 	moreinfo="none">net use /home</command> but allowed profiles outside the home directory.  
 	The current implementation is correct, and can be used for profiles if you use 
diff --git a/docs/smbdotconf/logon/logonpath.xml b/docs/smbdotconf/logon/logonpath.xml
index ab87c77bb9..eb2e9de056 100644
--- a/docs/smbdotconf/logon/logonpath.xml
+++ b/docs/smbdotconf/logon/logonpath.xml
@@ -8,8 +8,7 @@
 	where roaming profiles (NTuser.dat etc files for Windows NT) are 
 	stored.  Contrary to previous versions of these manual pages, it has 
 	nothing to do with Win 9X roaming profiles.  To find out how to 
-	handle roaming profiles for Win 9X system, see the <link linkend="LOGONHOME">
-	<parameter moreinfo="none">logon home</parameter></link> parameter.</para>
+	handle roaming profiles for Win 9X system, see the <smbconfoption name="logon home"/> parameter.</para>
 
 	<para>This option takes the standard substitutions, allowing you 
 	to have separate logon scripts for each user or machine.  It also 
diff --git a/docs/smbdotconf/logon/logonscript.xml b/docs/smbdotconf/logon/logonscript.xml
index eb7bda66ee..847896e1ce 100644
--- a/docs/smbdotconf/logon/logonscript.xml
+++ b/docs/smbdotconf/logon/logonscript.xml
@@ -11,13 +11,13 @@
 	file is recommended.</para>
 		
 	<para>The script must be a relative path to the [netlogon] 
-	service.  If the [netlogon] service specifies a <link linkend="PATH">
-	<parameter moreinfo="none">path</parameter></link> of <filename 
-	moreinfo="none">/usr/local/samba/netlogon</filename>, and <command 
-	moreinfo="none">logon script = STARTUP.BAT</command>, then 
-	the file that will be downloaded is:</para>
-
-	<para><filename moreinfo="none">/usr/local/samba/netlogon/STARTUP.BAT</filename></para>
+	service.  If the [netlogon] service specifies a <smbconfoption name="path"/> of <filename
+	moreinfo="none">/usr/local/samba/netlogon</filename>, and <smbconfoption name="logon
+	script">STARTUP.BAT</smbconfoption>, then the file that will be downloaded is:
+	<screen>
+	/usr/local/samba/netlogon/STARTUP.BAT
+	</screen>
+	</para>
 
 	<para>The contents of the batch file are entirely your choice.  A 
 	suggested command would be to add <command moreinfo="none">NET TIME \\SERVER /SET 
@@ -35,8 +35,7 @@
 	<para>This option takes the standard substitutions, allowing you 
 	to have separate logon scripts for each user or machine.</para>
 
-	<para>This option is only useful if Samba is set up as a logon 
-		server.</para>
+	<para>This option is only useful if Samba is set up as a logon server.</para>
 </description>
 <value type="default"></value>
 <value type="example">scripts\%U.bat</value>