From 47af65ccf3bacee7cf9619bacc4037162b919ac7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Sat, 10 Dec 2011 13:53:42 +0100
Subject: [PATCH] s3/doc: document the ignore system acls option of
 vfs_acl_xattr and vfs_acl_tdb
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Sat Dec 10 15:30:46 CET 2011 on sn-devel-104
(cherry picked from commit f452add2231906742c9fd119371cd4fd81a1bdd6)

Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).

Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).
(cherry picked from commit ceeab5c66cef2c5aa7931329a9976c8173f44467)
---
 docs-xml/manpages-3/vfs_acl_tdb.8.xml   | 23 ++++++++++++++++++++---
 docs-xml/manpages-3/vfs_acl_xattr.8.xml | 23 ++++++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 646c5baf330..7c22dec5ded 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -45,9 +45,26 @@
 
 <refsect1>
 	<title>OPTIONS</title>
-	<para>
-	There are no options for <command>vfs_acl_tdb</command>.
-	</para>
+
+	<variablelist>
+		<!-- please keep in sync with the other acl vfs modules that provide the same options -->
+		<varlistentry>
+		<term>acl_tdb:ignore system acls = [yes|no]</term>
+		<listitem>
+		<para>
+		When set to <emphasis>yes</emphasis>, a best effort mapping
+		from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+		done by this module. The default is <emphasis>no</emphasis>,
+		which means that Samba keeps setting and evaluating both the
+		system ACLs and the NT ACLs. This is better if you need your
+		system ACLs be set for local or NFS file access, too. If you only
+		access the data via Samba you might set this to yes to achieve
+		better NT ACL compatibility.
+		</para>
+		</listitem>
+		</varlistentry>
+	</variablelist>
+
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index d428cc22a35..41a8a9750a9 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -49,9 +49,26 @@
 
 <refsect1>
 	<title>OPTIONS</title>
-	<para>
-	There are no options for <command>vfs_acl_xattr</command>.
-	</para>
+
+	<variablelist>
+		<!-- please keep in sync with the other acl vfs modules that provide the same options -->
+		<varlistentry>
+		<term>acl_xattr:ignore system acls = [yes|no]</term>
+		<listitem>
+		<para>
+		When set to <emphasis>yes</emphasis>, a best effort mapping
+		from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+		done by this module. The default is <emphasis>no</emphasis>,
+		which means that Samba keeps setting and evaluating both the
+		system ACLs and the NT ACLs. This is better if you need your
+		system ACLs be set for local or NFS file access, too. If you only
+		access the data via Samba you might set this to yes to achieve
+		better NT ACL compatibility.
+		</para>
+		</listitem>
+		</varlistentry>
+	</variablelist>
+
 </refsect1>
 
 <refsect1>
-- 
2.11.4.GIT