From: Christof Schmitt <cs@samba.org>
Date: Thu, 18 Jul 2019 17:22:28 +0000 (-0700)
Subject: docs: Update vfs_gpfs manpage for the new default of nfs4:acedup
X-Git-Tag: tdb-1.4.2~520
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=f466f4d3e8435a2e0a4a7ec2ca50e02df1f7869e

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>
---

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>