Merging upstream version 0.6.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

6 files changed, 20 insertions, 110 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 10737a2..6789957 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZCAT "1" "October 2009" "Zcat 0.5" "User Commands"
+.TH ZCAT "1" "October 2009" "Zcat 0.6" "User Commands"
 .SH NAME
-Zcat \- manual page for Zcat 0.5
+Zcat \- concatenate compressed files to stdout
 .SH SYNOPSIS
 .B zcat
 [\fIOPTIONS\fR] [\fICAT_OPTIONS\fR] [\fIFILES\fR]
@@ -13,8 +13,9 @@ concatenation of 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, zcat tries the compressed file names
 corresponding to the supported compressors. If no files are specified,
-the standard input is decompressed using the selected compressor and
-sent to stdout.
+data is read from standard input, decompressed if needed, and sent to
+stdout. Data read from standard input must be of the same type; all
+uncompressed or all compressed with the same compressor.
 The supported compressors are gzip, bzip2, lzip and xz.
 .PP
 CAT_OPTIONS are passed directly to cat.
@@ -26,18 +27,6 @@ display this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 output version information and exit
-.TP
-\fB\-\-gzip\fR
-use gzip as decompressor for stdin (default)
-.TP
-\fB\-\-bzip2\fR
-use bzip2 as decompressor for stdin
-.TP
-\fB\-\-lzip\fR
-use lzip as decompressor for stdin
-.TP
-\fB\-\-xz\fR
-use xz as decompressor for stdin
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index 3509c21..cf19d27 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZDIFF "1" "October 2009" "Zdiff 0.5" "User Commands"
+.TH ZDIFF "1" "October 2009" "Zdiff 0.6" "User Commands"
 .SH NAME
-Zdiff \- manual page for Zdiff 0.5
+Zdiff \- compare compressed files
 .SH SYNOPSIS
 .B zdiff
 [\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 3db747b..fc22717 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZGREP "1" "October 2009" "Zgrep 0.5" "User Commands"
+.TH ZGREP "1" "October 2009" "Zgrep 0.6" "User Commands"
 .SH NAME
-Zgrep \- manual page for Zgrep 0.5
+Zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
 .B zgrep
 [\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
@@ -13,8 +13,9 @@ 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
 names corresponding to the supported compressors. If no files are
-specified, the standard input is decompressed using the selected
-compressor and fed to grep.
+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 gzip, bzip2, lzip and xz.
 .PP
 Zegrep is a shortcut for "zgrep \fB\-E\fR"
@@ -29,18 +30,6 @@ display this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 output version information and exit
-.TP
-\fB\-\-gzip\fR
-use gzip as decompressor for stdin (default)
-.TP
-\fB\-\-bzip2\fR
-use bzip2 as decompressor for stdin
-.TP
-\fB\-\-lzip\fR
-use lzip as decompressor for stdin
-.TP
-\fB\-\-xz\fR
-use xz as decompressor for stdin
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
diff --git a/doc/zutils.1 b/doc/zutils.1
deleted file mode 100644
index 4836ace..0000000
--- a/doc/zutils.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH ZUTILS "1" "October 2009" "Zutils 0.5" "User Commands"
-.SH NAME
-Zutils \- manual page for Zutils 0.5
-.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.
diff --git a/doc/zutils.info b/doc/zutils.info
index e2d3258..34f390b 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo
index 76f771b..3902270 100644
--- a/doc/zutils.texinfo
+++ b/doc/zutils.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 1 October 2009
-@set VERSION 0.5
+@set UPDATED 5 October 2009
+@set VERSION 0.6
 
 @dircategory Data Compression
 @direntry
@@ -68,8 +68,9 @@ concatenation of 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, zcat tries the compressed file names
 corresponding to the supported compressors. If no files are specified,
-the standard input is decompressed using the selected compressor and
-sent to stdout.
+data is read from standard input, decompressed if needed, and sent to
+stdout. Data read from standard input must be of the same type; all
+uncompressed or all compressed with the same compressor.
 
 The format for running zcat is:
 
@@ -92,18 +93,6 @@ Print an informative help message describing the options and exit.
 @itemx -V
 Print the version number of zcat on the standard output and exit.
 
-@item --gzip
-Use gzip as decompressor for stdin (default).
-
-@item --bzip2
-Use bzip2 as decompressor for stdin.
-
-@item --lzip
-Use lzip as decompressor for stdin.
-
-@item --xz
-Use xz as decompressor for stdin.
-
 @end table
 
 
@@ -170,8 +159,9 @@ 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
 names corresponding to the supported compressors. If no files are
-specified, the standard input is decompressed using the selected
-compressor and fed to grep.
+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.
 
 @noindent
 Zegrep is a shortcut for @samp{zgrep -E}@*
@@ -199,18 +189,6 @@ Print an informative help message describing the options and exit.
 @itemx -V
 Print the version number of zgrep on the standard output and exit.
 
-@item --gzip
-Use gzip as decompressor for stdin (default).
-
-@item --bzip2
-Use bzip2 as decompressor for stdin.
-
-@item --lzip
-Use lzip as decompressor for stdin.
-
-@item --xz
-Use xz as decompressor for stdin.
-
 @end table