Merging upstream version 1.3~pre2.

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

8 files changed, 29 insertions, 19 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 66a7965..58b1335 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" "June 2014" "zcat (zutils) 1.3-pre1" "User Commands"
+.TH ZCAT "1" "July 2014" "zcat (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index 2153787..60ffae4 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" "June 2014" "zcmp (zutils) 1.3-pre1" "User Commands"
+.TH ZCMP "1" "July 2014" "zcmp (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index c035b22..146a7e3 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZDIFF "1" "June 2014" "zdiff (zutils) 1.3-pre1" "User Commands"
+.TH ZDIFF "1" "July 2014" "zdiff (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 31d79f9..203938a 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZGREP "1" "June 2014" "zgrep (zutils) 1.3-pre1" "User Commands"
+.TH ZGREP "1" "July 2014" "zgrep (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
diff --git a/doc/ztest.1 b/doc/ztest.1
index 5b43353..44fcbc5 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZTEST "1" "June 2014" "ztest (zutils) 1.3-pre1" "User Commands"
+.TH ZTEST "1" "July 2014" "ztest (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 ztest \- verify integrity of compressed files
 .SH SYNOPSIS
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 08ee94e..ef23251 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZUPDATE "1" "June 2014" "zupdate (zutils) 1.3-pre1" "User Commands"
+.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-pre2" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz files to lzip files
 .SH SYNOPSIS
diff --git a/doc/zutils.info b/doc/zutils.info
index b8d66fd..7cc74aa 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -12,7 +12,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.3-pre1, 28 June 2014).
+This manual is for Zutils (version 1.3-pre2, 17 July 2014).
 
 * Menu:
 
@@ -63,6 +63,11 @@ which makes them safe to use with zutils. Gzip and xz may return
 ambiguous warning values, making them less reliable back ends for
 zutils.
 
+   FORMAT NOTE: If the '--format' option is given, the corresponding
+files are passed to the decompressor without verifying their format,
+allowing for example the processing of compress'd (.Z) files with gzip:
+'zcmp --format=gz file.Z file.lz'.
+
    LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may
 never have been compressed. Decompressed is used to refer to data which
 has undergone the process of decompression.
@@ -704,16 +709,16 @@ Concept index
 Tag Table:
 Node: Top222
 Node: Introduction1156
-Node: Common options3257
-Node: The zutilsrc file4506
-Node: Zcat5432
-Node: Zcmp7354
-Node: Zdiff9678
-Node: Zgrep12181
-Node: Ztest15149
-Node: Zupdate16373
-Node: Problems18761
-Node: Concept index19295
+Node: Common options3503
+Node: The zutilsrc file4752
+Node: Zcat5678
+Node: Zcmp7600
+Node: Zdiff9924
+Node: Zgrep12427
+Node: Ztest15395
+Node: Zupdate16619
+Node: Problems19007
+Node: Concept index19541
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 198fb20..f09e5e9 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 28 June 2014
-@set VERSION 1.3-pre1
+@set UPDATED 17 July 2014
+@set VERSION 1.3-pre2
 
 @dircategory Data Compression
 @direntry
@@ -83,6 +83,11 @@ NOTE: Bzip2 and lzip provide well-defined values of exit status, which
 makes them safe to use with zutils. Gzip and xz may return ambiguous
 warning values, making them less reliable back ends for zutils.
 
+FORMAT NOTE: If the @samp{--format} option is given, the corresponding
+files are passed to the decompressor without verifying their format,
+allowing for example the processing of compress'd (.Z) files with gzip:
+@samp{zcmp --format=gz file.Z file.lz}.
+
 LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never
 have been compressed. Decompressed is used to refer to data which has
 undergone the process of decompression.