Merging upstream version 0.4.

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

doc/zcat.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZCAT "1" "August 2009" "Zcat 0.3" "User Commands"
+.TH ZCAT "1" "September 2009" "Zcat 0.4" "User Commands"
 .SH NAME
-Zcat \- manual page for Zcat 0.3
+Zcat \- manual page for Zcat 0.4
 .SH SYNOPSIS
 .B zcat
 [\fIOPTIONS\fR] [\fICAT_OPTIONS\fR] [\fIFILES\fR]

doc/zdiff.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZDIFF "1" "August 2009" "Zdiff 0.3" "User Commands"
+.TH ZDIFF "1" "September 2009" "Zdiff 0.4" "User Commands"
 .SH NAME
-Zdiff \- manual page for Zdiff 0.3
+Zdiff \- manual page for Zdiff 0.4
 .SH SYNOPSIS
 .B zdiff
 [\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]

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.3" "User Commands"
+.TH ZGREP "1" "September 2009" "Zgrep 0.4" "User Commands"
 .SH NAME
-Zgrep \- manual page for Zgrep 0.3
+Zgrep \- manual page for Zgrep 0.4
 .SH SYNOPSIS
 .B zgrep
 [\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
@@ -15,6 +15,9 @@ used. If a given file does not exist, zgrep tries the compressed file
 names corresponding to the supported compressors.
 The supported compressors are gzip, bzip2, lzip and xz.
 .PP
+Zegrep is a shortcut for "zgrep \fB\-E\fR"
+Zfgrep is a shortcut for "zgrep \fB\-F\fR"
+.PP
 GREP_OPTIONS are passed directly to grep.
 The exit status from grep is preserved.
 .SH OPTIONS

doc/zutils.1

@@ -0,0 +1,46 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH ZUTILS "1" "September 2009" "Zutils 0.4" "User Commands"
+.SH NAME
+Zutils \- manual page for Zutils 0.4
+.SH SYNOPSIS
+.B zutils
+[\fIoptions\fR] [\fIfiles\fR]
+.SH DESCRIPTION
+Zutils \- A file format detector for compressed files.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+suppress all messages
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+test compressed file type
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+be verbose (a 2nd \fB\-v\fR gives more)
+.SH "REPORTING BUGS"
+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.
+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.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+The full documentation for
+.B Zutils
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B Zutils
+programs are properly installed at your site, the command
+.IP
+.B info Zutils
+.PP
+should give you access to the complete manual.

doc/zutils.texinfo

@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 13 August 2009
-@set VERSION 0.2
+@set UPDATED 17 September 2009
+@set VERSION 0.4
 
 @dircategory Data Compression
 @direntry
@@ -55,7 +55,8 @@ Zutils is a collection of utilities for dealing with any combination of
 compressed and non-compressed files transparently. The supported
 compressors are gzip, bzip2, lzip and xz.
 
-The currently provided utilities are zcat, zcmp, zdiff and zgrep.
+The currently provided utilities are zcat, zcmp, zdiff, zegrep, zfgrep
+and zgrep.
 
 
 @node Zcat
@@ -147,6 +148,8 @@ refer to temporary filenames instead of those specified.
 
 @node Zgrep
 @chapter Zgrep
+@cindex zegrep
+@cindex zfgrep
 @cindex zgrep
 
 Zgrep is a wrapper script around the grep command that allows
@@ -156,6 +159,11 @@ used. If a given file does not exist, zgrep tries the compressed file
 names corresponding to the supported compressors. The supported
 compressors are gzip, bzip2, lzip and xz.
 
+@noindent
+Zegrep is a shortcut for @samp{zgrep -E}@*
+Zfgrep is a shortcut for @samp{zgrep -F}
+
+
 The format for running zgrep is:
 
 @example