From b3d0030d3c107dfe8a936eeb59fc71e03fe9a170 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 15 Dec 2014 20:30:15 +0000
Subject: 	* new-features.xml (ov-new1.7.34): Add setfacl -k option. 
 * utils.xml (setfacl): Ditto.

---
 winsup/doc/ChangeLog        | 5 +++++
 winsup/doc/new-features.xml | 5 +++++
 winsup/doc/utils.xml        | 7 ++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 98fc72cdb..06b538043 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-15  Corinna Vinschen  <corinna@vinschen.de>
+
+	* new-features.xml (ov-new1.7.34): Add setfacl -k option.
+	* utils.xml (setfacl): Ditto.
+
 2014-12-10  Michael DePaulo  <mikedep333@gmail.com>
 
 	* ntsec.xml (ntsec-mapping-samba): Clarify Samba file server setup.
diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml
index 91b7714cf..7809e498d 100644
--- a/winsup/doc/new-features.xml
+++ b/winsup/doc/new-features.xml
@@ -30,6 +30,11 @@ Add -b/--remove-all option to setfacl to reduce the ACL to only the entries
 representing POSIX permission bits.
 </para></listitem>
 
+<listitem><para>
+Add -k/--remove-default option to setfacl to remove all default ACL entries
+from an ACL.
+</para></listitem>
+
 <listitem><para>
 Revamp Solaris ACL implementation to more closely work like POSIX ACLs
 are supposed to work.  Finally implement a CLASS_OBJ emulation.  Update
diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml
index 655b4e8bb..258baf63d 100644
--- a/winsup/doc/utils.xml
+++ b/winsup/doc/utils.xml
@@ -1695,6 +1695,8 @@ Modify file and directory access control lists (ACLs)
   -d, --delete     delete one or more specified ACL entries
   -f, --file       set ACL entries for FILE to ACL entries read
                    from a ACL_FILE
+  -k, --remove-default
+		   remove all default ACL entries
   -m, --modify     modify one or more specified ACL entries
   -r, --replace    replace mask entry with maximum permissions
                    needed for the file group class
@@ -1703,7 +1705,7 @@ Modify file and directory access control lists (ACLs)
   -h, --help       output usage information and exit
   -V, --version    output version information and exit
 
-At least one of (-b, -d, -f, -m, -s) must be specified
+At least one of (-b, -d, -f, -k, -m, -s) must be specified
 </screen>
 
     <para> For each file given as parameter, <command>setfacl</command> will
@@ -1774,6 +1776,9 @@ $ getfacl source_file | setfacl -f - target_file
       file, one default group entry for the group of the file, one default mask
       entry for the file group class, and one default other entry. </para>
 
+    <para> <literal>-k</literal> Remove all default ACL entries. If no default
+      ACL entries exist, no warnings are issued. </para>
+
     <para> <literal>-m</literal> Add or modify one or more specified ACL
       entries. Acl_entries is a comma-separated list of entries from the same
       list as above. </para>
-- 
cgit v1.2.3