Some random updates.

(This used to be commit 57d0cc9fcdc1c790a601f6dcf7071188448a5f58)

13 files changed, 27 insertions, 31 deletions

diff --git a/docs/smbdotconf/filename/casesensitive.xml b/docs/smbdotconf/filename/casesensitive.xml
index bace4b360f..7765adced2 100644
--- a/docs/smbdotconf/filename/casesensitive.xml
+++ b/docs/smbdotconf/filename/casesensitive.xml
@@ -4,7 +4,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>casesignames</synonym>
 <description>
-	<para>See the discussion in the section <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
+	<para>See the discussion in the section <smbconfoption name="name mangling"/>.</para>
 </description>
 <value type="default">no</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/filename/defaultcase.xml b/docs/smbdotconf/filename/defaultcase.xml
index 082a26cff9..ac5f589d3a 100644
--- a/docs/smbdotconf/filename/defaultcase.xml
+++ b/docs/smbdotconf/filename/defaultcase.xml
@@ -2,9 +2,8 @@
 	context="S"
 	type="string" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>See the section on <link linkend="NAMEMANGLINGSECT">
-	NAME MANGLING</link>. Also note the <link linkend="SHORTPRESERVECASE">
-	<parameter moreinfo="none">short preserve case</parameter></link> parameter.</para>
+	<para>See the section on <smbconfoption name="name mangling"/>
+		. Also note the <smbconfoption name="short preserve case"/> parameter.</para>
 </description>
 <value type="default">lower</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/filename/deletevetofiles.xml b/docs/smbdotconf/filename/deletevetofiles.xml
index a8ccced47d..b8809bacd7 100644
--- a/docs/smbdotconf/filename/deletevetofiles.xml
+++ b/docs/smbdotconf/filename/deletevetofiles.xml
@@ -5,7 +5,7 @@
 <description>
 	<para>This option is used when Samba is attempting to 
 	delete a directory that contains one or more vetoed directories 
