- patch from Denis Vlasenko to add and use bb_xchdir()

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

diff --git a/include/usage.h b/include/usage.h
index 3432d172c448374ec023f89d38a3d3ef79c48f56..d458936ca2c5f0b4b7662f496ce7f6e444fd2d90 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -46,7 +46,7 @@
        "\t-v\t\tverbosely list files processed"
 
 #define arping_trivial_usage \
-       "[-fqbDUA] [-c count] [-w timeout] [-I device] [-s sender] target"
+       "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
 #define arping_full_usage \
        "Ping hosts by ARP requests/replies.\n\n" \
        "Options:\n" \
@@ -58,7 +58,7 @@
        "\t-A\t\tARP answer mode, update your neighbours\n" \
        "\t-c count\tStop after sending count ARP request packets\n" \
        "\t-w timeout\tTime to wait for ARP reply, in seconds\n" \
-       "\t-I device\tOutgoing interface name, default is eth0\n" \
+       "\t-i device\tOutgoing interface name, default is eth0\n" \
        "\t-s sender\tSet specific sender IP address\n" \
        "\ttarget\t\tTarget IP address of ARP request"
 
@@ -453,6 +453,27 @@
        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
        "/dev/sda3              8690864   8553540    137324  98% /\n"
 
+#define diff_trivial_usage \
+       "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+#define diff_full_usage \
+       "Compare files line by line and output the differences between them.\n" \
+       "This diff implementation only supports unified diffs.\n\n" \
+       "Options:\n" \
+       "\t-a\tTreat all files as text\n" \
+       "\t-b\tIgnore changes in the amount of whitespace\n" \
+       "\t-d\tTry hard to find a smaller set of changes\n" \
+       "\t-i\tIgnore case differences\n" \
+       "\t-L\tUse LABEL instead of the filename in the unified header\n" \
+       "\t-N\tTreat absent files as empty\n" \
+       "\t-q\tOutput only whether files differ\n" \
+       "\t-r\tRecursively compare any subdirectories\n" \
+       "\t-S\tStart with FILE when comparing directories\n" \
+       "\t-T\tMake tabs line up by prefixing a tab when necessary\n" \
+       "\t-s\tReport when two files are the same\n" \
+       "\t-t\tExpand tabs to spaces in output\n" \
+       "\t-U\tOutput LINES lines of context\n" \
+       "\t-w\tIgnore all whitespace\n"
+
 #define dirname_trivial_usage \
        "FILENAME"
 #define dirname_full_usage \
@@ -579,7 +600,7 @@
 #define e2fsck_trivial_usage \
        "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
        "[-I inode_buffer_blocks] [-P process_inode_size] " \
-       "[-l|-L bad_blocks_file] [-C fd] [-j ext-journal] " \
+       "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
        "[-E extended-options] device"
 #define e2fsck_full_usage \
        "Check a Linux ext2/ext3 file system.\n\n" \
@@ -1491,7 +1512,7 @@
        "{ {add|del} IFADDR dev STRING | {show|flush}\n" \
        "\t\t[ dev STRING ] [ to PREFIX ] }"
 #define ipaddr_full_usage \
-       "ipaddr {add|del} IFADDR dev STRING\n" \
+       "ipaddr {add|delete} IFADDR dev STRING\n" \
        "ipaddr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n" \
        "\t\t\t[ to PREFIX ] [ label PATTERN ]\n" \
        "\t\t\tIFADDR := PREFIX | ADDR peer PREFIX\n" \
@@ -2584,7 +2605,6 @@
        "\t-a ARG\tPass ARG as an argument for every program invoked\n" \
        "\t-u MASK\tSet the umask to MASK before executing every program"
 
-#if BB_APPLET_RUNLEVEL
 #define runlevel_trivial_usage \
        "[utmp]"
 #define runlevel_full_usage \
@@ -2594,7 +2614,6 @@
 #define runlevel_example_usage \
        "$ runlevel /var/run/utmp\n" \
        "N 2"
-#endif
 
 #define rx_trivial_usage \
        "FILE"
@@ -2650,6 +2669,11 @@
 #define setkeycodes_example_usage \
        "$ setkeycodes e030 127\n"
 
+#define setlogcons_trivial_usage \
+       "N"
+#define setlogcons_full_usage \
+       "Redirects the kernel output to console N (0 for current)."
+
 #define setsid_trivial_usage \
        "program [arg ...]"
 #define setsid_full_usage \
@@ -2740,7 +2764,7 @@
        USAGE_SORT_BIG("\t-s\tstable (don't sort ties alphabetically)\n") \
        "\t-u\tsuppress duplicate lines" \
        USAGE_SORT_BIG("\n\t-z\tinput terminated by nulls, not newlines\n") \
-       USAGE_SORT_BIG("\t-mST\tignored for GNU compatability") \
+       USAGE_SORT_BIG("\t-mST\tignored for GNU compatibility") \
        ""
 #define sort_example_usage \
        "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \