5 files changed, 33 insertions, 18 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 303500008..5d9993d8b 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -41,17 +41,19 @@ typedef unsigned long long int uintmax_t;
 #endif
 
 static const char dd_usage[] =
-        "dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n"
-        "Copy a file, converting and formatting according to options\n\n"
+        "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nCopy a file, converting and formatting according to options\n\n"
         "\tif=FILE\tread from FILE instead of stdin\n"
         "\tof=FILE\twrite to FILE instead of stdout\n"
-        "\tbs=n\tread and write n bytes at a time\n"
-        "\tcount=n\tcopy only n input blocks\n"
-        "\tskip=n\tskip n input blocks\n"
-        "\tseek=n\tskip n output blocks\n"
-
+        "\tbs=N\tread and write N bytes at a time\n"
+        "\tcount=N\tcopy only N input blocks\n"
+        "\tskip=N\tskip N input blocks\n"
+        "\tseek=N\tskip N output blocks\n"
         "\n"
-        "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n";
+        "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
+#endif
+        ;
 
 
 
diff --git a/coreutils/df.c b/coreutils/df.c
index c38720454..417065943 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -28,8 +28,11 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 
-static const char df_usage[] = "df [filesystem ...]\n\n"
-        "Print the filesystem space used and space available.\n";
+static const char df_usage[] = "df [filesystem ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nPrint the filesystem space used and space available.\n"
+#endif
+        ;
 
 extern const char mtab_file[];  /* Defined in utility.c */
 
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 528b89a56..ce3cd6f03 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -28,7 +28,11 @@ extern int dirname_main(int argc, char **argv)
         char* s;
 
         if ((argc < 2) || (**(argv + 1) == '-')) {
-                usage("dirname [file ...]\n");
+                usage("dirname [FILENAME ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+                                "\nStrips non-directory suffix from FILENAME\n"
+#endif
+                                );
         }
         argv++;
 
diff --git a/coreutils/du.c b/coreutils/du.c
index c4fb3a38d..9c699978e 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -36,12 +36,15 @@
 typedef void (Display) (long, char *);
 
 static const char du_usage[] =
-        "du [OPTION]... [FILE]...\n\n"
-        "Summarize disk space used for each FILE and/or directory.\n"
+        "du [OPTION]... [FILE]...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nSummarizes disk space used for each FILE and/or directory.\n"
         "Disk space is printed in units of 1024 bytes.\n\n"
         "Options:\n"
         "\t-l\tcount sizes many times if hard linked\n"
-        "\t-s\tdisplay only a total for each argument\n";
+        "\t-s\tdisplay only a total for each argument\n"
+#endif
+        ;
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
@@ -181,7 +184,7 @@ int du_main(int argc, char **argv)
         exit(0);
 }
 
-/* $Id: du.c,v 1.18 2000/04/28 00:18:56 erik Exp $ */
+/* $Id: du.c,v 1.19 2000/05/10 05:05:45 erik Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 2405d0ae1..b31f2229b 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -26,12 +26,15 @@
 #include <stdio.h>
 
 static const char uname_usage[] =
-        "echo [-neE] [ARG ...]\n\n"
-        "Prints the specified ARGs to stdout\n\n"
+        "echo [-neE] [ARG ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nPrints the specified ARGs to stdout\n\n"
         "Options:\n"
         "\t-n\tsuppress trailing newline\n"
         "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
-        "\t-E\tdisable interpretation of backslash-escaped characters\n";
+        "\t-E\tdisable interpretation of backslash-escaped characters\n"
+#endif
+        ;
 
 extern int 
 echo_main(int argc, char** argv)