Merging upstream version 0.6.

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

1 files changed, 8 insertions, 30 deletions

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