Merging upstream version 1.4~pre1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

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.3, 22 January 2015).
+This manual is for Plzip (version 1.4-pre1, 25 February 2015).
 
 * Menu:
 
@@ -116,7 +116,7 @@ compressed files is also supported.
 
    WARNING! Even if plzip is bug-free, other causes may result in a
 corrupt compressed file (bugs in the system libraries, memory errors,
-etc).  Therefore, if the data you are going to compress is important,
+etc).  Therefore, if the data you are going to compress are important,
 give the '--keep' option to plzip and do not remove the original file
 until you verify the compressed file with a command like
 'plzip -cd file.lz | cmp file -'.
@@ -180,8 +180,9 @@ The format for running plzip is:
      Set the size of the input data blocks, in bytes. The input file
      will be divided in chunks of this size before compression is
      performed. Valid values range from 8 KiB to 1 GiB. Default value
-     is two times the dictionary size. Plzip will reduce the dictionary
-     size if it is larger than the chosen data size.
+     is two times the dictionary size, except for option '-0' where it
+     defaults to 1 MiB.  Plzip will reduce the dictionary size if it is
+     larger than the chosen data size.
 
 '-c'
 '--stdout'
@@ -267,10 +268,10 @@ The format for running plzip is:
      verbosity level, showing status, compression ratio, dictionary
      size, decompressed size, and compressed size.
 
-'-1 .. -9'
+'-0 .. -9'
      Set the compression parameters (dictionary size and match length
      limit) as shown in the table below. Note that '-9' can be much
-     slower than '-1'. These options have no effect when decompressing.
+     slower than '-0'. These options have no effect when decompressing.
 
      The bidimensional parameter space of LZMA can't be mapped to a
      linear scale optimal for all files. If your files are large, very
@@ -279,6 +280,7 @@ The format for running plzip is:
      performance.
 
      Level   Dictionary size   Match length limit
+     -0      64 KiB            16 bytes
      -1      1 MiB             5 bytes
      -2      1.5 MiB           6 bytes
      -3      2 MiB             8 bytes
@@ -372,8 +374,8 @@ additional information before, between, or after them.
 
 'Lzma stream'
      The lzma stream, finished by an end of stream marker. Uses default
-     values for encoder properties. See the lzip manual for a full
-     description.
+     values for encoder properties.  *Note Stream format: (lzip)Stream
+     format, for a complete description.
 
 'CRC32 (4 bytes)'
      CRC of the uncompressed original data.
@@ -397,8 +399,11 @@ File: plzip.info,  Node: Memory requirements,  Next: Minimum file sizes,  Prev:
 The amount of memory required *per thread* is approximately the
 following:
 
-   * For compression; 11 times the dictionary size plus 3 times the
-     data size (*note --data-size::).
+   * For compression at level -0; 1.5 MiB plus 3 times the data size
+     (*note --data-size::).
+
+   * For compression at other levels; 11 times the dictionary size plus
+     3 times the data size.
 
    * For decompression of a regular (seekable) file to another regular
      file, or for testing of a regular file; the dictionary size. Note
@@ -439,6 +444,7 @@ default data size for each level:
 Processors   2         4         8         16        64        256
 ------------------------------------------------------------------------- 
 Level                                                          
+-0           2 MiB     4 MiB     8 MiB     16 MiB    64 MiB    256 MiB
 -1           4 MiB     8 MiB     16 MiB    32 MiB    128 MiB   512 MiB
 -2           6 MiB     12 MiB    24 MiB    48 MiB    192 MiB   768 MiB
 -3           8 MiB     16 MiB    32 MiB    64 MiB    256 MiB   1 GiB
@@ -489,15 +495,15 @@ Concept index
 
 Tag Table:
 Node: Top221
-Node: Introduction988
-Node: Program design5284
-Node: Invoking plzip6873
-Ref: --data-size7287
-Node: File format12414
-Node: Memory requirements14930
-Node: Minimum file sizes15907
-Node: Problems17758
-Node: Concept index18294
+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
 
 End Tag Table