summaryrefslogtreecommitdiff
path: root/docs-xml/manpages/vfs_gpfs.8.xml
diff options
context:
space:
mode:
authorChristof Schmitt <cs@samba.org>2019-07-18 10:22:28 -0700
committerChristof Schmitt <cs@samba.org>2019-07-23 18:27:28 +0000
commitf466f4d3e8435a2e0a4a7ec2ca50e02df1f7869e (patch)
tree00c32255926a871690beceaee5094067fc15d848 /docs-xml/manpages/vfs_gpfs.8.xml
parentf81191d51bb345ac13402dc4c8100576b4b381cb (diff)
downloadsamba-f466f4d3e8435a2e0a4a7ec2ca50e02df1f7869e.tar.gz
docs: Update vfs_gpfs manpage for the new default of nfs4:acedup
Signed-off-by: Christof Schmitt <cs@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'docs-xml/manpages/vfs_gpfs.8.xml')
-rw-r--r--docs-xml/manpages/vfs_gpfs.8.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/manpages/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml
index d32a0db0fc9..eb0cc72f8f0 100644
--- a/docs-xml/manpages/vfs_gpfs.8.xml
+++ b/docs-xml/manpages/vfs_gpfs.8.xml
@@ -371,10 +371,10 @@
<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>