Next batch of conversions: File names.

Fixed some wrong context marks (most of "hide ..." parameters are per-share)
(This used to be commit 0f8d5b210a60a40f95a43daf06d3d8686985ecd1)

17 files changed, 238 insertions, 192 deletions

diff --git a/docs/docbook/smbdotconf/filename/casesensitive.xml b/docs/docbook/smbdotconf/filename/casesensitive.xml
index 622aea329e..94b20d6c0c 100644
--- a/docs/docbook/smbdotconf/filename/casesensitive.xml
+++ b/docs/docbook/smbdotconf/filename/casesensitive.xml
@@ -1,7 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="CASESENSITIVE"/>case sensitive (S)</term>
-		<listitem><para>See the discussion in the section <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
+<samba:parameter name="case sensitive"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>See the discussion in the section <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
 		
-		<para>Default: <command moreinfo="none">case sensitive = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">case sensitive = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/casesignames.xml b/docs/docbook/smbdotconf/filename/casesignames.xml
index 94bcb85984..3254b545c5 100644
--- a/docs/docbook/smbdotconf/filename/casesignames.xml
+++ b/docs/docbook/smbdotconf/filename/casesignames.xml
@@ -1,5 +1,8 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="CASESIGNAMES"/>casesignames (S)</term>
-		<listitem><para>Synonym for <link linkend="CASESENSITIVE">case 
-		sensitive</link>.</para></listitem>
-		</samba:parameter>
+<samba:parameter name="casesignames"
+                 context="S"
+		 hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>Synonym for <link linkend="CASESENSITIVE">case sensitive</link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/defaultcase.xml b/docs/docbook/smbdotconf/filename/defaultcase.xml
index f2bdf5db1c..de3ad35c0c 100644
--- a/docs/docbook/smbdotconf/filename/defaultcase.xml
+++ b/docs/docbook/smbdotconf/filename/defaultcase.xml
@@ -1,9 +1,11 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="DEFAULTCASE"/>default case (S)</term>
-		<listitem><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>
+<samba:parameter name="default case"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<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>Default: <command moreinfo="none">default case = lower</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">default case = lower</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/deletevetofiles.xml b/docs/docbook/smbdotconf/filename/deletevetofiles.xml
index 49a5e2232f..c851824b7e 100644
--- a/docs/docbook/smbdotconf/filename/deletevetofiles.xml
+++ b/docs/docbook/smbdotconf/filename/deletevetofiles.xml
@@ -1,25 +1,28 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="DELETEVETOFILES"/>delete veto files (S)</term>
-		<listitem><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>
-		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>
+<samba:parameter name="delete veto files"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<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>
+	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>
 
-		<para>If this option is set to <constant>yes</constant>, then Samba 
-		will attempt to recursively delete any files and directories within 
-		the vetoed directory. This can be useful for integration with file 
-		serving systems such as NetAtalk which create meta-files within 
-		directories you might normally veto DOS/Windows users from seeing 
-		(e.g. <filename moreinfo="none">.AppleDouble</filename>)</para>
+	<para>If this option is set to <constant>yes</constant>, then Samba 
+	will attempt to recursively delete any files and directories within 
+	the vetoed directory. This can be useful for integration with file 
+	serving systems such as NetAtalk which create meta-files within 
+	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 
-		directories to be  transparently deleted when the parent directory 
-		is deleted (so long as the user has permissions to do so).</para>
+	<para>Setting <command moreinfo="none">delete veto files = yes</command> allows these 
+	directories to be  transparently deleted when the parent directory 
+	is deleted (so long as the user has permissions to do so).</para>
 
-		<para>See also the <link linkend="VETOFILES"><parameter moreinfo="none">veto 
-		files</parameter></link> parameter.</para>
+	<para>See also the <link linkend="VETOFILES"><parameter moreinfo="none">veto 
+	files</parameter></link> parameter.</para>
 
