docs: Update vfs_gpfs manpage for the new default of nfs4:acedup
authorChristof Schmitt <cs@samba.org>
Thu, 18 Jul 2019 17:22:28 +0000 (10:22 -0700)
committerChristof Schmitt <cs@samba.org>
Tue, 23 Jul 2019 18:27:28 +0000 (18:27 +0000)
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
docs-xml/manpages/vfs_gpfs.8.xml

index d32a0db0fc94906d226284c0828c7d270711a840..eb0cc72f8f08ce0508c4d2b1ff70624d3b414509 100644 (file)
 
                <para>Following is the behaviour of Samba for different values :</para>
                <itemizedlist>
-               <listitem><para><command>dontcare (default)</command> - copy the ACEs as they come</para></listitem>
+               <listitem><para><command>dontcare</command> - copy the ACEs as they come</para></listitem>
                <listitem><para><command>reject (deprecated)</command> - stop operation and exit with error on ACL set op</para></listitem>
                <listitem><para><command>ignore (deprecated)</command> - don't include the second matching ACE</para></listitem>
-               <listitem><para><command>merge</command> - bitwise OR the 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE</para></listitem>
+               <listitem><para><command>merge (default)</command> - bitwise OR the 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE</para></listitem>
                </itemizedlist>
                </listitem>
                </varlistentry>