Merging upstream version 1.4.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

18 files changed, 115 insertions, 119 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b3dc01..16cbbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,9 @@
-2015-04-30  Antonio Diaz Diaz  <antonio@gnu.org>
+2015-05-29  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.4-pre2 released.
-	* zgrep.cc (main): Pass '-e' to grep if pattern begins with '-'.
-
-2015-04-27  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.4-pre1 released.
+	* Version 1.4 released.
 	* Option '--format' has been renamed to '-O, --force-format'.
 	* Added new option '-M, --format=<list>' to all utilities.
+	* zgrep.cc (main): Pass '-e' to grep if pattern begins with '-'.
 	* Makefile.in: Added new targets 'install*-compress'.
 
 2014-08-30  Antonio Diaz Diaz  <antonio@gnu.org>
diff --git a/NEWS b/NEWS
index 0e21717..43de972 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,9 @@ Changes in version 1.4:
 
 The option "--format" has been renamed to "-O, --force-format".
 
-Option "-M, --format=<list>" now excludes from automatic search the
-formats not listed in the comma-separated <list>. This change introduces
-a backward incompatibility with previous versions of zutils.
+Option "-M, --format=<list>" now restricts automatic search to the
+formats listed in the comma-separated <list>. This change introduces a
+backward incompatibility with previous versions of zutils.
 
 If the pattern begins with "-", zgrep now prepends "-e" before passing
 it to grep. ('zgrep -- -pattern file' now works as expected).
diff --git a/README b/README
index 8369e27..57c8389 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ The provided utilities are zcat, zcmp, zdiff, zgrep, ztest and zupdate.
 The supported formats are bzip2, gzip, lzip and xz.
 The compressor to be used for each format is configurable at runtime.
 
-Zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
-scripts provided by GNU gzip. Ztest is unique to zutils. Zupdate is
+zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
+scripts provided by GNU gzip. ztest is unique to zutils. zupdate is
 similar to gzip's znew.
 
 NOTE: Bzip2 and lzip provide well-defined values of exit status, which
diff --git a/configure b/configure
index 325e2a0..a3c78c4 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@
 # to copy, distribute and modify it.
 
 pkgname=zutils
-pkgversion=1.4-pre2
+pkgversion=1.4
 srctrigger=doc/${pkgname}.texi
 
 # clear some things potentially inherited from environment.
diff --git a/doc/zcat.1 b/doc/zcat.1
index 1ac291d..5b3ba2e 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCAT "1" "April 2015" "zcat (zutils) 1.4-pre2" "User Commands"
+.TH ZCAT "1" "May 2015" "zcat (zutils) 1.4" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -39,7 +39,7 @@ equivalent to '\-vE'
 display '$' at end of each line
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-n\fR, \fB\-\-number\fR
 number all output lines
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index 02e0a28..d1a4ee4 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZCMP "1" "April 2015" "zcmp (zutils) 1.4-pre2" "User Commands"
+.TH ZCMP "1" "May 2015" "zcmp (zutils) 1.4" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -46,7 +46,7 @@ ignore differences in the first <n> bytes
 list position, value of all differing bytes
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-n\fR, \fB\-\-bytes=\fR<n>
 compare at most <n> bytes
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index f9dd2ca..6a58cc3 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZDIFF "1" "April 2015" "zdiff (zutils) 1.4-pre2" "User Commands"
+.TH ZDIFF "1" "May 2015" "zdiff (zutils) 1.4" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -61,7 +61,7 @@ ignore changes due to tab expansion
 ignore case differences in file contents
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-N\fR, \fB\-\-no\-rcfile\fR
 don't read runtime configuration file
@@ -104,9 +104,6 @@ set compressor and options for lzip format
 .TP
 \fB\-\-xz=\fR<command>
 set compressor and options for xz format
-.PP
-Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
-Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 .br
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index e032217..864a6a5 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZGREP "1" "April 2015" "zgrep (zutils) 1.4-pre2" "User Commands"
+.TH ZGREP "1" "May 2015" "zgrep (zutils) 1.4" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -79,7 +79,7 @@ only print names of files containing no matches
 stop after <n> matches
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-n\fR, \fB\-\-line\-number\fR
 print the line number of each line
