Merging upstream version 1.2.

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

1 files changed, 11 insertions, 10 deletions

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