Merging upstream version 1.1~rc2.

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

1 files changed, 25 insertions, 7 deletions

diff --git a/doc/zcmp.1 b/doc/zcmp.1
index 68f44fd..e171601 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCMP "1" "May 2013" "Zcmp (zutils) 1.0" "User Commands"
+.TH ZCMP "1" "July 2013" "Zcmp (zutils) 1.1-rc2" "User Commands"
 .SH NAME
 Zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -9,19 +9,22 @@ Zcmp \- decompress and compare two files byte by byte
 Zcmp compares two files ("\-" means standard input), and if they
 differ, tells the first byte and line number where they differ. Bytes
 and lines are numbered starting with 1. If any given file is compressed,
-its uncompressed content is used. Compressed files are uncompressed on
+its decompressed content is used. Compressed files are decompressed on
 the fly; no temporary files are created.
 .PP
 The supported formats are bzip2, gzip, lzip and xz.
 .PP
 Compares <file1> to <file2>. If <file2> is omitted zcmp tries the
 following:
-If <file1> is compressed, compares <file1> to the file with the
-corresponding decompressed file name (removes the extension from
-<file1>).
-If <file1> is not compressed, compares <file1> to the uncompressed
+.IP
+1. If <file1> is compressed, compares its decompressed contents with
+the corresponding uncompressed file (the name of <file1> with the
+extension removed).
+.IP
+2. If <file1> is uncompressed, compares it with the decompressed
 contents of <file1>.[lz|bz2|gz|xz] (the first one that is found).
-If no suitable file is found, compares <file1> to data read from
+.IP
+3. If no suitable file is found, compares <file1> with data read from
 standard input.
 .PP
 Exit status is 0 if inputs are identical, 1 if different, 2 if trouble.
@@ -48,6 +51,9 @@ list position, value of all differing bytes
 \fB\-n\fR, \fB\-\-bytes=\fR<n>
 compare at most <n> bytes
 .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
@@ -56,6 +62,18 @@ suppress all messages
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 verbose mode (same as \fB\-\-list\fR)
+.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
 .PP
 Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
 Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...