Merging upstream version 1.5.

Signed-off-by: Daniel Baumann <daniel@debian.org>

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, 29 May 2015).
+This manual is for Zutils (version 1.5, 15 May 2016).
 
 * Menu:
 
@@ -29,7 +29,7 @@ This manual is for Zutils (version 1.4, 29 May 2015).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2015 Antonio Diaz Diaz.
+   Copyright (C) 2009-2016 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -52,7 +52,8 @@ in those utilities supporting it.
 
 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.
+Zutils uses external compressors. 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
@@ -140,7 +141,7 @@ described here.
 '--lz=COMMAND'
 '--xz=COMMAND'
      Set program (may include arguments) to be used as (de)compressor
-     for the given format. The mane of the program can't begin with
+     for the given format. The name of the program can't begin with
      '-'. These options override the values set in 'zutilsrc'. The
      compression program used must meet three requirements:
 
@@ -163,7 +164,7 @@ File: zutils.info,  Node: The zutilsrc file,  Next: Zcat,  Prev: Common options,
 
 'zutilsrc' is the runtime configuration file for zutils. In it you may
 define the compressor name and options to be used for each format.  The
-'zutilsrc' file is optional; you do not need to install it in order to
+'zutilsrc' file is optional; you don't need to install it in order to
 run zutils.
 
    The compressors specified in the command line override those
@@ -186,16 +187,15 @@ 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
-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
-corresponding to the supported formats.
+zcat copies each given file 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 corresponding to the supported formats.
 
-   If no files are specified, data is read from standard input,
-decompressed if needed, and sent to standard output. Data read from
-standard input must be of the same type; all uncompressed or all in the
-same compression format.
+   If no files are specified, or if a file is specified as '-', data is
+read from standard input, decompressed if needed, and sent to standard
+output. Data read from standard input must be of the same type; all
+uncompressed or all in the same compression format.
 
    The format for running zcat is:
 
@@ -336,7 +336,7 @@ differences were found, and 2 means trouble.
 '-s'
 '--quiet'
 '--silent'
-     Do not print anything; only return an exit status indicating
+     Don't print anything; only return an exit status indicating
      whether the files differ.
 
 
@@ -460,10 +460,10 @@ does not exist, and its name does not end with one of the known
 extensions, zgrep tries the compressed file names corresponding to the
 supported formats.
 
-   If no files are specified, data is read from standard input,
-decompressed if needed, and fed to grep. Data read from standard input
-must be of the same type; all uncompressed or all in the same
-compression format.
+   If no files are specified, or if a file is specified as '-', data is
+read from standard input, decompressed if needed, and fed to grep.
+Data read from standard input must be of the same type; all uncompressed
+or all in the same compression format.
 
    The format for running zgrep is:
 
@@ -509,6 +509,9 @@ matches were found, and 2 means trouble.
 '-f FILE'
 '--file=FILE'
      Obtain patterns from FILE, one per line.
+     When searching in several files at once, command substitution can
+     be used with '-e' to read FILE only once, for example if FILE is
+     not a regular file: 'zgrep -e "$(cat FILE)" file1.lz file2.gz'
 
 '-F'
 '--fixed-strings'
@@ -594,9 +597,10 @@ File: zutils.info,  Node: Ztest,  Next: Zupdate,  Prev: Zgrep,  Up: Top
 *******
 
 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.
+Uncompressed files are ignored. If no files are specified, or if a file
+is specified as '-', the integrity of compressed data read from
+standard input is verified. Data read from standard input must be all in
+the same compression format.
 
    Note that some xz files lack integrity information, and therefore
 can't be verified as reliably as the other formats can.
@@ -642,7 +646,7 @@ File: zutils.info,  Node: Zupdate,  Next: Problems,  Prev: Ztest,  Up: Top
 *********
 
 zupdate recompresses files from bzip2, gzip, and xz formats to lzip
-format. The originals are compared with the new files and then deleted.
+format. Each original is compared with the new file and then deleted.
 Only regular files with standard file name extensions are recompressed,
 other files are ignored. Compressed files are decompressed and then
 recompressed on the fly; no temporary files are created. The lzip format
@@ -682,7 +686,7 @@ otherwise.
 
 '-f'
 '--force'
-     Do not skip a file for which a lzip compressed version already
+     Don't skip a file for which a lzip compressed version already
      exists.  '--force' compares the content of the input file with the
      content of the existing lzip file and deletes the input file if
      both contents are identical.
@@ -758,17 +762,17 @@ Concept index
 Tag Table:
 Node: Top222
 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
+Node: Common options3726
+Ref: compressor-requirements5484
+Node: The zutilsrc file5856
+Node: Zcat6781
+Node: Zcmp8834
+Node: Zdiff11293
+Node: Zgrep13933
+Node: Ztest17271
+Node: Zupdate18809
+Node: Problems21681
+Node: Concept index22215
 
 End Tag Table