deluser: add optional support for removing users from groups
[oweals/busybox.git] / include / usage.h
index cfae4e1e120e35619afb157c54d2c68e6aba1beb..afcc4b3d794e36595586a80724e26a6d8f7f2878 100644 (file)
@@ -12,9 +12,9 @@
 #define __BB_USAGE_H__
 
 #define addgroup_trivial_usage \
-       "[-g GID] group_name [user_name]"
+       "[-g GID]"USE_FEATURE_ADDUSER_TO_GROUP(" [user_name]")" group_name"
 #define addgroup_full_usage \
-       "Add a group to the system" \
+       "Add a group to the system"USE_FEATURE_ADDUSER_TO_GROUP(" or add an user to a group") \
        "\n\nOptions:\n" \
        "       -g GID  Specify gid"
 
@@ -37,7 +37,7 @@
        "Read and optionally set system timebase parameters.\n" \
        "See adjtimex(2)." \
        "\n\nOptions:\n" \
-       "       -q              Quiet mode - do not print\n" \
+       "       -q              Quiet\n" \
        "       -o offset       Time offset, microseconds\n" \
        "       -f frequency    Frequency adjust, integer kernel units (65536 is 1ppm)\n" \
        "                       (positive values make the system clock run fast)\n" \
        "       -p      Extract to stdout\n" \
        "       -t      List\n" \
        "       -x      Extract\n" \
-       "       -v      Verbosely list files processed"
+       "       -v      Verbose"
 
 #define arp_trivial_usage \
        "\n" \
        "[-vn]  [-H type] [-i if] -a [hostname]\n" \
        "[-v]             [-i if] -d hostname [pub]\n" \
        "[-v]   [-H type] [-i if] -s hostname hw_addr [temp]\n" \
-       "[-v]   [-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
+       "[-v]   [-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
        "[-v]   [-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n"
 #define arp_full_usage \
        "Manipulate the system ARP cache" \
@@ -81,7 +81,7 @@
        "Ping hosts by ARP requests/replies" \
        "\n\nOptions:\n" \
        "       -f              Quit on first ARP reply\n" \
-       "       -q              Be quiet\n" \
+       "       -q              Quiet\n" \
        "       -b              Keep broadcasting, don't go unicast\n" \
        "       -D              Duplicated address detection mode\n" \
        "       -U              Unsolicited ARP mode, update your neighbours\n" \
        "[-jy] [[month] year]"
 #define cal_full_usage \
        "Display a calendar" \
-       "\n\nOptions:\n" \
-       "       -j      Use julian dates\n" \
-       "       -y      Display the entire year"
+       "\n\nOptions:" \
+       "\n     -j      Use julian dates" \
+       "\n     -y      Display the entire year"
 
 #define cat_trivial_usage \
        "[-u] [FILE]..."
 #define cat_full_usage \
        "Concatenate FILE(s) and print them to stdout" \
-       "\n\nOptions:\n" \
-       "       -u      Ignored since unbuffered i/o is always used"
+       "\n\nOptions:" \
+       "\n     -u      Ignored since unbuffered i/o is always used"
 #define cat_example_usage \
        "$ cat /proc/uptime\n" \
        "110716.72 17.67"
        "       -R      Recursively list subdirectories\n" \
        "       -v      Set the file's version/generation number"
 
-#define chgrp_trivial_usage \
-       "[-Rh"USE_DESKTOP("cvf")"]... GROUP FILE..."
-#define chgrp_full_usage \
-       "Change the group membership of each FILE to GROUP" \
-       "\n\nOptions:\n" \
-       "       -R      Changes files and directories recursively\n" \
-       "       -h      Do not dereference symbolic links" \
-       USE_DESKTOP( \
-       "\n     -c      List changed files" \
-       "\n     -v      List all files" \
-       "\n     -f      Hide errors" \
-       )
-#define chgrp_example_usage \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
-       "$ chgrp root /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
+#define chcon_trivial_usage \
+       "[OPTIONS] CONTEXT FILE...\n" \
+       "       chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" \
+       "       chcon [OPTIONS] --reference=RFILE FILE...\n"
+#define chcon_full_usage \
+       "Change the security context of each FILE to CONTEXT\n" \
+       "\n     -v, --verbose           Verbose" \
+       "\n     -c, --changes           Report changes made" \
+       "\n     -h, --no-dereference    Affect symlinks instead of their targets" \
+       "\n     -f, --silent, --quiet   Suppress most error messages" \
+       "\n     --reference=RFILE       Use RFILE's group instead of using a CONTEXT value" \
+       "\n     -u, --user=USER         Set user USER in the target security context" \
+       "\n     -r, --role=ROLE         Set role ROLE in the target security context" \
+       "\n     -t, --type=TYPE         Set type TYPE in the target security context" \
+       "\n     -l, --range=RANGE       Set range RANGE in the target security context" \
+       "\n     -R, --recursive         Recurse subdirectories" \
 
 #define chmod_trivial_usage \
        "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
        "$ ls -l /tmp/foo\n" \
        "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
 
+#define chgrp_trivial_usage \
+       "[-RhLHP"USE_DESKTOP("cvf")"]... GROUP FILE..."
+#define chgrp_full_usage \
+       "Change the group membership of each FILE to GROUP" \
+       "\n\nOptions:" \
+       "\n     -R      Recurse directories" \
+       "\n     -h      Affect symlinks instead of symlink targets" \
+       "\n     -L      Traverse all symlinks to directories" \
+       "\n     -H      Traverse symlinks on command line only" \
+       "\n     -P      Do not traverse symlinks (default)" \
+       USE_DESKTOP( \
+       "\n     -c      List changed files" \
+       "\n     -v      Verbose" \
+       "\n     -f      Hide errors" \
+       )
+#define chgrp_example_usage \
+       "$ ls -l /tmp/foo\n" \
+       "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
+       "$ chgrp root /tmp/foo\n" \
+       "$ ls -l /tmp/foo\n" \
+       "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
+
 #define chown_trivial_usage \
-       "[-Rh"USE_DESKTOP("cvf")"]...  OWNER[<.|:>[GROUP]] FILE..."
+       "[-RhLHP"USE_DESKTOP("cvf")"]...  OWNER[<.|:>[GROUP]] FILE..."
 #define chown_full_usage \
        "Change the owner and/or group of each FILE to OWNER and/or GROUP" \
        "\n\nOptions:" \