-		<para>Default: <command moreinfo="none">delete veto files = no</command></para></listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">delete veto files = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/hidedotfiles.xml b/docs/docbook/smbdotconf/filename/hidedotfiles.xml
index 63e87d8059..1728f01f8f 100644
--- a/docs/docbook/smbdotconf/filename/hidedotfiles.xml
+++ b/docs/docbook/smbdotconf/filename/hidedotfiles.xml
@@ -1,7 +1,10 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="HIDEDOTFILES"/>hide dot files (S)</term>
-		<listitem><para>This is a boolean parameter that controls whether 
-		files starting with a dot appear as hidden files.</para>
+<samba:parameter name="hide dot files"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This is a boolean parameter that controls whether 
+	files starting with a dot appear as hidden files.</para>
 
-		<para>Default: <command moreinfo="none">hide dot files = yes</command></para></listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">hide dot files = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/hidefiles.xml b/docs/docbook/smbdotconf/filename/hidefiles.xml
index 6f93a2a239..b687fc5a1f 100644
--- a/docs/docbook/smbdotconf/filename/hidefiles.xml
+++ b/docs/docbook/smbdotconf/filename/hidefiles.xml
@@ -1,35 +1,39 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="HIDEFILES"/>hide files(S)</term>
-		<listitem><para>This is a list of files or directories that are not 
-		visible but are accessible.  The DOS 'hidden' attribute is applied 
-		to any files or directories that match.</para>
+<samba:parameter name="hide files"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This is a list of files or directories that are not 
+	visible but are accessible.  The DOS 'hidden' attribute is applied 
+	to any files or directories that match.</para>
 
-		<para>Each entry in the list must be separated by a '/', 
-		which allows spaces to be included in the entry.  '*'
-		and '?' can be used to specify multiple files or directories 
-		as in DOS wildcards.</para>
+	<para>Each entry in the list must be separated by a '/', 
+	which allows spaces to be included in the entry.  '*'
+	and '?' can be used to specify multiple files or directories 
+	as in DOS wildcards.</para>
 
-		<para>Each entry must be a Unix path, not a DOS path and must 
-		not include the Unix directory separator '/'.</para>
+	<para>Each entry must be a Unix path, not a DOS path and must 
+	not include the Unix directory separator '/'.</para>
 
-		<para>Note that the case sensitivity option is applicable 
-		in hiding files.</para>
+	<para>Note that the case sensitivity option is applicable 
+	in hiding files.</para>
 		
-		<para>Setting this parameter will affect the performance of Samba, 
-		as it will be forced to check all files and directories for a match 
-		as they are scanned.</para>
+	<para>Setting this parameter will affect the performance of Samba, 
+	as it will be forced to check all files and directories for a match 
+	as they are scanned.</para>
 
-		<para>See also <link linkend="HIDEDOTFILES"><parameter moreinfo="none">hide 
-		dot files</parameter></link>, <link linkend="VETOFILES"><parameter moreinfo="none">
-		veto files</parameter></link> and <link linkend="CASESENSITIVE">
-		<parameter moreinfo="none">case sensitive</parameter></link>.</para>
+	<para>See also <link linkend="HIDEDOTFILES"><parameter moreinfo="none">hide 
+	dot files</parameter></link>, <link linkend="VETOFILES"><parameter moreinfo="none">
+	veto files</parameter></link> and <link linkend="CASESENSITIVE">
+	<parameter moreinfo="none">case sensitive</parameter></link>.</para>
 
-		<para>Default: <emphasis>no file are hidden</emphasis></para>
-  		<para>Example: <command moreinfo="none">hide files =
+	<para>Default: <emphasis>no file are hidden</emphasis></para>
+
+	<para>Example: <command moreinfo="none">hide files =
 		/.*/DesktopFolderDB/TrashFor%m/resource.frk/</command></para>
 
