*: remove "Options:" string from help texts

function                                             old     new   delta
packed_usage                                       28706   28623     -83

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

23 files changed, 6 insertions, 30 deletions

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:	)