Merging upstream version 0.6.

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

1 files changed, 5 insertions, 16 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