* cp -fa now works as expected for symlinks (it didn't before)

* zcat works again (wasn't working since option parsing was broken)
* more doc updates/more support for BB_FEATURE_SIMPLE_HELP
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@530 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 9 insertions, 1 deletions

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2bbf43a12..6fa17b5fb 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -34,7 +34,15 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 # include <sys/klog.h>
 #endif
 
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
+static const char dmesg_usage[] = "dmesg [-c] [-n LEVEL] [-s SIZE]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nPrints or controls the kernel ring buffer\n\n"
+        "Options:\n"
+        "\t-c\t\tClears the ring buffer's contents after printing\n"
+        "\t-n LEVEL\tSets console logging level\n"
+        "\t-s SIZE\t\tUse a buffer of size SIZE\n"
+#endif
+        ;
 
 int dmesg_main(int argc, char **argv)
 {