From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 30 Aug 2010 08:31:38 +0000 (+0200)
Subject: docs-xml/vfs_gpfs: document 'gpfs:merge_writeappend'
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=418374bd8087ed33a5a587c1e788deb198ad4bc0

docs-xml/vfs_gpfs: document 'gpfs:merge_writeappend'

metze
(cherry picked from commit 4d76c18f78742ba92b4772037ac306b567351ca1)
---

diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml
index 3c7cc08f9339..941afe2e1943 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages-3/vfs_gpfs.8.xml
@@ -149,6 +149,26 @@
 		</varlistentry>
 		<varlistentry>
 
+		<term>gpfs:merge_writeappend = [ yes | no ]</term>
+		<listitem>
+		<para>
+		GPFS ACLs doesn't know about the 'APPEND' right.
+		This optionen lets Samba map the 'APPEND' right to 'WRITE'.
+		</para>
+
+		<itemizedlist>
+		<listitem><para>
+		<command>yes(default)</command> - map 'APPEND' to 'WRITE'.
+		</para></listitem>
+		<listitem><para>
+		<command>no</command> - do not map 'APPEND' to 'WRITE'.
+		</para></listitem>
+		</itemizedlist>
+		</listitem>
+
+		</varlistentry>
+		<varlistentry>
+
 		<term>nfs4:mode = [ simple | special ]</term>
 		<listitem>
 		<para>