-       "\n     -R      Changes files and directories recursively" \
-       "\n     -h      Do not dereference symbolic links" \
+       "\n     -R      Recurse directories" \
+       "\n     -h      Affect symlinks instead of symlink targets" \
+       "\n     -L      Traverse all symlinks to directories" \
+       "\n     -H      Traverse symlinks on command line only" \
+       "\n     -P      Do not traverse symlinks (default)" \
        USE_DESKTOP( \
        "\n     -c      List changed files" \
        "\n     -v      List all files" \
        "Change the process state and run specified program" \
        "\n\nOptions:\n" \
        "       -u user[:grp]   Set uid and gid\n" \
-       "       -U user[:grp]   Set environment variables UID and GID\n" \
+       "       -U user[:grp]   Set environment variables UID and GID\n" \
        "       -e dir          Set environment variables as specified by files\n" \
        "                       in the directory: file=1st_line_of_file\n" \
        "       -/ dir          Chroot to dir\n" \
        "Clear screen"
 
 #define cmp_trivial_usage \
-       "[-l] [-s] FILE1 [FILE2]"
+       "[-l] [-s] FILE1 [FILE2" USE_DESKTOP(" [SKIP1 [SKIP2]") "]]"
 #define cmp_full_usage \
        "Compares FILE1 vs stdin if FILE2 is not specified" \
        "\n\nOptions:\n" \
        "       -l      Write the byte numbers (decimal) and values (octal)\n" \
        "               for all differing bytes\n" \
-       "       -s      Quiet mode - do not print"
+       "       -s      Quiet"
 
 #define comm_trivial_usage \
        "[-123] FILE1 FILE2"
 #define bbsh_full_usage \
        "The bbsh shell (command interpreter)"
 
+#define chrt_trivial_usage \
+       "[OPTION]... [prio] [pid | command [arg]...]"
+#define chrt_full_usage \
+       "manipulate real-time attributes of a process" \
+       "\n\nOptions:\n" \
+       "       -p      operate on pid\n" \
+       "       -r      set scheduling policy to SCHED_RR\n" \
+       "       -f      set scheduling policy to SCHED_FIFO\n" \
+       "       -o      set scheduling policy to SCHED_OTHER\n" \
+       "       -m      show min and max priorities"
+
+#define chrt_example_usage \
+       "$ chrt -r 4 sleep 900 ; x=$!\n" \
+       "$ chrt -f -p 3 $x\n" \
+       "You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
+
 #define cp_trivial_usage \
        "[OPTION]... SOURCE DEST"
 #define cp_full_usage \
        "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY" \
-       "\n\nOptions:\n" \
-       "       -a      Same as -dpR\n" \
-       "       -d,-P   Preserve links\n" \
-       "       -H,-L   Dereference all symlinks (implied by default)\n" \
-       "       -p      Preserve file attributes if possible\n" \
-       "       -f      Force, overwrite\n" \
-       "       -i      Interactive, prompt before overwrite\n" \
-       "       -R,-r   Copy directories recursively\n" \
-       "       -l,-s   Create (sym)links"
+       "\n\nOptions:" \
+       "\n     -a      Same as -dpR" \
+       USE_SELINUX( \
+       "\n     -c      Preserves security context" \
+       ) \
+       "\n     -d,-P   Preserve links" \
+       "\n     -H,-L   Dereference all symlinks (default)" \
+       "\n     -p      Preserve file attributes if possible" \
+       "\n     -f      Force overwrite" \
+       "\n     -i      Prompt before overwrite" \
+       "\n     -R,-r   Recurse directories" \
+       "\n     -l,-s   Create (sym)links"
 
 #define cpio_trivial_usage \
        "-[dimtuv][F cpiofile]"
        "Deallocate unused virtual terminal /dev/ttyN"
 
 #define delgroup_trivial_usage \
-       "GROUP"
+        USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
 #define delgroup_full_usage \
-       "Delete group GROUP from the system"
+       "Delete group GROUP from the system" \
+        USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
 
 #define deluser_trivial_usage \
        "USER"
        "       -L      Use LABEL instead of the filename in the unified header\n" \
        "       -N      Treat absent files as empty\n" \
        "       -q      Output only whether files differ\n" \
-       "       -r      Recursively compare any subdirectories\n" \
+       "       -r      Recursively compare subdirectories\n" \
        "       -S      Start with FILE when comparing directories\n" \
        "       -T      Make tabs line up by prefixing a tab when necessary\n" \
        "       -s      Report when two files are the same\n" \
        "       -c      Config filename\n" \
        "       -t      TTL in seconds\n" \
        "       -p      Listening port\n" \
-       "       -i      Listening iface ip (default all)\n" \
+       "       -i      Listening ip (default all)\n" \
        "       -d      Daemonize"
 
 #define dos2unix_trivial_usage \
        " bytes." \
        "\n\nOptions:\n" \
        "       -a      Show sizes of files in addition to directories\n" \
-       "       -H      Follow symbolic links that are FILE command line args\n" \
-       "       -L      Follow all symbolic links encountered\n" \
+       "       -H      Follow symlinks that are FILE command line args\n" \
+       "       -L      Follow all symlinks encountered\n" \
        "       -d N    Limit output to directories (and files with -a) of depth < N\n" \
        "       -c      Output a grand total\n" \
        "       -l      Count sizes many times if hard linked\n" \
        "       -y              Assume 'yes' to all questions\n" \
        "       -c              Check for bad blocks and add them to the badblock list\n" \
        "       -f              Force checking even if filesystem is marked clean\n" \
-       "       -v              Be verbose\n" \
+       "       -v              Verbose\n" \
        "       -b superblock   Use alternative superblock\n" \
        "       -B blocksize    Force blocksize when looking for superblock\n" \
        "       -j journal      Set location of the external journal\n" \
        "of characters matched or 0."
 
 #define fakeidentd_trivial_usage \
-       "[-b ip] [STRING]"
+       "[-fiw] [-b ADDR] [STRING]"
 #define fakeidentd_full_usage \
-       "Return a set string to auth requests" \
-       "\n\nOptions:\n" \
-       "       -b      Bind to ip address\n" \
-       "       STRING  The ident answer string (default is nobody)"
+       "Provide fake ident (auth) service" \
+       "\n\nOptions:" \
+       "\n     -f      Run in foreground" \
+       "\n     -i      Inetd mode" \
+       "\n     -w      Inetd 'wait' mode" \
+       "\n     -b ADDR Bind to specified address" \
+       "\n     STRING  Ident answer string (default is 'nobody')"
 
 #define false_trivial_usage \
        ""
        "Search for files in a directory hierarchy.  The default PATH is\n" \
        "the current directory; default EXPRESSION is '-print'\n" \
        "\nEXPRESSION may consist of:\n" \
-       "       -follow         Dereference symbolic links\n" \
+       "       -follow         Dereference symlinks\n" \
        "       -name PATTERN   File name (leading directories removed) matches PATTERN\n" \
        "       -print          Print (default and assumed)" \
        USE_FEATURE_FIND_PRINT0( \
        ) USE_FEATURE_FIND_EXEC( \
        "\n     -exec CMD       Execute CMD with all instances of {} replaced by the" \
        "\n                     files matching EXPRESSION" \
-       ) USE_DESKTOP( \
+        ) USE_FEATURE_FIND_USER( \
+       "\n     -user NAME      File is owned by user NAME (numeric user ID allowed)" \
+       ) USE_FEATURE_FIND_GROUP( \
+       "\n     -group NAME     File belongs to group NAME (numeric group ID allowed)" \
+       ) USE_FEATURE_FIND_DEPTH( \
+       "\n     -depth          Process directory after traversing it" \
+       ) USE_FEATURE_FIND_SIZE( \
        "\n     -size N         File size is N" \
+       ) USE_FEATURE_FIND_PRUNE( \
        "\n     -prune          Stop traversing current subtree" \
-       "\n     (expr)          Group" \
+        ) USE_FEATURE_FIND_DELETE( \
+       "\n     -delete         Delete files; Turns on -depth option" \
+        ) USE_FEATURE_FIND_PATH( \
+       "\n     -path           Path matches PATTERN" \
+       ) USE_FEATURE_FIND_PAREN( \
+       "\n     (EXPR)          Group an expression" \
        )
 
 #define find_example_usage \
        "       -6      When using port/proto only search IPv6 space\n" \
        "       -SIGNAL When used with -k, this signal will be used to kill"
 
+#define getenforce_trivial_usage
+#define getenforce_full_usage
+
 #define getopt_trivial_usage \
        "[OPTIONS]..."
 #define getopt_full_usage \
        " esac\n" \
        "done\n"
 
+#define getsebool_trivial_usage \
+       "-a or getsebool boolean..."
+#define getsebool_full_usage \
+       "       -a      Show all SELinux booleans"
+
 #define getty_trivial_usage \
        "[OPTIONS]... baud_rate,... line [termtype]"
 #define getty_full_usage \
        "       -H login_host   Log login_host into the utmp file as the hostname"
 
 #define grep_trivial_usage \
-       "[-rihHnqvso" \
+       "[-HhrilLnqvso" \
+       USE_DESKTOP("w") \
+       "eF" \
        USE_FEATURE_GREP_EGREP_ALIAS("E") \
        USE_FEATURE_GREP_CONTEXT("ABC") \
        "] PATTERN [FILEs...]"
 #define grep_full_usage \
        "Search for PATTERN in each FILE or standard input" \
-       "\n\nOptions:\n" \
-       "       -H      Prefix output lines with filename where match was found\n" \
-       "       -h      Suppress the prefixing filename on output\n" \
-       "       -r      Recurse subdirectories\n" \
-       "       -i      Ignore case distinctions\n" \
-       "       -l      List names of files that match\n" \
-       "       -L      List names of files that do not match\n" \
-       "       -n      Print line number with output lines\n" \
-       "       -q      Be quiet. Returns 0 if PATTERN was found, 1 otherwise\n" \
-       "       -v      Select non-matching lines\n" \
-       "       -s      Suppress file open/read error messages\n" \
-       "       -c      Only print count of matching lines\n" \
-       "       -f      Read PATTERN from file\n" \
-       "       -o      Show only the part of a line that matches PATTERN\n" \
-       "       -e      PATTERN is a regular expression\n" \
-       "       -F      PATTERN is a set of newline-separated strings" \
+       "\n\nOptions:" \
+       "\n     -H      Prefix output lines with filename where match was found" \
+       "\n     -h      Suppress the prefixing filename on output" \
+       "\n     -r      Recurse subdirectories" \
+       "\n     -i      Ignore case distinctions" \
+       "\n     -l      List names of files that match" \
+       "\n     -L      List names of files that do not match" \
+       "\n     -n      Print line number with output lines" \
+       "\n     -q      Quiet. Returns 0 if PATTERN was found, 1 otherwise" \
+       "\n     -v      Select non-matching lines" \
+       "\n     -s      Suppress file open/read error messages" \
+       "\n     -c      Only print count of matching lines" \
+       "\n     -f      Read PATTERN from file" \
+       "\n     -o      Show only the part of a line that matches PATTERN" \
+       USE_DESKTOP( \
+       "\n     -w      Match whole words only") \
+       "\n     -e      PATTERN is a regular expression" \
+       "\n     -F      PATTERN is a set of newline-separated strings" \
        USE_FEATURE_GREP_EGREP_ALIAS( \
        "\n     -E      PATTERN is an extended regular expression") \
        USE_FEATURE_GREP_CONTEXT( \
-       "\n     -A      Print NUM lines of trailing context") \
-       USE_FEATURE_GREP_CONTEXT( \
-       "\n     -B      Print NUM lines of leading context") \
-       USE_FEATURE_GREP_CONTEXT( \
-       "\n     -C      Print NUM lines of output context")
+       "\n     -A      Print NUM lines of trailing context" \
+       "\n     -B      Print NUM lines of leading context" \
+       "\n     -C      Print NUM lines of output context") \
 
 #define grep_example_usage \
        "$ grep root /etc/passwd\n" \
        "       -d STRING       URL decode STRING"
 
 #define hwclock_trivial_usage \
