cp: FEATURE_CP_LONG_OPTIONS depends on LONG_OPTS

[oweals/busybox.git] / include / usage.h

diff --git a/include/usage.h b/include/usage.h
index 9fa1b9ef8aaa71e30b5e5ac07388840bbe0f6596..c7013de22ccbee4e8480dda99bb49cb45ca74aad 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1338,7 +1338,7 @@
 #define ftpd_trivial_usage \
        "[-wvS] [-t N] [-T N] [DIR]"
 #define ftpd_full_usage "\n\n" \
-       "FTP server\n" \
+       "Anonymous FTP server\n" \
        "\n" \
        "ftpd should be used as an inetd service.\n" \
        "ftpd's line for inetd.conf:\n" \
@@ -2001,8 +2001,8 @@
      "\n       a       File is accessed" \
      "\n       c       File is modified" \
      "\n       e       Metadata changed" \
-     "\n       w       Writtable file is closed" \
-     "\n       0       Unwrittable file is closed" \
+     "\n       w       Writable file is closed" \
+     "\n       0       Unwritable file is closed" \
      "\n       r       File is opened" \
      "\n       D       File is deleted" \
      "\n       M       File is moved" \
@@ -2824,9 +2824,21 @@
        "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
 
 #define modprobe_trivial_usage \
-       "[-knqrsv] MODULE [symbol=value...]"
+       IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value...]") \
+       IF_NOT_MODPROBE_SMALL("[-" \
+               IF_FEATURE_2_4_MODULES("k")"nqrsv" \
+               IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value...]")
 #define modprobe_full_usage "\n\n" \
        "Options:" \
+       IF_MODPROBE_SMALL( \
+     "\n       -q      Quiet" \
+     "\n       -f      Force" \
+     "\n       -w      Wait for unload" \
+     "\n       -r      Remove module (stacks) or do autoclean" \
+     "\n       -s      Report via syslog instead of stderr" \
+     "\n       -v      Verbose" \
+       ) \
+       IF_NOT_MODPROBE_SMALL( \
        IF_FEATURE_2_4_MODULES( \
      "\n       -k      Make module autoclean-able" \
        ) \
@@ -2837,7 +2849,8 @@
      "\n       -v      Verbose" \
        IF_FEATURE_MODPROBE_BLACKLIST( \
      "\n       -b      Apply blacklist to module names too" \
-        )
+       ) \
+       )
 
 #define modprobe_notes_usage \
 "modprobe can (un)load a stack of modules, passing each module options (when\n" \
@@ -3411,6 +3424,9 @@
        "Report process status\n" \
      "\nOptions:" \
      "\n       -o col1,col2=header     Select columns for display" \
+       IF_FEATURE_SHOW_THREADS( \
+     "\n       -T                      Show threads" \
+       )
 
 #else /* !ENABLE_DESKTOP */
 
@@ -3860,7 +3876,7 @@
      "\n       -l      Log changes in file labels to syslog" \
      "\n       -n      Don't change any file labels" \
      "\n       -q      Suppress warnings" \
-     "\n       -r dir  Use an altenate root path" \
+     "\n       -r dir  Use an alternate root path" \
      "\n       -e dir  Exclude directory" \
      "\n       -F      Force reset of context to match file_context for customizable files" \
      "\n       -o file Save list of files with incorrect context" \
@@ -4553,7 +4569,7 @@
        "Defaults: SECS: 10, SIG: TERM." \
 
 #define top_trivial_usage \
-       "[-b] [-nCOUNT] [-dSECONDS]"
+       "[-b] [-nCOUNT] [-dSECONDS]" IF_FEATURE_TOPMEM(" [-m]")
 #define top_full_usage "\n\n" \
        "Provide a view of process activity in real time.\n" \
        "Read the status of all processes from /proc each SECONDS\n" \