Merging upstream version 1.1~rc2.

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" "May 2013" "Zgrep (zutils) 1.0" "User Commands"
+.TH ZGREP "1" "July 2013" "Zgrep (zutils) 1.1-rc2" "User Commands"
 .SH NAME
 Zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -7,8 +7,8 @@ Zgrep \- search compressed files for a regular expression
 [\fIoptions\fR] \fI<pattern> \fR[\fIfiles\fR]
 .SH DESCRIPTION
 Zgrep is a front end to the grep program that allows transparent search
-on any combination of compressed and non\-compressed files. If any given
-file is compressed, its uncompressed content is used. If a given file
+on any combination of compressed and uncompressed files. 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, zgrep tries the compressed file names corresponding to the
 supported formats. If no files are specified, data is read from
@@ -84,6 +84,9 @@ stop after <n> matches
 \fB\-n\fR, \fB\-\-line\-number\fR
 print the line number of each line
 .TP
+\fB\-N\fR, \fB\-\-no\-rcfile\fR
+don't read runtime configuration file
+.TP
 \fB\-o\fR, \fB\-\-only\-matching\fR
 show only the part of a line matching <pattern>
 .TP
@@ -107,6 +110,18 @@ match only whole words
 .TP
 \fB\-x\fR, \fB\-\-line\-regexp\fR
 match only whole lines
+.TP
+\fB\-\-bz2=\fR<command>
+set compressor and options for bzip2 format
+.TP
+\fB\-\-gz=\fR<command>
+set compressor and options for gzip format
+.TP
+\fB\-\-lz=\fR<command>
+set compressor and options for lzip format
+.TP
+\fB\-\-xz=\fR<command>
+set compressor and options for xz format
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 .br