-       "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]"
+       "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
+       " [-l|--localtime] [-u|--utc]" \
+       " [-f FILE]"
 #define hwclock_full_usage \
-       "Query and set the hardware clock (RTC)" \
+       "Query and set a hardware clock (RTC)" \
        "\n\nOptions:\n" \
        "       -r      Read hardware clock and print result\n" \
        "       -s      Set the system time from the hardware clock\n" \
        "       -w      Set the hardware clock to the current system time\n" \
        "       -u      The hardware clock is kept in coordinated universal time\n" \
-       "       -l      The hardware clock is kept in local time"
+       "       -l      The hardware clock is kept in local time\n" \
+       "       -f FILE Use the specified clock (e.g. /dev/rtc2)"
 
 #define id_trivial_usage \
        "[OPTIONS]... [USERNAME]"
        "Print information for USERNAME or the current user" \
        "\n\nOptions:\n" \
        USE_SELINUX( \
-       "       -c      Prints only the security context\n") \
+       "       -Z      prints only the security context\n" \
+       ) \
        "       -g      Prints only the group ID\n" \
        "       -u      Prints only the user ID\n" \
        "       -n      Print a name instead of a number\n" \
 #define inetd_full_usage \
        "Listen for network connections and launch programs" \
        "\n\nOptions:\n" \
