Merging upstream version 1.10.

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

4 files changed, 59 insertions, 43 deletions

diff --git a/doc/lzip.1 b/doc/lzip.1
index d0efa7d..3254f33 100644
--- a/doc/lzip.1
+++ b/doc/lzip.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH LZIP "1" "January 2010" "Lzip 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH LZIP "1" "April 2010" "Lzip 1.10" "User Commands"
 .SH NAME
 Lzip \- data compressor based on the LZMA algorithm
 .SH SYNOPSIS
@@ -66,6 +66,7 @@ Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
 Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
 .SH "REPORTING BUGS"
 Report bugs to lzip\-bug@nongnu.org
+.br
 Lzip home page: http://www.nongnu.org/lzip/lzip.html
 .SH COPYRIGHT
 Copyright \(co 2010 Antonio Diaz Diaz.
diff --git a/doc/lzip.info b/doc/lzip.info
index 5e2e530..7914b91 100644
--- a/doc/lzip.info
+++ b/doc/lzip.info
@@ -11,7 +11,7 @@ File: lzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzip Manual
 ***********
 
-This manual is for Lzip (version 1.9, 17 January 2010).
+This manual is for Lzip (version 1.10, 5 April 2010).
 
 * Menu:
 
@@ -68,11 +68,11 @@ multivolume compressed tar archives.
    The amount of memory required for compression is about 5 MiB plus 1
 or 2 times the dictionary size limit (1 if input file size is less than
 dictionary size limit, else 2) plus 8 times the dictionary size really
-used. For decompression is a little more than the dictionary size really
-used. Lzip will automatically use the smallest possible dictionary size
-without exceeding the given limit. It is important to appreciate that
-the decompression memory requirement is affected at compression time by
-the choice of dictionary size limit.
+used. For decompression it is a little more than the dictionary size
+really used. Lzip will automatically use the smallest possible
+dictionary size without exceeding the given limit. It is important to
+appreciate that the decompression memory requirement is affected at
+compression time by the choice of dictionary size limit.
 
    When decompressing, lzip attempts to guess the name for the
 decompressed file from that of the compressed file as follows:
@@ -254,15 +254,15 @@ The format for running lzip is:
      slower than `-1'. These options have no effect when decompressing.
 
      Level   Dictionary size   Match length limit
-     -1      1MiB              10 bytes
-     -2      1MiB              12 bytes
-     -3      1MiB              17 bytes
-     -4      2MiB              26 bytes
-     -5      4MiB              44 bytes
-     -6      8MiB              80 bytes
-     -7      16MiB             108 bytes
-     -8      16MiB             163 bytes
-     -9      32MiB             273 bytes
+     -1      1 MiB             10 bytes
+     -2      1.5 MiB           12 bytes
+     -3      2 MiB             17 bytes
+     -4      3 MiB             26 bytes
+     -5      4 MiB             44 bytes
+     -6      8 MiB             80 bytes
+     -7      16 MiB            108 bytes
+     -8      24 MiB            163 bytes
+     -9      32 MiB            273 bytes
 
 `--fast'
 `--best'
@@ -419,6 +419,12 @@ writes each member in its own .lz file. You can then use `lzip -t' to
 test the integrity of the resulting files, and decompress those which
 are undamaged.
 
+   Data from damaged members can be partially recovered writing it to
+stdout as shown in the following example (the resulting file may contain
+garbage data at the end):
+
+     lzip -cd rec00001file.lz > rec00001file
+
    Lziprecover takes a single argument, the name of the damaged file,
 and writes a number of files `rec00001file.lz', `rec00002file.lz', etc,
 containing the extracted members. The output filenames are designed so
@@ -466,13 +472,13 @@ Concept Index
 
 Tag Table:
 Node: Top224
-Node: Introduction899
-Node: Algorithm4206
-Node: Invoking Lzip6432
-Node: File Format10779
-Node: Examples12733
-Node: Lziprecover14571
-Node: Problems15270
-Node: Concept Index15795
+Node: Introduction897
+Node: Algorithm4207
+Node: Invoking Lzip6433
+Node: File Format10780
+Node: Examples12734
+Node: Lziprecover14572
+Node: Problems15487
+Node: Concept Index16012
 
 End Tag Table
diff --git a/doc/lzip.texinfo b/doc/lzip.texinfo
index a6d5d79..9cacd16 100644
--- a/doc/lzip.texinfo
+++ b/doc/lzip.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 17 January 2010
-@set VERSION 1.9
+@set UPDATED 5 April 2010
+@set VERSION 1.10
 
 @dircategory Data Compression
 @direntry
@@ -85,11 +85,11 @@ compressed tar archives.
 The amount of memory required for compression is about 5 MiB plus 1 or 2
 times the dictionary size limit (1 if input file size is less than
 dictionary size limit, else 2) plus 8 times the dictionary size really
-used. For decompression is a little more than the dictionary size really
-used. Lzip will automatically use the smallest possible dictionary size
-without exceeding the given limit. It is important to appreciate that
-the decompression memory requirement is affected at compression time by
-the choice of dictionary size limit.
+used. For decompression it is a little more than the dictionary size
+really used. Lzip will automatically use the smallest possible
+dictionary size without exceeding the given limit. It is important to
+appreciate that the decompression memory requirement is affected at
+compression time by the choice of dictionary size limit.
 
 When decompressing, lzip attempts to guess the name for the decompressed
 file from that of the compressed file as follows:
@@ -274,15 +274,15 @@ as shown in the table below. Note that @samp{-9} can be much slower than
 
 @multitable {Level} {Dictionary size} {Match length limit}
 @item Level @tab Dictionary size @tab Match length limit
-@item -1 @tab  1MiB @tab  10 bytes
-@item -2 @tab  1MiB @tab  12 bytes
-@item -3 @tab  1MiB @tab  17 bytes
-@item -4 @tab  2MiB @tab  26 bytes
-@item -5 @tab  4MiB @tab  44 bytes
-@item -6 @tab  8MiB @tab  80 bytes
-@item -7 @tab 16MiB @tab 108 bytes
-@item -8 @tab 16MiB @tab 163 bytes
-@item -9 @tab 32MiB @tab 273 bytes
+@item -1 @tab  1 MiB @tab  10 bytes
+@item -2 @tab  1.5 MiB @tab  12 bytes
+@item -3 @tab  2 MiB @tab  17 bytes
+@item -4 @tab  3 MiB @tab  26 bytes
+@item -5 @tab  4 MiB @tab  44 bytes
+@item -6 @tab  8 MiB @tab  80 bytes
+@item -7 @tab 16 MiB @tab 108 bytes
+@item -8 @tab 24 MiB @tab 163 bytes
+@item -9 @tab 32 MiB @tab 273 bytes
 @end multitable
 
 @item --fast
@@ -468,6 +468,14 @@ writes each member in its own .lz file. You can then use
 @w{@samp{lzip -t}} to test the integrity of the resulting files, and
 decompress those which are undamaged.
 
+Data from damaged members can be partially recovered writing it to
+stdout as shown in the following example (the resulting file may contain
+garbage data at the end):
+
+@example
+lzip -cd rec00001file.lz > rec00001file
+@end example
+
 Lziprecover takes a single argument, the name of the damaged file, and
 writes a number of files @samp{rec00001file.lz}, @samp{rec00002file.lz},
 etc, containing the extracted members. The output filenames are designed
diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index 95f5709..0a60e62 100644
--- a/doc/lziprecover.1
+++ b/doc/lziprecover.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH LZIPRECOVER "1" "January 2010" "Lziprecover 1.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH LZIPRECOVER "1" "April 2010" "Lziprecover 1.10" "User Commands"
 .SH NAME
 Lziprecover \- recover undamaged members from lzip files
 .SH SYNOPSIS
@@ -26,6 +26,7 @@ suppress all messages
 be verbose (a 2nd \fB\-v\fR gives more)
 .SH "REPORTING BUGS"
 Report bugs to lzip\-bug@nongnu.org
+.br
 Lzip home page: http://www.nongnu.org/lzip/lzip.html
 .SH COPYRIGHT
 Copyright \(co 2010 Antonio Diaz Diaz.