Merging upstream version 1.7~rc1.

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

1 files changed, 25 insertions, 26 deletions

diff --git a/doc/lzlib.info b/doc/lzlib.info
index 5a32927..6ef6f46 100644
--- a/doc/lzlib.info
+++ b/doc/lzlib.info
@@ -11,7 +11,7 @@ File: lzlib.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzlib Manual
 ************
 
-This manual is for Lzlib (version 1.7-pre1, 24 February 2015).
+This manual is for Lzlib (version 1.7-rc1, 23 May 2015).
 
 * Menu:
 
@@ -102,13 +102,14 @@ install any signal handler. The decoder checks the consistency of the
 compressed data, so the library should never crash even in case of
 corrupted input.
 
-   There is no such thing as a "LZMA algorithm"; it is more like a "LZMA
+   In spite of its name (Lempel-Ziv-Markov chain-Algorithm), LZMA is
+not a concrete algorithm; it is more like "any algorithm using the LZMA
 coding scheme". For example, the option '-0' of lzip uses the scheme in
-almost the simplest way possible; issuing the longest match it can find,
-or a literal byte if it can't find a match. Inversely, a much more
-elaborated way of finding coding sequences of minimum price than the one
-currently used by lzip could be developed, and the resulting sequence
-could also be coded using the LZMA coding scheme.
+almost the simplest way possible; issuing the longest match it can
+find, or a literal byte if it can't find a match. Inversely, a much
+more elaborated way of finding coding sequences of minimum size than
+the one currently used by lzip could be developed, and the resulting
+sequence could also be coded using the LZMA coding scheme.
 
    Lzlib currently implements two variants of the LZMA algorithm; fast
 (used by option -0 of minilzip) and normal (used by all other
@@ -591,14 +592,12 @@ with no additional information before, between, or after them.
      now.
 
 'DS (coded dictionary size, 1 byte)'
-     Lzip divides the distance between any two powers of 2 into 8
-     equally spaced intervals, named "wedges". The dictionary size is
-     calculated by taking a power of 2 (the base size) and substracting
-     from it a number of wedges between 0 and 7. The size of a wedge is
-     (base_size / 16).
+     The dictionary size is calculated by taking a power of 2 (the base
+     size) and substracting from it a fraction between 0/16 and 7/16 of
+     the base size.
      Bits 4-0 contain the base 2 logarithm of the base size (12 to 29).
-     Bits 7-5 contain the number of wedges (0 to 7) to substract from
-     the base size to obtain the dictionary size.
+     Bits 7-5 contain the numerator of the fraction (0 to 7) to
+     substract from the base size to obtain the dictionary size.
      Example: 0xD3 = 2^19 - 6 * 2^15 = 512 KiB - 6 * 32 KiB = 320 KiB
      Valid values for dictionary size range from 4 KiB to 512 MiB.
 
@@ -785,18 +784,18 @@ Concept index
 
 Tag Table:
 Node: Top220
-Node: Introduction1311
-Node: Library version5808
-Node: Buffering6453
-Node: Parameter limits7673
-Node: Compression functions8632
-Node: Decompression functions15176
-Node: Error codes21344
-Node: Error messages23283
-Node: Data format23862
-Node: Examples26538
-Node: Problems30624
-Node: Concept index31196
+Node: Introduction1305
+Node: Library version5869
+Node: Buffering6514
+Node: Parameter limits7734
+Node: Compression functions8693
+Node: Decompression functions15237
+Node: Error codes21405
+Node: Error messages23344
+Node: Data format23923
+Node: Examples26469
+Node: Problems30555
+Node: Concept index31127
 
 End Tag Table