-       "       -f      Run as a foreground progress\n" \
-       "       -q      Sets the size of the socket listen queue to\n" \
-       "               the specified value. Default is 128"
+       "       -f      Run in foreground\n" \
+       "       -q N    Set the size of the socket listen queue to N\n" \
+       "               (default: 128)"
 
 #define init_trivial_usage \
        ""
        "\n\nOptions:\n" \
        "       -f      Force module to load into the wrong kernel version\n" \
        "       -k      Make module autoclean-able\n" \
-       "       -v      Verbose output\n"  \
-       "       -q      Quiet output\n" \
+       "       -v      Verbose\n"  \
+       "       -q      Quiet\n" \
        "       -L      Lock to prevent simultaneous loads of a module\n" \
        USE_FEATURE_INSMOD_LOAD_MAP( \
        "       -m      Output load map to stdout\n") \
        "       -m      Set permission modes\n" \
        "       -o      Set ownership\n" \
        "       -p      Preserve date\n" \
-       "       -s      Strip symbol tables"
-
+       "       -s      Strip symbol tables" \
+       USE_SELINUX( \
+       "\n     -Z      Set security context of copy" \
+       )
+/* would need to make the " | " optional depending on more than one selected */
 #define ip_trivial_usage \
-       "[OPTIONS] {address | link | route | tunnel | rule} {COMMAND}"
+       "[OPTIONS] {" \
+       USE_FEATURE_IP_ADDRESS("address | ") \
+       USE_FEATURE_IP_ROUTE("route | ") \
+       USE_FEATURE_IP_LINK("link | ") \
+       USE_FEATURE_IP_TUNNEL("tunnel | ") \
+       USE_FEATURE_IP_RULE("rule") \
+       "} {COMMAND}"
 #define ip_full_usage \
        "ip [OPTIONS] OBJECT {COMMAND}\n" \
-       "where  OBJECT := {link | addr | route | tunnel |rule}\n" \
+       "where  OBJECT := {" \
+       USE_FEATURE_IP_ADDRESS("address | ") \
+       USE_FEATURE_IP_ROUTE("route | ") \
+       USE_FEATURE_IP_LINK("link | ") \
+       USE_FEATURE_IP_TUNNEL("tunnel | ") \
+       USE_FEATURE_IP_RULE("rule") \
+       "}\n" \
        "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
 
 #define ipaddr_trivial_usage \
 #define iplink_trivial_usage \
        "{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"
 #define iplink_full_usage \
-       "iplink set DEVICE { up | down | arp { on | off } |\n" \
+       "iplink set DEVICE { up | down | arp | multicast { on | off } |\n" \
        "                       dynamic { on | off } |\n" \
        "                       mtu MTU }\n" \
        "iplink show [ DEVICE ]"
        "Kernel logger" \
        "\n\nOptions:\n" \
        "       -c n    Sets the default log level of console messages to n\n" \
-       "       -n      Run as foreground process"
+       "       -n      Run as foreground process"
 
 #define length_trivial_usage \
        "STRING"
        "Create a link named LINK_NAME or DIRECTORY to the specified TARGET.\n" \
        "You may use '--' to indicate that all following arguments are non-options." \
        "\n\nOptions:\n" \
-       "       -s      Make symbolic links instead of hard links\n" \
+       "       -s      Make symlinks instead of hardlinks\n" \
        "       -f      Remove existing destination files\n" \
        "       -n      No dereference symlinks - treat like normal file\n" \
        "       -b      Make a backup of the target (if exists) before link operation\n" \
        "$ ls -l /tmp/ls\n" \
        "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
 
+#define load_policy_trivial_usage \
+       "[FILE]"
+#define load_policy_full_usage
+
 #define loadfont_trivial_usage \
        "< font"
 #define loadfont_full_usage \
 
 #define ls_trivial_usage \
        "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \
-       USE_FEATURE_LS_TIMESTAMPS("e")  USE_FEATURE_LS_FILETYPES("F") "iln" \
+       USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \
        USE_FEATURE_LS_FILETYPES("p") USE_FEATURE_LS_FOLLOWLINKS("L") \
        USE_FEATURE_LS_RECURSIVE("R") USE_FEATURE_LS_SORTFILES("rS") "s" \
        USE_FEATURE_AUTOWIDTH("T") USE_FEATURE_LS_TIMESTAMPS("tu") \
        USE_FEATURE_LS_FILETYPES( \
        "\n     -p      Append indicator (one of /=@|) to entries") \
        USE_FEATURE_LS_FOLLOWLINKS( \
-       "\n     -L      List entries pointed to by symbolic links") \
+       "\n     -L      List entries pointed to by symlinks") \
        USE_FEATURE_LS_RECURSIVE( \
        "\n     -R      List subdirectories recursively") \
        USE_FEATURE_LS_SORTFILES( \
        USE_SELINUX( \
        "\n     -k      Print security context") \
        USE_SELINUX( \
-       "\n     -K      Print security context in long format")
+       "\n     -K      Print security context in long format") \
+       USE_SELINUX( \
+       "\n     -Z      Print security context and permission")
 
 #define lsattr_trivial_usage \
        "[-Radlv] [files...]"
        "/dev/hda[0-15]\n"
 #endif
 
