f180de
diff -urNp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
f180de
--- coreutils-6.10-orig/doc/coreutils.texi	2008-04-07 17:52:11.000000000 +0200
f180de
+++ coreutils-6.10/doc/coreutils.texi	2008-04-07 18:01:43.000000000 +0200
f180de
@@ -6981,6 +6981,11 @@ for i; do
f180de
 exit $fail
f180de
 @end example
f180de
 
f180de
+@item -c
f180de
+@cindex SELinux security context information, preserving
f180de
+Preserve SELinux security context of the original files if possible.
f180de
+Some file systems don't support storing of SELinux security context.
f180de
+
f180de
 @item --copy-contents
f180de
 @cindex directories, copying recursively
f180de
 @cindex copying directories recursively
f180de
diff -urNp coreutils-8.22-orig/doc/coreutils.texi coreutils-8.22/doc/coreutils.texi
f180de
--- coreutils-8.22-orig/doc/coreutils.texi	2015-06-12 14:16:22.672832509 +0200
f180de
+++ coreutils-8.22/doc/coreutils.texi	2015-06-12 14:43:02.646303224 +0200
f180de
@@ -7311,13 +7311,32 @@ it also affects the HP-UX @command{ls} p
f180de
 
f180de
 @item -Z
f180de
 @itemx --context
f180de
+@itemx --scontext
f180de
+@itemx --lcontext
f180de
+@itemx --format=context
f180de
 @opindex -Z
f180de
 @opindex --context
f180de
+@opindex --format=security
f180de
+@opindex --scontext
f180de
+@opindex --lcontext
f180de
 @cindex SELinux
f180de
 @cindex security context
f180de
 Display the SELinux security context or @samp{?} if none is found.
f180de
-When used with the @option{-l} option, print the security context
f180de
-to the left of the size column.
f180de
+@option{-Z} counts as format option and enables displaying of SELinux
f180de
+context.
f180de
+@option{--scontext} prints SELinux context left to the file name.
f180de
+@option{--lcontext} prints long format with SELinux context in the middle.
f180de
+@option{--context} prints permissions, user/group, context and file name (in comparison to @option{--lcontext}, omits size, modification time and number of hardlinks).
f180de
+
f180de
+Note: When multiple format options are used in @command{ls},
f180de
+the last one is used. Therefore @samp{ls -lZ} (security format
f180de
+is last - same as @samp{ls --context}) differs from @samp{ls -Zl}
f180de
+(long format with selinux context is shown, same as @samp{ls --lcontext})
f180de
+
f180de
+Do not rely on @option{--scontext} and @option{--lcontext}
f180de
+options in your scripts. They will be removed in next major
f180de
+version of Red Hat Enterprise Linux. @option{--context} behaviour
f180de
+will change (just enabling displaying SELinux context).
f180de
 
f180de
 @end table
f180de