Merging upstream version 1.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 28 deletions

diff --git a/doc/zutils.info b/doc/zutils.info
index b753ec0..98ddf49 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.5, 15 May 2016).
+This manual is for Zutils (version 1.6, 5 April 2017).
 
 * Menu:
 
@@ -23,13 +23,13 @@ This manual is for Zutils (version 1.5, 15 May 2016).
 * Zcmp::                Comparing compressed files byte by byte
 * Zdiff::               Comparing compressed files line by line
 * Zgrep::               Searching inside compressed files
-* Ztest::               Testing integrity of compressed files
+* Ztest::               Testing the integrity of compressed files
 * Zupdate::             Recompressing files to lzip format
 * Problems::            Reporting bugs
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2016 Antonio Diaz Diaz.
+   Copyright (C) 2009-2017 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -64,9 +64,9 @@ 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
-of formats in search and recursive modes:
-'zgrep foo -r --format=bz2,lz somedir'.
+   FORMAT NOTE 1: The '--format' option allows the processing of a
+subset of formats in recursive mode and when trying compressed file
+names: 'zgrep foo -r --format=bz2,lz somedir somefile.tar'.
 
    FORMAT NOTE 2: If the '--force-format' option is given, the files
 are passed to the corresponding decompressor without verifying their
@@ -75,7 +75,7 @@ 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
-has undergone the process of decompression.
+have undergone the process of decompression.
 
 
    Numbers given as arguments to options (positions, sizes) may be
@@ -192,10 +192,10 @@ 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, 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.
+   If no files are specified, or if a file is specified as '-', data
+are 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:
 
@@ -307,7 +307,7 @@ differences were found, and 2 means trouble.
 '--ignore-initial=SIZE'
      Ignore any differences in the first SIZE bytes of the input files.
      Treat files with fewer than SIZE bytes as if they were empty. If
-     SIZE is in the form 'SIZE1,SIZE2', ignore the first SIZE1 bytes of
+     SIZE is in the form 'SIZE1:SIZE2', ignore the first SIZE1 bytes of
      the first input file and the first SIZE2 bytes of the second input
      file.
 
@@ -460,8 +460,8 @@ 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, or if a file is specified as '-', data is
-read from standard input, decompressed if needed, and fed to grep.
+   If no files are specified, or if a file is specified as '-', data
+are 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.
 
@@ -602,8 +602,12 @@ 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.
+   Note that error detection in the xz format is broken. First, some xz
+files lack integrity information. Second, not all xz decompressors can
+verify the integrity of all xz files. Third, section 2.1.1.2 'Stream
+Flags' of the xz format specification allows xz decompressors to
+produce garbage output without issuing any warning. Therefore, xz files
+can't always be verified as reliably as files in the other formats can.
 
    The format for running ztest is:
 
@@ -761,18 +765,18 @@ Concept index
 
 Tag Table:
 Node: Top222
-Node: Introduction1142
-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
+Node: Introduction1147
+Node: Common options3773
+Ref: compressor-requirements5531
+Node: The zutilsrc file5903
+Node: Zcat6828
+Node: Zcmp8882
+Node: Zdiff11341
+Node: Zgrep13981
+Node: Ztest17320
+Node: Zupdate19154
+Node: Problems22026
+Node: Concept index22560
 
 End Tag Table