+#define matchpathcon_trivial_usage \
+       "[-n] [-N] [-f file_contexts_file] [-p prefix] [-V]"
+#define matchpathcon_full_usage \
+       "       -n      Do not display path" \
+       "\n     -N      Do not use translations" \
+       "\n     -f      Use alternate file_context file" \
+       "\n     -p      Use prefix to speed translations" \
+       "\n     -V      Verify file context on disk matches defaults"
+
 #define md5sum_trivial_usage \
        "[OPTION] [FILEs...]" \
        USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTION] -c [FILE]")
        "Create the DIRECTORY(ies) if they do not already exist" \
        "\n\nOptions:\n" \
        "       -m      Set permission mode (as in chmod), not rwxrwxrwx - umask\n" \
-       "       -p      No error if existing, make parent directories as needed"
+       "       -p      No error if existing, make parent directories as needed" \
+       USE_SELINUX( \
+       "\n     -Z      Set security context" \
+       )
+
 #define mkdir_example_usage \
        "$ mkdir /tmp/foo\n" \
        "$ mkdir /tmp/foo\n" \
        "       -N num          Number of inodes to create\n" \
        "       -o os           Set the 'creator os' field\n" \
        "       -O features     Dir_index/filetype/has_journal/journal_dev/sparse_super\n" \
-       "       -q              Quiet execution\n" \
+       "       -q              Quiet\n" \
        "       -r rev          Set filesystem revision\n" \
        "       -S              Write superblock and group descriptors only\n" \
        "       -T fs-type      Set usage type (news/largefile/largefile4)\n" \
-       "       -v              Verbose execution"
+       "       -v              Verbose"
 
 #define mkfifo_trivial_usage \
        "[OPTIONS] name"
 #define mkfifo_full_usage \
        "Create a named pipe (identical to 'mknod name p')" \
        "\n\nOptions:\n" \
-       "       -m      Create the pipe using the specified mode (default a=rw)"
+       "       -m      Create the pipe using the specified mode (default a=rw)" \
+       USE_SELINUX( \
+       "\n     -Z      Set security context" \
+       )
 
 #define mkfs_minix_trivial_usage \
        "[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
        "\n\nTYPEs include:\n" \
        "       b:      Make a block (buffered) device\n" \
        "       c or u: Make a character (un-buffered) device\n" \
-       "       p:      Make a named pipe. MAJOR and MINOR are ignored for named pipes"
+       "       p:      Make a named pipe. MAJOR and MINOR are ignored for named pipes" \
+       USE_SELINUX( \
+       "\n     -Z      Set security context" \
+       )
+
 #define mknod_example_usage \
        "$ mknod /dev/fd0 b 2 0\n" \
        "$ mknod -m 644 /tmp/pipe p\n"
 #define mkswap_trivial_usage \
        "[-c] [-v0|-v1] device [block-count]"
 #define mkswap_full_usage \
-       "Prepare a disk partition to be used as swap partition" \
+       "Prepare a disk partition to be used as swap partition" \
        "\n\nOptions:\n" \
        "       -c              Check for read-ability\n" \
        "       -v0             Make version 0 swap [max 128 Megs]\n" \
        "Options:\n" \
        "       -k      Make module autoclean-able\n" \
        "       -n      Just show what would be done\n" \
-       "       -q      Quiet output\n" \
+       "       -q      Quiet\n" \
        "       -r      Remove module (stacks) or do autoclean\n" \
        "       -s      Report via syslog instead of stderr\n" \
-       "       -v      Verbose output"
+       "       -v      Verbose"
 #define modprobe_notes_usage \
 "modprobe can (un)load a stack of modules, passing each module options (when\n" \
 "loading). modprobe uses a configuration file to determine what option(s) to\n" \
 #define mountpoint_full_usage \
        "mountpoint checks if the directory is a mountpoint" \
        "\n\nOptions:\n"  \
-       "       -q      Be more quiet\n" \
+       "       -q      Quiet\n" \
        "       -d      Print major/minor device number of the filesystem\n" \
        "       -x      Print major/minor device number of the blockdevice"
 #define mountpoint_example_usage \
        " or\n" \
        "$ nameif -c /etc/my_mactab_file\n" \
 
+#if !ENABLE_DESKTOP
+
 #if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
 #define NC_OPTIONS_STR "\n\nOptions:"
 #else
        "\n     -e      Exec rest of command line after connect" \
        "\n     -i SECS Delay interval for lines sent" \
        "\n     -w SECS Timeout for connect" \