-	(see the <link linkend="VETOFILES"><parameter moreinfo="none">veto files</parameter></link>
+	(see the <smbconfoption name="veto files"/>
 	option).  If this option is set to <constant>no</constant> (the default) then if a vetoed 
 	directory contains any non-vetoed files or directories then the 
 	directory delete will fail. This is usually what you want.</para>
@@ -17,7 +17,7 @@
 	directories you might normally veto DOS/Windows users from seeing 
 	(e.g. <filename moreinfo="none">.AppleDouble</filename>)</para>
 
-	<para>Setting <command moreinfo="none">delete veto files = yes</command> allows these 
+<para>Setting <smbconfoption name="delete veto files">yes</smbconfoption> allows these 
 	directories to be  transparently deleted when the parent directory 
 	is deleted (so long as the user has permissions to do so).</para>
 </description>
diff --git a/docs/smbdotconf/filename/mangledmap.xml b/docs/smbdotconf/filename/mangledmap.xml
index b199a299de..cbcec9b1df 100644
--- a/docs/smbdotconf/filename/mangledmap.xml
+++ b/docs/smbdotconf/filename/mangledmap.xml
@@ -14,7 +14,7 @@
 	<para>So to map <filename moreinfo="none">html</filename> to <filename moreinfo="none">htm</filename> 
 	you would use:</para>
 		
-	<para><command moreinfo="none">mangled map = (*.html *.htm)</command></para>
+<para><smbconfoption name="mangled map">(*.html *.htm)</smbconfoption>.</para>
 
 	<para>One very useful case is to remove the annoying <filename moreinfo="none">;1
 	</filename> off the ends of filenames on some CDROMs (only visible 
diff --git a/docs/smbdotconf/filename/manglednames.xml b/docs/smbdotconf/filename/manglednames.xml
index 9906c595bc..64bc4a9412 100644
--- a/docs/smbdotconf/filename/manglednames.xml
+++ b/docs/smbdotconf/filename/manglednames.xml
@@ -7,7 +7,7 @@
 	should be mapped to DOS-compatible names (&quot;mangled&quot;) and made visible, 
 	or whether non-DOS names should simply be ignored.</para>
 
-	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link> for 
+<para>See the section on <smbconfoption name="name mangling"/> for 
 	details on how to control the mangling process.</para>
 
 	<para>If mangling is used then the mangling algorithm is as follows:</para>
@@ -29,8 +29,8 @@
 			characters.</para>
 
 			<para>Note that the character to use may be specified using 
-			the <link linkend="MANGLINGCHAR"><parameter moreinfo="none">mangling char</parameter>
-			</link> option, if you don't like '~'.</para>
+				the <smbconfoption name="mangling char"/>
+			option, if you don't like '~'.</para>
 		</listitem>
 
 		<listitem>
diff --git a/docs/smbdotconf/filename/maparchive.xml b/docs/smbdotconf/filename/maparchive.xml
index 0a6504a3c9..1110ec943b 100644
--- a/docs/smbdotconf/filename/maparchive.xml
+++ b/docs/smbdotconf/filename/maparchive.xml
@@ -10,10 +10,9 @@
 	any file it touches from becoming executable under UNIX.  This can 
 	be quite annoying for shared source code, documents, etc...</para>
 
-	<para>Note that this requires the <parameter moreinfo="none">create mask</parameter>
+<para>Note that this requires the <smbconfoption name="create mask"/>
 	parameter to be set such that owner execute bit is not masked out 
-	(i.e. it must include 100). See the parameter <link linkend="CREATEMASK">
-	<parameter moreinfo="none">create mask</parameter></link> for details.</para>
+	(i.e. it must include 100). See the parameter <smbconfoption name="create mask"/> for details.</para>
 </description>
 
 <value type="default">yes</value>
diff --git a/docs/smbdotconf/filename/maphidden.xml b/docs/smbdotconf/filename/maphidden.xml
index f3a6abd57f..da40f7ff3e 100644
--- a/docs/smbdotconf/filename/maphidden.xml
+++ b/docs/smbdotconf/filename/maphidden.xml
@@ -6,10 +6,9 @@
 	<para>This controls whether DOS style hidden files 
 	should be mapped to the UNIX world execute bit.</para>
 
-	<para>Note that this requires the <parameter moreinfo="none">create mask</parameter> 
+<para>Note that this requires the <smbconfoption name="create mask"/> 
 	to be set such that the world execute bit is not masked out (i.e. 
-	it must include 001). See the parameter <link linkend="CREATEMASK">
-	<parameter moreinfo="none">create mask</parameter></link> for details.</para>
+	it must include 001). See the parameter <smbconfoption name="create mask"/> for details.</para>
 
 </description>
 <value type="boolean">no</value>
diff --git a/docs/smbdotconf/filename/mapsystem.xml b/docs/smbdotconf/filename/mapsystem.xml
index cf8226dd09..35b7dc7cfe 100644
--- a/docs/smbdotconf/filename/mapsystem.xml
+++ b/docs/smbdotconf/filename/mapsystem.xml
@@ -6,10 +6,10 @@
 	<para>This controls whether DOS style system files 
 	should be mapped to the UNIX group execute bit.</para>
 
-	<para>Note that this requires the <parameter moreinfo="none">create mask</parameter> 
+<para>Note that this requires the <smbconfoption name="create mask"/>
 	to be set such that the group execute bit is not masked out (i.e. 
-	it must include 010). See the parameter <link linkend="CREATEMASK">
-	<parameter moreinfo="none">create mask</parameter></link> for details.</para>
+	it must include 010). See the parameter <smbconfoption name="create mask"/>
+	 for details.</para>
 	</description>
 	<value type="default">no</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/filename/preservecase.xml b/docs/smbdotconf/filename/preservecase.xml
index 6346c31463..e84cb56461 100644
--- a/docs/smbdotconf/filename/preservecase.xml
+++ b/docs/smbdotconf/filename/preservecase.xml
@@ -5,8 +5,7 @@
 <description>
 	<para> This controls if new filenames are created
 	with the case that the client passes, or if they are forced to 
-	be the <link linkend="DEFAULTCASE"><parameter moreinfo="none">default case
-	</parameter></link>.</para>
+	be the <smbconfoption name="default case"/>.</para>
 	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link> for a fuller discussion.</para>
 </description>
 
diff --git a/docs/smbdotconf/filename/shortpreservecase.xml b/docs/smbdotconf/filename/shortpreservecase.xml
index 8742b60830..5a164c3d48 100644
--- a/docs/smbdotconf/filename/shortpreservecase.xml
+++ b/docs/smbdotconf/filename/shortpreservecase.xml
@@ -6,9 +6,9 @@
 	<para>This boolean parameter controls if new files 
 	which conform to 8.3 syntax, that is all in upper case and of 
 	suitable length, are created upper case, or if they are forced 