@@ -125,6 +125,9 @@ set compressor and options for lzip format
 .TP
 \fB\-\-xz=\fR<command>
 set compressor and options for xz format
+.PP
+Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
+Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 .br
diff --git a/doc/ztest.1 b/doc/ztest.1
index 8eeaf4d..793e94d 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZTEST "1" "April 2015" "ztest (zutils) 1.4-pre2" "User Commands"
+.TH ZTEST "1" "May 2015" "ztest (zutils) 1.4" "User Commands"
 .SH NAME
 ztest \- verify integrity of compressed files
 .SH SYNOPSIS
@@ -28,7 +28,7 @@ display this help and exit
 output version information and exit
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-N\fR, \fB\-\-no\-rcfile\fR
 don't read runtime configuration file
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 29ac253..a14914c 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZUPDATE "1" "April 2015" "zupdate (zutils) 1.4-pre2" "User Commands"
+.TH ZUPDATE "1" "May 2015" "zupdate (zutils) 1.4" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz files to lzip files
 .SH SYNOPSIS
@@ -43,7 +43,7 @@ keep (don't delete) input files
 pass a \fB\-v\fR option to the lzip compressor
 .TP
 \fB\-M\fR, \fB\-\-format=\fR<list>
-exclude formats not in <list>
+process only the formats in <list>
 .TP
 \fB\-N\fR, \fB\-\-no\-rcfile\fR
 don't read runtime configuration file
diff --git a/doc/zutils.info b/doc/zutils.info
index 83f07b7..090ec48 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -12,7 +12,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.4-pre2, 30 April 2015).
+This manual is for Zutils (version 1.4, 29 May 2015).
 
 * Menu:
 
@@ -54,8 +54,8 @@ The provided utilities are zcat, zcmp, zdiff, zgrep, ztest and zupdate.
 The supported formats are bzip2, gzip, lzip and xz.
 The compressor to be used for each format is configurable at runtime.
 
-   Zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
-scripts provided by GNU gzip. Ztest is unique to zutils. Zupdate is
+   zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
+scripts provided by GNU gzip. ztest is unique to zutils. zupdate is
 similar to gzip's znew.
 
    NOTE: Bzip2 and lzip provide well-defined values of exit status,
@@ -63,14 +63,14 @@ which makes them safe to use with zutils. Gzip and xz may return
 ambiguous warning values, making them less reliable back ends for
 zutils.  *Note compressor-requirements::.
 
-   FORMAT NOTE: The "-format" option allows the processing of a subset
+   FORMAT NOTE: The '--format' option allows the processing of a subset
 of formats in search and recursive modes:
 'zgrep foo -r --format=bz2,lz somedir'.
 
-   FORMAT NOTE 2: If the '--force-format' option is given, the files are
-passed to the corresponding decompressor without verifying their format,
-allowing for example the processing of compress'd (.Z) files with gzip:
-'zcmp --force-format=gz file.Z file.lz'.
+   FORMAT NOTE 2: If the '--force-format' option is given, the files
+are passed to the corresponding decompressor without verifying their
+format, allowing for example the processing of compress'd (.Z) files
+with gzip: 'zcmp --force-format=gz file.Z file.lz'.
 
    LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may
 never have been compressed. Decompressed is used to refer to data which
@@ -105,7 +105,7 @@ described here.
 '-h'
 '--help'
      Print an informative help message describing the options and exit.
-     Zgrep only supports the '--help' form of this option.
+     zgrep only supports the '--help' form of this option.
 
 '-V'
 '--version'
@@ -113,14 +113,14 @@ described here.
 
 '-M FORMAT_LIST'
 '--format=FORMAT_LIST'
