summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/doc/ChangeLog4
-rw-r--r--winsup/doc/utils.xml13
2 files changed, 11 insertions, 6 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index f12e63de2..362af7a4b 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-03 Corinna Vinschen <corinna@vinschen.de>
+
+ * utils.xml (setfacl): Align documentation to help text in setfacl.
+
2014-08-31 Corinna Vinschen <corinna@vinschen.de>
* ntsec.xml (ntsec-common): Drop outdated comment about underdeveloped
diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml
index bd82cfa85..acbda53d8 100644
--- a/winsup/doc/utils.xml
+++ b/winsup/doc/utils.xml
@@ -1738,12 +1738,13 @@ At least one of (-d, -f, -m, -s) must be specified
Acl_entries to be deleted should be specified without permissions, as in
the following list:
<screen>
- u[ser]:uid
- g[roup]:gid
- d[efault]:u[ser]:uid
- d[efault]:g[roup]:gid
- d[efault]:m[ask]:
- d[efault]:o[ther]:
+ u[ser]:uid[:]
+ g[roup]:gid[:]
+ m[ask][:]
+ d[efault]:u[ser][:uid]
+ d[efault]:g[roup][:gid]
+ d[efault]:m[ask][:]
+ d[efault]:o[ther][:]
</screen> </para>
<para> <literal>-f</literal> Take the Acl_entries from ACL_FILE one per