-	to be the <link linkend="DEFAULTCASE"><parameter moreinfo="none">default case
-	</parameter></link>. This  option can be use with <link linkend="PRESERVECASE"><command moreinfo="none">preserve case = yes</command>
-	</link> to permit long filenames to retain their case, while short 
+	to be the <smbconfoption name="default case"/>
+	. This  option can be use with <smbconfoption name="preserve case">yes</smbconfoption>
+	 to permit long filenames to retain their case, while short 
 	names are lowered. </para>
 		
 	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
diff --git a/docs/smbdotconf/filename/storedosattributes.xml b/docs/smbdotconf/filename/storedosattributes.xml
index 56e5a0c175..bedf185c2f 100644
--- a/docs/smbdotconf/filename/storedosattributes.xml
+++ b/docs/smbdotconf/filename/storedosattributes.xml
@@ -5,9 +5,9 @@
 <description>
 	<para>If this parameter is set Samba no longer attempts to
 	map DOS attributes like SYSTEM, HIDDEN, ARCHIVE or READ-ONLY
-	to UNIX permission bits (such as the <link linkend="MAPHIDDEN"><parameter moreinfo="none">map hidden</parameter></link>. Instead, DOS attributes will be stored onto an extended
+	to UNIX permission bits (such as the <smbconfoption name="map hidden"/>. Instead, DOS attributes will be stored onto an extended
 	attribute in the UNIX filesystem, associated with the file or directory.
-	For this to operate correctly, the parameters <link linkend="MAPHIDDEN"><parameter moreinfo="none">map hidden</parameter></link>, <link linkend="MAPSYSTEM"><parameter moreinfo="none">map system</parameter></link>, <link linkend="MAPARCHIVE"><parameter moreinfo="none">map archive</parameter></link> must be set to off.
+	For this to operate correctly, the parameters <smbconfoption name="map hidden"/>, <smbconfoption name="map system"/>, <smbconfoption name="map archive"/> must be set to off.
 	This parameter writes the DOS attributes as a string into the
 	extended attribute named "user.DOSATTRIB". This extended attribute
 	is explicitly hidden from smbd clients requesting an EA list.
diff --git a/docs/smbdotconf/filename/vetofiles.xml b/docs/smbdotconf/filename/vetofiles.xml
index b5a60053f4..9115da6f7c 100644
--- a/docs/smbdotconf/filename/vetofiles.xml
+++ b/docs/smbdotconf/filename/vetofiles.xml
@@ -13,7 +13,7 @@
 	must <emphasis>not</emphasis> include the  unix directory 
 	separator '/'.</para>
 
-	<para>Note that the <parameter moreinfo="none">case sensitive</parameter> option 
+<para>Note that the <smbconfoption name="case sensitive"/> option 
 	is applicable in vetoing files.</para>
 		
 	<para>One feature of the veto files parameter that it
@@ -21,7 +21,7 @@
 	trying to delete a directory. If a directory that is
 	to be deleted contains nothing but veto files this
 	deletion will <emphasis>fail</emphasis> unless you also set
-	the <parameter moreinfo="none">delete veto files</parameter> parameter to
+	the <smbconfoption name="delete veto files"/> parameter to
 	<parameter moreinfo="none">yes</parameter>.</para>
 
 	<para>Setting this parameter will affect the performance 
diff --git a/docs/smbdotconf/filename/vetooplockfiles.xml b/docs/smbdotconf/filename/vetooplockfiles.xml
index 6deb2d20b0..a8b2797796 100644
--- a/docs/smbdotconf/filename/vetooplockfiles.xml
+++ b/docs/smbdotconf/filename/vetooplockfiles.xml
@@ -3,12 +3,12 @@
 				 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
-	<para>This parameter is only valid when the <link linkend="OPLOCKS">
-	<parameter moreinfo="none">oplocks</parameter></link>
+	<para>This parameter is only valid when the 
+			<smbconfoption name="oplocks"/>
 	parameter is turned on for a share. It allows the Samba administrator
 	to selectively turn off the granting of oplocks on selected files that
 	match a wildcarded list, similar to the wildcarded list used in the
-	<link linkend="VETOFILES"><parameter moreinfo="none">veto files</parameter></link> 
+	<smbconfoption name="veto files"/> 
 	parameter.</para>