Merging upstream version 1.7.

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.6, 5 April 2017).
+This manual is for Zutils (version 1.7, 13 February 2018).
 
 * Menu:
 
@@ -29,7 +29,7 @@ This manual is for Zutils (version 1.6, 5 April 2017).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2017 Antonio Diaz Diaz.
+   Copyright (C) 2009-2018 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -40,7 +40,7 @@ File: zutils.info,  Node: Introduction,  Next: Common options,  Prev: Top,  Up:
 1 Introduction
 **************
 
-Zutils is a collection of utilities able to deal with any combination of
+Zutils is a collection of utilities able to process any combination of
 compressed and uncompressed files transparently. If any given file,
 including standard input, is compressed, its decompressed content is
 used. Compressed files are decompressed on the fly; no temporary files
@@ -372,7 +372,8 @@ 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 (some options only work if the
+diff program used supports them):
 
 '-a'
 '--text'
@@ -472,7 +473,8 @@ or all in the same 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 (some options only work if the
+grep program used supports them):
 
 '-a'
 '--text'
@@ -498,6 +500,9 @@ matches were found, and 2 means trouble.
 '--context=N'
      Print N lines of output context.
 
+'--color[=WHEN]'
+     Show matched strings in color. WHEN is 'never', 'always' or 'auto'.
+
 '-e PATTERN'
 '--regexp=PATTERN'
      Use PATTERN as the pattern to match.
@@ -765,18 +770,18 @@ Concept index
 
 Tag Table:
 Node: Top222
-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
+Node: Introduction1151
+Node: Common options3775
+Ref: compressor-requirements5533
+Node: The zutilsrc file5905
+Node: Zcat6830
+Node: Zcmp8884
+Node: Zdiff11343
+Node: Zgrep14047
+Node: Ztest17541
+Node: Zupdate19375
+Node: Problems22247
+Node: Concept index22781
 
 End Tag Table