sed: unbreak multiple -e, -f option handling (my fault)

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

diff --git a/include/usage.h b/include/usage.h
index db608003dd44007d4d272d8a54d99e42e95e905a..1da436ad4dbd02a9502790a42ba9d4cfb8063a20 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -412,17 +412,17 @@ USE_FEATURE_DATE_ISOFMT( \
 #define deallocvt_trivial_usage \
        "[N]"
 #define deallocvt_full_usage \
-        "Deallocate unused virtual terminal /dev/ttyN"
+       "Deallocate unused virtual terminal /dev/ttyN"
 
 #define delgroup_trivial_usage \
        "GROUP"
 #define delgroup_full_usage \
-        "Deletes group GROUP from the system"
+       "Deletes group GROUP from the system"
 
 #define deluser_trivial_usage \
        "USER"
 #define deluser_full_usage \
-        "Deletes user USER from the system"
+       "Deletes user USER from the system"
 
 #define devfsd_trivial_usage \
        "mntpnt [-v]" \
@@ -927,7 +927,7 @@ USE_FEATURE_DATE_ISOFMT( \
        "\t-H login_host\tLog login_host into the utmp file as the hostname"
 
 #define grep_trivial_usage \
-       "[-ihHnqvs" \
+       "[-ihHnqvso" \
        USE_FEATURE_GREP_EGREP_ALIAS("E") \
        USE_FEATURE_GREP_CONTEXT("ABC") \
        "] PATTERN [FILEs...]"
@@ -945,6 +945,7 @@ USE_FEATURE_DATE_ISOFMT( \
        "\t-s\tsuppress file open/read error messages\n" \
        "\t-c\tonly print count of matching lines\n" \
        "\t-f\tread PATTERN from file\n" \
+       "\t-o\tshow only the part of a line that matches PATTERN\n" \
        "\t-e\tPATTERN is a regular expression\n" \
        "\t-F\tPATTERN is a set of newline-separated strings" \
        USE_FEATURE_GREP_EGREP_ALIAS("\n\t-E\tPATTERN is an extended regular expression") \
@@ -2146,8 +2147,7 @@ USE_FEATURE_MDEV_CONFIG( \
        "changes the password for the current user.\n" \
        "Options:\n" \
        "\t-a\tDefine which algorithm shall be used for the password\n" \
-       "\t\t\t(Choices: des, md5" \
-       USE_FEATURE_SHA1_PASSWORDS(", sha1") ")\n" \
+       "\t\t\t(Choices: des, md5, sha1)\n" \
        "\t-d\tDelete the password for the specified user account\n" \
        "\t-l\tLocks (disables) the specified user account\n" \
        "\t-u\tUnlocks (re-enables) the specified user account"
@@ -2408,9 +2408,9 @@ USE_FEATURE_MDEV_CONFIG( \
 #define route_full_usage \
        "Edit the kernel's routing tables.\n\n" \
        "Options:\n" \
-       "\t-n\t\tDont resolve names\n" \
-       "\t-e\t\tDisplay other/more information\n" \
-       "\t-A inet" USE_FEATURE_ROUTE_IPV6("{6}") "\tSelect address family"
+       "\t-n\tDont resolve names\n" \
+       "\t-e\tDisplay other/more information\n" \
+       "\t-A inet" USE_FEATURE_IPV6("{6}") "\tSelect address family"
 
 #define rpm_trivial_usage \
        "-i -q[ildc]p package.rpm"
@@ -2780,7 +2780,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "\t-m MIN\t\tMinutes between MARK lines (default=20, 0=off)\n" \
        "\t-n\t\tRun as a foreground process\n" \
        "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" \
-       "\t-S\t\tMake logging output smaller." \
+       "\t-l n\tSets the local log level of messages to n\n" \
+       "\t-S\t\tMake logging output smaller" \
        USE_FEATURE_ROTATE_LOGFILE( \
        "\n\t-s SIZE\t\tMax size (KB) before rotate (default=200KB, 0=off)\n" \
        "\t-b NUM\t\tNumber of rotated logs to keep (default=1, max=99, 0=purge)") \
@@ -2939,13 +2940,11 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "\t-v\tDisplays verbose resource usage information"
 
 #define top_trivial_usage \
-       "[-d <seconds>]"
+       "[-b] [-n count] [-d seconds]"
 #define top_full_usage \
-       "top provides an view of processor activity in real time.\n" \
-       "This utility reads the status for all processes in /proc each <seconds>\n" \
-       "and shows the status for however many processes will fit on the screen.\n" \
-       "This utility will not show processes that are started after program startup,\n" \
-       "but it will show the EXIT status for and PIDs that exit while it is running."
+       "top provides a view of process activity in real time.\n" \
+       "It reads the status of all processes from /proc each <seconds>\n" \
+       "and shows the status for however many processes will fit on the screen."
 
 #define touch_trivial_usage \
        "[-c] FILE [FILE ...]"