-		<para>The above example is based on files that the Macintosh 
-		SMB client (DAVE) available from <ulink url="http://www.thursby.com"> 
-		Thursby</ulink> creates for internal use, and also still hides 
-		all files beginning with a dot.</para></listitem>
-		</samba:parameter>
+	<para>The above example is based on files that the Macintosh 
+	SMB client (DAVE) available from <ulink url="http://www.thursby.com"> 
+	Thursby</ulink> creates for internal use, and also still hides 
+	all files beginning with a dot.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/hidespecialfiles.xml b/docs/docbook/smbdotconf/filename/hidespecialfiles.xml
index 9a8c206097..815e8ea63c 100644
--- a/docs/docbook/smbdotconf/filename/hidespecialfiles.xml
+++ b/docs/docbook/smbdotconf/filename/hidespecialfiles.xml
@@ -1,10 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="HIDESPECIALFILES"/>hide special files (G)</term>
-		<listitem><para>This parameter prevents clients from seeing
-		special files such as sockets, devices and fifo's in directory 
-		listings.
-		</para>
+<samba:parameter name="hide special files"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter prevents clients from seeing
+	special files such as sockets, devices and fifo's in directory 
+	listings.
+	</para>
 
-		<para>Default: <command moreinfo="none">hide special files = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">hide special files = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/hideunreadable.xml b/docs/docbook/smbdotconf/filename/hideunreadable.xml
index d25153f103..f34a3a597d 100644
--- a/docs/docbook/smbdotconf/filename/hideunreadable.xml
+++ b/docs/docbook/smbdotconf/filename/hideunreadable.xml
@@ -1,8 +1,10 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="HIDEUNREADABLE"/>hide unreadable (G)</term>
-		<listitem><para>This parameter prevents clients from seeing the
-		existance of files that cannot be read. Defaults to off.</para>
+<samba:parameter name="hide unreadable"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter prevents clients from seeing the
+	existance of files that cannot be read. Defaults to off.</para>
 
-		<para>Default: <command moreinfo="none">hide unreadable = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">hide unreadable = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/hideunwriteablefiles.xml b/docs/docbook/smbdotconf/filename/hideunwriteablefiles.xml
index 9e28e8de5c..7d20296ff2 100644
--- a/docs/docbook/smbdotconf/filename/hideunwriteablefiles.xml
+++ b/docs/docbook/smbdotconf/filename/hideunwriteablefiles.xml
@@ -1,10 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="HIDEUNWRITEABLEFILES"/>hide unwriteable files (G)</term>
-		<listitem><para>This parameter prevents clients from seeing
-		the existance of files that cannot be written to. Defaults to off.
-		Note that unwriteable directories are shown as usual.
-		</para>
+<samba:parameter name="hide unwriteable files"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter prevents clients from seeing
+	the existance of files that cannot be written to. Defaults to off.
+	Note that unwriteable directories are shown as usual.
+	</para>
 
-		<para>Default: <command moreinfo="none">hide unwriteable = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">hide unwriteable = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/manglecase.xml b/docs/docbook/smbdotconf/filename/manglecase.xml
index 170d77d453..d514375c3b 100644
--- a/docs/docbook/smbdotconf/filename/manglecase.xml
+++ b/docs/docbook/smbdotconf/filename/manglecase.xml
@@ -1,8 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MANGLECASE"/>mangle case (S)</term>
-		<listitem><para>See the section on <link linkend="NAMEMANGLINGSECT">
-		NAME MANGLING</link></para>
+<samba:parameter name="mangle case"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link></para>
 		
-		<para>Default: <command moreinfo="none">mangle case = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">mangle case = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/mangledstack.xml b/docs/docbook/smbdotconf/filename/mangledstack.xml
index 3e6099ba92..42083d13a2 100644
--- a/docs/docbook/smbdotconf/filename/mangledstack.xml
+++ b/docs/docbook/smbdotconf/filename/mangledstack.xml
@@ -1,23 +1,27 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MANGLEDSTACK"/>mangled stack (G)</term>
-		<listitem><para>This parameter controls the number of mangled names 
-		that should be cached in the Samba server <citerefentry><refentrytitle>smbd</refentrytitle>
-		<manvolnum>8</manvolnum></citerefentry>.</para>
+<samba:parameter name="mangling stack"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This parameter controls the number of mangled names 
+	that should be cached in the Samba server <citerefentry><refentrytitle>smbd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry>.</para>
 
