Merging upstream version 1.0~rc6.

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

1 files changed, 15 insertions, 11 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 0c8fc54..5e06419 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCAT "1" "January 2011" "Zcat (zutils) 0.9" "User Commands"
+.TH ZCAT "1" "March 2013" "Zcat (zutils) 1.0-rc6" "User Commands"
 .SH NAME
 Zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -10,11 +10,12 @@ Zcat copies each given file ("\-" means standard input), to standard
 output. If any given file is compressed, its uncompressed content is
 used. If a given file does not exist, and its name does not end with one
 of the known extensions, zcat tries the compressed file names
-corresponding to the supported compressors. If no files are specified,
+corresponding to the supported formats. If no files are specified,
 data is read from standard input, decompressed if needed, and sent to
 standard output. Data read from standard input must be of the same type;
-all uncompressed or all compressed with the same compressor.
-The supported compressors are bzip2, gzip, lzip and xz.
+all uncompressed or all in the same compression format.
+.PP
+The supported formats are bzip2, gzip, lzip and xz.
 .PP
 Exit status is 0 if no errors occurred, 1 otherwise.
 .SH OPTIONS
@@ -26,16 +27,19 @@ display this help and exit
 output version information and exit
 .TP
 \fB\-A\fR, \fB\-\-show\-all\fR
-equivalent to `\-vET'
+equivalent to '\-vET'
 .TP
 \fB\-b\fR, \fB\-\-number\-nonblank\fR
 number nonblank output lines
 .TP
 \fB\-e\fR
-equivalent to `\-vE'
+equivalent to '\-vE'
 .TP
 \fB\-E\fR, \fB\-\-show\-ends\fR
-display `$' at end of each line
+display '$' at end of each line
+.TP
+\fB\-\-format=\fR<fmt>
+force given format (bz2, gz, lz, xz)
 .TP
 \fB\-n\fR, \fB\-\-number\fR
 number all output lines
@@ -50,13 +54,13 @@ operate recursively on directories
 never more than one single blank line
 .TP
 \fB\-t\fR
-equivalent to `\-vT'
+equivalent to '\-vT'
 .TP
 \fB\-T\fR, \fB\-\-show\-tabs\fR
-display TAB characters as `^I'
+display TAB characters as '^I'
 .TP
 \fB\-v\fR, \fB\-\-show\-nonprinting\fR
-use `^' and `M\-' notation, except for LF and TAB
+use '^' and 'M\-' notation, except for LF and TAB
 .TP
 \fB\-\-verbose\fR
 verbose mode (show error messages)
@@ -65,7 +69,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2011 Antonio Diaz Diaz.
+Copyright \(co 2013 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.