Fix up the man pages to explain that "store dos attributes" overrides them.

Signed-off-by: Jeremy Allison <jra@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue May  7 01:24:54 CEST 2013 on sn-devel-104

5 files changed, 26 insertions, 2 deletions

diff --git a/docs-xml/smbdotconf/filename/maparchive.xml b/docs-xml/smbdotconf/filename/maparchive.xml
index ead72cf25a..33ff876c74 100644
--- a/docs-xml/smbdotconf/filename/maparchive.xml
+++ b/docs-xml/smbdotconf/filename/maparchive.xml
@@ -13,6 +13,12 @@
 	</para>
 
 	<para>
+	Note that this parameter will be ignored if the <smbconfoption name="store dos attributes"/>
+	parameter is set, as the DOS archive attribute will then be stored inside a UNIX extended
+	attribute.
+	</para>
+
+	<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 
 	<smbconfoption name="create mask"/> for details.
diff --git a/docs-xml/smbdotconf/filename/maphidden.xml b/docs-xml/smbdotconf/filename/maphidden.xml
index 841c6876e6..004f493ec9 100644
--- a/docs-xml/smbdotconf/filename/maphidden.xml
+++ b/docs-xml/smbdotconf/filename/maphidden.xml
@@ -8,6 +8,12 @@
 	</para>
 
 	<para>
+	Note that this parameter will be ignored if the <smbconfoption name="store dos attributes"/>
+	parameter is set, as the DOS hidden attribute will then be stored inside a UNIX extended
+	attribute.
+	</para>
+
+	<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 <smbconfoption name="create mask"/> 
 	for details.
diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml
index 24a2c84143..f4ac7c8014 100644
--- a/docs-xml/smbdotconf/filename/mapreadonly.xml
+++ b/docs-xml/smbdotconf/filename/mapreadonly.xml
@@ -42,6 +42,12 @@
 		</para></listitem>
     </itemizedlist>
 
+        <para>
+        Note that this parameter will be ignored if the <smbconfoption name="store dos attributes"/>
+        parameter is set, as the DOS 'read-only' attribute will then be stored inside a UNIX extended
+        attribute.
+        </para>
+
 </description>
 <value type="default">yes</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/filename/mapsystem.xml b/docs-xml/smbdotconf/filename/mapsystem.xml
index 021602d578..5605d8860a 100644
--- a/docs-xml/smbdotconf/filename/mapsystem.xml
+++ b/docs-xml/smbdotconf/filename/mapsystem.xml
@@ -7,6 +7,12 @@
 	This controls whether DOS style system files should be mapped to the UNIX group execute bit.
 	</para>
 
+        <para>
+        Note that this parameter will be ignored if the <smbconfoption name="store dos attributes"/>
+        parameter is set, as the DOS system attribute will then be stored inside a UNIX extended
+        attribute.
+        </para>
+
 	<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 
diff --git a/docs-xml/smbdotconf/filename/storedosattributes.xml b/docs-xml/smbdotconf/filename/storedosattributes.xml
index 621b4ace74..acd78b076e 100644
--- a/docs-xml/smbdotconf/filename/storedosattributes.xml
+++ b/docs-xml/smbdotconf/filename/storedosattributes.xml
@@ -8,9 +8,9 @@
 	READ-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such
 	as occurs with <smbconfoption name="map hidden"/> and <smbconfoption name="map readonly"/>).  When set, DOS
 	attributes will be stored onto an extended attribute in the UNIX filesystem, associated with the file or
-	directory.  For no other mapping to occur as a fall-back, the parameters <smbconfoption name="map hidden"/>,
+	directory.  When this parameter is set it will override the parameters <smbconfoption name="map hidden"/>,
 	<smbconfoption name="map system"/>, <smbconfoption name="map archive"/> and <smbconfoption name="map
-	readonly"/> must be set to off.  This parameter writes the DOS attributes as a string into the extended
+	readonly"/> and they will behave as if they were 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. On Linux the filesystem must have been mounted with the mount option user_xattr in order for
 	extended attributes to work, also extended attributes must be compiled into the Linux kernel.