Merging upstream version 1.1~rc2.

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

doc/zcat.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCAT "1" "May 2013" "Zcat (zutils) 1.0" "User Commands"
+.TH ZCAT "1" "July 2013" "Zcat (zutils) 1.1-rc2" "User Commands"
 .SH NAME
 Zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -7,7 +7,7 @@ Zcat \- decompress and concatenate files to standard output
 [\fIoptions\fR] [\fIfiles\fR]
 .SH DESCRIPTION
 Zcat copies each given file ("\-" means standard input), to standard
-output. If any given file is compressed, its uncompressed content is
+output. If any given file is compressed, its decompressed 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 formats. If no files are specified,
@@ -17,7 +17,7 @@ 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.
+Exit status is 0 if no errors occurred, non\-zero otherwise.
 .SH OPTIONS
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -44,6 +44,9 @@ force given format (bz2, gz, lz, xz)
 \fB\-n\fR, \fB\-\-number\fR
 number all output lines
 .TP
+\fB\-N\fR, \fB\-\-no\-rcfile\fR
+don't read runtime configuration file
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR
 suppress all messages
 .TP
@@ -64,6 +67,18 @@ use '^' and 'M\-' notation, except for LF and TAB
 .TP
 \fB\-\-verbose\fR
 verbose mode (show error messages)
+.TP
+\fB\-\-bz2=\fR<command>
+set compressor and options for bzip2 format
+.TP
+\fB\-\-gz=\fR<command>
+set compressor and options for gzip format
+.TP
+\fB\-\-lz=\fR<command>
+set compressor and options for lzip format
+.TP
+\fB\-\-xz=\fR<command>
+set compressor and options for xz format
 .SH "REPORTING BUGS"
 Report bugs to zutils\-bug@nongnu.org
 .br