diff options
author | attilio <attilio@FreeBSD.org> | 2013-02-08 23:59:21 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2013-02-08 23:59:21 +0000 |
commit | 450eca0c4dcf45d80e1b47ef0f8f534027e67fd3 (patch) | |
tree | 82e77728c2b91e78b54bb235fd86d605344f1299 /bin/setfacl | |
parent | 5efa156edcb187c952cb48193661867644a4de26 (diff) | |
download | FreeBSD-src-450eca0c4dcf45d80e1b47ef0f8f534027e67fd3.zip FreeBSD-src-450eca0c4dcf45d80e1b47ef0f8f534027e67fd3.tar.gz |
Merge from vmcontention
Diffstat (limited to 'bin/setfacl')
-rw-r--r-- | bin/setfacl/setfacl.1 | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1 index 3d7b517..83dc41a 100644 --- a/bin/setfacl/setfacl.1 +++ b/bin/setfacl/setfacl.1 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 2012 +.Dd February 8, 2013 .Dt SETFACL 1 .Os .Sh NAME @@ -91,10 +91,16 @@ An error will be reported if any of the specified files cannot have a default entry (i.e.\& non-directories). This option is not applicable to NFSv4 ACLs. .It Fl m Ar entries -Modify the ACL entries on the specified files by adding new -entries and modifying existing ACL entries with the ACL entries -specified in -.Ar entries . +Modify the ACL on the specified file. +New entries will be added, and existing entries will be modified +according to the +.Ar entries +argument. +For NFSv4 ACLs, it is recommended to use the +.Fl a +and +.Fl x +options instead. .It Fl M Ar file Modify the ACL entries on the specified files by adding new ACL entries and modifying existing ACL entries with the ACL @@ -319,9 +325,9 @@ write_data execute .It p append_data -.It d -delete_child .It D +delete_child +.It d delete .It a read_attributes |