Merging upstream version 1.0~rc6.

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

doc/zgrep.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZGREP "1" "January 2011" "Zgrep (zutils) 0.9" "User Commands"
+.TH ZGREP "1" "March 2013" "Zgrep (zutils) 1.0-rc6" "User Commands"
 .SH NAME
 Zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -11,11 +11,12 @@ on any combination of compressed and non\-compressed files. If any given
 file is compressed, its uncompressed content is used. If a given file
 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 compressors. If no files are specified, data is read from
+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
-compressed with the same compressor.
-The supported compressors are bzip2, gzip, lzip and xz.
+in the same compression format.
+.PP
+The supported formats are bzip2, gzip, lzip and xz.
 .PP
 Exit status is 0 if match, 1 if no match, 2 if trouble.
 .SH OPTIONS
@@ -56,6 +57,9 @@ obtain patterns from <file>
 \fB\-F\fR, \fB\-\-fixed\-strings\fR
 <pattern> is a set of newline\-separated strings
 .TP
+\fB\-\-format=\fR<fmt>
+force given format (bz2, gz, lz, xz)
+.TP
 \fB\-h\fR, \fB\-\-no\-filename\fR
 suppress the prefixing filename on output
 .TP
@@ -108,7 +112,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2011 Antonio Diaz Diaz.
+Copyright \(co 2013 Antonio Diaz Diaz.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.