Merging upstream version 1.7.

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

8 files changed, 49 insertions, 35 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 9a76208..4cfbdf3 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 2017" "zcat (zutils) 1.6" "User Commands"
+.TH ZCAT "1" "February 2018" "zcat (zutils) 1.7" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -88,7 +88,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index c9583f8..03a3f19 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 2017" "zcmp (zutils) 1.6" "User Commands"
+.TH ZCMP "1" "February 2018" "zcmp (zutils) 1.7" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -85,7 +85,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index f803ee8..aee3b3a 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 2017" "zdiff (zutils) 1.6" "User Commands"
+.TH ZDIFF "1" "February 2018" "zdiff (zutils) 1.7" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -109,7 +109,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 571d410..5533b43 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 2017" "zgrep (zutils) 1.6" "User Commands"
+.TH ZGREP "1" "February 2018" "zgrep (zutils) 1.7" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -47,6 +47,9 @@ only print a count of matching lines per file
 \fB\-C\fR, \fB\-\-context=\fR<n>
 print <n> lines of output context
 .TP
+\fB\-\-color[=\fR<when>]
+show matched strings in color
+.TP
 \fB\-e\fR, \fB\-\-regexp=\fR<pattern>
 use <pattern> as the pattern to match
 .TP
@@ -135,7 +138,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/ztest.1 b/doc/ztest.1
index 252489b..7cad696 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 2017" "ztest (zutils) 1.6" "User Commands"
+.TH ZTEST "1" "February 2018" "ztest (zutils) 1.7" "User Commands"
 .SH NAME
 ztest \- verify the integrity of compressed files
 .SH SYNOPSIS
@@ -66,7 +66,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 6894418..f0025d7 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 2017" "zupdate (zutils) 1.6" "User Commands"
+.TH ZUPDATE "1" "February 2018" "zupdate (zutils) 1.7" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz files to lzip format
 .SH SYNOPSIS
@@ -76,7 +76,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2017 Antonio Diaz Diaz.
+Copyright \(co 2018 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zutils.info b/doc/zutils.info
index 98ddf49..11ea41a 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.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
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index ea9fb2d..343c297 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 5 April 2017
-@set VERSION 1.6
+@set UPDATED 13 February 2018
+@set VERSION 1.7
 
 @dircategory Data Compression
 @direntry
@@ -49,7 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2017 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2018 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -59,7 +59,7 @@ to copy, distribute and modify it.
 @chapter Introduction
 @cindex 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
@@ -421,7 +421,8 @@ 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 (some options only work if the diff
+program used supports them):
 
 @table @code
 @item -a
@@ -525,7 +526,8 @@ 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 (some options only work if the grep
+program used supports them):
 
 @table @code
 @item -a
@@ -552,6 +554,10 @@ Only print a count of matching lines per file.
 @itemx --context=@var{n}
 Print @var{n} lines of output context.
 
+@item --color[=@var{when}]
+Show matched strings in color. @var{when} is @samp{never}, @samp{always}
+or @samp{auto}.
+
 @item -e @var{pattern}
 @itemx --regexp=@var{pattern}
 Use @var{pattern} as the pattern to match.