From 66426760beef7e87c4735f433d123daf911b5b4a Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 5 Jun 2011 03:58:28 +0200
Subject: *: remove "Options:" string from help texts
function old new delta
packed_usage 28706 28623 -83
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
archival/ar.c | 1 -
archival/bbunzip.c | 7 -------
archival/bzip2.c | 1 -
archival/cpio.c | 1 -
archival/dpkg.c | 1 -
archival/dpkg_deb.c | 1 -
archival/gzip.c | 1 -
archival/lzop.c | 6 ++----
archival/rpm.c | 1 -
archival/tar.c | 1 -
archival/unzip.c | 1 -
console-tools/kbd_mode.c | 1 -
console-tools/loadfont.c | 1 -
console-tools/openvt.c | 1 -
console-tools/setconsole.c | 1 -
console-tools/showkey.c | 1 -
coreutils/cal.c | 1 -
coreutils/catv.c | 1 -
coreutils/chgrp.c | 1 -
coreutils/chmod.c | 1 -
coreutils/chown.c | 1 -
coreutils/comm.c | 1 -
coreutils/cp.c | 1 -
coreutils/cut.c | 1 -
coreutils/date.c | 1 -
coreutils/dd.c | 1 -
coreutils/df.c | 1 -
coreutils/dos2unix.c | 2 --
coreutils/du.c | 1 -
coreutils/echo.c | 1 -
coreutils/env.c | 1 -
coreutils/expand.c | 2 --
coreutils/fold.c | 1 -
coreutils/fsync.c | 1 -
coreutils/head.c | 1 -
coreutils/id.c | 1 -
coreutils/install.c | 1 -
coreutils/ln.c | 1 -
coreutils/ls.c | 1 -
coreutils/md5_sha1_sum.c | 4 ----
coreutils/mkdir.c | 1 -
coreutils/mkfifo.c | 1 -
coreutils/mknod.c | 1 -
coreutils/mv.c | 1 -
coreutils/nice.c | 1 -
coreutils/readlink.c | 1 -
coreutils/rm.c | 1 -
coreutils/rmdir.c | 1 -
coreutils/seq.c | 1 -
coreutils/sort.c | 1 -
coreutils/split.c | 3 +--
coreutils/stat.c | 1 -
coreutils/stty.c | 1 -
coreutils/sum.c | 1 -
coreutils/tail.c | 1 -
coreutils/tee.c | 1 -
coreutils/touch.c | 1 -
coreutils/tr.c | 1 -
coreutils/tty.c | 1 -
coreutils/uname.c | 1 -
coreutils/uniq.c | 1 -
coreutils/uudecode.c | 1 -
coreutils/uuencode.c | 1 -
coreutils/wc.c | 1 -
coreutils/who.c | 1 -
debianutils/mktemp.c | 1 -
debianutils/run_parts.c | 1 -
e2fsprogs/chattr.c | 1 -
e2fsprogs/fsck.c | 1 -
e2fsprogs/lsattr.c | 1 -
e2fsprogs/old_e2fsprogs/e2fsck.c | 1 -
editors/awk.c | 3 +--
editors/cmp.c | 1 -
editors/diff.c | 1 -
editors/sed.c | 3 +--
editors/vi.c | 1 -
findutils/find.c | 1 -
findutils/grep.c | 1 -
findutils/xargs.c | 1 -
init/bootchartd.c | 1 -
init/halt.c | 3 ---
loginutils/addgroup.c | 1 -
loginutils/adduser.c | 1 -
loginutils/chpasswd.c | 1 -
loginutils/cryptpw.c | 2 --
loginutils/getty.c | 1 -
loginutils/login.c | 1 -
loginutils/passwd.c | 1 -
loginutils/su.c | 1 -
loginutils/sulogin.c | 1 -
loginutils/vlock.c | 1 -
mailutils/makemime.c | 3 +--
mailutils/popmaildir.c | 1 -
mailutils/reformime.c | 1 -
miscutils/adjtimex.c | 1 -
miscutils/beep.c | 3 +--
miscutils/chrt.c | 1 -
miscutils/conspy.c | 1 -
miscutils/devfsd.c | 1 -
miscutils/eject.c | 1 -
miscutils/fbsplash.c | 3 +--
miscutils/flash_eraseall.c | 1 -
miscutils/flashcp.c | 1 -
miscutils/hdparm.c | 3 +--
miscutils/ionice.c | 1 -
miscutils/last.c | 1 -
miscutils/less.c | 1 -
miscutils/man.c | 3 +--
miscutils/microcom.c | 1 -
miscutils/mountpoint.c | 1 -
miscutils/nandwrite.c | 2 --
miscutils/setserial.c | 4 ++--
miscutils/strings.c | 1 -
miscutils/taskset.c | 1 -
miscutils/time.c | 1 -
miscutils/ubi_tools.c | 10 ++--------
miscutils/watchdog.c | 1 -
modutils/insmod.c | 1 -
modutils/modinfo.c | 3 +--
modutils/modprobe-small.c | 5 +----
modutils/modprobe.c | 3 +--
modutils/rmmod.c | 1 -
networking/arp.c | 1 -
networking/arping.c | 1 -
networking/dnsd.c | 1 -
networking/ether-wake.c | 1 -
networking/ftpd.c | 1 -
networking/ftpgetput.c | 2 --
networking/hostname.c | 1 -
networking/httpd.c | 1 -
networking/ifconfig.c | 1 -
networking/ifenslave.c | 1 -
networking/ifplugd.c | 1 -
networking/ifupdown.c | 6 ++----
networking/inetd.c | 3 +--
networking/ip.c | 2 +-
networking/ipcalc.c | 1 -
networking/isrv_identd.c | 1 -
networking/nameif.c | 1 -
networking/nc.c | 2 +-
networking/nc_bloaty.c | 3 +--
networking/netstat.c | 1 -
networking/ntpd.c | 1 -
networking/ping.c | 2 --
networking/pscan.c | 1 -
networking/route.c | 1 -
networking/slattach.c | 1 -
networking/telnet.c | 1 -
networking/telnetd.c | 1 -
networking/tftp.c | 2 --
networking/traceroute.c | 2 --
networking/tunctl.c | 1 -
networking/udhcp/dumpleases.c | 1 -
networking/vconfig.c | 1 -
networking/wget.c | 1 -
networking/whois.c | 1 -
networking/zcip.c | 1 -
printutils/lpr.c | 6 ++----
procps/fuser.c | 1 -
procps/iostat.c | 1 -
procps/kill.c | 3 ---
procps/mpstat.c | 1 -
procps/pgrep.c | 2 --
procps/pidof.c | 2 +-
procps/pmap.c | 16 ++++++++--------
procps/ps.c | 2 --
procps/pstree.c | 1 -
procps/renice.c | 1 -
procps/sysctl.c | 1 -
procps/watch.c | 1 -
runit/chpst.c | 2 --
sysklogd/klogd.c | 1 -
sysklogd/logger.c | 1 -
sysklogd/logread.c | 1 -
sysklogd/syslogd.c | 1 -
util-linux/acpid.c | 1 -
util-linux/blockdev.c | 3 +--
util-linux/dmesg.c | 1 -
util-linux/fdformat.c | 1 -
util-linux/fdisk.c | 1 -
util-linux/flock.c | 1 -
util-linux/fsck_minix.c | 1 -
util-linux/getopt.c | 5 ++---
util-linux/hexdump.c | 1 -
util-linux/hwclock.c | 1 -
util-linux/ipcrm.c | 1 -
util-linux/losetup.c | 3 +--
util-linux/mkfs_minix.c | 1 -
util-linux/mkfs_reiser.c | 1 -
util-linux/mkfs_vfat.c | 1 -
util-linux/mkswap.c | 1 -
util-linux/mount.c | 1 -
util-linux/rdate.c | 1 -
util-linux/readprofile.c | 3 +--
util-linux/script.c | 3 +--
util-linux/swaponoff.c | 2 --
util-linux/switch_root.c | 1 -
util-linux/umount.c | 1 -
198 files changed, 40 insertions(+), 268 deletions(-)
diff --git a/archival/ar.c b/archival/ar.c
index e7973af94..acad20ff2 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -21,7 +21,6 @@
//usage: "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
//usage:#define ar_full_usage "\n\n"
//usage: "Extract or list FILES from an ar archive\n"
-//usage: "\nOptions:"
//usage: "\n -o Preserve original dates"
//usage: "\n -p Extract to stdout"
//usage: "\n -t List"
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 734c9b269..bb1ec0e37 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -172,7 +172,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
//usage: "[-cf] [FILE]..."
//usage:#define uncompress_full_usage "\n\n"
//usage: "Decompress .Z file[s]\n"
-//usage: "\nOptions:"
//usage: "\n -c Write to stdout"
//usage: "\n -f Overwrite"
@@ -232,7 +231,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
//usage: "[-cft] [FILE]..."
//usage:#define gunzip_full_usage "\n\n"
//usage: "Decompress FILEs (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
//usage: "\n -t Test file integrity"
@@ -339,7 +337,6 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
//usage: "[-cf] [FILE]..."
//usage:#define bunzip2_full_usage "\n\n"
//usage: "Decompress FILEs (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
//usage:#define bzcat_trivial_usage
@@ -380,7 +377,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "[-cf] [FILE]..."
//usage:#define unlzma_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
//usage:
@@ -388,7 +384,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "-d [-cf] [FILE]..."
//usage:#define lzma_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
@@ -402,7 +397,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "[-cf] [FILE]..."
//usage:#define unxz_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
//usage:
@@ -410,7 +404,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "-d [-cf] [FILE]..."
//usage:#define xz_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
diff --git a/archival/bzip2.c b/archival/bzip2.c
index cfaf5fe20..e39d7f704 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -11,7 +11,6 @@
//usage: "[OPTIONS] [FILE]..."
//usage:#define bzip2_full_usage "\n\n"
//usage: "Compress FILEs (or stdin) with bzip2 algorithm\n"
-//usage: "\nOptions:"
//usage: "\n -1..9 Compression level"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
diff --git a/archival/cpio.c b/archival/cpio.c
index c746a71fa..9674a046b 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -34,7 +34,6 @@
//usage: IF_FEATURE_CPIO_P(
//usage: "\n -p DIR Copy files to DIR"
//usage: )
-//usage: "\nOptions:"
//usage: "\n -d Make leading directories"
//usage: "\n -m Preserve mtime"
//usage: "\n -v Verbose"
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 8899d1719..2a6a7b3bf 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -32,7 +32,6 @@
//usage: "[-ilCPru] [-F OPT] PACKAGE"
//usage:#define dpkg_full_usage "\n\n"
//usage: "Install, remove and manage Debian packages\n"
-//usage: "\nOptions:"
//usage: IF_LONG_OPTS(
//usage: "\n -i,--install Install the package"
//usage: "\n -l,--list List of installed packages"
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 9e1e811ee..5d814d7ef 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -9,7 +9,6 @@
//usage: "[-cefxX] FILE [argument"
//usage:#define dpkg_deb_full_usage "\n\n"
//usage: "Perform actions on Debian packages (.debs)\n"
-//usage: "\nOptions:"
//usage: "\n -c List contents of filesystem tree"
//usage: "\n -e Extract control files to [argument] directory"
//usage: "\n -f Display control field name starting with [argument]"
diff --git a/archival/gzip.c b/archival/gzip.c
index a9b216afe..403eb4dcb 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -43,7 +43,6 @@ aa: 85.1% -- replaced with aa.gz
//usage: "[-cfd] [FILE]..."
//usage:#define gzip_full_usage "\n\n"
//usage: "Compress FILEs (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
diff --git a/archival/lzop.c b/archival/lzop.c
index f4419910f..1326bd790 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -28,8 +28,7 @@
//usage:#define lzop_trivial_usage
//usage: "[-cfvd123456789CF] [FILE]..."
//usage:#define lzop_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -1..9 Compression level"
+//usage: " -1..9 Compression level"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
@@ -46,8 +45,7 @@
//usage:#define unlzop_trivial_usage
//usage: "[-cfvCF] [FILE]..."
//usage:#define unlzop_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -c Write to stdout"
+//usage: " -c Write to stdout"
//usage: "\n -f Force"
//usage: "\n -v Verbose"
//usage: "\n -F Don't store or verify checksum"
diff --git a/archival/rpm.c b/archival/rpm.c
index 98a45d9cc..8174f4869 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -14,7 +14,6 @@
//usage: "\nCommands:"
//usage: "\n -i Install package"
//usage: "\n -qp Query package"
-//usage: "\nOptions:"
//usage: "\n -i Show information"
//usage: "\n -l List contents"
//usage: "\n -d List documents"
diff --git a/archival/tar.c b/archival/tar.c
index ebaa183b4..3e90d46cb 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -759,7 +759,6 @@ static void handle_SIGCHLD(int status)
//usage: )
//usage: "\n x Extract"
//usage: "\n t List"
-//usage: "\nOptions:"
//usage: "\n f Name of TARFILE ('-' for stdin/out)"
//usage: "\n C Change to DIR before operation"
//usage: "\n v Verbose"
diff --git a/archival/unzip.c b/archival/unzip.c
index 52b0a6414..4fa729326 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -23,7 +23,6 @@
//usage: "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
//usage:#define unzip_full_usage "\n\n"
//usage: "Extract files from ZIP archives\n"
-//usage: "\nOptions:"
//usage: "\n -l List archive contents (with -q for short form)"
//usage: "\n -n Never overwrite files (default)"
//usage: "\n -o Overwrite"
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 221a9f782..138536721 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -13,7 +13,6 @@
//usage: "[-a|k|s|u] [-C TTY]"
//usage:#define kbd_mode_full_usage "\n\n"
//usage: "Report or set the keyboard mode\n"
-//usage: "\nOptions:"
//usage: "\n -a Default (ASCII)"
//usage: "\n -k Medium-raw (keyboard)"
//usage: "\n -s Raw (scancode)"
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 597519f91..9e887f256 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -23,7 +23,6 @@
//usage: "FONT [-m MAPFILE] [-C TTY]"
//usage:#define setfont_full_usage "\n\n"
//usage: "Load a console font\n"
-//usage: "\nOptions:"
//usage: "\n -m MAPFILE Load console screen map"
//usage: "\n -C TTY Affect TTY instead of /dev/tty"
//usage:
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index de5cf93fe..e52356692 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -12,7 +12,6 @@
//usage: "[-c N] [-sw] [PROG ARGS]"
//usage:#define openvt_full_usage "\n\n"
//usage: "Start PROG on a new virtual terminal\n"
-//usage: "\nOptions:"
//usage: "\n -c N Use specified VT"
//usage: "\n -s Switch to the VT"
/* //usage: "\n -l Run PROG as login shell (by prepending '-')" */
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 771974ae3..c0051dcc8 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -12,7 +12,6 @@
//usage: "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
//usage:#define setconsole_full_usage "\n\n"
//usage: "Redirect system console output to DEVICE (default: /dev/tty)\n"
-//usage: "\nOptions:"
//usage: "\n -r Reset output to /dev/console"
#include "libbb.h"
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index 2c832c92c..69b785ec6 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -11,7 +11,6 @@
//usage: "[-a | -k | -s]"
//usage:#define showkey_full_usage "\n\n"
//usage: "Show keys pressed\n"
-//usage: "\nOptions:"
//usage: "\n -a Display decimal/octal/hex values of the keys"
//usage: "\n -k Display interpreted keycodes (default)"
//usage: "\n -s Display raw scan-codes"
diff --git a/coreutils/cal.c b/coreutils/cal.c
index ef1c29bb9..b470ad968 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -21,7 +21,6 @@
//usage: "[-jy] [[MONTH] YEAR]"
//usage:#define cal_full_usage "\n\n"
//usage: "Display a calendar\n"
-//usage: "\nOptions:"
//usage: "\n -j Use julian dates"
//usage: "\n -y Display the entire year"
diff --git a/coreutils/catv.c b/coreutils/catv.c
index 37c7ed2d1..214b4311a 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -14,7 +14,6 @@
//usage: "[-etv] [FILE]..."
//usage:#define catv_full_usage "\n\n"
//usage: "Display nonprinting characters as ^x or M-x\n"
-//usage: "\nOptions:"
//usage: "\n -e End each line with $"
//usage: "\n -t Show tabs as ^I"
//usage: "\n -v Don't use ^x or M-x escapes"
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index bc9608362..7076db62f 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -15,7 +15,6 @@
//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
//usage:#define chgrp_full_usage "\n\n"
//usage: "Change the group membership of each FILE to GROUP\n"
-//usage: "\nOptions:"
//usage: "\n -R Recurse"
//usage: "\n -h Affect symlinks instead of symlink targets"
//usage: "\n -L Traverse all symlinks to directories"
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 0bcd6bb66..5ee45b942 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -19,7 +19,6 @@
//usage:#define chmod_full_usage "\n\n"
//usage: "Each MODE is one or more of the letters ugoa, one of the\n"
//usage: "symbols +-= and one or more of the letters rwxst\n"
-//usage: "\nOptions:"
//usage: "\n -R Recurse"
//usage: IF_DESKTOP(
//usage: "\n -c List changed files"
diff --git a/coreutils/chown.c b/coreutils/chown.c
index c4c182d3c..bb166d8fe 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -14,7 +14,6 @@
//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
//usage:#define chown_full_usage "\n\n"
//usage: "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
-//usage: "\nOptions:"
//usage: "\n -R Recurse"
//usage: "\n -h Affect symlinks instead of symlink targets"
//usage: "\n -L Traverse all symlinks to directories"
diff --git a/coreutils/comm.c b/coreutils/comm.c
index 7da6b25f9..cd450950b 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -11,7 +11,6 @@
//usage: "[-123] FILE1 FILE2"
//usage:#define comm_full_usage "\n\n"
//usage: "Compare FILE1 with FILE2\n"
-//usage: "\nOptions:"
//usage: "\n -1 Suppress lines unique to FILE1"
//usage: "\n -2 Suppress lines unique to FILE2"
//usage: "\n -3 Suppress lines common to both files"
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 337054d7b..e48e21c97 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -19,7 +19,6 @@
//usage: "[OPTIONS] SOURCE DEST"
//usage:#define cp_full_usage "\n\n"
//usage: "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n"
-//usage: "\nOptions:"
//usage: "\n -a Same as -dpR"
//usage: IF_SELINUX(
//usage: "\n -c Preserve security context"
diff --git a/coreutils/cut.c b/coreutils/cut.c
index dfa1833b4..2c27b704f 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -13,7 +13,6 @@
//usage: "[OPTIONS] [FILE]..."
//usage:#define cut_full_usage "\n\n"
//usage: "Print selected fields from each input FILE to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -b LIST Output only bytes from LIST"
//usage: "\n -c LIST Output only characters from LIST"
//usage: "\n -d CHAR Use CHAR instead of tab as the field delimiter"
diff --git a/coreutils/date.c b/coreutils/date.c
index db1b693aa..6a7d5fac3 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -98,7 +98,6 @@
//usage: "[OPTIONS] [+FMT] [TIME]"
//usage:#define date_full_usage "\n\n"
//usage: "Display time (using +FMT), or set time\n"
-//usage: "\nOptions:"
//usage: IF_NOT_LONG_OPTS(
//usage: "\n [-s] TIME Set time to TIME"
//usage: "\n -u Work in UTC (don't convert to local time)"
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 8a2eaed72..96602ebdd 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -13,7 +13,6 @@
//usage: " [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
//usage:#define dd_full_usage "\n\n"
//usage: "Copy a file with converting and formatting\n"
-//usage: "\nOptions:"
//usage: "\n if=FILE Read from FILE instead of stdin"
//usage: "\n of=FILE Write to FILE instead of stdout"
//usage: "\n bs=N Read and write N bytes at a time"
diff --git a/coreutils/df.c b/coreutils/df.c
index 518e856a2..846cb38ad 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -29,7 +29,6 @@
//usage: "] [FILESYSTEM]..."
//usage:#define df_full_usage "\n\n"
//usage: "Print filesystem usage statistics\n"
-//usage: "\nOptions:"
//usage: "\n -P POSIX output format"
//usage: "\n -k 1024-byte blocks (default)"
//usage: IF_FEATURE_HUMAN_READABLE(
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index df2376bea..07398bdfa 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -17,7 +17,6 @@
//usage:#define dos2unix_full_usage "\n\n"
//usage: "Convert FILE in-place from DOS to Unix format.\n"
//usage: "When no file is given, use stdin/stdout.\n"
-//usage: "\nOptions:"
//usage: "\n -u dos2unix"
//usage: "\n -d unix2dos"
//usage:
@@ -26,7 +25,6 @@
//usage:#define unix2dos_full_usage "\n\n"
//usage: "Convert FILE in-place from Unix to DOS format.\n"
//usage: "When no file is given, use stdin/stdout.\n"
-//usage: "\nOptions:"
//usage: "\n -u dos2unix"
//usage: "\n -d unix2dos"
diff --git a/coreutils/du.c b/coreutils/du.c
index 7a6662d1e..b8bbe3d9e 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -31,7 +31,6 @@
//usage: IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024")
//usage: IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512")
//usage: " bytes.\n"
-//usage: "\nOptions:"
//usage: "\n -a Show file sizes too"
//usage: "\n -L Follow all symlinks"
//usage: "\n -H Follow symlinks on command line"
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 0895e2940..9663894ec 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -28,7 +28,6 @@
//usage:#define echo_full_usage "\n\n"
//usage: "Print the specified ARGs to stdout"
//usage: IF_FEATURE_FANCY_ECHO( "\n"
-//usage: "\nOptions:"
//usage: "\n -n Suppress trailing newline"
//usage: "\n -e Interpret backslash escapes (i.e., \\t=tab)"
//usage: "\n -E Don't interpret backslash escapes (default)"
diff --git a/coreutils/env.c b/coreutils/env.c
index 747c668da..807ef13e9 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -36,7 +36,6 @@
//usage:#define env_full_usage "\n\n"
//usage: "Print the current environment or run PROG after setting up\n"
//usage: "the specified environment\n"
-//usage: "\nOptions:"
//usage: "\n -, -i Start with an empty environment"
//usage: "\n -u Remove variable from the environment"
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 73ab0ece3..25bbffc66 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -25,7 +25,6 @@
//usage: "[-i] [-t N] [FILE]..."
//usage:#define expand_full_usage "\n\n"
//usage: "Convert tabs to spaces, writing to stdout\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_EXPAND_LONG_OPTIONS(
//usage: "\n -i,--initial Don't convert tabs after non blanks"
//usage: "\n -t,--tabs=N Tabstops every N chars"
@@ -39,7 +38,6 @@
//usage: "[-fa][-t N] [FILE]..."
//usage:#define unexpand_full_usage "\n\n"
//usage: "Convert spaces to tabs, writing to stdout\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_UNEXPAND_LONG_OPTIONS(
//usage: "\n -a,--all Convert all blanks"
//usage: "\n -f,--first-only Convert only leading blanks"
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 3fe668512..0e7306377 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -14,7 +14,6 @@
//usage: "[-bs] [-w WIDTH] [FILE]..."
//usage:#define fold_full_usage "\n\n"
//usage: "Wrap input lines in each FILE (or stdin), writing to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -b Count bytes rather than columns"
//usage: "\n -s Break at spaces"
//usage: "\n -w Use WIDTH columns instead of 80"
diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index 518c5642b..652a41c33 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -11,7 +11,6 @@
//usage: "[-d] FILE..."
//usage:#define fsync_full_usage "\n\n"
//usage: "Write files' buffered blocks to disk\n"
-//usage: "\nOptions:"
//usage: "\n -d Avoid syncing metadata"
#include "libbb.h"
diff --git a/coreutils/head.c b/coreutils/head.c
index f49320ef4..ec4512765 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -16,7 +16,6 @@
//usage:#define head_full_usage "\n\n"
//usage: "Print first 10 lines of each FILE (or stdin) to stdout.\n"
//usage: "With more than one FILE, precede each with a filename header.\n"
-//usage: "\nOptions:"
//usage: "\n -n N[kbm] Print first N lines"
//usage: IF_FEATURE_FANCY_HEAD(
//usage: "\n -c N[kbm] Print first N bytes"
diff --git a/coreutils/id.c b/coreutils/id.c
index 42ed4c749..aa6ae4711 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -19,7 +19,6 @@
//usage: "[OPTIONS] [USER]"
//usage:#define id_full_usage "\n\n"
//usage: "Print information about USER or the current user\n"
-//usage: "\nOptions:"
//usage: IF_SELINUX(
//usage: "\n -Z Security context"
//usage: )
diff --git a/coreutils/install.c b/coreutils/install.c
index fe5f26e79..445497f9a 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -11,7 +11,6 @@
//usage: "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
//usage:#define install_full_usage "\n\n"
//usage: "Copy files and set attributes\n"
-//usage: "\nOptions:"
//usage: "\n -c Just copy (default)"
//usage: "\n -d Create directories"
//usage: "\n -D Create leading target directories"
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 2da915a68..88a9a8f91 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -15,7 +15,6 @@
//usage: "[OPTIONS] TARGET... LINK|DIR"
//usage:#define ln_full_usage "\n\n"
//usage: "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n"
-//usage: "\nOptions:"
//usage: "\n -s Make symlinks instead of hardlinks"
//usage: "\n -f Remove existing destinations"
//usage: "\n -n Don't dereference symlinks - treat like normal file"
diff --git a/coreutils/ls.c b/coreutils/ls.c
index e7b2e39e1..dec0f85f3 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -42,7 +42,6 @@
//usage: IF_FEATURE_AUTOWIDTH(" [-w WIDTH]") " [FILE]..."
//usage:#define ls_full_usage "\n\n"
//usage: "List directory contents\n"
-//usage: "\nOptions:"
//usage: "\n -1 One column output"
//usage: "\n -a Include entries which start with ."
//usage: "\n -A Like -a, but exclude . and .."
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 050d46701..53fd4d1a8 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -12,7 +12,6 @@
//usage:#define md5sum_full_usage "\n\n"
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums"
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage: "\nOptions:"
//usage: "\n -c Check sums against given list"
//usage: "\n -s Don't output anything, status code shows success"
//usage: "\n -w Warn about improperly formatted checksum lines"
@@ -34,7 +33,6 @@
//usage:#define sha1sum_full_usage "\n\n"
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums"
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage: "\nOptions:"
//usage: "\n -c Check sums against given list"
//usage: "\n -s Don't output anything, status code shows success"
//usage: "\n -w Warn about improperly formatted checksum lines"
@@ -46,7 +44,6 @@
//usage:#define sha256sum_full_usage "\n\n"
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums"
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage: "\nOptions:"
//usage: "\n -c Check sums against given list"
//usage: "\n -s Don't output anything, status code shows success"
//usage: "\n -w Warn about improperly formatted checksum lines"
@@ -58,7 +55,6 @@
//usage:#define sha512sum_full_usage "\n\n"
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums"
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage: "\nOptions:"
//usage: "\n -c Check sums against given list"
//usage: "\n -s Don't output anything, status code shows success"
//usage: "\n -w Warn about improperly formatted checksum lines"
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index e425bbe5e..a4429b1cb 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -23,7 +23,6 @@
//usage: "[OPTIONS] DIRECTORY..."
//usage:#define mkdir_full_usage "\n\n"
//usage: "Create DIRECTORY\n"
-//usage: "\nOptions:"
//usage: "\n -m MODE Mode"
//usage: "\n -p No error if exists; make parent directories as needed"
//usage: IF_SELINUX(
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 84d8d99dd..ef58325b3 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -14,7 +14,6 @@
//usage: "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
//usage:#define mkfifo_full_usage "\n\n"
//usage: "Create named pipe\n"
-//usage: "\nOptions:"
//usage: "\n -m MODE Mode (default a=rw)"
//usage: IF_SELINUX(
//usage: "\n -Z Set security context"
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 50dbd62e3..32d3659ac 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -13,7 +13,6 @@
//usage: "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
//usage:#define mknod_full_usage "\n\n"
//usage: "Create a special file (block, character, or pipe)\n"
-//usage: "\nOptions:"
//usage: "\n -m MODE Creation mode (default a=rw)"
//usage: IF_SELINUX(
//usage: "\n -Z Set security context"
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 399f391b2..87f4cd5a5 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -21,7 +21,6 @@
//usage: "or: mv [-fin] SOURCE... DIRECTORY"
//usage:#define mv_full_usage "\n\n"
//usage: "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n"
-//usage: "\nOptions:"
//usage: "\n -f Don't prompt before overwriting"
//usage: "\n -i Interactive, prompt before overwrite"
//usage: "\n -n Don't overwrite an existing file"
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 2763986e7..ce759916f 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -11,7 +11,6 @@
//usage: "[-n ADJUST] [PROG ARGS]"
//usage:#define nice_full_usage "\n\n"
//usage: "Change scheduling priority, run PROG\n"
-//usage: "\nOptions:"
//usage: "\n -n ADJUST Adjust priority by ADJUST"
#include <sys/resource.h>
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 1a0eca646..f7ad791ec 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -12,7 +12,6 @@
//usage:#define readlink_full_usage "\n\n"
//usage: "Display the value of a symlink"
//usage: IF_FEATURE_READLINK_FOLLOW( "\n"
-//usage: "\nOptions:"
//usage: "\n -f Canonicalize by following all symlinks"
//usage: "\n -n Don't add newline"
//usage: "\n -v Verbose"
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 8efd895cc..042fba162 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -19,7 +19,6 @@
//usage: "[-irf] FILE..."
//usage:#define rm_full_usage "\n\n"
//usage: "Remove (unlink) FILEs\n"
-//usage: "\nOptions:"
//usage: "\n -i Always prompt before removing"
//usage: "\n -f Never prompt"
//usage: "\n -R,-r Recurse"
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 0dbd940a1..2840d1cfa 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -14,7 +14,6 @@
//usage: "[OPTIONS] DIRECTORY..."
//usage:#define rmdir_full_usage "\n\n"
//usage: "Remove DIRECTORY if it is empty\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_RMDIR_LONG_OPTIONS(
//usage: "\n -p|--parents Include parents"
//usage: "\n --ignore-fail-on-non-empty"
diff --git a/coreutils/seq.c b/coreutils/seq.c
index b600266fd..898619293 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -12,7 +12,6 @@
//usage:#define seq_full_usage "\n\n"
//usage: "Print numbers from FIRST to LAST, in steps of INC.\n"
//usage: "FIRST, INC default to 1.\n"
-//usage: "\nOptions:"
//usage: "\n -w Pad to last with leading zeros"
//usage: "\n -s SEP String separator"
diff --git a/coreutils/sort.c b/coreutils/sort.c
index f709ea1b3..1df07285c 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -18,7 +18,6 @@
//usage: "] [FILE]..."
//usage:#define sort_full_usage "\n\n"
//usage: "Sort lines of text\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_SORT_BIG(
//usage: "\n -b Ignore leading blanks"
//usage: "\n -c Check whether input is sorted"
diff --git a/coreutils/split.c b/coreutils/split.c
index f0077077e..11e640442 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -13,8 +13,7 @@
//usage:#define split_trivial_usage
//usage: "[OPTIONS] [INPUT [PREFIX]]"
//usage:#define split_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -b N[k|m] Split by N (kilo|mega)bytes"
+//usage: " -b N[k|m] Split by N (kilo|mega)bytes"
//usage: "\n -l N Split by N lines"
//usage: "\n -a N Use N letters as suffix"
//usage:
diff --git a/coreutils/stat.c b/coreutils/stat.c
index e85e51033..2797719dd 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -17,7 +17,6 @@
//usage: "[OPTIONS] FILE..."
//usage:#define stat_full_usage "\n\n"
//usage: "Display file (default) or filesystem status\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_STAT_FORMAT(
//usage: "\n -c fmt Use the specified format"
//usage: )
diff --git a/coreutils/stty.c b/coreutils/stty.c
index af2347161..7f057ead2 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -26,7 +26,6 @@
//usage:#define stty_full_usage "\n\n"
//usage: "Without arguments, prints baud rate, line discipline,\n"
//usage: "and deviations from stty sane\n"
-//usage: "\nOptions:"
//usage: "\n -F DEVICE Open device instead of stdin"
//usage: "\n -a Print all current settings in human-readable form"
//usage: "\n -g Print in stty-readable form"
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 9e6b0c5b1..95110a6da 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -17,7 +17,6 @@
//usage: "[-rs] [FILE]..."
//usage:#define sum_full_usage "\n\n"
//usage: "Checksum and count the blocks in a file\n"
-//usage: "\nOptions:"
//usage: "\n -r Use BSD sum algorithm (1K blocks)"
//usage: "\n -s Use System V sum algorithm (512byte blocks)"
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 4b42ebc52..454c25936 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -29,7 +29,6 @@
//usage:#define tail_full_usage "\n\n"
//usage: "Print last 10 lines of each FILE (or stdin) to stdout.\n"
//usage: "With more than one FILE, precede each with a filename header.\n"
-//usage: "\nOptions:"
//usage: "\n -f Print data as file grows"
//usage: IF_FEATURE_FANCY_TAIL(
//usage: "\n -s SECONDS Wait SECONDS between reads with -f"
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 3e3164e70..48cc0508f 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -14,7 +14,6 @@
//usage: "[-ai] [FILE]..."
//usage:#define tee_full_usage "\n\n"
//usage: "Copy stdin to each FILE, and also to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -a Append to the given FILEs, don't overwrite"
//usage: "\n -i Ignore interrupt signals (SIGINT)"
//usage:
diff --git a/coreutils/touch.c b/coreutils/touch.c
index c51fb70ca..0f980fd7b 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -34,7 +34,6 @@
//usage: "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
//usage:#define touch_full_usage "\n\n"
//usage: "Update the last-modified date on the given FILE[s]\n"
-//usage: "\nOptions:"
//usage: "\n -c Don't create files"
//usage: IF_DESKTOP(
//usage: "\n -d DT Date/time to use"
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 2f14a414f..e67948a36 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -51,7 +51,6 @@
//usage: "[-cds] STRING1 [STRING2]"
//usage:#define tr_full_usage "\n\n"
//usage: "Translate, squeeze, or delete characters from stdin, writing to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -c Take complement of STRING1"
//usage: "\n -d Delete input characters coded STRING1"
//usage: "\n -s Squeeze multiple output characters of STRING2 into one character"
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 67399cbf3..45175054e 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -15,7 +15,6 @@
//usage:#define tty_full_usage "\n\n"
//usage: "Print file name of stdin's terminal"
//usage: IF_INCLUDE_SUSv2( "\n"
-//usage: "\nOptions:"
//usage: "\n -s Print nothing, only return exit status"
//usage: )
//usage:
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 7a86b32a6..b96d76b6c 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -52,7 +52,6 @@
//usage: "[-amnrspv]"
//usage:#define uname_full_usage "\n\n"
//usage: "Print system information\n"
-//usage: "\nOptions:"
//usage: "\n -a Print all"
//usage: "\n -m The machine (hardware) type"
//usage: "\n -n Hostname"
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 6e764d8a4..9208d34ec 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -14,7 +14,6 @@
//usage: "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
//usage:#define uniq_full_usage "\n\n"
//usage: "Discard duplicate lines\n"
-//usage: "\nOptions:"
//usage: "\n -c Prefix lines by the number of occurrences"
//usage: "\n -d Only print duplicate lines"
//usage: "\n -u Only print unique lines"
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 47a155ecb..6ecfe6cef 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -158,7 +158,6 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
//usage: "[-d] [FILE]"
//usage:#define base64_full_usage "\n\n"
//usage: "Base64 encode or decode FILE to standard output"
-//usage: "\nOptions:"
//usage: "\n -d Decode data"
////usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)"
////usage: "\n -i When decoding, ignore non-alphabet characters"
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index b4cd0a9e6..84a489a11 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -12,7 +12,6 @@
//usage: "[-m] [INFILE] STORED_FILENAME"
//usage:#define uuencode_full_usage "\n\n"
//usage: "Uuencode a file to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -m Use base64 encoding per RFC1521"
//usage:
//usage:#define uuencode_example_usage
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 6e22c66c8..a410e407a 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -64,7 +64,6 @@
//usage:
//usage:#define wc_full_usage "\n\n"
//usage: "Count lines, words, and bytes for each FILE (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -c Count bytes"
//usage: IF_UNICODE_SUPPORT(
//usage: "\n -m Count characters"
diff --git a/coreutils/who.c b/coreutils/who.c
index ec385bf95..9f37f65fd 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -22,7 +22,6 @@
//usage: "[-a]"
//usage:#define who_full_usage "\n\n"
//usage: "Show who is logged on\n"
-//usage: "\nOptions:"
//usage: "\n -a Show all"
#include "libbb.h"
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index f4961af59..007cb1c5b 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -37,7 +37,6 @@
//usage: "Create a temporary file with name based on TEMPLATE and print its name.\n"
//usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n"
//usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n"
-//usage: "\nOptions:"
//usage: "\n -d Make directory, not file"
////usage: "\n -q Fail silently on errors" - we ignore this opt
//usage: "\n -t Prepend base directory name to TEMPLATE"
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 0c2302696..65cbfc338 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -34,7 +34,6 @@
//usage: "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
//usage:#define run_parts_full_usage "\n\n"
//usage: "Run a bunch of scripts in DIRECTORY\n"
-//usage: "\nOptions:"
//usage: "\n -t Print what would be run, but don't actually run anything"
//usage: "\n -a ARG Pass ARG as argument for every program"
//usage: "\n -u MASK Set the umask to MASK before running every program"
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index b1c77faad..f1cc8389f 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -39,7 +39,6 @@
//usage: "\n S Write file contents synchronously"
//usage: "\n t Disable tail-merging of partial blocks with other files"
//usage: "\n u Allow file to be undeleted"
-//usage: "\nOptions:"
//usage: "\n -R Recurse"
//usage: "\n -v Set the file's version/generation number"
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index fcbdb5989..4b2f774f5 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -38,7 +38,6 @@
//usage: "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
//usage:#define fsck_full_usage "\n\n"
//usage: "Check and repair filesystems\n"
-//usage: "\nOptions:"
//usage: "\n -A Walk /etc/fstab and check all filesystems"
//usage: "\n -N Don't execute, just show what would be done"
//usage: "\n -P With -A, check filesystems in parallel"
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 964e8d026..1312fe754 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -22,7 +22,6 @@
//usage: "[-Radlv] [FILE]..."
//usage:#define lsattr_full_usage "\n\n"
//usage: "List file attributes on an ext2 fs\n"
-//usage: "\nOptions:"
//usage: "\n -R Recurse"
//usage: "\n -a Don't hide entries starting with ."
//usage: "\n -d List directory entries instead of contents"
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index ad4ff348b..8fffa7f20 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -37,7 +37,6 @@
//usage: "[-E extended-options] device"
//usage:#define e2fsck_full_usage "\n\n"
//usage: "Check ext2/ext3 file system\n"
-//usage: "\nOptions:"
//usage: "\n -p Automatic repair (no questions)"
//usage: "\n -n Make no changes to the filesystem"
//usage: "\n -y Assume 'yes' to all questions"
diff --git a/editors/awk.c b/editors/awk.c
index 9d38b1f88..7685546e5 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -10,8 +10,7 @@
//usage:#define awk_trivial_usage
//usage: "[OPTIONS] [AWK_PROGRAM] [FILE]..."
//usage:#define awk_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -v VAR=VAL Set variable"
+//usage: " -v VAR=VAL Set variable"
//usage: "\n -F SEP Use SEP as field separator"
//usage: "\n -f FILE Read program from FILE"
diff --git a/editors/cmp.c b/editors/cmp.c
index 3a0f5aa4f..fbe6b9753 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -14,7 +14,6 @@
//usage: "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
//usage:#define cmp_full_usage "\n\n"
//usage: "Compare FILE1 with FILE2 (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -l Write the byte numbers (decimal) and values (octal)"
//usage: "\n for all differing bytes"
//usage: "\n -s Quiet"
diff --git a/editors/diff.c b/editors/diff.c
index 8b1e92783..8c0a31f47 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -81,7 +81,6 @@
//usage:#define diff_full_usage "\n\n"
//usage: "Compare files line by line and output the differences between them.\n"
//usage: "This implementation supports unified diffs only.\n"
-//usage: "\nOptions:"
//usage: "\n -a Treat all files as text"
//usage: "\n -b Ignore changes in the amount of whitespace"
//usage: "\n -B Ignore changes whose lines are all blank"
diff --git a/editors/sed.c b/editors/sed.c
index 99e56ff52..5c4e9cc3b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -59,8 +59,7 @@
//usage:#define sed_trivial_usage
//usage: "[-efinr] SED_CMD [FILE]..."
//usage:#define sed_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -e CMD Add CMD to sed commands to be executed"
+//usage: " -e CMD Add CMD to sed commands to be executed"
//usage: "\n -f FILE Add FILE contents to sed commands to be executed"
//usage: "\n -i Edit files in-place (else sends result to stdout)"
//usage: "\n -n Suppress automatic printing of pattern space"
diff --git a/editors/vi.c b/editors/vi.c
index e1f3724cc..3656fee95 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -25,7 +25,6 @@
//usage: "[OPTIONS] [FILE]..."
//usage:#define vi_full_usage "\n\n"
//usage: "Edit FILE\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_VI_COLON(
//usage: "\n -c Initial command to run ($EXINIT also available)"
//usage: )
diff --git a/findutils/find.c b/findutils/find.c
index 050d6373e..babcda0ed 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -236,7 +236,6 @@
//usage: "Search for files and perform actions on them.\n"
//usage: "First failed action stops processing of current file.\n"
//usage: "Defaults: PATH is current directory, action is '-print'\n"
-//usage: "\nOptions:"
//usage: "\n -follow Follow symlinks"
//usage: IF_FEATURE_FIND_XDEV(
//usage: "\n -xdev Don't descend directories on other filesystems"
diff --git a/findutils/grep.c b/findutils/grep.c
index e7116e4c9..3acfa9197 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -72,7 +72,6 @@
//usage: "PATTERN/-e PATTERN.../-f FILE [FILE]..."
//usage:#define grep_full_usage "\n\n"
//usage: "Search for PATTERN in FILEs (or stdin)\n"
-//usage: "\nOptions:"
//usage: "\n -H Add 'filename:' prefix"
//usage: "\n -h Do not add 'filename:' prefix"
//usage: "\n -n Add 'line_no:' prefix"
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 967737133..0d1bb43fc 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -349,7 +349,6 @@ static int xargs_ask_confirmation(void)
//usage: "[OPTIONS] [PROG ARGS]"
//usage:#define xargs_full_usage "\n\n"
//usage: "Run PROG on every item given by stdin\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
//usage: "\n -p Ask user whether to run each command"
//usage: )
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 009e2690c..5f6121fa4 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -327,7 +327,6 @@ static void finalize(char *tempdir, const char *prog)
//usage: "start [PROG ARGS]|stop|init"
//usage:#define bootchartd_full_usage "\n\n"
//usage: "Create /var/log/bootchart.tgz with boot chart data\n"
-//usage: "\nOptions:"
//usage: "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1"
//usage: "\nstop: send USR1 to all bootchartd processes"
//usage: "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)"
diff --git a/init/halt.c b/init/halt.c
index a84a72747..433326dd4 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -43,7 +43,6 @@
//usage: "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
//usage:#define halt_full_usage "\n\n"
//usage: "Halt the system\n"
-//usage: "\nOptions:"
//usage: "\n -d SEC Delay interval"
//usage: "\n -n Do not sync"
//usage: "\n -f Force (don't go through init)"
@@ -55,7 +54,6 @@
//usage: "[-d DELAY] [-n] [-f]"
//usage:#define poweroff_full_usage "\n\n"
//usage: "Halt and shut off power\n"
-//usage: "\nOptions:"
//usage: "\n -d SEC Delay interval"
//usage: "\n -n Do not sync"
//usage: "\n -f Force (don't go through init)"
@@ -64,7 +62,6 @@
//usage: "[-d DELAY] [-n] [-f]"
//usage:#define reboot_full_usage "\n\n"
//usage: "Reboot the system\n"
-//usage: "\nOptions:"
//usage: "\n -d SEC Delay interval"
//usage: "\n -n Do not sync"
//usage: "\n -f Force (don't go through init)"
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 2d6736f1a..b37270ff0 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -14,7 +14,6 @@
//usage: "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
//usage:#define addgroup_full_usage "\n\n"
//usage: "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n"
-//usage: "\nOptions:"
//usage: "\n -g GID Group id"
//usage: "\n -S Create a system group"
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 47c674bf4..1d082c876 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -12,7 +12,6 @@
//usage: "[OPTIONS] USER"
//usage:#define adduser_full_usage "\n\n"
//usage: "Add a user\n"
-//usage: "\nOptions:"
//usage: "\n -h DIR Home directory"
//usage: "\n -g GECOS GECOS field"
//usage: "\n -s SHELL Login shell"
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index f4718c829..2262b792a 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -11,7 +11,6 @@
//usage: IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
//usage:#define chpasswd_full_usage "\n\n"
//usage: "Read user:password from stdin and update /etc/passwd\n"
-//usage: "\nOptions:"
//usage: IF_LONG_OPTS(
//usage: "\n -e,--encrypted Supplied passwords are in encrypted form"
//usage: "\n -m,--md5 Use MD5 encryption instead of DES"
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index b25a39ac9..b244f55e3 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -15,7 +15,6 @@
/* We do support -s, we just don't mention it */
//usage:#define cryptpw_full_usage "\n\n"
//usage: "Crypt PASSWORD using crypt(3)\n"
-//usage: "\nOptions:"
//usage: IF_LONG_OPTS(
//usage: "\n -P,--password-fd=N Read password from fd N"
/* //usage: "\n -s,--stdin Use stdin; like -P0" */
@@ -35,7 +34,6 @@
/* We do support -s, we just don't mention it */
//usage:#define mkpasswd_full_usage "\n\n"
//usage: "Crypt PASSWORD using crypt(3)\n"
-//usage: "\nOptions:"
//usage: IF_LONG_OPTS(
//usage: "\n -P,--password-fd=N Read password from fd N"
/* //usage: "\n -s,--stdin Use stdin; like -P0" */
diff --git a/loginutils/getty.c b/loginutils/getty.c
index dfa15b3da..62456651b 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -105,7 +105,6 @@ struct globals {
//usage: "[OPTIONS] BAUD_RATE[,BAUD_RATE]... TTY [TERMTYPE]"
//usage:#define getty_full_usage "\n\n"
//usage: "Open a tty, prompt for a login name, then invoke /bin/login\n"
-//usage: "\nOptions:"
//usage: "\n -h Enable hardware RTS/CTS flow control"
//usage: "\n -L Set CLOCAL (ignore Carrier Detect state)"
//usage: "\n -m Get baud rate from modem's CONNECT status message"
diff --git a/loginutils/login.c b/loginutils/login.c
index f2563dc09..2f7b9b212 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -7,7 +7,6 @@
//usage: "[-p] [-h HOST] [[-f] USER]"
//usage:#define login_full_usage "\n\n"
//usage: "Begin a new session on the system\n"
-//usage: "\nOptions:"
//usage: "\n -f Don't authenticate (user already authenticated)"
//usage: "\n -h Name of the remote host"
//usage: "\n -p Preserve environment"
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b3ce646f1..1cfafaec3 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -8,7 +8,6 @@
//usage:#define passwd_full_usage "\n\n"
//usage: "Change USER's password (default: current user)"
//usage: "\n"
-//usage: "\nOptions:"
//usage: "\n -a ALG Encryption method"
//usage: "\n -d Set password to ''"
//usage: "\n -l Lock (disable) account"
diff --git a/loginutils/su.c b/loginutils/su.c
index 72dd0f06f..57ea738f4 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -12,7 +12,6 @@
//usage: "[OPTIONS] [-] [USER]"
//usage:#define su_full_usage "\n\n"
//usage: "Run shell under USER (by default, root)\n"
-//usage: "\nOptions:"
//usage: "\n -,-l Clear environment, run shell as login shell"
//usage: "\n -p,-m Do not set new $HOME, $SHELL, $USER, $LOGNAME"
//usage: "\n -c CMD Command to pass to 'sh -c'"
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 28edf067c..bd2b09eed 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -9,7 +9,6 @@
//usage: "[-t N] [TTY]"
//usage:#define sulogin_full_usage "\n\n"
//usage: "Single user login\n"
-//usage: "\nOptions:"
//usage: "\n -t N Timeout"
#include "libbb.h"
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index efad63ff3..75af9390e 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -19,7 +19,6 @@
//usage: "[-a]"
//usage:#define vlock_full_usage "\n\n"
//usage: "Lock a virtual terminal. A password is required to unlock.\n"
-//usage: "\nOptions:"
//usage: "\n -a Lock all VTs"
#include "libbb.h"
diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 628619bb8..4dc53a3b2 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -132,12 +132,11 @@ Content-Transfer-Encoding: 7bit
//usage:#define makemime_full_usage "\n\n"
//usage: "Create multipart MIME-encoded message from FILEs\n"
/* //usage: "Transfer encoding is base64, disposition is inline (not attachment)\n" */
-//usage: "\nOptions:"
//usage: "\n -o FILE Output. Default: stdout"
//usage: "\n -a HDR Add header. Examples:"
//usage: "\n \"From: user@host.org\", \"Date: `date -R`\""
//usage: "\n -c CT Content type. Default: text/plain"
-//usage: "\n -C CS Charset. Default: " CONFIG_FEATURE_MIME_CHARSET
+//usage: "\n -C CS Charset. Default: " CONFIG_FEATURE_MIME_CHARSET
/* //usage: "\n -e ENC Transfer encoding. Ignored. base64 is assumed" */
//usage: "\n"
//usage: "\nOther options are silently ignored"
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index c9d22aa28..62030331e 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -16,7 +16,6 @@
//usage: "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
//usage:#define popmaildir_full_usage "\n\n"
//usage: "Fetch content of remote mailbox to local maildir\n"
-//usage: "\nOptions:"
/* //usage: "\n -b Binary mode. Ignored" */
/* //usage: "\n -d Debug. Ignored" */
/* //usage: "\n -m Show used memory. Ignored" */
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index aa5e3b1c0..5e28ef729 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -234,7 +234,6 @@ static int parse(const char *boundary, char **argv)
//usage: "[OPTIONS]"
//usage:#define reformime_full_usage "\n\n"
//usage: "Parse MIME-encoded message on stdin\n"
-//usage: "\nOptions:"
//usage: "\n -x PREFIX Extract content of MIME sections to files"
//usage: "\n -X PROG ARGS Filter content of MIME sections through PROG"
//usage: "\n Must be the last option"
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index e1edbbebc..98b6ccfbf 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -15,7 +15,6 @@
//usage: "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
//usage:#define adjtimex_full_usage "\n\n"
//usage: "Read and optionally set system timebase parameters. See adjtimex(2)\n"
-//usage: "\nOptions:"
//usage: "\n -q Quiet"
//usage: "\n -o OFF Time offset, microseconds"
//usage: "\n -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)"
diff --git a/miscutils/beep.c b/miscutils/beep.c
index c7699ffe1..910e03e1b 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -11,8 +11,7 @@
//usage:#define beep_trivial_usage
//usage: "-f FREQ -l LEN -d DELAY -r COUNT -n"
//usage:#define beep_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -f Frequency in Hz"
+//usage: " -f Frequency in Hz"
//usage: "\n -l Length in ms"
//usage: "\n -d Delay in ms"
//usage: "\n -r Repetitions"
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index 7e40b9f13..91b5397c4 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -10,7 +10,6 @@
//usage: "[-prfom] [PRIO] [PID | PROG ARGS]"
//usage:#define chrt_full_usage "\n\n"
//usage: "Change scheduling priority and class for a process\n"
-//usage: "\nOptions:"
//usage: "\n -p Operate on PID"
//usage: "\n -r Set SCHED_RR class"
//usage: "\n -f Set SCHED_FIFO class"
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 90ef91c5c..433c3e829 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -30,7 +30,6 @@
//usage: "A text-mode VNC like program for Linux virtual consoles."
//usage: "\nTo exit, quickly press ESC 3 times."
//usage: "\n"
-//usage: "\nOptions:"
//usage: "\n -v Don't send keystrokes to the console"
//usage: "\n -c Create missing devices in /dev"
//usage: "\n -s Open a SHELL session"
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 706276015..6493fe4f1 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -58,7 +58,6 @@
//usage: "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
//usage:#define devfsd_full_usage "\n\n"
//usage: "Manage devfs permissions and old device name symlinks\n"
-//usage: "\nOptions:"
//usage: "\n mntpnt The mount point where devfs is mounted"
//usage: "\n -v Print the protocol version numbers for devfsd"
//usage: "\n and the kernel-side protocol version and exit"
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 184ccc5d7..a20e04b7f 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -17,7 +17,6 @@
//usage: "[-t] [-T] [DEVICE]"
//usage:#define eject_full_usage "\n\n"
//usage: "Eject DEVICE or default /dev/cdrom\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_EJECT_SCSI(
//usage: "\n -s SCSI device"
//usage: )
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index c761a88ca..51ba4729e 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -24,8 +24,7 @@
//usage:#define fbsplash_trivial_usage
//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
//usage:#define fbsplash_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -s Image"
+//usage: " -s Image"
//usage: "\n -c Hide cursor"
//usage: "\n -d Framebuffer device (default /dev/fb0)"
//usage: "\n -i Config file (var=value):"
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 33803f87d..0598371d5 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -14,7 +14,6 @@
//usage: "[-jq] MTD_DEVICE"
//usage:#define flash_eraseall_full_usage "\n\n"
//usage: "Erase an MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -j Format the device for jffs2"
//usage: "\n -q Don't display progress messages"
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index e4bb3a902..790f9c01f 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -11,7 +11,6 @@
//usage: "-v FILE MTD_DEVICE"
//usage:#define flashcp_full_usage "\n\n"
//usage: "Copy an image to MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -v Verbose"
#include "libbb.h"
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 7608408dd..f30e7dec6 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -15,8 +15,7 @@
//usage:#define hdparm_trivial_usage
//usage: "[OPTIONS] [DEVICE]"
//usage:#define hdparm_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a Get/set fs readahead"
+//usage: " -a Get/set fs readahead"
//usage: "\n -A Set drive read-lookahead flag (0/1)"
//usage: "\n -b Get/set bus state (0 == off, 1 == on, 2 == tristate)"
//usage: "\n -B Set Advanced Power Management setting (1-255)"
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 2bc83c5eb..bd300605f 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -11,7 +11,6 @@
//usage: "[-c 1-3] [-n 0-7] [-p PID] [PROG]"
//usage:#define ionice_full_usage "\n\n"
//usage: "Change I/O priority and class\n"
-//usage: "\nOptions:"
//usage: "\n -c Class. 1:realtime 2:best-effort 3:idle"
//usage: "\n -n Priority"
diff --git a/miscutils/last.c b/miscutils/last.c
index 27f5a35ce..d52780374 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -12,7 +12,6 @@
//usage:#define last_full_usage "\n\n"
//usage: "Show listing of the last users that logged into the system"
//usage: IF_FEATURE_LAST_FANCY( "\n"
-//usage: "\nOptions:"
/* //usage: "\n -H Show header line" */
//usage: "\n -W Display with no host column truncation"
//usage: "\n -f FILE Read from FILE instead of /var/log/wtmp"
diff --git a/miscutils/less.c b/miscutils/less.c
index 77fd5a8de..46024f9f7 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -25,7 +25,6 @@
//usage: "[-EMNmh~I?] [FILE]..."
//usage:#define less_full_usage "\n\n"
//usage: "View FILE (or stdin) one screenful at a time\n"
-//usage: "\nOptions:"
//usage: "\n -E Quit once the end of a file is reached"
//usage: "\n -M,-m Display status line with line numbers"
//usage: "\n and percentage through the file"
diff --git a/miscutils/man.c b/miscutils/man.c
index 2c6b25ceb..3bf7e84b6 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -7,8 +7,7 @@
//usage: "[-aw] [MANPAGE]..."
//usage:#define man_full_usage "\n\n"
//usage: "Format and display manual page\n"
-//usage: "\nOptions:"
-//usage: "\n -a Display all pages"
+//usage: "\n -a Display all pages"
//usage: "\n -w Show page locations"
#include "libbb.h"
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index edaeb6fa5..5e29a1acd 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -12,7 +12,6 @@
//usage: "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
//usage:#define microcom_full_usage "\n\n"
//usage: "Copy bytes for stdin to TTY and from TTY to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -d Wait up to DELAY ms for TTY output before sending every"
//usage: "\n next byte to it"
//usage: "\n -t Exit if both stdin and TTY are silent for TIMEOUT ms"
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index a1a5b396a..7041f7c59 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -13,7 +13,6 @@
//usage: "[-q] <[-dn] DIR | -x DEVICE>"
//usage:#define mountpoint_full_usage "\n\n"
//usage: "Check if the directory is a mountpoint\n"
-//usage: "\nOptions:"
//usage: "\n -q Quiet"
//usage: "\n -d Print major/minor device number of the filesystem"
//usage: "\n -n Print device name of the filesystem"
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index c7fbe7d9c..768aed116 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -32,7 +32,6 @@
//usage: "[-p] [-s ADDR] MTD_DEVICE [FILE]"
//usage:#define nandwrite_full_usage "\n\n"
//usage: "Write to the specified MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -p Pad to page size"
//usage: "\n -s ADDR Start address"
@@ -40,7 +39,6 @@
//usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
//usage:#define nanddump_full_usage "\n\n"
//usage: "Dump the sepcified MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -o Omit oob data"
//usage: "\n -b Omit bad block from the dump"
//usage: "\n -s ADDR Start address"
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 2951b987d..1574e3afd 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -212,8 +212,8 @@ struct serial_struct {
//usage:#define setserial_trivial_usage
//usage: "[-gabGvzV] DEVICE [PARAMETER [ARG]]..."
//usage:#define setserial_full_usage "\n\n"
-//usage: "Request or set Linux serial port information\n\n"
-//usage: "Options:\n"
+//usage: "Request or set Linux serial port information\n"
+//usage: "\n"
//usage: " -g Interpret parameters as list of devices for reporting"
//usage: " -a Print all available information\n"
//usage: " -b Print summary information\n"
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 6e8b9aefc..9f5018244 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -11,7 +11,6 @@
//usage: "[-afo] [-n LEN] [FILE]..."
//usage:#define strings_full_usage "\n\n"
//usage: "Display printable strings in a binary file\n"
-//usage: "\nOptions:"
//usage: "\n -a Scan whole file (default)"
//usage: "\n -f Precede strings with filenames"
//usage: "\n -n LEN At least LEN characters form a string (default 4)"
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 77fc8643d..4a9e3230d 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -10,7 +10,6 @@
//usage: "[-p] [MASK] [PID | PROG ARGS]"
//usage:#define taskset_full_usage "\n\n"
//usage: "Set or get CPU affinity\n"
-//usage: "\nOptions:"
//usage: "\n -p Operate on an existing PID"
//usage:
//usage:#define taskset_example_usage
diff --git a/miscutils/time.c b/miscutils/time.c
index dcd89f8fc..945f15f0d 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -13,7 +13,6 @@
//usage: "[-v] PROG ARGS"
//usage:#define time_full_usage "\n\n"
//usage: "Run PROG, display resource usage when it exits\n"
-//usage: "\nOptions:"
//usage: "\n -v Verbose"
#include "libbb.h"
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index fc7f38c5d..2a426dbdc 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -81,7 +81,6 @@
//usage: "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV"
//usage:#define ubiattach_full_usage "\n\n"
//usage: "Attach MTD device to UBI\n"
-//usage: "\nOptions:"
//usage: "\n -m MTD_NUM MTD device number to attach"
//usage: "\n -d UBI_NUM UBI device number to assign"
//usage:
@@ -89,14 +88,12 @@
//usage: "-d UBI_NUM UBI_CTRL_DEV"
//usage:#define ubidetach_full_usage "\n\n"
//usage: "Detach MTD device from UBI\n"
-//usage: "\nOptions:"
//usage: "\n -d UBI_NUM UBI device number"
//usage:
//usage:#define ubimkvol_trivial_usage
//usage: "UBI_DEVICE -N NAME -s SIZE"
//usage:#define ubimkvol_full_usage "\n\n"
//usage: "Create UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -a ALIGNMENT Volume alignment (default 1)"
//usage: "\n -n VOLID Volume ID, if not specified, it"
//usage: "\n will be assigned automatically"
@@ -108,14 +105,12 @@
//usage: "UBI_DEVICE -n VOLID"
//usage:#define ubirmvol_full_usage "\n\n"
//usage: "Remove UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -n VOLID Volume ID"
//usage:
//usage:#define ubirsvol_trivial_usage
//usage: "UBI_DEVICE -n VOLID -s SIZE"
//usage:#define ubirsvol_full_usage "\n\n"
//usage: "Resize UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -n VOLID Volume ID to resize"
//usage: "\n -s SIZE Size in bytes"
//usage:
@@ -123,9 +118,8 @@
//usage: "UBI_DEVICE [IMG_FILE]"
//usage:#define ubiupdatevol_full_usage "\n\n"
//usage: "Update UBI volume\n"
-//usage: "\nOptions:"
-//usage: "\n -t Truncate UBI volume"
-//usage: "\n -s SIZE Bytes in input (if reading stdin)"
+//usage: "\n -t Truncate UBI volume"
+//usage: "\n -s SIZE Bytes in input (if reading stdin)"
int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index b24dd4b82..ee28dc30d 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -13,7 +13,6 @@
//usage: "[-t N[ms]] [-T N[ms]] [-F] DEV"
//usage:#define watchdog_full_usage "\n\n"
//usage: "Periodically write to watchdog device DEV\n"
-//usage: "\nOptions:"
//usage: "\n -T N Reboot after N seconds if not reset (default 60)"
//usage: "\n -t N Reset every N seconds (default 30)"
//usage: "\n -F Run in foreground"
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 94e4e2863..887d9f2a3 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -23,7 +23,6 @@
//usage:#define insmod_full_usage "\n\n"
//usage: "Load the specified kernel modules into the kernel"
//usage: IF_FEATURE_2_4_MODULES( "\n"
-//usage: "\nOptions:"
//usage: "\n -f Force module to load into the wrong kernel version"
//usage: "\n -k Make module autoclean-able"
//usage: "\n -v Verbose"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index db134bd00..410b6fbe4 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -108,8 +108,7 @@ static void modinfo(const char *path, const char *version,
//usage:#define modinfo_trivial_usage
//usage: "[-adlp0] [-F keyword] MODULE"
//usage:#define modinfo_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a Shortcut for '-F author'"
+//usage: " -a Shortcut for '-F author'"
//usage: "\n -d Shortcut for '-F description'"
//usage: "\n -l Shortcut for '-F license'"
//usage: "\n -p Shortcut for '-F parm'"
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 2a69eb513..f5b283b47 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -711,7 +711,6 @@ The following options are useful for people managing distributions:
//usage:#define insmod_full_usage "\n\n"
//usage: "Load the specified kernel modules into the kernel"
//usage: IF_FEATURE_2_4_MODULES( "\n"
-//usage: "\nOptions:"
//usage: "\n -f Force module to load into the wrong kernel version"
//usage: "\n -k Make module autoclean-able"
//usage: "\n -v Verbose"
@@ -727,7 +726,6 @@ The following options are useful for people managing distributions:
//usage: "[-wfa] [MODULE]..."
//usage:#define rmmod_full_usage "\n\n"
//usage: "Unload kernel modules\n"
-//usage: "\nOptions:"
//usage: "\n -w Wait until the module is no longer used"
//usage: "\n -f Force unload"
//usage: "\n -a Remove all unused modules (recursively)"
@@ -738,8 +736,7 @@ The following options are useful for people managing distributions:
//usage:#define modprobe_trivial_usage
//usage: "[-qfwrsv] MODULE [symbol=value]..."
//usage:#define modprobe_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -r Remove MODULE (stacks) or do autoclean"
+//usage: " -r Remove MODULE (stacks) or do autoclean"
//usage: "\n -q Quiet"
//usage: "\n -v Verbose"
//usage: "\n -f Force"
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 7ae459826..678f4bea5 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -89,8 +89,7 @@
//usage: "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
//usage: " MODULE [symbol=value]..."
//usage:#define modprobe_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a Load multiple MODULEs"
+//usage: " -a Load multiple MODULEs"
//usage: "\n -l List (MODULE is a pattern)"
//usage: "\n -r Remove MODULE (stacks) or do autoclean"
//usage: "\n -q Quiet"
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 65a4911cd..4a4a91982 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -15,7 +15,6 @@
//usage: "[-wfa] [MODULE]..."
//usage:#define rmmod_full_usage "\n\n"
//usage: "Unload kernel modules\n"
-//usage: "\nOptions:"
//usage: "\n -w Wait until the module is no longer used"
//usage: "\n -f Force unload"
//usage: "\n -a Remove all unused modules (recursively)"
diff --git a/networking/arp.c b/networking/arp.c
index 3f68f5cf7..696c402e0 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -21,7 +21,6 @@
//usage: "\n[-v] [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
//usage:#define arp_full_usage "\n\n"
//usage: "Manipulate ARP cache\n"
-//usage: "\nOptions:"
//usage: "\n -a Display (all) hosts"
//usage: "\n -s Set new ARP entry"
//usage: "\n -d Delete a specified entry"
diff --git a/networking/arping.c b/networking/arping.c
index 357dcaaf0..a4421edcb 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -10,7 +10,6 @@
//usage: "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
//usage:#define arping_full_usage "\n\n"
//usage: "Send ARP requests/replies\n"
-//usage: "\nOptions:"
//usage: "\n -f Quit on first ARP reply"
//usage: "\n -q Quiet"
//usage: "\n -b Keep broadcasting, don't go unicast"
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 65eae9670..d80306d3d 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -21,7 +21,6 @@
//usage: "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
//usage:#define dnsd_full_usage "\n\n"
//usage: "Small static DNS server daemon\n"
-//usage: "\nOptions:"
//usage: "\n -c FILE Config file"
//usage: "\n -t SEC TTL"
//usage: "\n -p PORT Listen on PORT"
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 7bb9aa5a7..260ba2463 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -70,7 +70,6 @@
//usage: "Send a magic packet to wake up sleeping machines.\n"
//usage: "MAC must be a station address (00:11:22:33:44:55) or\n"
//usage: "a hostname with a known 'ethers' entry.\n"
-//usage: "\nOptions:"
//usage: "\n -b Send wake-up packet to the broadcast address"
//usage: "\n -i iface Interface to use (default eth0)"
//usage: "\n -p pass Append four or six byte password PW to the packet"
diff --git a/networking/ftpd.c b/networking/ftpd.c
index fae634ec4..e38138c0a 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -22,7 +22,6 @@
//usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
//usage: "It also can be ran from tcpsvd:\n"
//usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
-//usage: "\nOptions:"
//usage: "\n -w Allow upload"
//usage: "\n -v Log errors to stderr. -vv: verbose log"
//usage: "\n -S Log errors to syslog. -SS: verbose log"
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index f63df55f4..abdf94c45 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -17,7 +17,6 @@
//usage: "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
//usage:#define ftpget_full_usage "\n\n"
//usage: "Retrieve a remote file via FTP\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
//usage: "\n -c,--continue Continue previous transfer"
//usage: "\n -v,--verbose Verbose"
@@ -37,7 +36,6 @@
//usage: "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
//usage:#define ftpput_full_usage "\n\n"
//usage: "Store a local file on a remote machine via FTP\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
//usage: "\n -v,--verbose Verbose"
//usage: "\n -u,--username Username"
diff --git a/networking/hostname.c b/networking/hostname.c
index 49a3e89bb..5f663908c 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -14,7 +14,6 @@
//usage: "[OPTIONS] [HOSTNAME | -F FILE]"
//usage:#define hostname_full_usage "\n\n"
//usage: "Get or set hostname or DNS domain name\n"
-//usage: "\nOptions:"
//usage: "\n -s Short"
//usage: "\n -i Addresses for the hostname"
//usage: "\n -d DNS domain name"
diff --git a/networking/httpd.c b/networking/httpd.c
index d77342a2a..ba5eebad5 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -107,7 +107,6 @@
//usage: "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
//usage:#define httpd_full_usage "\n\n"
//usage: "Listen for incoming HTTP requests\n"
-//usage: "\nOptions:"
//usage: "\n -i Inetd mode"
//usage: "\n -f Don't daemonize"
//usage: "\n -v[v] Verbose"
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 220b02126..2a56da561 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -30,7 +30,6 @@
//usage: IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
//usage:#define ifconfig_full_usage "\n\n"
//usage: "Configure a network interface\n"
-//usage: "\nOptions:"
//usage: "\n"
//usage: IF_FEATURE_IPV6(
//usage: " [add ADDRESS[/PREFIXLEN]]\n")
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 208623e7d..ae7719f52 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -102,7 +102,6 @@
//usage: "[-cdf] MASTER_IFACE SLAVE_IFACE..."
//usage:#define ifenslave_full_usage "\n\n"
//usage: "Configure network interfaces for parallel routing\n"
-//usage: "\nOptions:"
//usage: "\n -c,--change-active Change active slave"
//usage: "\n -d,--detach Remove slave interface from bonding device"
//usage: "\n -f,--force Force, even if interface is not Ethernet"
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 421611aae..57d04e67b 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -11,7 +11,6 @@
//usage: "[OPTIONS]"
//usage:#define ifplugd_full_usage "\n\n"
//usage: "Network interface plug detection daemon\n"
-//usage: "\nOptions:"
//usage: "\n -n Don't daemonize"
//usage: "\n -s Don't log to syslog"
//usage: "\n -i IFACE Interface"
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index b48abb7dc..382033038 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -20,8 +20,7 @@
//usage:#define ifup_trivial_usage
//usage: "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
//usage:#define ifup_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a De/configure all interfaces automatically"
+//usage: " -a De/configure all interfaces automatically"
//usage: "\n -i FILE Use FILE for interface definitions"
//usage: "\n -n Print out what would happen, but don't do it"
//usage: IF_FEATURE_IFUPDOWN_MAPPING(
@@ -34,8 +33,7 @@
//usage:#define ifdown_trivial_usage
//usage: "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
//usage:#define ifdown_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a De/configure all interfaces automatically"
+//usage: " -a De/configure all interfaces automatically"
//usage: "\n -i FILE Use FILE for interface definitions"
//usage: "\n -n Print out what would happen, but don't do it"
//usage: IF_FEATURE_IFUPDOWN_MAPPING(
diff --git a/networking/inetd.c b/networking/inetd.c
index 58ae089d1..26348fa93 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -158,10 +158,9 @@
//usage: "[-fe] [-q N] [-R N] [CONFFILE]"
//usage:#define inetd_full_usage "\n\n"
//usage: "Listen for network connections and launch programs\n"
-//usage: "\nOptions:"
//usage: "\n -f Run in foreground"
//usage: "\n -e Log to stderr"
-//usage: "\n -q N Socket listen queue (default: 128)"
+//usage: "\n -q N Socket listen queue (default: 128)"
//usage: "\n -R N Pause services after N connects/min"
//usage: "\n (default: 0 - disabled)"
diff --git a/networking/ip.c b/networking/ip.c
index 98d583325..fb2f5e2da 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -55,7 +55,7 @@
//usage:#define iproute_full_usage "\n\n"
//usage: "iproute { list | flush } SELECTOR\n"
//usage: "iproute get ADDRESS [from ADDRESS iif STRING]\n"
-//usage: " [oif STRING] [tos TOS]\n"
+//usage: " [oif STRING] [tos TOS]\n"
//usage: "iproute { add | del | change | append | replace | monitor } ROUTE\n"
//usage: " SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n"
//usage: " ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]\n"
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index f96c73912..3c8b8bfc9 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -16,7 +16,6 @@
//usage: "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
//usage:#define ipcalc_full_usage "\n\n"
//usage: "Calculate IP network settings from a IP address\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_IPCALC_LONG_OPTIONS(
//usage: "\n -b,--broadcast Display calculated broadcast address"
//usage: "\n -n,--network Display calculated network address"
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 199e11225..a41405c33 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -11,7 +11,6 @@
//usage: "[-fiw] [-b ADDR] [STRING]"
//usage:#define fakeidentd_full_usage "\n\n"
//usage: "Provide fake ident (auth) service\n"
-//usage: "\nOptions:"
//usage: "\n -f Run in foreground"
//usage: "\n -i Inetd mode"
//usage: "\n -w Inetd 'wait' mode"
diff --git a/networking/nameif.c b/networking/nameif.c
index 78719edac..9a16b0fbc 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -61,7 +61,6 @@
//usage: "\n [mac=]XX:XX:XX:XX:XX:XX"
//usage: )
//usage: "\n"
-//usage: "\nOptions:"
//usage: "\n -c FILE Configuration file (default: /etc/mactab)"
//usage: "\n -s Log to syslog"
//usage:
diff --git a/networking/nc.c b/networking/nc.c
index 31d450dda..1b32e3aa3 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -49,7 +49,7 @@
//usage:#if !ENABLE_NC_110_COMPAT
//usage:
//usage:#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
-//usage:#define NC_OPTIONS_STR "\n\nOptions:"
+//usage:#define NC_OPTIONS_STR "\n"
//usage:#else
//usage:#define NC_OPTIONS_STR
//usage:#endif
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 29f99e76b..1daad1358 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -60,8 +60,7 @@
//usage: "nc [OPTIONS] -l -p PORT [HOST] [PORT] - listen"
//usage: )
//usage:#define nc_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -e PROG Run PROG after connect (must be last)"
+//usage: " -e PROG Run PROG after connect (must be last)"
//usage: IF_NC_SERVER(
//usage: "\n -l Listen mode, for inbound connects"
//usage: )
diff --git a/networking/netstat.c b/networking/netstat.c
index 356fb53cb..9c239579f 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -21,7 +21,6 @@
//usage: "[-"IF_ROUTE("r")"al] [-tuwx] [-en"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]"
//usage:#define netstat_full_usage "\n\n"
//usage: "Display networking information\n"
-//usage: "\nOptions:"
//usage: IF_ROUTE(
//usage: "\n -r Routing table"
//usage: )
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 165673a1e..206af00c7 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -32,7 +32,6 @@
//usage: "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
//usage:#define ntpd_full_usage "\n\n"
//usage: "NTP client/server\n"
-//usage: "\nOptions:"
//usage: "\n -d Verbose"
//usage: "\n -n Do not daemonize"
//usage: "\n -q Quit after clock is set"
diff --git a/networking/ping.c b/networking/ping.c
index 7a9c2d1f0..d75747984 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -73,7 +73,6 @@
//usage: "[OPTIONS] HOST"
//usage:# define ping_full_usage "\n\n"
//usage: "Send ICMP ECHO_REQUEST packets to network hosts\n"
-//usage: "\nOptions:"
//usage: "\n -4,-6 Force IP or IPv6 name resolution"
//usage: "\n -c CNT Send only CNT pings"
//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)"
@@ -90,7 +89,6 @@
//usage: "[OPTIONS] HOST"
//usage:# define ping6_full_usage "\n\n"
//usage: "Send ICMP ECHO_REQUEST packets to network hosts\n"
-//usage: "\nOptions:"
//usage: "\n -c CNT Send only CNT pings"
//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)"
//usage: "\n -I IFACE/IP Use interface or IP address as source"
diff --git a/networking/pscan.c b/networking/pscan.c
index 5595148fc..28005ad57 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -10,7 +10,6 @@
//usage: "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
//usage:#define pscan_full_usage "\n\n"
//usage: "Scan a host, print all open ports\n"
-//usage: "\nOptions:"
//usage: "\n -c Show closed ports too"
//usage: "\n -b Show blocked ports too"
//usage: "\n -p Scan from this port (default 1)"
diff --git a/networking/route.c b/networking/route.c
index 6699a1c32..b7b5a02e6 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -29,7 +29,6 @@
//usage: "[{add|del|delete}]"
//usage:#define route_full_usage "\n\n"
//usage: "Edit kernel routing tables\n"
-//usage: "\nOptions:"
//usage: "\n -n Don't resolve names"
//usage: "\n -e Display other/more information"
//usage: "\n -A inet" IF_FEATURE_IPV6("{6}") " Select address family"
diff --git a/networking/slattach.c b/networking/slattach.c
index d1221b11a..a500da6d0 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -17,7 +17,6 @@
//usage: "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
//usage:#define slattach_full_usage "\n\n"
//usage: "Attach network interface(s) to serial line(s)\n"
-//usage: "\nOptions:"
//usage: "\n -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)"
//usage: "\n -s SPD Set line speed"
//usage: "\n -e Exit after initializing device"
diff --git a/networking/telnet.c b/networking/telnet.c
index 1f0d85107..6dd0de53a 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -26,7 +26,6 @@
//usage: "[-a] [-l USER] HOST [PORT]"
//usage:#define telnet_full_usage "\n\n"
//usage: "Connect to telnet server\n"
-//usage: "\nOptions:"
//usage: "\n -a Automatic login with $USER variable"
//usage: "\n -l USER Automatic login as USER"
//usage:
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 4404064fc..33020f1b4 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -26,7 +26,6 @@
//usage:#define telnetd_full_usage "\n\n"
//usage: "Handle incoming telnet connections"
//usage: IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n"
-//usage: "\nOptions:"
//usage: "\n -l LOGIN Exec LOGIN on connect"
//usage: "\n -f ISSUE_FILE Display ISSUE_FILE instead of /etc/issue"
//usage: "\n -K Close connection as soon as login exits"
diff --git a/networking/tftp.c b/networking/tftp.c
index 648441016..17485a527 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -23,7 +23,6 @@
//usage: "[OPTIONS] HOST [PORT]"
//usage:#define tftp_full_usage "\n\n"
//usage: "Transfer a file from/to tftp server\n"
-//usage: "\nOptions:"
//usage: "\n -l FILE Local FILE"
//usage: "\n -r FILE Remote FILE"
//usage: IF_FEATURE_TFTP_GET(
@@ -46,7 +45,6 @@
//usage: " 69 dgram udp nowait root tftpd tftpd -l /files/to/serve\n"
//usage: "It also can be ran from udpsvd:\n"
//usage: " udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n"
-//usage: "\nOptions:"
//usage: "\n -r Prohibit upload"
//usage: "\n -c Allow file creation via upload"
//usage: "\n -u Access files as USER"
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 85181ab8d..c32103519 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -216,7 +216,6 @@
//usage: " [-z PAUSE_MSEC] HOST [BYTES]"
//usage:#define traceroute_full_usage "\n\n"
//usage: "Trace the route to HOST\n"
-//usage: "\nOptions:"
//usage: IF_TRACEROUTE6(
//usage: "\n -4,-6 Force IP or IPv6 name resolution"
//usage: )
@@ -242,7 +241,6 @@
//usage: " HOST [BYTES]"
//usage:#define traceroute6_full_usage "\n\n"
//usage: "Trace the route to HOST\n"
-//usage: "\nOptions:"
//usage: "\n -d Set SO_DEBUG options to socket"
//usage: "\n -n Print numeric addresses"
//usage: "\n -r Bypass routing tables, send directly to HOST"
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 8cb733b68..3a0870eb5 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -14,7 +14,6 @@
//usage: "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
//usage:#define tunctl_full_usage "\n\n"
//usage: "Create or delete tun interfaces\n"
-//usage: "\nOptions:"
//usage: "\n -f name tun device (/dev/net/tun)"
//usage: "\n -t name Create iface 'name'"
//usage: "\n -d name Delete iface 'name'"
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index ec07192c1..64cd73ec7 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -7,7 +7,6 @@
//usage: "[-r|-a] [-f LEASEFILE]"
//usage:#define dumpleases_full_usage "\n\n"
//usage: "Display DHCP leases granted by udhcpd\n"
-//usage: "\nOptions:"
//usage: IF_LONG_OPTS(
//usage: "\n -f,--file=FILE Lease file"
//usage: "\n -r,--remaining Show remaining time"
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 4fa341ac3..48b45d9af 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -13,7 +13,6 @@
//usage: "COMMAND [OPTIONS]"
//usage:#define vconfig_full_usage "\n\n"
//usage: "Create and remove virtual ethernet devices\n"
-//usage: "\nOptions:"
//usage: "\n add [interface-name] [vlan_id]"
//usage: "\n rem [vlan-name]"
//usage: "\n set_flag [interface-name] [flag-num] [0 | 1]"
diff --git a/networking/wget.c b/networking/wget.c
index df6d36358..6443705fd 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -22,7 +22,6 @@
//usage: )
//usage:#define wget_full_usage "\n\n"
//usage: "Retrieve files via HTTP or FTP\n"
-//usage: "\nOptions:"
//usage: "\n -s Spider mode - only check file existence"
//usage: "\n -c Continue retrieval of aborted transfer"
//usage: "\n -q Quiet"
diff --git a/networking/whois.c b/networking/whois.c
index 4eab9e5fe..bf330334a 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -24,7 +24,6 @@
//usage: "[-h SERVER] [-p PORT] NAME..."
//usage:#define whois_full_usage "\n\n"
//usage: "Query WHOIS info about NAME\n"
-//usage: "\nOptions:"
//usage: "\n -h,-p Server to query"
#include "libbb.h"
diff --git a/networking/zcip.c b/networking/zcip.c
index 7250fb2fd..6b7f2144f 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -27,7 +27,6 @@
//usage: "[OPTIONS] IFACE SCRIPT"
//usage:#define zcip_full_usage "\n\n"
//usage: "Manage a ZeroConf IPv4 link-local address\n"
-//usage: "\nOptions:"
//usage: "\n -f Run in foreground"
//usage: "\n -q Quit after obtaining address"
//usage: "\n -r 169.254.x.x Request this address first"
diff --git a/printutils/lpr.c b/printutils/lpr.c
index f8ee9a11b..fc6bca9e8 100644
--- a/printutils/lpr.c
+++ b/printutils/lpr.c
@@ -17,8 +17,7 @@
/* -C CLASS exists too, not shown.
* CLASS is supposed to be printed on banner page, if one is requested */
//usage:#define lpr_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -P lp service to connect to (else uses $PRINTER)"
+//usage: " -P lp service to connect to (else uses $PRINTER)"
//usage: "\n -m Send mail on completion"
//usage: "\n -h Print banner page too"
//usage: "\n -V Verbose"
@@ -26,8 +25,7 @@
//usage:#define lpq_trivial_usage
//usage: "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID]... [-fs]"
//usage:#define lpq_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -P lp service to connect to (else uses $PRINTER)"
+//usage: " -P lp service to connect to (else uses $PRINTER)"
//usage: "\n -d Delete jobs"
//usage: "\n -f Force any waiting job to be printed"
//usage: "\n -s Short display"
diff --git a/procps/fuser.c b/procps/fuser.c
index 8d63a7313..05b52abb1 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -11,7 +11,6 @@
//usage: "[OPTIONS] FILE or PORT/PROTO"
//usage:#define fuser_full_usage "\n\n"
//usage: "Find processes which use FILEs or PORTs\n"
-//usage: "\nOptions:"
//usage: "\n -m Find processes which use same fs as FILEs"
//usage: "\n -4,-6 Search only IPv4/IPv6 space"
//usage: "\n -s Don't display PIDs"
diff --git a/procps/iostat.c b/procps/iostat.c
index 51c5fac08..978d23430 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -393,7 +393,6 @@ static void dev_report(cputime_t itv)
//usage: "[-c] [-d] [-t] [-z] [-k|-m] [ALL|BLOCKDEV...] [INTERVAL [COUNT]]"
//usage:#define iostat_full_usage "\n\n"
//usage: "Report CPU and I/O statistics\n"
-//usage: "\nOptions:"
//usage: "\n -c Show CPU utilization"
//usage: "\n -d Show device utilization"
//usage: "\n -t Print current time"
diff --git a/procps/kill.c b/procps/kill.c
index 6776d9546..224e5ad1a 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -12,7 +12,6 @@
//usage: "[-l] [-SIG] PID..."
//usage:#define kill_full_usage "\n\n"
//usage: "Send a signal (default: TERM) to given PIDs\n"
-//usage: "\nOptions:"
//usage: "\n -l List all signal names and numbers"
/* //usage: "\n -s SIG Yet another way of specifying SIG" */
//usage:
@@ -30,7 +29,6 @@
//usage: "[-l] [-q] [-SIG] PROCESS_NAME..."
//usage:#define killall_full_usage "\n\n"
//usage: "Send a signal (default: TERM) to given processes\n"
-//usage: "\nOptions:"
//usage: "\n -l List all signal names and numbers"
/* //usage: "\n -s SIG Yet another way of specifying SIG" */
//usage: "\n -q Don't complain if no processes were killed"
@@ -42,7 +40,6 @@
//usage: "[-l] [-SIG] [-o PID]..."
//usage:#define killall5_full_usage "\n\n"
//usage: "Send a signal (default: TERM) to all processes outside current session\n"
-//usage: "\nOptions:"
//usage: "\n -l List all signal names and numbers"
//usage: "\n -o PID Don't signal this PID"
/* //usage: "\n -s SIG Yet another way of specifying SIG" */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index da8f34dab..aa5a5c73f 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -844,7 +844,6 @@ static int get_irqcpu_nr(const char *f, int max_irqs)
//usage: "[-A] [-I SUM|CPU|ALL|SCPU] [-u] [-P num|ALL] [INTERVAL [COUNT]]"
//usage:#define mpstat_full_usage "\n\n"
//usage: "Per-processor statistics\n"
-//usage: "\nOptions:"
//usage: "\n -A Same as -I ALL -u -P ALL"
//usage: "\n -I SUM|CPU|ALL|SCPU Report interrupt statistics"
//usage: "\n -P num|ALL Processor to monitor"
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 902a3a75e..156b4ad69 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -11,7 +11,6 @@
//usage: "[-flnovx] [-s SID|-P PPID|PATTERN]"
//usage:#define pgrep_full_usage "\n\n"
//usage: "Display process(es) selected by regex PATTERN\n"
-//usage: "\nOptions:"
//usage: "\n -l Show command name too"
//usage: "\n -f Match against entire command line"
//usage: "\n -n Show the newest process only"
@@ -25,7 +24,6 @@
//usage: "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
//usage:#define pkill_full_usage "\n\n"
//usage: "Send a signal to process(es) selected by regex PATTERN\n"
-//usage: "\nOptions:"
//usage: "\n -l List all signals"
//usage: "\n -f Match against entire command line"
//usage: "\n -n Signal the newest process only"
diff --git a/procps/pidof.c b/procps/pidof.c
index e102a31c6..6d7b59109 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -10,7 +10,7 @@
//usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
//usage:#define pidof_trivial_usage
//usage: "[OPTIONS] [NAME]..."
-//usage:#define USAGE_PIDOF "\n\nOptions:"
+//usage:#define USAGE_PIDOF "\n"
//usage:#else
//usage:#define pidof_trivial_usage
//usage: "[NAME]..."
diff --git a/procps/pmap.c b/procps/pmap.c
index 7f7f391b9..fd995a54d 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -8,22 +8,22 @@
* for details.
*/
-//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_PMAP) += pmap.o
-
//config:config PMAP
//config: bool "pmap"
//config: default y
//config: help
//config: Display processes' memory mappings.
+//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_PMAP) += pmap.o
+
//usage:#define pmap_trivial_usage
-//usage: "[-x][-q] PID"
+//usage: "[-xq] PID"
//usage:#define pmap_full_usage "\n\n"
-//usage: "Display detailed precesses' memory usage\n"
-//usage: "\nOptions:"
-//usage: "\n -x show details"
-//usage: "\n -q quiet"
+//usage: "Display detailed process memory usage"
+//usage: "\n"
+//usage: "\n -x Show details"
+//usage: "\n -q Quiet"
#include "libbb.h"
diff --git a/procps/ps.c b/procps/ps.c
index 7f273d0a6..213695f16 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -15,7 +15,6 @@
//usage: "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
//usage:#define ps_full_usage "\n\n"
//usage: "Show list of processes\n"
-//usage: "\nOptions:"
//usage: "\n -o COL1,COL2=HEADER Select columns for display"
//usage: IF_FEATURE_SHOW_THREADS(
//usage: "\n -T Show threads"
@@ -26,7 +25,6 @@
//usage:#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
//usage:#define USAGE_PS "\nThis version of ps accepts no options"
//usage:#else
-//usage:#define USAGE_PS "\nOptions:"
//usage:#endif
//usage:
//usage:#define ps_trivial_usage
diff --git a/procps/pstree.c b/procps/pstree.c
index 16649cfaa..8ba30795d 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -24,7 +24,6 @@
//usage: "[-p] [PID|USER]"
//usage:#define pstree_full_usage "\n\n"
//usage: "Display process tree, optionally start from USER or PID\n"
-//usage: "\nOptions:"
//usage: "\n -p Show pids"
#include "libbb.h"
diff --git a/procps/renice.c b/procps/renice.c
index 067c8f75a..77f400a1d 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -23,7 +23,6 @@
//usage: "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
//usage:#define renice_full_usage "\n\n"
//usage: "Change scheduling priority for a running process\n"
-//usage: "\nOptions:"
//usage: "\n -n Adjust current nice value (smaller is faster)"
//usage: "\n -p Process id(s) (default)"
//usage: "\n -g Process group id(s)"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index f36548f87..cb3b6a25a 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -15,7 +15,6 @@
//usage: "[OPTIONS] [VALUE]..."
//usage:#define sysctl_full_usage "\n\n"
//usage: "Configure kernel parameters at runtime\n"
-//usage: "\nOptions:"
//usage: "\n -n Don't print key names"
//usage: "\n -e Don't warn about unknown keys"
//usage: "\n -w Change sysctl setting"
diff --git a/procps/watch.c b/procps/watch.c
index e289bf8cb..36af1cca7 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -15,7 +15,6 @@
//usage: "[-n SEC] [-t] PROG ARGS"
//usage:#define watch_full_usage "\n\n"
//usage: "Run PROG periodically\n"
-//usage: "\nOptions:"
//usage: "\n -n Loop period in seconds (default 2)"
//usage: "\n -t Don't print header"
//usage:
diff --git a/runit/chpst.c b/runit/chpst.c
index 63da4797f..185706089 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -34,7 +34,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//usage: " [-p N] [-f BYTES] [-c BYTES] PROG ARGS"
//usage:#define chpst_full_usage "\n\n"
//usage: "Change the process state, run PROG\n"
-//usage: "\nOptions:"
//usage: "\n -u USER[:GRP] Set uid and gid"
//usage: "\n -U USER[:GRP] Set $UID and $GID in environment"
//usage: "\n -e DIR Set environment variables as specified by files"
@@ -76,7 +75,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//usage: " PROG ARGS"
//usage:#define softlimit_full_usage "\n\n"
//usage: "Set soft resource limits, then run PROG\n"
-//usage: "\nOptions:"
//usage: "\n -a BYTES Limit total size of all segments"
//usage: "\n -m BYTES Same as -d BYTES -s BYTES -l BYTES -a BYTES"
//usage: "\n -d BYTES Limit data segment"
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 27995e570..efa0e537a 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -21,7 +21,6 @@
//usage: "[-c N] [-n]"
//usage:#define klogd_full_usage "\n\n"
//usage: "Kernel logger\n"
-//usage: "\nOptions:"
//usage: "\n -c N Print to console messages more urgent than prio N (1-8)"
//usage: "\n -n Run in foreground"
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 0fabd97ca..5a7027731 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -11,7 +11,6 @@
//usage: "[OPTIONS] [MESSAGE]"
//usage:#define logger_full_usage "\n\n"
//usage: "Write MESSAGE (or stdin) to syslog\n"
-//usage: "\nOptions:"
//usage: "\n -s Log to stderr as well as the system log"
//usage: "\n -t TAG Log using the specified tag (defaults to user name)"
//usage: "\n -p PRIO Priority (numeric or facility.level pair)"
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index ae0b2194b..993956904 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -13,7 +13,6 @@
//usage: "[-f]"
//usage:#define logread_full_usage "\n\n"
//usage: "Show messages in syslogd's circular buffer\n"
-//usage: "\nOptions:"
//usage: "\n -f Output data as log grows"
#include "libbb.h"
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index c5c2a2e86..2f0ca6ac5 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -20,7 +20,6 @@
//usage: IF_NOT_FEATURE_SYSLOGD_CFG(
//usage: "(this version of syslogd ignores /etc/syslog.conf)\n"
//usage: )
-//usage: "\nOptions:"
//usage: "\n -n Run in foreground"
//usage: "\n -O FILE Log to FILE (default:/var/log/messages)"
//usage: "\n -l N Log only messages more urgent than prio N (1-8)"
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 4b7e5cacb..2f27cfd1c 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -11,7 +11,6 @@
//usage: "[-d] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
//usage:#define acpid_full_usage "\n\n"
//usage: "Listen to ACPI events and spawn specific helpers on event arrival\n"
-//usage: "\nOptions:"
//usage: "\n -c DIR Config directory [/etc/acpi]"
//usage: "\n -d Don't daemonize, (implies -f)"
//usage: "\n -e FILE /proc event file [/proc/acpi/event]"
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index 4aed02982..e25e529db 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -19,8 +19,7 @@
//usage:#define blockdev_trivial_usage
//usage: "OPTION BLOCKDEV"
//usage:#define blockdev_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n --setro Set ro"
+//usage: " --setro Set ro"
//usage: "\n --setrw Set rw"
//usage: "\n --getro Get ro"
//usage: "\n --getss Get sector size"
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 412bf024b..6505da54b 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -13,7 +13,6 @@
//usage: "[-c] [-n LEVEL] [-s SIZE]"
//usage:#define dmesg_full_usage "\n\n"
//usage: "Print or control the kernel ring buffer\n"
-//usage: "\nOptions:"
//usage: "\n -c Clear ring buffer after printing"
//usage: "\n -n LEVEL Set console logging level"
//usage: "\n -s SIZE Buffer size"
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index bf7098e71..2f0854a30 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -9,7 +9,6 @@
//usage: "[-n] DEVICE"
//usage:#define fdformat_full_usage "\n\n"
//usage: "Format floppy disk\n"
-//usage: "\nOptions:"
//usage: "\n -n Don't verify after format"
#include "libbb.h"
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index f4fd4d31d..b86b13bdc 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -18,7 +18,6 @@
//usage: "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
//usage:#define fdisk_full_usage "\n\n"
//usage: "Change partition table\n"
-//usage: "\nOptions:"
//usage: "\n -u Start and End are in sectors (instead of cylinders)"
//usage: "\n -l Show partition table for each DISK, then exit"
//usage: IF_FEATURE_FDISK_BLKSIZE(
diff --git a/util-linux/flock.c b/util-linux/flock.c
index 8fecb54d4..e9be4eee9 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -8,7 +8,6 @@
//usage: "[-sxun] FD|{FILE [-c] PROG ARGS}"
//usage:#define flock_full_usage "\n\n"
//usage: "[Un]lock file descriptor, or lock FILE, run PROG\n"
-//usage: "\nOptions:"
//usage: "\n -s Shared lock"
//usage: "\n -x Exclusive lock (default)"
//usage: "\n -u Unlock FD"
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index b53c97248..1508ecb03 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -91,7 +91,6 @@
//usage: "[-larvsmf] BLOCKDEV"
//usage:#define fsck_minix_full_usage "\n\n"
//usage: "Check MINIX filesystem\n"
-//usage: "\nOptions:"
//usage: "\n -l List all filenames"
//usage: "\n -r Perform interactive repairs"
//usage: "\n -a Perform automatic repairs"
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 85ff76189..c45edf8ca 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -34,9 +34,8 @@
//usage:#define getopt_trivial_usage
//usage: "[OPTIONS]"
//usage:#define getopt_full_usage "\n\n"
-//usage: "Options:"
//usage: IF_LONG_OPTS(
-//usage: "\n -a,--alternative Allow long options starting with single -"
+//usage: " -a,--alternative Allow long options starting with single -"
//usage: "\n -l,--longoptions=longopts Long options to be recognized"
//usage: "\n -n,--name=progname The name under which errors are reported"
//usage: "\n -o,--options=optstring Short options to be recognized"
@@ -47,7 +46,7 @@
//usage: "\n -u,--unquoted Don't quote the output"
//usage: )
//usage: IF_NOT_LONG_OPTS(
-//usage: "\n -a Allow long options starting with single -"
+//usage: " -a Allow long options starting with single -"
//usage: "\n -l longopts Long options to be recognized"
//usage: "\n -n progname The name under which errors are reported"
//usage: "\n -o optstring Short options to be recognized"
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 1f5d57d74..9a312f95c 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -13,7 +13,6 @@
//usage: "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
//usage:#define hexdump_full_usage "\n\n"
//usage: "Display FILEs (or stdin) in a user specified format\n"
-//usage: "\nOptions:"
//usage: "\n -b One-byte octal display"
//usage: "\n -c One-byte character display"
//usage: "\n -C Canonical hex+ASCII, 16 bytes per line"
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 54e97e5bb..ee68be8c5 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -263,7 +263,6 @@ static void set_system_clock_timezone(int utc)
//usage: )
//usage:#define hwclock_full_usage "\n\n"
//usage: "Query and set hardware clock (RTC)\n"
-//usage: "\nOptions:"
//usage: "\n -r Show hardware clock time"
//usage: "\n -s Set system time from hardware clock"
//usage: "\n -w Set hardware clock from system time"
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index bdd019f6f..274050cdf 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -13,7 +13,6 @@
//usage:#define ipcrm_full_usage "\n\n"
//usage: "Upper-case options MQS remove an object by shmkey value.\n"
//usage: "Lower-case options remove an object by shmid value.\n"
-//usage: "\nOptions:"
//usage: "\n -mM Remove memory segment after last detach"
//usage: "\n -qQ Remove message queue"
//usage: "\n -sS Remove semaphore"
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 7e11e292d..9b7c49f50 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -12,8 +12,7 @@
//usage: " losetup -d LOOPDEV - disassociate\n"
//usage: " losetup [-f] - show"
//usage:#define losetup_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -o OFS Start OFS bytes into FILE"
+//usage: " -o OFS Start OFS bytes into FILE"
//usage: "\n -f Show first free loop device"
//usage:
//usage:#define losetup_notes_usage
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index a8bc4b80d..59d7d23d4 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -67,7 +67,6 @@
//usage: "[-c | -l FILE] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
//usage:#define mkfs_minix_full_usage "\n\n"
//usage: "Make a MINIX filesystem\n"
-//usage: "\nOptions:"
//usage: "\n -c Check device for bad blocks"
//usage: "\n -n [14|30] Maximum length of filenames"
//usage: "\n -i INODES Number of inodes for the filesystem"
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index 463ae1e2a..b4efb9e9f 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -11,7 +11,6 @@
//usage: "[-f] [-l LABEL] BLOCKDEV [4K-BLOCKS]"
//usage:#define mkfs_reiser_full_usage "\n\n"
//usage: "Make a ReiserFS V3 filesystem\n"
-//usage: "\nOptions:"
//usage: "\n -f Force"
//usage: "\n -l LBL Volume label"
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index e83ae7510..7d81ed06d 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -18,7 +18,6 @@
*/
//usage:#define mkfs_vfat_full_usage "\n\n"
//usage: "Make a FAT32 filesystem\n"
-//usage: "\nOptions:"
/* //usage: "\n -c Check device for bad blocks" */
//usage: "\n -v Verbose"
/* //usage: "\n -I Allow to use entire disk device (e.g. /dev/hda)" */
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index ef6932c6c..b5d2c49b6 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -10,7 +10,6 @@
//usage: "[-L LBL] BLOCKDEV [KBYTES]"
//usage:#define mkswap_full_usage "\n\n"
//usage: "Prepare BLOCKDEV to be used as swap partition\n"
-//usage: "\nOptions:"
//usage: "\n -L LBL Label"
#include "libbb.h"
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 6a154e2b2..05e532cda 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -21,7 +21,6 @@
//usage: "[OPTIONS] [-o OPTS] DEVICE NODE"
//usage:#define mount_full_usage "\n\n"
//usage: "Mount a filesystem. Filesystem autodetection requires /proc.\n"
-//usage: "\nOptions:"
//usage: "\n -a Mount all filesystems in fstab"
//usage: IF_FEATURE_MOUNT_FAKE(
//usage: IF_FEATURE_MTAB_SUPPORT(
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 628df0da7..1f36d8f37 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -12,7 +12,6 @@
//usage: "[-sp] HOST"
//usage:#define rdate_full_usage "\n\n"
//usage: "Get and possibly set the system date and time from a remote HOST\n"
-//usage: "\nOptions:"
//usage: "\n -s Set the system date and time (default)"
//usage: "\n -p Print the date and time"
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 7b7aa7c9f..4ed801137 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -35,8 +35,7 @@
//usage:#define readprofile_trivial_usage
//usage: "[OPTIONS]"
//usage:#define readprofile_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -m mapfile (Default: /boot/System.map)"
+//usage: " -m mapfile (Default: /boot/System.map)"
//usage: "\n -p profile (Default: /proc/profile)"
//usage: "\n -M NUM Set the profiling multiplier to NUM"
//usage: "\n -i Print only info about the sampling step"
diff --git a/util-linux/script.c b/util-linux/script.c
index 26f16ebf5..8fb991d15 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -14,8 +14,7 @@
//usage:#define script_trivial_usage
//usage: "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
//usage:#define script_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a Append output"
+//usage: " -a Append output"
//usage: "\n -c PROG Run PROG, not shell"
//usage: "\n -f Flush output after each write"
//usage: "\n -q Quiet"
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index b7cf69833..dbefa4cf2 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -11,7 +11,6 @@
//usage: "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
//usage:#define swapon_full_usage "\n\n"
//usage: "Start swapping on DEVICE\n"
-//usage: "\nOptions:"
//usage: "\n -a Start swapping on all swap devices"
//usage: IF_FEATURE_SWAPON_PRI(
//usage: "\n -p PRI Set swap device priority"
@@ -21,7 +20,6 @@
//usage: "[-a] [DEVICE]"
//usage:#define swapoff_full_usage "\n\n"
//usage: "Stop swapping on DEVICE\n"
-//usage: "\nOptions:"
//usage: "\n -a Stop swapping on all swap devices"
#include "libbb.h"
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 7794de18d..db6ae3542 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -12,7 +12,6 @@
//usage: "Free initramfs and switch to another root fs:\n"
//usage: "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n"
//usage: "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n"
-//usage: "\nOptions:"
//usage: "\n -c DEV Reopen stdio to DEV after switch"
#include <sys/vfs.h>
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 1e576ca4e..5b716c688 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -12,7 +12,6 @@
//usage: "[OPTIONS] FILESYSTEM|DIRECTORY"
//usage:#define umount_full_usage "\n\n"
//usage: "Unmount file systems\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_UMOUNT_ALL(
//usage: "\n -a Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
//usage: )
--
cgit v1.2.3-55-g6feb