summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-03-03 02:49:25 +0000
committerPádraig Brady <P@draigBrady.com>2014-03-03 16:39:18 +0000
commit849c1c5b16c32756e14be719855601017770e621 (patch)
tree5addf755b58ed4c2426f6260270dd5318432bcf8
parenta4faa6a0a3ae93c01d036d830ae7a21b74913baf (diff)
downloadcoreutils-849c1c5b16c32756e14be719855601017770e621.tar.xz
doc: improve df --human and --si, help and man page
* src/df.c (usage): Adjust the --human and --si descriptions to not depend on each other. Also include an example that is illustrative of the rounding, suffix, width, and localized fractions. * src/system.h (emit_size_note). Adjust so that it's obvious the description is pertaining to the input SIZE argument, and not to any sizes that might be output by df for example. Fixes http://bugs.gnu.org/16922
-rw-r--r--src/df.c7
-rw-r--r--src/system.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/df.c b/src/df.c
index e4fafb9b6..3036c74ab 100644
--- a/src/df.c
+++ b/src/df.c
@@ -1260,15 +1260,16 @@ or all file systems by default.\n\
emit_mandatory_arg_note ();
+ /* TRANSLATORS: The thousands and decimal separators are best
+ adjusted to an appropriate default for your locale. */
fputs (_("\
-a, --all include dummy file systems\n\
-B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n\
'-BM' prints sizes in units of 1,048,576 bytes;\n\
see SIZE format below\n\
--total produce a grand total\n\
- -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\
-\n\
- -H, --si likewise, but use powers of 1000 not 1024\n\
+ -h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n\
+ -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n\
"), stdout);
fputs (_("\
-i, --inodes list inode information instead of block usage\n\
diff --git a/src/system.h b/src/system.h
index 39750e82f..a9588e779 100644
--- a/src/system.h
+++ b/src/system.h
@@ -549,8 +549,8 @@ static inline void
emit_size_note (void)
{
fputs (_("\n\
-SIZE is an integer and optional unit (example: 10M is 10*1024*1024). Units\n\
-are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000).\n\
+The SIZE argument is an integer and optional unit (example: 10K is 10*1024).\n\
+Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n\
"), stdout);
}