Merging upstream version 0.3.

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

doc/zgrep.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZGREP "1" "August 2009" "Zgrep 0.2" "User Commands"
+.TH ZGREP "1" "August 2009" "Zgrep 0.3" "User Commands"
 .SH NAME
-Zgrep \- manual page for Zgrep 0.2
+Zgrep \- manual page for Zgrep 0.3
 .SH SYNOPSIS
 .B zgrep
 [\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
@@ -12,8 +12,8 @@ Zgrep is a wrapper script around the grep command 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 does not exist, zgrep tries the compressed file
-name corresponding to the default compressor selected. The supported
-compressors are gzip, bzip2, lzip and xz.
+names corresponding to the supported compressors.
+The supported compressors are gzip, bzip2, lzip and xz.
 .PP
 GREP_OPTIONS are passed directly to grep.
 The exit status from grep is preserved.
@@ -24,21 +24,9 @@ display this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 output version information and exit
-.TP
-\fB\-\-gzip\fR
-use gzip as default decompressor
-.TP
-\fB\-\-bzip2\fR
-use bzip2 as default decompressor
-.TP
-\fB\-\-lzip\fR
-use lzip as default decompressor (default)
-.TP
-\fB\-\-xz\fR
-use xz as default decompressor
 .SH "REPORTING BUGS"
-Report bugs to lzip\-bug@nongnu.org
-Lzip home page: http://www.nongnu.org/lzip/lzip.html
+Report bugs to zutils\-bug@nongnu.org
+Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2009 Antonio Diaz Diaz.
 This script is free software: you have unlimited permission