Merging upstream version 1.4~rc1.

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

1 files changed, 17 insertions, 19 deletions

diff --git a/doc/plzip.info b/doc/plzip.info
index e8bfe0d..d07ba9e 100644
--- a/doc/plzip.info
+++ b/doc/plzip.info
@@ -11,7 +11,7 @@ File: plzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Plzip Manual
 ************
 
-This manual is for Plzip (version 1.4-pre1, 25 February 2015).
+This manual is for Plzip (version 1.4-rc1, 23 May 2015).
 
 * Menu:
 
@@ -361,14 +361,12 @@ 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.
 
@@ -400,10 +398,10 @@ The amount of memory required *per thread* is approximately the
 following:
 
    * For compression at level -0; 1.5 MiB plus 3 times the data size
-     (*note --data-size::).
+     (*note --data-size::). About 4.5 MiB.
 
    * For compression at other levels; 11 times the dictionary size plus
-     3 times the data size.
+     3 times the data size. Default is 136 MiB.
 
    * For decompression of a regular (seekable) file to another regular
      file, or for testing of a regular file; the dictionary size. Note
@@ -495,15 +493,15 @@ Concept index
 
 Tag Table:
 Node: Top221
-Node: Introduction994
-Node: Program design5291
-Node: Invoking plzip6880
-Ref: --data-size7294
-Node: File format12518
-Node: Memory requirements15061
-Node: Minimum file sizes16130
-Node: Problems18052
-Node: Concept index18588
+Node: Introduction988
+Node: Program design5285
+Node: Invoking plzip6874
+Ref: --data-size7288
+Node: File format12512
+Node: Memory requirements14925
+Node: Minimum file sizes16029
+Node: Problems17951
+Node: Concept index18487
 
 End Tag Table