Merging upstream version 1.2.

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

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