Merging upstream version 1.3~pre1.

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

8 files changed, 32 insertions, 29 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 2a94f76..66a7965 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCAT "1" "February 2014" "Zcat (zutils) 1.2" "User Commands"
+.TH ZCAT "1" "June 2014" "zcat (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Zcat \- decompress and concatenate files to standard output
+zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
 .B zcat
 [\fIoptions\fR] [\fIfiles\fR]
@@ -85,7 +85,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index ec03656..2153787 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCMP "1" "February 2014" "Zcmp (zutils) 1.2" "User Commands"
+.TH ZCMP "1" "June 2014" "zcmp (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Zcmp \- decompress and compare two files byte by byte
+zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
 .B zcmp
 [\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR]
@@ -83,7 +83,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index d41ee59..c035b22 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZDIFF "1" "February 2014" "Zdiff (zutils) 1.2" "User Commands"
+.TH ZDIFF "1" "June 2014" "zdiff (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Zdiff \- decompress and compare two files line by line
+zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
 .B zdiff
 [\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR]
@@ -110,7 +110,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 8adecee..31d79f9 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZGREP "1" "February 2014" "Zgrep (zutils) 1.2" "User Commands"
+.TH ZGREP "1" "June 2014" "zgrep (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Zgrep \- search compressed files for a regular expression
+zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
 .B zgrep
 [\fIoptions\fR] \fI<pattern> \fR[\fIfiles\fR]
@@ -128,7 +128,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/ztest.1 b/doc/ztest.1
index 77758c1..5b43353 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZTEST "1" "February 2014" "Ztest (zutils) 1.2" "User Commands"
+.TH ZTEST "1" "June 2014" "ztest (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Ztest \- verify integrity of compressed files
+ztest \- verify integrity of compressed files
 .SH SYNOPSIS
 .B ztest
 [\fIoptions\fR] [\fIfiles\fR]
@@ -59,7 +59,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index f534870..08ee94e 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZUPDATE "1" "February 2014" "Zupdate (zutils) 1.2" "User Commands"
+.TH ZUPDATE "1" "June 2014" "zupdate (zutils) 1.3-pre1" "User Commands"
 .SH NAME
-Zupdate \- recompress bzip2, gzip, xz files to lzip files
+zupdate \- recompress bzip2, gzip, xz files to lzip files
 .SH SYNOPSIS
 .B zupdate
 [\fIoptions\fR] [\fIfiles\fR]
@@ -23,7 +23,8 @@ to be safe and not produce any data loss. Therefore, existing lzip
 compressed files are never overwritten nor deleted.
 .PP
 Exit status is 0 if all the compressed files were successfully
-recompressed (if needed), compared and deleted. Non\-zero otherwise.
+recompressed (if needed), compared and deleted (if requested). Non\-zero
+otherwise.
 .SH OPTIONS
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -73,7 +74,7 @@ Report bugs to zutils\-bug@nongnu.org
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
 Copyright \(co 2014 Antonio Diaz Diaz.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/doc/zutils.info b/doc/zutils.info
index d075c8d..b8d66fd 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.2, 1 February 2014).
+This manual is for Zutils (version 1.3-pre1, 28 June 2014).
 
 * Menu:
 
@@ -55,7 +55,7 @@ The supported formats are bzip2, gzip, lzip and xz.
 The compressor to be used for each format is configurable at runtime.
 
    Zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
-scripts provided with GNU gzip. Ztest is unique to zutils. Zupdate is
+scripts provided by GNU gzip. Ztest is unique to zutils. Zupdate is
 similar to gzip's znew.
 
    NOTE: Bzip2 and lzip provide well-defined values of exit status,
@@ -621,7 +621,8 @@ files produced have the extensions '.lz' or '.tar.lz'.
      zupdate [OPTIONS] [FILES]
 
 Exit status is 0 if all the compressed files were successfully
-recompressed (if needed), compared and deleted. Non-zero otherwise.
+recompressed (if needed), compared and deleted (if requested). Non-zero
+otherwise.
 
    Zupdate supports the following options:
 
@@ -702,7 +703,7 @@ Concept index
 
 Tag Table:
 Node: Top222
-Node: Introduction1154
+Node: Introduction1156
 Node: Common options3257
 Node: The zutilsrc file4506
 Node: Zcat5432
@@ -711,8 +712,8 @@ Node: Zdiff9678
 Node: Zgrep12181
 Node: Ztest15149
 Node: Zupdate16373
-Node: Problems18746
-Node: Concept index19280
+Node: Problems18761
+Node: Concept index19295
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 09237d2..198fb20 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 1 February 2014
-@set VERSION 1.2
+@set UPDATED 28 June 2014
+@set VERSION 1.3-pre1
 
 @dircategory Data Compression
 @direntry
@@ -76,7 +76,7 @@ The supported formats are bzip2, gzip, lzip and xz.@*
 The compressor to be used for each format is configurable at runtime.
 
 Zcat, zcmp, zdiff, and zgrep are improved replacements for the shell
-scripts provided with GNU gzip. Ztest is unique to zutils. Zupdate is
+scripts provided by GNU gzip. Ztest is unique to zutils. Zupdate is
 similar to gzip's znew.
 
 NOTE: Bzip2 and lzip provide well-defined values of exit status, which
@@ -679,7 +679,8 @@ zupdate [@var{options}] [@var{files}]
 
 @noindent
 Exit status is 0 if all the compressed files were successfully
-recompressed (if needed), compared and deleted. Non-zero otherwise.
+recompressed (if needed), compared and deleted (if requested). Non-zero
+otherwise.
 
 Zupdate supports the following options: