Merging upstream version 1.2.

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

8 files changed, 49 insertions, 48 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 1ceda79..2a94f76 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" "October 2013" "Zcat (zutils) 1.2-pre3" "User Commands"
+.TH ZCAT "1" "February 2014" "Zcat (zutils) 1.2" "User Commands"
 .SH NAME
 Zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -84,7 +84,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index f07b725..ec03656 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" "October 2013" "Zcmp (zutils) 1.2-pre3" "User Commands"
+.TH ZCMP "1" "February 2014" "Zcmp (zutils) 1.2" "User Commands"
 .SH NAME
 Zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -82,7 +82,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index ce89018..d41ee59 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" "October 2013" "Zdiff (zutils) 1.2-pre3" "User Commands"
+.TH ZDIFF "1" "February 2014" "Zdiff (zutils) 1.2" "User Commands"
 .SH NAME
 Zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -109,7 +109,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 8041fe0..8adecee 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" "October 2013" "Zgrep (zutils) 1.2-pre3" "User Commands"
+.TH ZGREP "1" "February 2014" "Zgrep (zutils) 1.2" "User Commands"
 .SH NAME
 Zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -127,7 +127,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/ztest.1 b/doc/ztest.1
index cdf40f5..77758c1 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" "October 2013" "Ztest (zutils) 1.2-pre3" "User Commands"
+.TH ZTEST "1" "February 2014" "Ztest (zutils) 1.2" "User Commands"
 .SH NAME
 Ztest \- verify integrity of compressed files
 .SH SYNOPSIS
@@ -58,7 +58,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 63696ac..f534870 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" "October 2013" "Zupdate (zutils) 1.2-pre3" "User Commands"
+.TH ZUPDATE "1" "February 2014" "Zupdate (zutils) 1.2" "User Commands"
 .SH NAME
 Zupdate \- recompress bzip2, gzip, xz files to lzip files
 .SH SYNOPSIS
@@ -17,10 +17,10 @@ appropriate for long\-term data archiving.
 .PP
 If the lzip compressed version of a file already exists, the file is
 skipped unless the '\-\-force' option is given. In this case, if the
-comparison fails, an error is returned and the original file is not
-deleted. The operation of zupdate is meant to be safe and not produce
-any data loss. Therefore, existing lzip compressed files are never
-overwritten nor deleted.
+comparison with the existing lzip version fails, an error is returned
+and the original file is not deleted. The operation of zupdate is meant
+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.
@@ -72,7 +72,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
+Copyright \(co 2014 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.
diff --git a/doc/zutils.info b/doc/zutils.info
index 59c7af2..d075c8d 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -1,5 +1,5 @@
 This is zutils.info, produced by makeinfo version 4.13+ from
-zutils.texinfo.
+zutils.texi.
 
 INFO-DIR-SECTION Data Compression
 START-INFO-DIR-ENTRY
@@ -12,7 +12,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.2-pre3, 11 October 2013).
+This manual is for Zutils (version 1.2, 1 February 2014).
 
 * Menu:
 
@@ -29,7 +29,7 @@ This manual is for Zutils (version 1.2-pre3, 11 October 2013).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -607,10 +607,10 @@ long-term data archiving.
 
    If the lzip compressed version of a file already exists, the file is
 skipped unless the '--force' option is given. In this case, if the
-comparison fails, an error is returned and the original file is not
-deleted. The operation of zupdate is meant to be safe and not produce
-any data loss. Therefore, existing lzip compressed files are never
-overwritten nor deleted.
+comparison with the existing lzip version fails, an error is returned
+and the original file is not deleted. The operation of zupdate is meant
+to be safe and not produce any data loss. Therefore, existing lzip
+compressed files are never overwritten nor deleted.
 
    The names of the original files must have one of the following
 extensions: '.bz2', '.tbz', '.tbz2', '.gz', '.tgz', '.xz', '.txz'. The
@@ -629,8 +629,8 @@ recompressed (if needed), compared and deleted. Non-zero otherwise.
 '--force'
      Do not skip a file for which a lzip compressed version already
      exists.  '--force' compares the content of the input file with the
-     content of the lzip file and deletes the input file if both
-     contents are identical.
+     content of the existing lzip file and deletes the input file if
+     both contents are identical.
 
 '-k'
 '--keep'
@@ -675,7 +675,7 @@ for all eternity, if not longer.
 
    If you find a bug in zutils, please send electronic mail to
 <zutils-bug@nongnu.org>. Include the version number, which you can find
-by running 'zcmp --version'.
+by running 'zupdate --version'.
 
 
 File: zutils.info,  Node: Concept index,  Prev: Problems,  Up: Top
@@ -701,18 +701,18 @@ Concept index
 
 
 Tag Table:
-Node: Top225
-Node: Introduction1156
-Node: Common options3259
-Node: The zutilsrc file4508
-Node: Zcat5434
-Node: Zcmp7356
-Node: Zdiff9680
-Node: Zgrep12183
-Node: Ztest15151
-Node: Zupdate16375
-Node: Problems18708
-Node: Concept index19239
+Node: Top222
+Node: Introduction1154
+Node: Common options3257
+Node: The zutilsrc file4506
+Node: Zcat5432
+Node: Zcmp7354
+Node: Zdiff9678
+Node: Zgrep12181
+Node: Ztest15149
+Node: Zupdate16373
+Node: Problems18746
+Node: Concept index19280
 
 End Tag Table
 
diff --git a/doc/zutils.texinfo b/doc/zutils.texi
index e39b51f..09237d2 100644
--- a/doc/zutils.texinfo
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 11 October 2013
-@set VERSION 1.2-pre3
+@set UPDATED 1 February 2014
+@set VERSION 1.2
 
 @dircategory Data Compression
 @direntry
@@ -49,7 +49,8 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+Copyright @copyright{} 2009, 2010, 2011, 2012, 2013, 2014
+Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -660,10 +661,10 @@ long-term data archiving.
 
 If the lzip compressed version of a file already exists, the file is
 skipped unless the @samp{--force} option is given. In this case, if the
-comparison fails, an error is returned and the original file is not
-deleted. The operation of zupdate is meant to be safe and not produce
-any data loss. Therefore, existing lzip compressed files are never
-overwritten nor deleted.
+comparison with the existing lzip version fails, an error is returned
+and the original file is not deleted. The operation of zupdate is meant
+to be safe and not produce any data loss. Therefore, existing lzip
+compressed files are never overwritten nor deleted.
 
 The names of the original files must have one of the following
 extensions: @samp{.bz2}, @samp{.tbz}, @samp{.tbz2}, @samp{.gz},
@@ -687,8 +688,8 @@ Zupdate supports the following options:
 @itemx --force
 Do not skip a file for which a lzip compressed version already exists.
 @samp{--force} compares the content of the input file with the content
-of the lzip file and deletes the input file if both contents are
-identical.
+of the existing lzip file and deletes the input file if both contents
+are identical.
 
 @item -k
 @itemx --keep
@@ -733,7 +734,7 @@ for all eternity, if not longer.
 
 If you find a bug in zutils, please send electronic mail to
 @email{zutils-bug@@nongnu.org}. Include the version number, which you can
-find by running @w{@samp{zcmp --version}}.
+find by running @w{@samp{zupdate --version}}.
 
 
 @node Concept index