aboutsummaryrefslogtreecommitdiff
path: root/toys/other
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-12-04 14:22:12 -0800
committerRob Landley <rob@landley.net>2018-12-04 17:08:19 -0600
commit141a075c0e192dc9910e777270114b1864270bfd (patch)
tree2d62f0cedc34773310b23b3d8f55f577cbbaf9db /toys/other
parentbcf244f3e6ff3c76536063bc5f7d684c6fd4e3fd (diff)
downloadtoybox-141a075c0e192dc9910e777270114b1864270bfd.tar.gz
Clean up some --help formatting.
Be consistent about upper versus lower case. (Upper seems to have the majority, so I went with that, though I'm happy to provide the opposite patch as long as we're consistent!) Be consistent about using \t. (Though saving a few bytes seems like it might be better done in the code that generates help.h rather than directly in the source, since tabs make careful ASCII art layout hard enough that we regularly have things misaligned.) Remove trailing periods (most of which seem to have been added by me). Always use the US "human readable" rather than my British "human-readable", and be more consistent about declaring whether we're showing multiples of 1000 or 1024. Just say "verbose" rather than adding a useless "mode" or "output".
Diffstat (limited to 'toys/other')
-rw-r--r--toys/other/acpi.c10
-rw-r--r--toys/other/base64.c6
-rw-r--r--toys/other/bzcat.c10
-rw-r--r--toys/other/chcon.c6
-rw-r--r--toys/other/fmt.c2
-rw-r--r--toys/other/free.c2
-rw-r--r--toys/other/fsfreeze.c4
-rw-r--r--toys/other/makedevs.c2
-rw-r--r--toys/other/mkpasswd.c4
-rw-r--r--toys/other/nsenter.c6
-rw-r--r--toys/other/readlink.c10
-rw-r--r--toys/other/stat.c2
-rw-r--r--toys/other/uptime.c2
-rw-r--r--toys/other/watch.c8
14 files changed, 37 insertions, 37 deletions
diff --git a/toys/other/acpi.c b/toys/other/acpi.c
index b73cff95..3e19141c 100644
--- a/toys/other/acpi.c
+++ b/toys/other/acpi.c
@@ -14,11 +14,11 @@ config ACPI
Show status of power sources and thermal devices.
- -a show power adapters
- -b show batteries
- -c show cooling device state
- -t show temperatures
- -V show everything
+ -a Show power adapters
+ -b Show batteries
+ -c Show cooling device state
+ -t Show temperatures
+ -V Show everything
*/
#define FOR_acpi
diff --git a/toys/other/base64.c b/toys/other/base64.c
index 87887cda..f1b617d6 100644
--- a/toys/other/base64.c
+++ b/toys/other/base64.c
@@ -14,9 +14,9 @@ config BASE64
Encode or decode in base64.
- -d decode
- -i ignore non-alphabetic characters
- -w wrap output at COLUMNS (default 76 or 0 for no wrap)
+ -d Decode
+ -i Ignore non-alphabetic characters
+ -w Wrap output at COLUMNS (default 76 or 0 for no wrap)
*/
#define FOR_base64
diff --git a/toys/other/bzcat.c b/toys/other/bzcat.c
index 0c79773a..f7453441 100644
--- a/toys/other/bzcat.c
+++ b/toys/other/bzcat.c
@@ -23,11 +23,11 @@ config BUNZIP2
Decompress listed files (file.bz becomes file) deleting archive file(s).
Read from stdin if no files listed.
- -c force output to stdout
- -f force decompression (if FILE doesn't end in .bz, replace original)
- -k keep input files (-c and -t imply this)
- -t test integrity
- -v verbose
+ -c Force output to stdout
+ -f Force decompression (if FILE doesn't end in .bz, replace original)
+ -k Keep input files (-c and -t imply this)
+ -t Test integrity
+ -v Verbose
config BZCAT
bool "bzcat"
diff --git a/toys/other/chcon.c b/toys/other/chcon.c
index a071eef5..cdbabf76 100644
--- a/toys/other/chcon.c
+++ b/toys/other/chcon.c
@@ -13,9 +13,9 @@ config CHCON
Change the SELinux security context of listed file[s].
- -h change symlinks instead of what they point to
- -R recurse into subdirectories
- -v verbose output
+ -h Change symlinks instead of what they point to
+ -R Recurse into subdirectories
+ -v Verbose
*/
#define FOR_chcon
diff --git a/toys/other/fmt.c b/toys/other/fmt.c
index 764fe2b7..a4460ec2 100644
--- a/toys/other/fmt.c
+++ b/toys/other/fmt.c
@@ -20,7 +20,7 @@ config FMT
Reformat input to wordwrap at a given line length, preserving existing
indentation level, writing to stdout.
- -w WIDTH maximum characters per line (default 75)
+ -w WIDTH Maximum characters per line (default 75)
*/
#define FOR_fmt
diff --git a/toys/other/free.c b/toys/other/free.c
index 0a4d69b9..ce0df020 100644
--- a/toys/other/free.c
+++ b/toys/other/free.c
@@ -14,7 +14,7 @@ config FREE
Display the total, free and used amount of physical memory and swap space.
-bkmgt Output units (default is bytes)
- -h Human readable
+ -h Human readable (K=1024)
*/
#define FOR_free
diff --git a/toys/other/fsfreeze.c b/toys/other/fsfreeze.c
index dfe17fb9..b494ce96 100644
--- a/toys/other/fsfreeze.c
+++ b/toys/other/fsfreeze.c
@@ -13,8 +13,8 @@ config FSFREEZE
Freeze or unfreeze a filesystem.
- -f freeze
- -u unfreeze
+ -f Freeze
+ -u Unfreeze
*/
#define FOR_fsfreeze
diff --git a/toys/other/makedevs.c b/toys/other/makedevs.c
index 5e6a9822..def1c4b6 100644
--- a/toys/other/makedevs.c
+++ b/toys/other/makedevs.c
@@ -15,7 +15,7 @@ config MAKEDEVS
Create a range of special files as specified in a device table.
- -d file containing device table (default reads from stdin)
+ -d File containing device table (default reads from stdin)
Each line of of the device table has the fields:
<name> <type> <mode> <uid> <gid> <major> <minor> <start> <increment> <count>
diff --git a/toys/other/mkpasswd.c b/toys/other/mkpasswd.c
index b4151363..6ff578ff 100644
--- a/toys/other/mkpasswd.c
+++ b/toys/other/mkpasswd.c
@@ -16,8 +16,8 @@ config MKPASSWD
Crypt PASSWORD using crypt(3)
- -P FD Read password from file descriptor FD
- -m TYPE Encryption method (des, md5, sha256, or sha512; default is des)
+ -P FD Read password from file descriptor FD
+ -m TYPE Encryption method (des, md5, sha256, or sha512; default is des)
-S SALT
*/
diff --git a/toys/other/nsenter.c b/toys/other/nsenter.c
index 007e0556..dfcfbe83 100644
--- a/toys/other/nsenter.c
+++ b/toys/other/nsenter.c
@@ -25,7 +25,7 @@ config UNSHARE
Create new container namespace(s) for this process and its children, so
some attribute is not shared with the parent process.
- -f Fork command in the background (--fork)
+ -f Fork command in the background (--fork)
-i SysV IPC (message queues, semaphores, shared memory) (--ipc)
-m Mount/unmount tree (--mount)
-n Network address, sockets, routing, iptables (--net)
@@ -46,8 +46,8 @@ config NSENTER
Run COMMAND in an existing (set of) namespace(s).
- -t PID to take namespaces from (--target)
- -F don't fork, even if -p is used (--no-fork)
+ -t PID to take namespaces from (--target)
+ -F don't fork, even if -p is used (--no-fork)
The namespaces to switch are:
diff --git a/toys/other/readlink.c b/toys/other/readlink.c
index 2e0cf11e..1a75dcac 100644
--- a/toys/other/readlink.c
+++ b/toys/other/readlink.c
@@ -14,11 +14,11 @@ config READLINK
Options for producing cannonical paths (all symlinks/./.. resolved):
- -e cannonical path to existing entry (fail if missing)
- -f full path (fail if directory missing)
- -m ignore missing entries, show where it would be
- -n no trailing newline
- -q quiet (no output, just error code)
+ -e Canonical path to existing entry (fail if missing)
+ -f Full path (fail if directory missing)
+ -m Ignore missing entries, show where it would be
+ -n No trailing newline
+ -q Quiet (no output, just error code)
*/
#define FOR_readlink
diff --git a/toys/other/stat.c b/toys/other/stat.c
index f571857a..7c2e337b 100644
--- a/toys/other/stat.c
+++ b/toys/other/stat.c
@@ -13,7 +13,7 @@ config STAT
Display status of files or filesystems.
-c Output specified FORMAT string instead of default
- -f display filesystem status instead of file status
+ -f Display filesystem status instead of file status
-L Follow symlinks
-t terse (-c "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o")
(with -f = -c "%n %i %l %t %s %S %b %f %a %c %d")
diff --git a/toys/other/uptime.c b/toys/other/uptime.c
index 61aed8fb..001af02c 100644
--- a/toys/other/uptime.c
+++ b/toys/other/uptime.c
@@ -16,7 +16,7 @@ config UPTIME
Tell the current time, how long the system has been running, the number
of users, and the system load averages for the past 1, 5 and 15 minutes.
- -p Pretty (human-readable) uptime
+ -p Pretty (human readable) uptime
-s Since when has the system been up?
*/
diff --git a/toys/other/watch.c b/toys/other/watch.c
index ab51148c..0a21cccc 100644
--- a/toys/other/watch.c
+++ b/toys/other/watch.c
@@ -16,10 +16,10 @@ config WATCH
Run PROG every -n seconds, showing output. Hit q to quit.
- -n Loop period in seconds (default 2)
- -t Don't print header
- -e Exit on error
- -b Beep on command error
+ -n Loop period in seconds (default 2)
+ -t Don't print header
+ -e Exit on error
+ -b Beep on command error
-x Exec command directly (vs "sh -c")
*/