-     Exclude formats not listed in the comma-separated FORMAT_LIST.
-     Valid formats are 'bz2', 'gz', 'lz', 'xz' and 'un' for
-     'uncompressed', meaning "any file name without a known extension".
-     This option excludes files based on extension, instead of format,
-     because it is more efficient. The exclusion only applies to names
-     generated automatically (for example when adding extensions to a
-     file name or when operating recursively on directories). Files
-     given in the command line are always processed.
+     Process only the formats listed in the comma-separated
+     FORMAT_LIST. Valid formats are 'bz2', 'gz', 'lz', 'xz' and 'un'
+     for 'uncompressed', meaning "any file name without a known
+     extension". This option excludes files based on extension, instead
+     of format, because it is more efficient. The exclusion only
+     applies to names generated automatically (for example when adding
+     extensions to a file name or when operating recursively on
+     directories). Files given in the command line are always processed.
 
      Each format in FORMAT_LIST enables file names with the following
      extensions:
@@ -186,7 +186,7 @@ File: zutils.info,  Node: Zcat,  Next: Zcmp,  Prev: The zutilsrc file,  Up: Top
 4 Zcat
 ******
 
-Zcat copies each given file ('-' means standard input), to standard
+zcat copies each given file ('-' means standard input), to standard
 output. If any given file is compressed, its decompressed content is
 used. If a given file does not exist, and its name does not end with one
 of the known extensions, zcat tries the compressed file names
@@ -203,7 +203,7 @@ same compression format.
 
 Exit status is 0 if no errors occurred, non-zero otherwise.
 
-   Zcat supports the following options:
+   zcat supports the following options:
 
 '-A'
 '--show-all'
@@ -269,7 +269,7 @@ File: zutils.info,  Node: Zcmp,  Next: Zdiff,  Prev: Zcat,  Up: Top
 5 Zcmp
 ******
 
-Zcmp compares two files ('-' means standard input), and if they differ,
+zcmp compares two files ('-' means standard input), and if they differ,
 tells the first byte and line number where they differ. Bytes and lines
 are numbered starting with 1. If any given file is compressed, its
 decompressed content is used. Compressed files are decompressed on the
@@ -295,7 +295,7 @@ following:
 An exit status of 0 means no differences were found, 1 means some
 differences were found, and 2 means trouble.
 
-   Zcmp supports the following options:
+   zcmp supports the following options:
 
 '-b'
 '--print-bytes'
@@ -346,9 +346,9 @@ File: zutils.info,  Node: Zdiff,  Next: Zgrep,  Prev: Zcmp,  Up: Top
 6 Zdiff
 *******
 
-Zdiff compares two files ('-' means standard input), and if they
+zdiff compares two files ('-' means standard input), and if they
 differ, shows the differences line by line. If any given file is
-compressed, its decompressed content is used. Zdiff is a front end to
+compressed, its decompressed content is used. zdiff is a front end to
 the diff program and has the limitation that messages from diff refer to
 temporary file names instead of those specified.
 
@@ -372,7 +372,7 @@ following:
 An exit status of 0 means no differences were found, 1 means some
 differences were found, and 2 means trouble.
 
-   Zdiff supports the following options:
+   zdiff supports the following options:
 
 '-a'
 '--text'
@@ -453,7 +453,7 @@ File: zutils.info,  Node: Zgrep,  Next: Ztest,  Prev: Zdiff,  Up: Top
 7 Zgrep
 *******
 
-Zgrep is a front end to the grep program that allows transparent search
+zgrep is a front end to the grep program that allows transparent search
 on any combination of compressed and uncompressed files. If any given
 file is compressed, its decompressed content is used. If a given file
 does not exist, and its name does not end with one of the known
@@ -472,7 +472,7 @@ compression format.
 An exit status of 0 means at least one match was found, 1 means no
 matches were found, and 2 means trouble.
 
-   Zgrep supports the following options:
+   zgrep supports the following options:
 
 '-a'
 '--text'
@@ -593,7 +593,7 @@ File: zutils.info,  Node: Ztest,  Next: Zupdate,  Prev: Zgrep,  Up: Top
 8 Ztest
 *******
 
