summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--doc/coreutils.texi9
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6373865af..cb3fbfef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-04 Paul Eggert <eggert@cs.ucla.edu>
+
+ * doc/coreutils.texi (Common options): Mention that -h and
+ --human-readable are equivalent to --block-size=human-readable.
+ Documentation problem reported by Steve Ward in
+ <http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00007.html>.
+ (du invocation): Use optSi rather than duplicating the macro's
+ contents (incorrectly, since we claimed a "B" was output).
+
2007-05-31 Jim Meyering <jim@meyering.net>
Pull printf-related code from gnulib, rather than using forked copy.
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index e3a7ec124..f89db18f1 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -573,6 +573,7 @@ you prefer powers of 1024.
@cindex human-readable output
Append a size letter to each size, such as @samp{M} for mebibytes.
Powers of 1024 are used, not 1000; @samp{M} stands for 1,048,576 bytes.
+This option is equivalent to @option{--block-size=human-readable}.
Use the @option{--si} option if you prefer powers of 1000.
@end macro
@@ -9765,13 +9766,7 @@ Output a null byte at the end of each line, rather than a newline.
This option enables other programs to parse the output of @command{du}
even when that output would contain file names with embedded newlines.
-@itemx --si
-@opindex --si
-@cindex SI output
-Append an SI-style abbreviation to each size, such as @samp{MB} for
-megabytes. Powers of 1000 are used, not 1024; @samp{MB} stands for
-1,000,000 bytes. Use the @option{-h} or @option{--human-readable} option if
-you prefer powers of 1024.
+@optSi
@item -s
@itemx --summarize