summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2005-12-17 10:46:57 +0000
committerJim Meyering <jim@meyering.net>2005-12-17 10:46:57 +0000
commit01a5f3830fbb22defb3b7eb2b8797c4cee0dc186 (patch)
tree202afdcff3cd10f6fadf39575bc8e9e25bee1241
parent7b08fdb1eb01a9f789423b722bf9752027eab802 (diff)
downloadcoreutils-01a5f3830fbb22defb3b7eb2b8797c4cee0dc186.tar.xz
(ls): Clarify the Alternate Access Method description.
(cp): Clarify that --preserve=mode also preserves acls.
-rw-r--r--doc/coreutils.texi14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 86c9e8aa4..af0a88ceb 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -5719,9 +5719,14 @@ Otherwise.
@end table
Following the permission bits is a single character that specifies
-whether an alternate access method applies to the file. When that
-character is a space, there is no alternate access method. When it
-is a printing character (e.g., @samp{+}), then there is such a method.
+whether an alternate access method such as an access control list
+applies to the file. When the character following the permissions is a
+space, there is no alternate access method. When it is a printing
+character, then there is such a method.
+
+For a file with an extended access control list, a @samp{+} character is
+listed. Basic access control lists are equivalent to the permissions
+listed, and are not considered an alternate access method.
@item -n
@itemx --numeric-uid-gid
@@ -6558,7 +6563,7 @@ of one or more of the following strings:
@table @samp
@itemx mode
-Preserve the permission attributes.
+Preserve the permission attributes, including access control lists.
@itemx ownership
Preserve the owner and group. On most modern systems,
only the super-user may change the owner of a file, and regular users
@@ -6574,7 +6579,6 @@ any links between corresponding source files.
@itemx all
Preserve all file attributes.
Equivalent to specifying all of the above.
-@c Mention ACLs here.
@end table
Using @option{--preserve} with no @var{attribute_list} is equivalent