Merge branch 'busybox' into merge

Conflicts:
	include/platform.h
	scripts/basic/fixdep.c

3 files changed, 6 insertions, 6 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index b5701217e..ef14be471 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -635,12 +635,13 @@ config FEATURE_FANCY_TAIL
         default y
         depends on TAIL
         help
-          The options (-q, -s, and -v) are provided by GNU tail, but
+          The options (-q, -s, -v and -F) are provided by GNU tail, but
           are not specific in the SUSv3 standard.
 
             -q      Never output headers giving file names
             -s SEC  Wait SEC seconds between reads with -f
             -v      Always output headers giving file names
+            -F      Same as -f, but keep retrying
 
 config TEE
         bool "tee"
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 1a9127622..cb07bbcbb 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -16,10 +16,10 @@
 //usage:       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
 //usage:     "\n        -R      Recurse"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
+//usage:        IF_DESKTOP(
 //usage:     "\n        -L      Traverse all symlinks to directories"
 //usage:     "\n        -H      Traverse symlinks on command line only"
 //usage:     "\n        -P      Don't traverse symlinks (default)"
-//usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
 //usage:     "\n        -v      List all files"
 //usage:     "\n        -f      Hide errors"
diff --git a/coreutils/tail.c b/coreutils/tail.c
index eab502beb..e352ab627 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -32,15 +32,14 @@
 //usage:       "Print last 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
 //usage:     "\n        -f              Print data as file grows"
-//usage:        IF_FEATURE_FANCY_TAIL(
-//usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
-//usage:        )
+//usage:     "\n        -c [+]N[kbm]    Print last N bytes"
 //usage:     "\n        -n N[kbm]       Print last N lines"
 //usage:     "\n        -n +N[kbm]      Start on Nth line and print the rest"
 //usage:        IF_FEATURE_FANCY_TAIL(
-//usage:     "\n        -c [+]N[kbm]    Print last N bytes"
 //usage:     "\n        -q              Never print headers"
+//usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
 //usage:     "\n        -v              Always print headers"
+//usage:     "\n        -F              Same as -f, but keep retrying"
 //usage:     "\n"
 //usage:     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)."
 //usage:        )