-Ztest verifies the integrity of the specified compressed files.
+ztest verifies the integrity of the specified compressed files.
 Uncompressed files are ignored. If no files are specified, the integrity
 of compressed data read from standard input is verified. Data read from
 standard input must be all in the same compression format.
@@ -609,7 +609,7 @@ The exit status is 0 if all compressed files verify OK, 1 if
 environmental problems (file not found, invalid flags, I/O errors, etc),
 2 if any compressed file is corrupt or invalid.
 
-   Ztest supports the following options:
+   ztest supports the following options:
 
 '-O FORMAT'
 '--force-format=FORMAT'
@@ -641,7 +641,7 @@ File: zutils.info,  Node: Zupdate,  Next: Problems,  Prev: Ztest,  Up: Top
 9 Zupdate
 *********
 
-Zupdate recompresses files from bzip2, gzip, and xz formats to lzip
+zupdate recompresses files from bzip2, gzip, and xz formats to lzip
 format. The originals are compared with the new files and then deleted.
 Only regular files with standard file name extensions are recompressed,
 other files are ignored. Compressed files are decompressed and then
@@ -678,7 +678,7 @@ Exit status is 0 if all the compressed files were successfully
 recompressed (if needed), compared and deleted (if requested). Non-zero
 otherwise.
 
-   Zupdate supports the following options:
+   zupdate supports the following options:
 
 '-f'
 '--force'
@@ -757,18 +757,18 @@ Concept index
 
 Tag Table:
 Node: Top222
-Node: Introduction1149
-Node: Common options3698
-Ref: compressor-requirements5451
-Node: The zutilsrc file5823
-Node: Zcat6749
-Node: Zcmp8796
-Node: Zdiff11256
-Node: Zgrep13896
-Node: Ztest16991
-Node: Zupdate18495
-Node: Problems21370
-Node: Concept index21904
+Node: Introduction1142
+Node: Common options3692
+Ref: compressor-requirements5450
+Node: The zutilsrc file5822
+Node: Zcat6748
+Node: Zcmp8795
+Node: Zdiff11255
+Node: Zgrep13895
+Node: Ztest16990
+Node: Zupdate18494
+Node: Problems21369
+Node: Concept index21903
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 4624d8c..236265c 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 30 April 2015
-@set VERSION 1.4-pre2
+@set UPDATED 29 May 2015
+@set VERSION 1.4
 
 @dircategory Data Compression
 @direntry
@@ -74,8 +74,8 @@ The provided utilities are zcat, zcmp, zdiff, zgrep, ztest and zupdate.@*
 The supported formats are bzip2, gzip, lzip and xz.@*
 The compressor to be used for each format is configurable at runtime.
 
-Zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
-scripts provided by GNU gzip. Ztest is unique to zutils. Zupdate is
+zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
+scripts provided by GNU gzip. ztest is unique to zutils. zupdate is
 similar to gzip's znew.
 
 NOTE: Bzip2 and lzip provide well-defined values of exit status, which
@@ -83,14 +83,14 @@ makes them safe to use with zutils. Gzip and xz may return ambiguous
 warning values, making them less reliable back ends for zutils.
 @xref{compressor-requirements}.
 
-FORMAT NOTE: The "--format" option allows the processing of a subset of
-formats in search and recursive modes:
+FORMAT NOTE: The @samp{--format} option allows the processing of a
+subset of formats in search and recursive modes:
 @w{@samp{zgrep foo -r --format=bz2,lz somedir}}.
 
-FORMAT NOTE 2: If the @samp{--force-format} option is given, the files are
-passed to the corresponding decompressor without verifying their format,
-allowing for example the processing of compress'd (.Z) files with gzip:
-@w{@samp{zcmp --force-format=gz file.Z file.lz}}.
+FORMAT NOTE 2: If the @samp{--force-format} option is given, the files
+are passed to the corresponding decompressor without verifying their
+format, allowing for example the processing of compress'd (.Z) files
+with gzip: @w{@samp{zcmp --force-format=gz file.Z file.lz}}.
 
 LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never
 have been compressed. Decompressed is used to refer to data which has
