aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-28 00:30:35 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-03-28 00:30:35 +0100
commit4816fe9179057f7869e9324954adc939b647bc01 (patch)
tree2e06a0662baf95bc074a1732dea06ecb9f12d93b
parentc8a2ab1023f80e0088e2b83abc2fb2470dd63773 (diff)
downloadbusybox-w32-4816fe9179057f7869e9324954adc939b647bc01.tar.gz
busybox-w32-4816fe9179057f7869e9324954adc939b647bc01.tar.bz2
busybox-w32-4816fe9179057f7869e9324954adc939b647bc01.zip
usage: random tweaks to help texts
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/usage.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/include/usage.h b/include/usage.h
index f3d89d341..8b026b43a 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1090,7 +1090,7 @@
1090 "\n -p pass Append four or six byte password PW to the packet" \ 1090 "\n -p pass Append four or six byte password PW to the packet" \
1091 1091
1092#define expand_trivial_usage \ 1092#define expand_trivial_usage \
1093 "[-i] [-t N] [FILE|-]" 1093 "[-i] [-t N] [FILE]..."
1094#define expand_full_usage "\n\n" \ 1094#define expand_full_usage "\n\n" \
1095 "Convert tabs to spaces, writing to stdout\n" \ 1095 "Convert tabs to spaces, writing to stdout\n" \
1096 "\nOptions:" \ 1096 "\nOptions:" \
@@ -1496,7 +1496,7 @@
1496#define getsebool_trivial_usage \ 1496#define getsebool_trivial_usage \
1497 "-a or getsebool boolean..." 1497 "-a or getsebool boolean..."
1498#define getsebool_full_usage "\n\n" \ 1498#define getsebool_full_usage "\n\n" \
1499 " -a Show all SELinux booleans" 1499 " -a Show all selinux booleans"
1500 1500
1501#define getty_trivial_usage \ 1501#define getty_trivial_usage \
1502 "[OPTIONS] BAUD_RATE TTY [TERMTYPE]" 1502 "[OPTIONS] BAUD_RATE TTY [TERMTYPE]"
@@ -3520,7 +3520,7 @@
3520 "Halt and shut off power\n" \ 3520 "Halt and shut off power\n" \
3521 "\nOptions:" \ 3521 "\nOptions:" \
3522 "\n -d Delay interval for halting" \ 3522 "\n -d Delay interval for halting" \
3523 "\n -n No call to sync()" \ 3523 "\n -n Do not sync" \
3524 "\n -f Force power off (don't go through init)" \ 3524 "\n -f Force power off (don't go through init)" \
3525 3525
3526#define printenv_trivial_usage \ 3526#define printenv_trivial_usage \
@@ -3565,7 +3565,7 @@
3565 "Report process status\n" \ 3565 "Report process status\n" \
3566 USAGE_PS \ 3566 USAGE_PS \
3567 IF_SELINUX( \ 3567 IF_SELINUX( \
3568 "\n -Z Show SE Linux context" \ 3568 "\n -Z Show selinux context" \
3569 ) \ 3569 ) \
3570 IF_FEATURE_PS_WIDE( \ 3570 IF_FEATURE_PS_WIDE( \
3571 "\n w Wide output" \ 3571 "\n w Wide output" \
@@ -3651,7 +3651,7 @@
3651 "Options:" \ 3651 "Options:" \
3652 "\n -m mapfile (Default: /boot/System.map)" \ 3652 "\n -m mapfile (Default: /boot/System.map)" \
3653 "\n -p profile (Default: /proc/profile)" \ 3653 "\n -p profile (Default: /proc/profile)" \
3654 "\n -M mult Set the profiling multiplier to mult" \ 3654 "\n -M NUM Set the profiling multiplier to NUM" \
3655 "\n -i Print only info about the sampling step" \ 3655 "\n -i Print only info about the sampling step" \
3656 "\n -v Verbose" \ 3656 "\n -v Verbose" \
3657 "\n -a Print all symbols, even if count is 0" \ 3657 "\n -a Print all symbols, even if count is 0" \
@@ -3711,20 +3711,20 @@
3711 "Resize the screen" 3711 "Resize the screen"
3712 3712
3713#define restorecon_trivial_usage \ 3713#define restorecon_trivial_usage \
3714 "[-iFnrRv] [-e excludedir]... [-o filename] [-f filename | pathname]" 3714 "[-iFnRv] [-e EXCLUDEDIR]... [-o FILE] [-f FILE]"
3715#define restorecon_full_usage "\n\n" \ 3715#define restorecon_full_usage "\n\n" \
3716 "Reset security contexts of files in pathname\n" \ 3716 "Reset security contexts of files in pathname\n" \
3717 "\n -i Ignore files that don't exist" \ 3717 "\n -i Ignore files that don't exist" \
3718 "\n -f file File with list of files to process. Use - for stdin" \ 3718 "\n -f FILE File with list of files to process" \
3719 "\n -e directory Directory to exclude" \ 3719 "\n -e DIR Directory to exclude" \
3720 "\n -R,-r Recurse" \ 3720 "\n -R,-r Recurse" \
3721 "\n -n Don't change any file labels" \ 3721 "\n -n Don't change any file labels" \
3722 "\n -o file Save list of files with incorrect context" \ 3722 "\n -o FILE Save list of files with incorrect context" \
3723 "\n -v Verbose" \ 3723 "\n -v Verbose" \
3724 "\n -vv Show changed labels" \ 3724 "\n -vv Show changed labels" \
3725 "\n -F Force reset of context to match file_context" \ 3725 "\n -F Force reset of context to match file_context" \
3726 "\n for customizable files, or the user section," \ 3726 "\n for customizable files, or the user section," \
3727 "\n if it has changed" \ 3727 "\n if it has changed" \
3728 3728
3729#define rm_trivial_usage \ 3729#define rm_trivial_usage \
3730 "[OPTIONS] FILE..." 3730 "[OPTIONS] FILE..."
@@ -3818,7 +3818,7 @@
3818 3818
3819#define runcon_trivial_usage \ 3819#define runcon_trivial_usage \
3820 "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \ 3820 "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \
3821 " runcon CONTEXT PROG ARGS" 3821 "runcon CONTEXT PROG ARGS"
3822#define runcon_full_usage "\n\n" \ 3822#define runcon_full_usage "\n\n" \
3823 "Run PROG in a different security context\n" \ 3823 "Run PROG in a different security context\n" \
3824 "\n CONTEXT Complete security context\n" \ 3824 "\n CONTEXT Complete security context\n" \
@@ -3898,7 +3898,7 @@
3898#define script_full_usage "\n\n" \ 3898#define script_full_usage "\n\n" \
3899 "Options:" \ 3899 "Options:" \
3900 "\n -a Append output" \ 3900 "\n -a Append output" \
3901 "\n -c Run PROG, not shell" \ 3901 "\n -c PROG Run PROG, not shell" \
3902 "\n -f Flush output after each write" \ 3902 "\n -f Flush output after each write" \
3903 "\n -q Quiet" \ 3903 "\n -q Quiet" \
3904 IF_SCRIPTREPLAY( \ 3904 IF_SCRIPTREPLAY( \
@@ -4046,14 +4046,14 @@
4046 "See setsid(2) for details." \ 4046 "See setsid(2) for details." \
4047 4047
4048#define last_trivial_usage \ 4048#define last_trivial_usage \
4049 ""IF_FEATURE_LAST_FANCY("[-HW] [-f file]") 4049 ""IF_FEATURE_LAST_FANCY("[-HW] [-f FILE]")
4050#define last_full_usage "\n\n" \ 4050#define last_full_usage "\n\n" \
4051 "Show listing of the last users that logged into the system" \ 4051 "Show listing of the last users that logged into the system" \
4052 IF_FEATURE_LAST_FANCY( "\n" \ 4052 IF_FEATURE_LAST_FANCY( "\n" \
4053 "\nOptions:" \ 4053 "\nOptions:" \
4054/* "\n -H Show header line" */ \ 4054/* "\n -H Show header line" */ \
4055 "\n -W Display with no host column truncation" \ 4055 "\n -W Display with no host column truncation" \
4056 "\n -f file Read from file instead of /var/log/wtmp" \ 4056 "\n -f FILE Read from FILE instead of /var/log/wtmp" \
4057 ) 4057 )
4058 4058
4059#define showkey_trivial_usage \ 4059#define showkey_trivial_usage \
@@ -4265,7 +4265,7 @@
4265 " %d Free file nodes in file system\n" \ 4265 " %d Free file nodes in file system\n" \
4266 " %f Free blocks in file system\n" \ 4266 " %f Free blocks in file system\n" \
4267 IF_SELINUX( \ 4267 IF_SELINUX( \
4268 " %C Security context in SELinux\n" \ 4268 " %C Security context in selinux\n" \
4269 ) \ 4269 ) \
4270 " %i File System ID in hex\n" \ 4270 " %i File System ID in hex\n" \
4271 " %l Maximum length of filenames\n" \ 4271 " %l Maximum length of filenames\n" \
@@ -4338,7 +4338,7 @@
4338 "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service" \ 4338 "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service" \
4339 4339
4340#define svlogd_trivial_usage \ 4340#define svlogd_trivial_usage \
4341 "[-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir..." 4341 "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
4342#define svlogd_full_usage "\n\n" \ 4342#define svlogd_full_usage "\n\n" \
4343 "Continuously read log data from stdin, optionally\n" \ 4343 "Continuously read log data from stdin, optionally\n" \
4344 "filter log messages, and write the data to one or more automatically\n" \ 4344 "filter log messages, and write the data to one or more automatically\n" \
@@ -4926,7 +4926,7 @@
4926 "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n" 4926 "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
4927 4927
4928#define uncompress_trivial_usage \ 4928#define uncompress_trivial_usage \
4929 "[-c] [-f] [FILE]..." 4929 "[-cf] [FILE]..."
4930#define uncompress_full_usage "\n\n" \ 4930#define uncompress_full_usage "\n\n" \
4931 "Uncompress .Z file[s]\n" \ 4931 "Uncompress .Z file[s]\n" \
4932 "\nOptions:" \ 4932 "\nOptions:" \
@@ -4934,7 +4934,7 @@
4934 "\n -f Overwrite an existing file" \ 4934 "\n -f Overwrite an existing file" \
4935 4935
4936#define unexpand_trivial_usage \ 4936#define unexpand_trivial_usage \
4937 "[-f][-a][-t N] [FILE|-]" 4937 "[-fa][-t N] [FILE]..."
4938#define unexpand_full_usage "\n\n" \ 4938#define unexpand_full_usage "\n\n" \
4939 "Convert spaces to tabs, writing to stdout\n" \ 4939 "Convert spaces to tabs, writing to stdout\n" \
4940 "\nOptions:" \ 4940 "\nOptions:" \
@@ -4950,7 +4950,7 @@
4950 ) 4950 )
4951 4951
4952#define uniq_trivial_usage \ 4952#define uniq_trivial_usage \
4953 "[-fscduw]... [INPUT [OUTPUT]]" 4953 "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
4954#define uniq_full_usage "\n\n" \ 4954#define uniq_full_usage "\n\n" \
4955 "Discard duplicate lines\n" \ 4955 "Discard duplicate lines\n" \
4956 "\nOptions:" \ 4956 "\nOptions:" \
@@ -4968,7 +4968,7 @@
4968 "c\n" 4968 "c\n"
4969 4969
4970#define unzip_trivial_usage \ 4970#define unzip_trivial_usage \
4971 "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]" 4971 "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
4972#define unzip_full_usage "\n\n" \ 4972#define unzip_full_usage "\n\n" \
4973 "Extract files from ZIP archives\n" \ 4973 "Extract files from ZIP archives\n" \
4974 "\nOptions:" \ 4974 "\nOptions:" \
@@ -4977,8 +4977,8 @@
4977 "\n -o Overwrite files without prompting" \ 4977 "\n -o Overwrite files without prompting" \
4978 "\n -p Send output to stdout" \ 4978 "\n -p Send output to stdout" \
4979 "\n -q Quiet" \ 4979 "\n -q Quiet" \
4980 "\n -x Exclude these files" \ 4980 "\n -x XLST Exclude these files" \
4981 "\n -d Extract files into this directory" \ 4981 "\n -d DIR Extract files into DIR" \
4982 4982
4983#define uptime_trivial_usage \ 4983#define uptime_trivial_usage \
4984 "" 4984 ""
@@ -5108,12 +5108,12 @@
5108 5108
5109#define wget_trivial_usage \ 5109#define wget_trivial_usage \
5110 IF_FEATURE_WGET_LONG_OPTIONS( \ 5110 IF_FEATURE_WGET_LONG_OPTIONS( \
5111 "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \ 5111 "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
5112 " [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \ 5112 " [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
5113 " [--no-check-certificate] [-U|--user-agent agent] url" \ 5113 " [--no-check-certificate] [-U|--user-agent AGENT] URL" \
5114 ) \ 5114 ) \
5115 IF_NOT_FEATURE_WGET_LONG_OPTIONS( \ 5115 IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
5116 "[-csq] [-O file] [-Y on/off] [-P DIR] [-U agent] url" \ 5116 "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT] URL" \
5117 ) 5117 )
5118#define wget_full_usage "\n\n" \ 5118#define wget_full_usage "\n\n" \
5119 "Retrieve files via HTTP or FTP\n" \ 5119 "Retrieve files via HTTP or FTP\n" \
@@ -5122,8 +5122,8 @@
5122 "\n -c Continue retrieval of aborted transfer" \ 5122 "\n -c Continue retrieval of aborted transfer" \
5123 "\n -q Quiet" \ 5123 "\n -q Quiet" \
5124 "\n -P Set directory prefix to DIR" \ 5124 "\n -P Set directory prefix to DIR" \
5125 "\n -O Save to filename ('-' for stdout)" \ 5125 "\n -O FILE Save to FILE ('-' for stdout)" \
5126 "\n -U Adjust 'User-Agent' field" \ 5126 "\n -U STR Use STR for User-Agent header" \
5127 "\n -Y Use proxy ('on' or 'off')" \ 5127 "\n -Y Use proxy ('on' or 'off')" \
5128 5128
5129#define which_trivial_usage \ 5129#define which_trivial_usage \