-		<para>This stack is a list of recently mangled base names 
-		(extensions are only maintained if they are longer than 3 characters 
-		or contains upper case characters).</para>
+	<para>This stack is a list of recently mangled base names 
+	(extensions are only maintained if they are longer than 3 characters 
+	or contains upper case characters).</para>
 
-		<para>The larger this value, the more likely it is that mangled 
-		names can be successfully converted to correct long UNIX names. 
-		However, large stack sizes will slow most directory accesses. Smaller 
-		stacks save memory in the server (each stack element costs 256 bytes).
-		</para>
+	<para>The larger this value, the more likely it is that mangled 
+	names can be successfully converted to correct long UNIX names. 
+	However, large stack sizes will slow most directory accesses. Smaller 
+	stacks save memory in the server (each stack element costs 256 bytes).
+	</para>
 
-		<para>It is not possible to absolutely guarantee correct long 
-		filenames, so be prepared for some surprises!</para>
+	<para>It is not possible to absolutely guarantee correct long 
+	filenames, so be prepared for some surprises!</para>
 
-		<para>Default: <command moreinfo="none">mangled stack = 50</command></para>
-  		<para>Example: <command moreinfo="none">mangled stack = 100</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">mangled stack = 50</command></para>
+
+  	<para>Example: <command moreinfo="none">mangled stack = 100</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/mangleprefix.xml b/docs/docbook/smbdotconf/filename/mangleprefix.xml
index 7dfd46199c..5476ed1f08 100644
--- a/docs/docbook/smbdotconf/filename/mangleprefix.xml
+++ b/docs/docbook/smbdotconf/filename/mangleprefix.xml
@@ -1,11 +1,16 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MANGLEPREFIX"/>mangle prefix (G)</term>
-		<listitem><para> controls the number of prefix
-		characters from the original name used when generating
-		the mangled names. A larger value will give a weaker
-		hash and therefore more name collisions. The minimum
-		value is 1 and the maximum value is 6.</para>
-		<para>Default: <command moreinfo="none">mangle prefix = 1</command></para>
-		<para>Example: <command moreinfo="none">mangle prefix = 4</command></para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="mangling prefix"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para> controls the number of prefix
+	characters from the original name used when generating
+	the mangled names. A larger value will give a weaker
+	hash and therefore more name collisions. The minimum
+	value is 1 and the maximum value is 6.</para>
+
+	<para>Default: <command moreinfo="none">mangle prefix = 1</command></para>
+
+	<para>Example: <command moreinfo="none">mangle prefix = 4</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/manglingchar.xml b/docs/docbook/smbdotconf/filename/manglingchar.xml
index e6a9050466..57c4fa2acd 100644
--- a/docs/docbook/smbdotconf/filename/manglingchar.xml
+++ b/docs/docbook/smbdotconf/filename/manglingchar.xml
@@ -1,11 +1,14 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MANGLINGCHAR"/>mangling char (S)</term>
-		<listitem><para>This controls what character is used as 
-		the <emphasis>magic</emphasis> character in <link linkend="NAMEMANGLINGSECT">name mangling</link>. The default is a '~'
-		but this may interfere with some software. Use this option to set 
-		it to whatever you prefer.</para>
+<samba:parameter name="mangling char"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This controls what character is used as 
+	the <emphasis>magic</emphasis> character in <link linkend="NAMEMANGLINGSECT">name mangling</link>. The 
+	default is a '~' but this may interfere with some software. Use this option to set 
+	it to whatever you prefer.</para>
 
