Merging upstream version 1.0~rc6.

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

doc/ztest.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZTEST "1" "January 2011" "Ztest (zutils) 0.9" "User Commands"
+.TH ZTEST "1" "March 2013" "Ztest (zutils) 1.0-rc6" "User Commands"
 .SH NAME
 Ztest \- verify integrity of compressed files
 .SH SYNOPSIS
@@ -9,10 +9,16 @@ Ztest \- verify integrity of compressed files
 Ztest verifies the integrity of the specified compressed files.
 Non\-compressed files are ignored. If no files are specified, the
 integrity of compressed data read from standard input is verified. Data
-read from standard input must be all compressed with the same compressor.
-The supported compressors are bzip2, gzip, lzip and xz.
+read from standard input must be all in the same compression format.
 .PP
-Exit status is 2 if any compressed file is corrupt, 0 otherwise.
+The supported formats are bzip2, gzip, lzip and xz.
+.PP
+Note that some xz files lack integrity information, and therefore can't
+be verified as reliably as the other formats can.
+.PP
+Exit status is 0 if all compressed files verify OK, 1 if environmental
+problems (file not found, invalid flags, I/O errors, etc), 2 if any
+compressed file is corrupt or invalid.
 .SH OPTIONS
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -21,6 +27,9 @@ display this help and exit
 \fB\-V\fR, \fB\-\-version\fR
 output version information and exit
 .TP
+\fB\-\-format=\fR<fmt>
+force given format (bz2, gz, lz, xz)
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR
 suppress all messages
 .TP
@@ -34,7 +43,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.