-       "\n     -f file Use file (ala /dev/ttyS0) instead of network" \
+       "\n     -f FILE Use file (ala /dev/ttyS0) instead of network" \
        ) \
        USE_NC_SERVER( \
        "\n     -l      Listen mode, for inbound connects" \
        "quit\n" \
        "221 foobar closing connection\n"
 
+#else /* DESKTOP nc - much more compatible with nc 1.10 */
+
+#define nc_trivial_usage \
+       "[-options] hostname port  - connect" \
+       USE_NC_SERVER("\nnc [-options] -l -p port [hostname] [port]  - listen")
+#define nc_full_usage \
+       USE_NC_SERVER( \
+       "-l             Listen mode, for inbound connects\n" \
+       ) \
+       "-n             Do not do DNS resolution" \
+     "\n-s addr                Local address" \
+     "\n-p port                Local port" \
+     "\n-u             UDP mode" \
+     "\n-v             Verbose (cumulative: -vv)" \
+     "\n-w secs                Timeout for connects and final net reads" \
+       USE_NC_EXTRA( \
+     "\n-i sec         Delay interval for lines sent" /* ", ports scanned" */ \
+     "\n-o file                Hex dump of traffic" \
+     "\n-z             Zero-I/O mode (scanning)" \
+       ) \
+     "\n-e prog [args] Program to exec after connect (must be last)" \
+/*   "\n-r             Randomize local and remote ports" */
+/*   "\n-g gateway     Source-routing hop point[s], up to 8" */
+/*   "\n-G num         Source-routing pointer: 4, 8, 12, ..." */
+/*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
+
+#endif
+
+
 #define netstat_trivial_usage \
        "[-laenrtuwx]"
 #define netstat_full_usage \
        "host"
 #define ping_full_usage \
        "Send ICMP ECHO_REQUEST packets to network hosts"
+#define ping6_trivial_usage \
+       "host"
+#define ping6_full_usage \
+       "Send ICMP ECHO_REQUEST packets to network hosts"
 #else
 #define ping_trivial_usage \
        "[OPTION]... host"
 #define ping_full_usage \
        "Send ICMP ECHO_REQUEST packets to network hosts" \
        "\n\nOptions:\n" \
-       "       -c CNT  Send only CNT pings\n" \
-       "       -s SIZE Send SIZE data bytes in packets (default=56)\n" \
-       "       -I IP   Use IP as source address\n" \
-       "       -q      Quiet mode, only displays output at start\n" \
-       "               and when finished"
+       "       -4, -6          Force IPv4 or IPv6 hostname resolution\n" \
+       "       -c CNT          Send only CNT pings\n" \
+       "       -s SIZE         Send SIZE data bytes in packets (default=56)\n" \
+       "       -I iface/IP     Use interface or IP address as source\n" \
+       "       -q              Quiet, only displays output at start\n" \
+       "                       and when finished"
+#define ping6_trivial_usage \
+       "[OPTION]... host"
+#define ping6_full_usage \
+       "Send ICMP ECHO_REQUEST packets to network hosts" \
+       "\n\nOptions:\n" \
+       "       -c CNT          Send only CNT pings\n" \
+       "       -s SIZE         Send SIZE data bytes in packets (default=56)\n" \
+       "       -I iface/IP     Use interface or IP address as source\n" \
+       "       -q              Quiet, only displays output at start\n" \
+       "                       and when finished"
 #endif
 #define ping_example_usage \
        "$ ping localhost\n" \
        "--- debian ping statistics ---\n" \
        "1 packets transmitted, 1 packets received, 0% packet loss\n" \
        "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-
-#ifndef CONFIG_FEATURE_FANCY_PING6
-#define ping6_trivial_usage \
-       "host"
-#define ping6_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#else
-#define ping6_trivial_usage \
-       "[OPTION]... host"
-#define ping6_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts" \
-       "\n\nOptions:\n" \
-       "       -c CNT  Send only CNT pings\n" \
-       "       -s SIZE Send SIZE data bytes in packets (default=56)\n" \
-       "       -q      Quiet mode, only displays output at start\n" \
-       "               and when finished"
-#endif
 #define ping6_example_usage \
        "$ ping6 ip6-localhost\n" \
        "PING ip6-localhost (::1): 56 data bytes\n" \
        "Report process status\n" \
        USAGE_PS \
        USE_SELINUX( \
-       "\n     -c      Show SE Linux context") \
+       "\n     -Z      Show SE Linux context") \
        USE_FEATURE_PS_WIDE( \
        "\n     w       Wide output")
 
 #define readlink_trivial_usage \
        USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
 #define readlink_full_usage \
-       "Display the value of a symbolic link" \
+       "Display the value of a symlink" \
        USE_FEATURE_READLINK_FOLLOW( \
        "\n\nOptions:\n" \
        "       -f      Canonicalize by following all symlinks")
        "       -p <profile>    (Default: /proc/profile)\n" \
        "       -M <mult>       Set the profiling multiplier to <mult>\n" \
        "       -i              Print only info about the sampling step\n" \
-       "       -v              Print verbose data\n" \
+       "       -v              Verbose\n" \
        "       -a              Print all symbols, even if count is 0\n" \
        "       -b              Print individual histogram-bin counts\n" \
        "       -s              Print individual counters within functions\n" \
 #define rpm2cpio_full_usage \
        "Output a cpio archive of the rpm file"
 
+#define runcon_trivial_usage \
+       "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
+       "       runcon CONTEXT COMMAND [args]"
+#define runcon_full_usage \
+       "runcon [-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
+       "runcon CONTEXT COMMAND [args]\n" \
+       "Run a program in a different security context\n\n" \
+       "       CONTEXT         Complete security context\n" \
+       "       -c, --compute   Compute process transition context before modifying\n" \
+       "       -t, --type=TYPE Type (for same role as parent)\n" \
+       "       -u, --user=USER User identity\n" \
+       "       -r, --role=ROLE Role\n" \
+       "       -l, --range=RNG Levelrange" \
+
 #define run_parts_trivial_usage \
-       "[-t] [-a ARG] [-u MASK] DIRECTORY"
+       "[-t] "USE_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
 #define run_parts_full_usage \
        "Run a bunch of scripts in a directory" \
        "\n\nOptions:\n" \
        "       -t      Prints what would be run, but does not actually run anything\n" \
        "       -a ARG  Pass ARG as an argument for every program invoked\n" \
-       "       -u MASK Set the umask to MASK before executing every program"
+       "       -u MASK Set the umask to MASK before executing every program" \
+USE_FEATURE_RUN_PARTS_FANCY("\n        -l      Prints names of all matching files even when they are not executable")
+
+#define run_parts_example_usage \
+       "$ run-parts -a start /etc/init.d\n" \
+       "$ run-parts -a stop=now /etc/init.d\n\n" \
+       "Let's assume you have a script foo/dosomething:\n" \
+       "#!/bin/sh\n" \
+       "for i in $*; do eval $i; done ; unset i\n" \
+       "case \"$1\" in\n" \
+       "start*) echo starting something ;;\n" \
+       "stop*) set -x ; shutdown -h $stop ;;\n" \
+       "esac\n\n" \
+       "Running this yields:\n" \
+       "$run-parts -a stop=+4m foo/\n" \
+       "+ shutdown -h +4m"
 
 #define runlevel_trivial_usage \
        "[utmp]"
        "$ echo \"foo\" | sed -e 's/f[a-zA-Z]o/bar/g'\n" \
        "bar\n"
 
+#define selinuxenabled_trivial_usage
+#define selinuxenabled_full_usage
+
 #define seq_trivial_usage \
        "[first [increment]] last"
 #define seq_full_usage \
        "\n\nOptions:\n" \
        "       -r      Reset output to /dev/console"
 
+#define setenforce_trivial_usage \
+       "[ Enforcing | Permissive | 1 | 0 ]"
+#define setenforce_full_usage
+
 #define setkeycodes_trivial_usage \
        "SCANCODE KEYCODE ..."
 #define setkeycodes_full_usage \
        ) \
        ""
 
+#define split_trivial_usage \
+       "[OPTION] [INPUT [PREFIX]]"
+#define split_full_usage \
+       "Options:" \
+       "\n     -b n[k|m] Split by bytes" \
+       "\n     -l n      Split by lines" \
+       "\n     -a n      Use n letters as suffix"
+#define split_example_usage \
+       "$ split TODO foo\n" \
+       "$ cat TODO | split -a 2 -l 2 TODO_\n"
+
 #define start_stop_daemon_trivial_usage \
        "[OPTIONS] [--start|--stop] ... [-- arguments...]"
 #define start_stop_daemon_full_usage \
        "\n     -m|--make-pidfile               Create the -p file and enter pid in it" \
        "\n     -n|--name <process-name>        Stop processes with this name" \
        "\n     -p|--pidfile <pid-file>         Save or load pid using a pid-file" \
-       "\n     -q|--quiet                      Be quiet" \
+       "\n     -q|--quiet                      Quiet" \
        USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "\n     -o|--oknodo                     Exit status 0 if nothing done" \
-       "\n     -v|--verbose                    Be verbose" \
+       "\n     -v|--verbose                    Verbose" \
        "\n     -N|--nicelevel <N>              Add N to process's nice level" \
        ) \
        "\n     -s|--signal <signal>            Signal to send (default TERM)" \
-       "\n     -U|--chuid <username>|<uid>     Start process with this name"
+       "\n     -c|--chuid <user>[:[<group>]]   Change to specified user/group"
 
 #define stat_trivial_usage \
        "[OPTION] FILE..."
        "       -f      Display filesystem status\n" \
        "       -L,-l   Dereference links\n" \
        "       -t      Display info in terse form" \
+       USE_SELINUX( \
+       "\n     -Z      Print security context" \
+       ) \
        USE_FEATURE_STAT_FORMAT( \
        "\n\nValid format sequences for files:\n" \
        " %a    Access rights in octal\n" \
        " %h    Number of hard links\n" \
        " %i    Inode number\n" \
        " %n    File name\n" \
-       " %N    Quoted file name with dereference if symbolic link\n" \
+       " %N    Quoted file name with dereference if symlink\n" \
        " %o    I/O block size\n" \
        " %s    Total size, in bytes\n" \
        " %t    Major device type in hex\n" \
        " %c    Total file nodes in file system\n" \
        " %d    Free file nodes in file system\n" \
        " %f    Free blocks in file system\n" \
+       USE_SELINUX( \
+       " %C    Security context in SELinux\n" \
+       ) \
        " %i    File System ID in hex\n" \
        " %l    Maximum length of filenames\n" \
        " %n    File name\n" \
-       " %s    Block size (for faster transfers)\n" \
+       " %s    Block size (for faster transfer)\n" \
        " %S    Fundamental block size (for block counts)\n" \
        " %t    Type in hex\n" \
        " %T    Type in human readable form" \
        "System logging utility.\n" \
        "Note that this version of syslogd ignores /etc/syslog.conf." \
        "\n\nOptions:" \
-       "\n     -m MIN          Minutes between MARK lines (default=20, 0=off)" \
-       "\n     -n              Run as a foreground process" \
+       "\n     -n              Run as foreground process" \
        "\n     -O FILE         Use an alternate log file (default=/var/log/messages)" \
        "\n     -l n            Sets the local log level of messages to n" \
        "\n     -S              Make logging output smaller" \
        USE_FEATURE_IPC_SYSLOG( \
        "\n     -C[size(KiB)]   Log to a shared mem buffer (read the buffer using logread)")
        /* NB: -Csize shouldn't have space (because size is optional) */
+/*       "\n   -m MIN          Minutes between MARK lines (default=20, 0=off)" */
 #define syslogd_example_usage \
        "$ syslogd -R masterlog:514\n" \
        "$ syslogd -R 192.168.1.1:601\n"
        "       exclude File to exclude\n" \
        "       X       File with names to exclude\n") \
        "       C       Change to directory DIR before operation\n" \
