Merging upstream version 1.14~rc3.

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

1 files changed, 30 insertions, 21 deletions

diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index 676e8d6..9c1612c 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 25 March 2013
-@set VERSION 1.14-rc2
+@set UPDATED 23 April 2013
+@set VERSION 1.14-rc3
 
 @dircategory Data Compression
 @direntry
@@ -86,7 +86,7 @@ in the following example (the resulting file may contain some garbage
 data at the end):
 
 @example
-lziprecover -cd rec00001file.lz > rec00001file
+lziprecover -cd rec01file.lz > rec01file
 @end example
 
 If the cause of file corruption is damaged media, the combination
@@ -148,6 +148,14 @@ containing the desired data.
 @itemx --force
 Force overwrite of output files.
 
+@item -i
+@itemx --ignore-errors
+Make @samp{--range-decompress} ignore data errors and continue
+decompressing the remaining members in the file. For example,
+@w{@samp{lziprecover -i -D0 file.lz > file}} decompresses all the
+recoverable data in all members of @samp{file.lz} without having to
+split it first.
+
 @item -k
 @itemx --keep
 Keep (don't delete) input files during decompression.
@@ -179,10 +187,10 @@ copies.
 @itemx --output=@var{file}
 Place the output into @samp{@var{file}} instead of into
 @samp{@var{file}_fixed.lz}. If splitting, the names of the files
-produced are in the form @samp{rec00001@var{file}},
-@samp{rec00002@var{file}}, etc. If decompressing from standard input and
-@samp{--stdout} has not been specified, use @samp{@var{file}} as the
-name of the decompressed file.
+produced are in the form @samp{rec01@var{file}}, @samp{rec02@var{file}},
+etc. If decompressing from standard input and @samp{--stdout} has not
+been specified, use @samp{@var{file}} as the name of the decompressed
+file.
 
 @item -q
 @itemx --quiet
@@ -203,10 +211,11 @@ integrity of the resulting files, decompress those which are undamaged,
 and try to repair or partially decompress those which are damaged.
 
 The names of the files produced are in the form
-@samp{rec00001@var{file}.lz}, @samp{rec00002@var{file}.lz}, etc, and are
+@samp{rec01@var{file}.lz}, @samp{rec02@var{file}.lz}, etc, and are
 designed so that the use of wildcards in subsequent processing, for
 example, @w{@samp{lziprecover -cd rec*@var{file}.lz > recovered_data}},
-processes the files in the correct order.
+processes the files in the correct order. The number of digits used in
+the names varies depending on the number of members in @samp{@var{file}}.
 
 @item -t
 @itemx --test
@@ -411,26 +420,26 @@ lziprecover -m -v -o rescued.tar.lz rescued1.tar.lz rescued2.tar.lz
 @noindent
 Example 8: Recover the first volume of those created with the command
 @w{@code{lzip -b 32MiB -S 650MB big_db}} from two copies,
-@samp{big_db1_00001.lz} and @samp{big_db2_00001.lz}, with member 00007
-damaged in the first copy, member 00018 damaged in the second copy, and
-member 00012 damaged in both copies. Two correct copies are produced and
+@samp{big_db1_00001.lz} and @samp{big_db2_00001.lz}, with member 07
+damaged in the first copy, member 18 damaged in the second copy, and
+member 12 damaged in both copies. Two correct copies are produced and
 compared.
 
 @example
 lziprecover -s big_db1_00001.lz
 lziprecover -s big_db2_00001.lz
 lziprecover -t rec*big_db1_00001.lz
-  rec00007big_db1_00001.lz: crc mismatch
-  rec00012big_db1_00001.lz: crc mismatch
+  rec07big_db1_00001.lz: crc mismatch
+  rec12big_db1_00001.lz: crc mismatch
 lziprecover -t rec*big_db2_00001.lz
-  rec00012big_db2_00001.lz: crc mismatch
-  rec00018big_db2_00001.lz: crc mismatch
-lziprecover -m -v rec00012big_db1_00001.lz rec00012big_db2_00001.lz
+  rec12big_db2_00001.lz: crc mismatch
+  rec18big_db2_00001.lz: crc mismatch
+lziprecover -m -v rec12big_db1_00001.lz rec12big_db2_00001.lz
   Input files merged successfully
-cp rec00007big_db2_00001.lz rec00007big_db1_00001.lz
-cp rec00012big_db1_00001_fixed.lz rec00012big_db1_00001.lz
-cp rec00012big_db1_00001_fixed.lz rec00012big_db2_00001.lz
-cp rec00018big_db1_00001.lz rec00018big_db2_00001.lz
+cp rec07big_db2_00001.lz rec07big_db1_00001.lz
+cp rec12big_db1_00001_fixed.lz rec12big_db1_00001.lz
+cp rec12big_db1_00001_fixed.lz rec12big_db2_00001.lz
+cp rec18big_db1_00001.lz rec18big_db2_00001.lz
 cat rec*big_db1_00001.lz > big_db3_00001.lz
 cat rec*big_db2_00001.lz > big_db4_00001.lz
 zcmp big_db3_00001.lz big_db4_00001.lz