From f22cd4be3b210126bf386de44f64001ebb9e8b68 Mon Sep 17 00:00:00 2001 From: trasz Date: Fri, 15 Feb 2013 06:52:56 +0000 Subject: [PATCH] MFC r246557: In the setfacl(1) manual page, make it clear that for NFSv4 ACLs, one should really use -a and -x instead of -m. MFC r246558: Improve description of the "-m" option to setfacl(1). MFC r246559: Fix NFSv4 permission description in setfacl(1) manual page: the 'D' means delete_child, not delete. git-svn-id: svn://svn.freebsd.org/base/stable/9@246819 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/setfacl/setfacl.1 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1 index 3d7b517a3..83dc41a42 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 -- 2.45.0