-       "       v       Verbosely list files processed"
+       "       v       Verbose"
 #define tar_example_usage \
        "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
        "$ tar -cf /tmp/tarball.tar /usr/local\n"
        "$ echo $?\n" \
        "1\n"
 
+#define tcpsvd_trivial_usage \
+       "[-hEv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] ip port prog..."
+/* with not-implemented options: */
+/*     "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [ -t sec] ip port prog..." */
+#define tcpsvd_full_usage \
+       "Creates TCP socket, binds it to ip:port and listens on it\n" \
+       "for incoming connections. For each connection it runs prog." \
+     "\n" \
+     "\nip             IP to listen on. '0' = all" \
+     "\nport           Port to listen on" \
+     "\nprog [arg]     Program to run" \
+     "\n-l name                Local hostname (else looks up local hostname in DNS)" \
+     "\n-u user[:group]        Change to user/group after bind" \
+     "\n-c n           Handle up to n connections simultaneously" \
+     "\n-b n           Allow a backlog of approximately n TCP SYNs" \
+     "\n-C n[:msg]     Allow only up to n connections from the same IP" \
+     "\n               New connections from this IP address are closed" \
+     "\n               immediately. 'msg' is written to the peer before close" \
+     "\n-h             Look up peer's hostname" \
+     "\n-E             Do not set up environment variables" \
+     "\n-v             Verbose"
+
+#define udpsvd_trivial_usage \
+       "[-hEv] [-c n] [-u user] [-l name] ip port prog"
+#define udpsvd_full_usage \
+       "Creates UDP socket, binds it to ip:port and listens on it\n" \
+       "for incoming packets. For each packet it runs prog\n" \
+       "(redirecting all further packets with same peer ip:port to it)." \
+     "\n" \
+     "\nip             IP to listen on. '0' = all" \
+     "\nport           Port to listen on" \
+     "\nprog [arg]     Program to run" \
+     "\n-l name                Local hostname (else looks up local hostname in DNS)" \
+     "\n-u user[:group]        Change to user/group after bind" \
+     "\n-c n           Handle up to n connections simultaneously" \
+     "\n-h             Look up peer's hostname" \
+     "\n-E             Do not set up environment variables" \
+     "\n-v             Verbose"
+
 #define tftp_trivial_usage \
        "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \
        "Run the program COMMAND with arguments ARGS.  When COMMAND finishes,\n" \
        "COMMAND's resource usage information is displayed." \
        "\n\nOptions:\n" \
-       "       -v      Display verbose resource usage information"
+       "       -v      Verbose"
 
 #define top_trivial_usage \
        "[-b] [-n count] [-d seconds]"
        "       -d      Set SO_DEBUG options to socket\n" \
        "       -n      Print hop addresses numerically rather than symbolically\n" \
        "       -r      Bypass the normal routing tables and send directly to a host\n" \
