summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2013-11-26 15:32:39 +0000
committerPádraig Brady <P@draigBrady.com>2013-11-26 15:46:22 +0000
commit17bce8c63e9e0f85b48ca62b63413ce9102af5c1 (patch)
tree649bf6bd7cce7ae58c16e395f51ba9b0c745f060
parentebea85b49c244c8bff69297efc02d9485420087e (diff)
downloadcoreutils-17bce8c63e9e0f85b48ca62b63413ce9102af5c1.tar.xz
doc: clarify the operation of ls -k
* src/ls.c (usage): Mention -k only changes the display for disk usage (directory total, and ls -s), and imply that it can be overridden (by --block-size, and -h). * doc/coreutils.texi (block size): Mention that ls -k handling is different to other utilities. Addresses http://bugs.gnu.org/14525
-rw-r--r--doc/coreutils.texi4
-rw-r--r--src/ls.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 64713dc4a..67feb125a 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -1012,7 +1012,9 @@ option is equivalent to @option{--block-size=1K}, which
is the default unless the @env{POSIXLY_CORRECT} environment variable is
set. The @option{-h} or @option{--human-readable} option is equivalent to
@option{--block-size=human-readable}. The @option{--si} option is
-equivalent to @option{--block-size=si}.
+equivalent to @option{--block-size=si}. Note for @command{ls}
+the @option{-k} option does not control the display of the
+apparent file sizes, whereas the @option{--block-size} option does.
@node Floating point
@section Floating point numbers
diff --git a/src/ls.c b/src/ls.c
index 512d65e2d..e7d1d9315 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -4816,7 +4816,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
-i, --inode print the index number of each file\n\
-I, --ignore=PATTERN do not list implied entries matching shell PATTERN\
\n\
- -k, --kibibytes use 1024-byte blocks\n\
+ -k, --kibibytes default to 1024-byte blocks for disk usage\n\
"), stdout);
fputs (_("\
-l use a long listing format\n\