@@ -123,10 +123,10 @@ The following options are available in all the utilities. Rather than
 writing identical descriptions for each of the programs, they are
 described here.
 
-@table @samp
+@table @code
 @item -h
 @itemx --help
-Print an informative help message describing the options and exit. Zgrep
+Print an informative help message describing the options and exit. zgrep
 only supports the @samp{--help} form of this option.
 
 @item -V
@@ -135,14 +135,14 @@ Print the version number on the standard output and exit.
 
 @item -M @var{format_list}
 @itemx --format=@var{format_list}
-Exclude formats not listed in the comma-separated @var{format_list}.
-Valid formats are @samp{bz2}, @samp{gz}, @samp{lz}, @samp{xz} and
-@samp{un} for @samp{uncompressed}, meaning "any file name without a
-known extension". This option excludes files based on extension, instead
-of format, because it is more efficient. The exclusion only applies to
-names generated automatically (for example when adding extensions to a
-file name or when operating recursively on directories). Files given in
-the command line are always processed.
+Process only the formats listed in the comma-separated
+@var{format_list}. Valid formats are @samp{bz2}, @samp{gz}, @samp{lz},
+@samp{xz} and @samp{un} for @samp{uncompressed}, meaning "any file name
+without a known extension". This option excludes files based on
+extension, instead of format, because it is more efficient. The
+exclusion only applies to names generated automatically (for example
+when adding extensions to a file name or when operating recursively on
+directories). Files given in the command line are always processed.
 
 Each format in @var{format_list} enables file names with the following
 extensions:
@@ -217,7 +217,7 @@ where <format> is one of @samp{bz2}, @samp{gz}, @samp{lz} or @samp{xz}.
 @chapter Zcat
 @cindex zcat
 
-Zcat copies each given file (@samp{-} means standard input), to standard
+zcat copies each given file (@samp{-} means standard input), to standard
 output. If any given file is compressed, its decompressed content is
 used. If a given file does not exist, and its name does not end with one
 of the known extensions, zcat tries the compressed file names
@@ -237,9 +237,9 @@ zcat [@var{options}] [@var{files}]
 @noindent
 Exit status is 0 if no errors occurred, non-zero otherwise.
 
-Zcat supports the following options:
+zcat supports the following options:
 
-@table @samp
+@table @code
 @item -A
 @itemx --show-all
 Equivalent to @samp{-vET}.
@@ -303,7 +303,7 @@ Verbose mode. Show error messages.
 @chapter Zcmp
 @cindex zcmp
 
-Zcmp compares two files (@samp{-} means standard input), and if they
+zcmp compares two files (@samp{-} means standard input), and if they
 differ, tells the first byte and line number where they differ. Bytes
 and lines are numbered starting with 1. If any given file is compressed,
 its decompressed content is used. Compressed files are decompressed on
@@ -336,9 +336,9 @@ standard input.
 An exit status of 0 means no differences were found, 1 means some
 differences were found, and 2 means trouble.
 
-Zcmp supports the following options:
+zcmp supports the following options:
 
-@table @samp
+@table @code
 @item -b
 @itemx --print-bytes
 Print the differing bytes. Print control bytes as a @samp{^} followed by
@@ -388,9 +388,9 @@ files differ.
 @chapter Zdiff
 @cindex zdiff
 
-Zdiff compares two files (@samp{-} means standard input), and if they
+zdiff compares two files (@samp{-} means standard input), and if they
 differ, shows the differences line by line. If any given file is
-compressed, its decompressed content is used. Zdiff is a front end to
+compressed, its decompressed content is used. zdiff is a front end to
 the diff program and has the limitation that messages from diff refer to
 temporary file names instead of those specified.
 
@@ -421,9 +421,9 @@ standard input.
 An exit status of 0 means no differences were found, 1 means some
 differences were found, and 2 means trouble.
 
-Zdiff supports the following options:
+zdiff supports the following options:
 
