From 5a87b49919eeb1c5931666b4f1a0350ae2abad3e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 16:54:05 +0100 Subject: Merging upstream version 1.4~rc1. Signed-off-by: Daniel Baumann --- doc/plzip.1 | 6 +++--- doc/plzip.info | 36 +++++++++++++++++------------------- doc/plzip.texi | 21 ++++++++++----------- 3 files changed, 30 insertions(+), 33 deletions(-) (limited to 'doc') diff --git a/doc/plzip.1 b/doc/plzip.1 index 9fb2220..6ed21c1 100644 --- a/doc/plzip.1 +++ b/doc/plzip.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. -.TH PLZIP "1" "February 2015" "plzip 1.4-pre1" "User Commands" +.TH PLZIP "1" "May 2015" "plzip 1.4-rc1" "User Commands" .SH NAME plzip \- reduces the size of files .SH SYNOPSIS @@ -16,7 +16,7 @@ display this help and exit output version information and exit .TP \fB\-B\fR, \fB\-\-data\-size=\fR -set size of input data blocks, in bytes +set size of input data blocks [2x8=16 MiB] .TP \fB\-c\fR, \fB\-\-stdout\fR send output to standard output @@ -84,7 +84,7 @@ Plzip home page: http://www.nongnu.org/lzip/plzip.html Copyright \(co 2009 Laszlo Ersek. .br Copyright \(co 2015 Antonio Diaz Diaz. -Using Lzlib 1.7\-pre1 +Using Lzlib 1.7\-rc1 License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. 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 diff --git a/doc/plzip.texi b/doc/plzip.texi index 1c2d42c..b501b9a 100644 --- a/doc/plzip.texi +++ b/doc/plzip.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 25 February 2015 -@set VERSION 1.4-pre1 +@set UPDATED 23 May 2015 +@set VERSION 1.4-rc1 @dircategory Data Compression @direntry @@ -195,7 +195,7 @@ plzip [@var{options}] [@var{files}] Plzip supports the following options: -@table @samp +@table @code @item -h @itemx --help Print an informative help message describing the options and exit. @@ -394,13 +394,12 @@ A four byte string, identifying the lzip format, with the value "LZIP" Just in case something needs to be modified in the future. 1 for now. @item 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. @@ -440,11 +439,11 @@ following: @itemize @bullet @item For compression at level -0; 1.5 MiB plus 3 times the data size -(@pxref{--data-size}). +(@pxref{--data-size}). About 4.5 MiB. @item For compression at other levels; 11 times the dictionary size plus 3 -times the data size. +times the data size. Default is 136 MiB. @item For decompression of a regular (seekable) file to another regular file, -- cgit v1.2.3