-       "       -v      Verbose output\n" \
-       "       -m max_ttl      Set the max time-to-live (max number of hops)\n" \
-       "       -p port#        Set the base UDP port number used in probes\n" \
+       "       -v      Verbose\n" \
+       "       -m max_ttl      Max time-to-live (max number of hops)\n" \
+       "       -p port#        Base UDP port number used in probes\n" \
        "                       (default is 33434)\n" \
-       "       -q nqueries     Set the number of probes per 'ttl' to nqueries\n" \
-       "                       (default is 3)\n" \
-       "       -s src_addr     Use the following IP address as the source address\n" \
-       "       -t tos          Set the type-of-service in probe packets to the following value\n" \
-       "                       (default 0)\n" \
-       "       -w wait         Set the time (in seconds) to wait for a response to a probe\n" \
+       "       -q nqueries     Number of probes per 'ttl' (default 3)\n" \
+       "       -s src_addr     IP address to use as the source address\n" \
+       "       -t tos          Type-of-service in probe packets (default 0)\n" \
+       "       -w wait         Time in seconds to wait for a response to a probe\n" \
        "                       (default 3 sec)\n" \
-       "       -g              Specify a loose source route gateway (8 maximum)"
+       "       -g              Specify a loose source route gateway (8 max)"
 
 
 #define true_trivial_usage \
        ""
 #define tty_full_usage \
        "Print the file name of the terminal connected to standard input" \
+       USE_INCLUDE_SUSv2( \
        "\n\nOptions:\n" \
-       "       -s      Print nothing, only return an exit status"
+       "       -s      Print nothing, only return an exit status")
 #define tty_example_usage \
        "$ tty\n" \
        "/dev/tty2\n"
 #define umount_full_usage \
        "Unmount file systems" \
        "\n\nOptions:\n" \
-       "\n     -a      Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
+       USE_FEATURE_UMOUNT_ALL( \
+       "\n     -a      Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab")) \
        USE_FEATURE_MTAB_SUPPORT( \
        "\n     -n      Don't erase /etc/mtab entries") \
        "\n     -r      Try to remount devices as read-only if mount is busy" \
 #define unix2dos_full_usage \
        "Convert FILE from unix format to dos format.  When no option\n" \
        "is given, the input is converted to the opposite output format.\n" \
-       "When no file is given, use stdin for input and stdout for output." \
+       "When no file is given, use stdin/stdout." \
        "\n\nOptions:\n" \
        "       -u      Output will be in UNIX format\n" \
        "       -d      Output will be in DOS format"
        "       -n      Never overwrite existing files (default)\n" \
        "       -o      Overwrite files without prompting\n" \
        "       -p      Send output to stdout\n" \
-       "       -q      Be quiet\n" \
+       "       -q      Quiet\n" \
        "       -x      Exclude these files\n" \
        "       -d      Extract files into this directory"
 
 #define vconfig_full_usage \
        "Create and remove virtual ethernet devices" \
        "\n\nOptions:\n" \
-       "       add             [interface-name] [vlan_id]\n" \
-       "       rem             [vlan-name]\n" \
-       "       set_flag        [interface-name] [flag-num]       [0 | 1]\n" \
-       "       set_egress_map  [vlan-name]      [skb_priority]   [vlan_qos]\n" \
-       "       set_ingress_map [vlan-name]      [skb_priority]   [vlan_qos]\n" \
-       "       set_name_type   [name-type]"
+       "       add             [interface-name] [vlan_id]\n" \
+       "       rem             [vlan-name]\n" \
+       "       set_flag        [interface-name] [flag-num] [0 | 1]\n" \
+       "       set_egress_map  [vlan-name] [skb_priority] [vlan_qos]\n" \
+       "       set_ingress_map [vlan-name] [skb_priority] [vlan_qos]\n" \
+       "       set_name_type   [name-type]"
 
 #define vi_trivial_usage \
        "[OPTION] [FILE]..."
        "     31      46    1365 /etc/passwd\n"
 
 #define wget_trivial_usage \
-       "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n" \
+       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \
        "               [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
        "               [-U|--user-agent agent] url"
 #define wget_full_usage \
        "Retrieve files via HTTP or FTP" \
        "\n\nOptions:\n" \
-       "       -c      Continue retrieval of aborted transfers\n" \
-       "       -q      Quiet mode - do not print\n" \
+       "       -s      Spider mode - only check file existence\n" \
+       "       -c      Continue retrieval of aborted transfer\n" \
+       "       -q      Quiet\n" \
        "       -P      Set directory prefix to DIR\n" \
        "       -O      Save to filename ('-' for stdout)\n" \
        "       -U      Adjust 'User-Agent' field\n" \
 #define zcip_full_usage \
        "Manage a ZeroConf IPv4 link-local address" \
        "\n\nOptions:\n" \
-       "       -f              foreground mode\n" \
-       "       -q              quit after address (no daemon)\n" \
-       "       -r 169.254.x.x  request this address first\n" \
-       "       -v              verbose"
+       "       -f              Foreground mode\n" \
+       "       -q              Quit after address (no daemon)\n" \
+       "       -r 169.254.x.x  Request this address first\n" \
+       "       -v              Verbose"
 
 #endif /* __BB_USAGE_H__ */