Added a few clarifications on map readonly parameter.

Jeremy.
(This used to be commit 05fd3a9df9f8e2bd22bb88bef8e762f8653e3659)

diff --git a/docs/smbdotconf/filename/mapreadonly.xml b/docs/smbdotconf/filename/mapreadonly.xml
index b223da1afe748f9c4c8f19f1d12f7450fbbc761f..2f48e7987c100f534bf2b748ec43fabac58b66bc 100644 (file)
--- a/docs/smbdotconf/filename/mapreadonly.xml
+++ b/docs/smbdotconf/filename/mapreadonly.xml
@@ -1,18 +1,18 @@
 <samba:parameter name="map read only"
                  context="S"
-                                type="enum"
+                type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>
-       This controls how the DOS read only attribute should be
-       mapped.
+       This controls how the DOS read only attribute should be mapped from a UNIX filesystem.
        </para>
 
        <para>
        This parameter can take three different values, which tell <citerefentry><refentrytitle>smbd</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry> how to display the read only attribute on files, where either
        <smbconfoption name="store dos attributes"/> is set to <constant>No</constant>, or no extended attribute is
-       present.
+       present. If <smbconfoption name="store dos attributes"/> is set to <constant>yes</constant> then this
+       parameter is <emphasis>ignored</emphasis>. This is a new parameter introduced in Samba version 3.0.21.
        </para>
 
     <para>The three settings are :</para>
@@ -20,18 +20,21 @@
     <itemizedlist>
                <listitem><para>
                <constant>Yes</constant> - The read only DOS attribute is mapped to the inverse of the user
-               write bit in the unix permission mode
+               or owner write bit in the unix permission mode set. If the owner write bit is not set, the
+               read only attribute is reported as being set on the file.
                </para></listitem>
 
                <listitem><para>
                <constant>Permissions</constant> - The read only DOS attribute is mapped to the effective permissions of
                the connecting user, as evaluated by <citerefentry><refentrytitle>smbd</refentrytitle>
                <manvolnum>8</manvolnum></citerefentry> by reading the unix permissions and POSIX ACL (if present).
+               If the connecting user doesn't have permissions to read the file, the read only attribute
+               is reported as being set on the file.
                </para></listitem>
 
                <listitem><para>
                <constant>No</constant> - The read only DOS attribute is unaffected by permissions, and can only be set by
-               the <smbconfoption name="store dos attributes"/> method.  This may be useful for exporting mounted CDs.
+               the <smbconfoption name="store dos attributes"/> method. This may be useful for exporting mounted CDs.
                </para></listitem>
     </itemizedlist>