-		<para>Default: <command moreinfo="none">mangling char = ~</command></para>
-		<para>Example: <command moreinfo="none">mangling char = ^</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">mangling char = ~</command></para>
+
+	<para>Example: <command moreinfo="none">mangling char = ^</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/manglingmethod.xml b/docs/docbook/smbdotconf/filename/manglingmethod.xml
index 11f9e9eb01..74366483bd 100644
--- a/docs/docbook/smbdotconf/filename/manglingmethod.xml
+++ b/docs/docbook/smbdotconf/filename/manglingmethod.xml
@@ -1,14 +1,19 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MANGLINGMETHOD"/>mangling method (G)</term>
-		<listitem><para> controls the algorithm used for the generating
-		the mangled names. Can take two different values, &quot;hash&quot; and
-		&quot;hash2&quot;. &quot;hash&quot; is  the default and is the algorithm that has been
-		used in Samba for many years. &quot;hash2&quot; is a newer and considered
-		a better algorithm (generates less collisions) in the names.
-		However, many Win32 applications store the mangled names and so
-		changing to the new algorithm must not be done
-		lightly as these applications may break unless reinstalled.</para>
-		<para>Default: <command moreinfo="none">mangling method = hash2</command></para>
-		<para>Example: <command moreinfo="none">mangling method = hash</command></para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="mangling method"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para> controls the algorithm used for the generating
+	the mangled names. Can take two different values, &quot;hash&quot; and
+	&quot;hash2&quot;. &quot;hash&quot; is  the default and is the algorithm that has been
+	used in Samba for many years. &quot;hash2&quot; is a newer and considered
+	a better algorithm (generates less collisions) in the names.
+	However, many Win32 applications store the mangled names and so
+	changing to the new algorithm must not be done
+	lightly as these applications may break unless reinstalled.</para>
+
+	<para>Default: <command moreinfo="none">mangling method = hash2</command></para>
+
+	<para>Example: <command moreinfo="none">mangling method = hash</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/preservecase.xml b/docs/docbook/smbdotconf/filename/preservecase.xml
index 3be458ce15..d8a4e2342d 100644
--- a/docs/docbook/smbdotconf/filename/preservecase.xml
+++ b/docs/docbook/smbdotconf/filename/preservecase.xml
@@ -1,13 +1,14 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRESERVECASE"/>preserve case (S)</term>
-		<listitem><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>
+<samba:parameter name="preserve case"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<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>
 
-		<para>Default: <command moreinfo="none">preserve case = yes</command></para>
+	<para>Default: <command moreinfo="none">preserve case = yes</command></para>
 
-		<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME 
-		MANGLING</link> for a fuller discussion.</para>
-		</listitem>
-		</samba:parameter>
+	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link> for a fuller discussion.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/shortpreservecase.xml b/docs/docbook/smbdotconf/filename/shortpreservecase.xml
index 1c8b36380d..52c93e1370 100644
--- a/docs/docbook/smbdotconf/filename/shortpreservecase.xml
+++ b/docs/docbook/smbdotconf/filename/shortpreservecase.xml
@@ -1,16 +1,17 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="SHORTPRESERVECASE"/>short preserve case (S)</term>
-		<listitem><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 
-		names are lowered. </para>
+<samba:parameter name="short preserve case"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<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 
+	names are lowered. </para>
 		
-		<para>See the section on <link linkend="NAMEMANGLINGSECT">
-		NAME MANGLING</link>.</para>
+	<para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
 
-		<para>Default: <command moreinfo="none">short preserve case = yes</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">short preserve case = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/filename/stripdot.xml b/docs/docbook/smbdotconf/filename/stripdot.xml
index ff877144a6..afed63a12b 100644
--- a/docs/docbook/smbdotconf/filename/stripdot.xml
+++ b/docs/docbook/smbdotconf/filename/stripdot.xml
@@ -1,9 +1,12 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="STRIPDOT"/>strip dot (G)</term>
-		<listitem><para>This is a boolean that controls whether to 
-		strip trailing dots off UNIX filenames. This helps with some 
-		CDROMs that have filenames ending in a single dot.</para>
+<samba:parameter name="strip dot"
+                 context="G"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This is a boolean that controls whether to 
+	strip trailing dots off UNIX filenames. This helps with some 
+	CDROMs that have filenames ending in a single dot.</para>
 
-		<para>Default: <command moreinfo="none">strip dot = no</command></para>
-		</listitem>
-		</samba:parameter>
+	<para>Default: <command moreinfo="none">strip dot = no</command></para>
+</listitem>
+</samba:parameter>