-@table @samp
+@table @code
 @item -a
 @itemx --text
 Treat all files as text.
@@ -503,7 +503,7 @@ Ignore all white space.
 @chapter Zgrep
 @cindex zgrep
 
-Zgrep is a front end to the grep program that allows transparent search
+zgrep is a front end to the grep program that allows transparent search
 on any combination of compressed and uncompressed files. If any given
 file is compressed, its decompressed content is used. If a given file
 does not exist, and its name does not end with one of the known
@@ -525,9 +525,9 @@ zgrep [@var{options}] @var{pattern} [@var{files}]
 An exit status of 0 means at least one match was found, 1 means no
 matches were found, and 2 means trouble.
 
-Zgrep supports the following options:
+zgrep supports the following options:
 
-@table @samp
+@table @code
 @item -a
 @itemx --text
 Treat all files as text.
@@ -647,7 +647,7 @@ Match only whole lines.
 @chapter Ztest
 @cindex ztest
 
-Ztest verifies the integrity of the specified compressed files.
+ztest verifies the integrity of the specified compressed files.
 Uncompressed files are ignored. If no files are specified, the integrity
 of compressed data read from standard input is verified. Data read from
 standard input must be all in the same compression format.
@@ -666,9 +666,9 @@ The exit status is 0 if all compressed files verify OK, 1 if
 environmental problems (file not found, invalid flags, I/O errors, etc),
 2 if any compressed file is corrupt or invalid.
 
-Ztest supports the following options:
+ztest supports the following options:
 
-@table @samp
+@table @code
 @item -O @var{format}
 @itemx --force-format=@var{format}
 Force the given compression format. Valid values for @var{format} are
@@ -699,7 +699,7 @@ Further -v's increase the verbosity level.
 @chapter Zupdate
 @cindex zupdate
 
-Zupdate recompresses files from bzip2, gzip, and xz formats to lzip
+zupdate recompresses files from bzip2, gzip, and xz formats to lzip
 format. The originals are compared with the new files and then deleted.
 Only regular files with standard file name extensions are recompressed,
 other files are ignored. Compressed files are decompressed and then
@@ -740,9 +740,9 @@ Exit status is 0 if all the compressed files were successfully
 recompressed (if needed), compared and deleted (if requested). Non-zero
 otherwise.
 
-Zupdate supports the following options:
+zupdate supports the following options:
 
-@table @samp
+@table @code
 @item -f
 @itemx --force
 Do not skip a file for which a lzip compressed version already exists.
diff --git a/zcat.cc b/zcat.cc
index d349383..e4f7956 100644
--- a/zcat.cc
+++ b/zcat.cc
@@ -108,7 +108,7 @@ void show_help()
                "  -b, --number-nonblank      number nonblank output lines\n"
                "  -e                         equivalent to '-vE'\n"
                "  -E, --show-ends            display '$' at end of each line\n"
-               "  -M, --format=<list>        exclude formats not in <list>\n"
+               "  -M, --format=<list>        process only the formats in <list>\n"
                "  -n, --number               number all output lines\n"
                "  -N, --no-rcfile            don't read runtime configuration file\n"
                "  -O, --force-format=<fmt>   force given format (bz2, gz, lz, xz)\n"
diff --git a/zcmp.cc b/zcmp.cc
index 365e76b..68e219e 100644
--- a/zcmp.cc
+++ b/zcmp.cc
@@ -73,7 +73,7 @@ void show_help()
                "  -b, --print-bytes                 print differing bytes\n"
                "  -i, --ignore-initial=<n>[,<n2>]   ignore differences in the first <n> bytes\n"
                "  -l, --list                        list position, value of all differing bytes\n"
-               "  -M, --format=<list>               exclude formats not in <list>\n"
+               "  -M, --format=<list>               process only the formats in <list>\n"
                "  -n, --bytes=<n>                   compare at most <n> bytes\n"
                "  -N, --no-rcfile                   don't read runtime configuration file\n"
                "  -O, --force-format=[<f1>][,<f2>]  force given formats (bz2, gz, lz, xz)\n"
