*: remove "Options:" string from help texts

function                                             old     new   delta
packed_usage                                       28706   28623     -83

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

11 files changed, 2 insertions, 20 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"