"I'll think about it" != "apply it now". It means I need to think about it.

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

diff --git a/include/usage.h b/include/usage.h
index ced9f68c75e64a5f71b3e1d91420f2677814a424..6ef7f1ecfbba9060a775d5e2151d18b220a1aa1a 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -265,6 +265,12 @@
 #define bbconfig_full_usage \
        "Print the config file which built busybox"
 
+#define bbsh_trivial_usage \
+       "[FILE]...\n" \
+       "or: bbsh -c command [args]..."
+#define bbsh_full_usage \
+       "The bbsh shell (command interpreter)"
+
 #define cp_trivial_usage \
        "[OPTION]... SOURCE DEST"
 #define cp_full_usage \
@@ -493,9 +499,9 @@ USE_FEATURE_DATE_ISOFMT( \
        "\t-s SIZE\t\tUse a buffer of size SIZE"
 
 #define dnsd_trivial_usage \
-        "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
+       "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
 #define dnsd_full_usage \
-        "Small and static DNS server daemon\n\n" \
+       "Small and static DNS server daemon\n\n" \
        "Options:\n" \
        "\t-c\t\tconfig filename\n" \
        "\t-t\t\tTTL in seconds\n" \
@@ -1426,15 +1432,15 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ipcrm_trivial_usage \
        "[-[MQS] key] [-[mqs] id]"
 #define ipcrm_full_usage \
-       "The upper-case options MQS are used to remove a shared memory\n" \
-       "segment by an shmkey value. The lower-case options mqs are used\n" \
+       "The upper-case options MQS are used to remove a shared memory segment by a\n" \
+       "segment by a shmkey value. The lower-case options mqs are used\n" \
        "to remove a segment by shmid value.\n" \
-       "\t-m | -M\tRemove the memory segment after the last detach\n" \
-       "\t-q | -Q\tRemove the message queue\n" \
-       "\t-s | -S\tRemove the semaphore"
+       "\t-[mM]\tRemove the memory segment after the last detach\n" \
+       "\t-[qQ]\tRemove the message queue\n" \
+       "\t-[sS]\tRemove the semaphore"
 
 #define ipcs_trivial_usage \
-       "[[-smq] -i shmid] | [[-asmq] [-tclup]]"
+       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
 #define ipcs_full_usage \
        "\t-i\tspecify a specific resource id\n" \
        "Resource specification:\n" \
@@ -1444,10 +1450,10 @@ USE_FEATURE_DATE_ISOFMT( \
        "\t-a\tall (default)\n" \
        "Output format:\n" \
        "\t-t\ttime\n" \
+       "\t-c\tcreator\n" \
        "\t-p\tpid\n" \
-       "\t-s\tcreator\n" \
-       "\t-a\tlimits\n" \
-       "\t-i\tsummary"
+       "\t-l\tlimits\n" \
+       "\t-u\tsummary"
 
 #define iplink_trivial_usage \
        "{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"
@@ -2052,7 +2058,7 @@ USE_FEATURE_MDEV_CONFIG( \
        "$ mount /tmp/diskimage /opt -t ext2 -o loop\n" \
        "$ mount cd_image.iso mydir\n"
 #define mount_notes_usage \
-       "Returns 0 for success, number of failed mounts for -a, or errno for one mount." 
+       "Returns 0 for success, number of failed mounts for -a, or errno for one mount."
 
 #define mountpoint_trivial_usage \
        "[-q] <[-d] DIR | -x DEVICE>"
@@ -2092,7 +2098,7 @@ USE_FEATURE_MDEV_CONFIG( \
 #define nameif_trivial_usage \
        "[-s] [-c FILE] [{IFNAME MACADDR}]"
 #define nameif_full_usage \
-       "Nameif renaming network interface while it in the down state.\n\n" \
+       "Nameif renames network interface while it in the down state.\n\n" \
        "Options:\n" \
        "\t-c FILE\t\tUse configuration file (default is /etc/mactab)\n" \
        "\t-s\t\tUse syslog (LOCAL0 facility)\n" \
@@ -2272,6 +2278,7 @@ USE_FEATURE_MDEV_CONFIG( \
        "Options:\n" \
        "\t-c COUNT\tSend only COUNT pings\n" \
        "\t-s SIZE\t\tSend SIZE data bytes in packets (default=56)\n" \
+       "\t-I IPADDR\tUse IPADDR as source address\n" \
        "\t-q\t\tQuiet mode, only displays output at start\n" \
        "\t\t\tand when finished"
 #endif
@@ -2707,7 +2714,7 @@ USE_FEATURE_MDEV_CONFIG( \
        "\n\t-b|--background\t\t\tforce process into background" \
        "\n\t-u|--user <username>|<uid>\tstop this user's processes" \
        "\n\t-x|--exec <executable>\t\tprogram to either start or check" \
-       "\n\t-m|--make-pidfile <filename>\tcreate the -p file and enter pid in it" \
+       "\n\t-m|--make-pidfile\tcreate the -p file and enter pid in it" \
        "\n\t-n|--name <process-name>\tstop processes with this name" \
        "\n\t-p|--pidfile <pid-file>\t\tsave or load pid using a pid-file" \
        "\n\t-q|--quiet\t\t\tbe quiet" \
@@ -2810,9 +2817,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define sulogin_full_usage \
        "Single user login\n" \
        "Options:\n" \
-       "\t-f\tDo not authenticate (user already authenticated)\n" \
-       "\t-h\tName of the remote host for this login\n" \
-       "\t-p\tPreserve environment"
+       "\t-t\tTimeout"
 
 #define sum_trivial_usage \
        "[rs] [files...]"
@@ -3396,7 +3401,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 
 #define wget_trivial_usage \
        "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n" \
-       "\t\t[--header 'header: value'] [-Y|--proxy on/off] [-P DIR] url"
+       "\t\t[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
+       "\t\t[-U|--user-agent agent] url"
 #define wget_full_usage \
        "wget retrieves files via HTTP or FTP\n\n" \
        "Options:\n" \
@@ -3404,6 +3410,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "\t-q\tquiet mode - do not print\n" \
        "\t-P\tSet directory prefix to DIR\n" \
        "\t-O\tsave to filename ('-' for stdout)\n" \
+       "\t-U\tadjust 'User-Agent' field\n" \
        "\t-Y\tuse proxy ('on' or 'off')"
 
 #define which_trivial_usage \