* 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, 5 insertions, 2 deletions

diff --git a/df.c b/df.c
index c38720454..417065943 100644
--- a/df.c
+++ b/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 */