diff --git a/zdiff.cc b/zdiff.cc
index e14f9b0..1e03356 100644
--- a/zdiff.cc
+++ b/zdiff.cc
@@ -76,7 +76,7 @@ void show_help()
                "  -d, --minimal                     try hard to find a smaller set of changes\n"
                "  -E, --ignore-tab-expansion        ignore changes due to tab expansion\n"
                "  -i, --ignore-case                 ignore case differences in file contents\n"
-               "  -M, --format=<list>               exclude formats not in <list>\n"
+               "  -M, --format=<list>               process only the formats in <list>\n"
                "  -N, --no-rcfile                   don't read runtime configuration file\n"
                "  -O, --force-format=[<f1>][,<f2>]  force given formats (bz2, gz, lz, xz)\n"
                "  -p, --show-c-function             show which C function each change is in\n"
@@ -90,9 +90,7 @@ void show_help()
                "      --bz2=<command>               set compressor and options for bzip2 format\n"
                "      --gz=<command>                set compressor and options for gzip format\n"
                "      --lz=<command>                set compressor and options for lzip format\n"
-               "      --xz=<command>                set compressor and options for xz format\n"
-               "Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,\n"
-               "Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...\n" );
+               "      --xz=<command>                set compressor and options for xz format\n" );
   show_help_addr();
   }
 
diff --git a/zgrep.cc b/zgrep.cc
index 0f7bd50..98899cd 100644
--- a/zgrep.cc
+++ b/zgrep.cc
@@ -79,7 +79,7 @@ void show_help()
                "  -l, --files-with-matches   only print names of files containing matches\n"
                "  -L, --files-without-match  only print names of files containing no matches\n"
                "  -m, --max-count=<n>        stop after <n> matches\n"
-               "  -M, --format=<list>        exclude formats not in <list>\n"
+               "  -M, --format=<list>        process only the formats in <list>\n"
                "  -n, --line-number          print the line number of each line\n"
                "  -N, --no-rcfile            don't read runtime configuration file\n"
                "  -o, --only-matching        show only the part of a line matching <pattern>\n"
@@ -94,7 +94,9 @@ void show_help()
                "      --bz2=<command>        set compressor and options for bzip2 format\n"
                "      --gz=<command>         set compressor and options for gzip format\n"
                "      --lz=<command>         set compressor and options for lzip format\n"
-               "      --xz=<command>         set compressor and options for xz format\n" );
+               "      --xz=<command>         set compressor and options for xz format\n"
+               "Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,\n"
+               "Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...\n" );
   show_help_addr();
   }
 
diff --git a/ztest.cc b/ztest.cc
index 600d32e..5377c6d 100644
--- a/ztest.cc
+++ b/ztest.cc
@@ -64,7 +64,7 @@ void show_help()
                "\nOptions:\n"
                "  -h, --help                 display this help and exit\n"
                "  -V, --version              output version information and exit\n"
-               "  -M, --format=<list>        exclude formats not in <list>\n"
+               "  -M, --format=<list>        process only the formats in <list>\n"
                "  -N, --no-rcfile            don't read runtime configuration file\n"
                "  -O, --force-format=<fmt>   force given format (bz2, gz, lz, xz)\n"
                "  -q, --quiet                suppress all messages\n"
diff --git a/zupdate.cc b/zupdate.cc
index 8685018..6a94c70 100644
--- a/zupdate.cc
+++ b/zupdate.cc
@@ -75,7 +75,7 @@ void show_help()
                "  -f, --force                do not skip a file even if the .lz exists\n"
                "  -k, --keep                 keep (don't delete) input files\n"
                "  -l, --lzip-verbose         pass a -v option to the lzip compressor\n"
-               "  -M, --format=<list>        exclude formats not in <list>\n"
+               "  -M, --format=<list>        process only the formats in <list>\n"
                "  -N, --no-rcfile            don't read runtime configuration file\n"
                "  -q, --quiet                suppress all messages\n"
                "  -r, --recursive            operate recursively on directories\n"