Merging upstream version 1.3.

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

3 files changed, 39 insertions, 39 deletions

diff --git a/doc/plzip.1 b/doc/plzip.1
index 9146257..1722eb7 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" "November 2014" "plzip 1.3-pre1" "User Commands"
+.TH PLZIP "1" "January 2015" "plzip 1.3" "User Commands"
 .SH NAME
 plzip \- reduces the size of files
 .SH SYNOPSIS
@@ -83,7 +83,7 @@ Plzip home page: http://www.nongnu.org/lzip/plzip.html
 .SH COPYRIGHT
 Copyright \(co 2009 Laszlo Ersek.
 .br
-Copyright \(co 2014 Antonio Diaz Diaz.
+Copyright \(co 2015 Antonio Diaz Diaz.
 Using Lzlib 1.6
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
diff --git a/doc/plzip.info b/doc/plzip.info
index 2e64673..7e83ab0 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.3-pre1, 25 November 2014).
+This manual is for Plzip (version 1.3, 22 January 2015).
 
 * Menu:
 
@@ -25,7 +25,7 @@ This manual is for Plzip (version 1.3-pre1, 25 November 2014).
 * Concept index::          Index of concepts
 
 
-   Copyright (C) 2009-2014 Antonio Diaz Diaz.
+   Copyright (C) 2009-2015 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -436,18 +436,18 @@ ratio (file_size / data_size).
 for full use of N processors at a given compression level, using the
 default data size for each level:
 
-Processors   2         3         4         8         16        64
+Processors   2         4         8         16        64        256
 ------------------------------------------------------------------------- 
 Level                                                          
--1           4 MiB     6 MiB     8 MiB     16 MiB    32 MiB    128 MiB
--2           6 MiB     9 MiB     12 MiB    24 MiB    48 MiB    192 MiB
--3           8 MiB     12 MiB    16 MiB    32 MiB    64 MiB    256 MiB
--4           12 MiB    18 MiB    24 MiB    48 MiB    96 MiB    384 MiB
--5           16 MiB    24 MiB    32 MiB    64 MiB    128 MiB   512 MiB
--6           32 MiB    48 MiB    64 MiB    128 MiB   256 MiB   1 GiB
--7           64 MiB    96 MiB    128 MiB   256 MiB   512 MiB   2 GiB
--8           96 MiB    144 MiB   192 MiB   384 MiB   768 MiB   3 GiB
--9           128 MiB   192 MiB   256 MiB   512 MiB   1 GiB     4 GiB
+-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
+-4           12 MiB    24 MiB    48 MiB    96 MiB    384 MiB   1.5 GiB
+-5           16 MiB    32 MiB    64 MiB    128 MiB   512 MiB   2 GiB
+-6           32 MiB    64 MiB    128 MiB   256 MiB   1 GiB     4 GiB
+-7           64 MiB    128 MiB   256 MiB   512 MiB   2 GiB     8 GiB
+-8           96 MiB    192 MiB   384 MiB   768 MiB   3 GiB     12 GiB
+-9           128 MiB   256 MiB   512 MiB   1 GiB     4 GiB     16 GiB
 
 
 File: plzip.info,  Node: Problems,  Next: Concept index,  Prev: Minimum file sizes,  Up: Top
@@ -489,15 +489,15 @@ Concept index
 
 Tag Table:
 Node: Top221
-Node: Introduction994
-Node: Program design5290
-Node: Invoking plzip6879
-Ref: --data-size7324
-Node: File format12420
-Node: Memory requirements14936
-Node: Minimum file sizes15913
-Node: Problems17765
-Node: Concept index18301
+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
 
 End Tag Table
 
diff --git a/doc/plzip.texi b/doc/plzip.texi
index c0cb0fd..64b608c 100644
--- a/doc/plzip.texi
+++ b/doc/plzip.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 25 November 2014
-@set VERSION 1.3-pre1
+@set UPDATED 22 January 2015
+@set VERSION 1.3
 
 @dircategory Data Compression
 @direntry
@@ -46,7 +46,7 @@ This manual is for Plzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2014 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2015 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -204,9 +204,9 @@ Print an informative help message describing the options and exit.
 @itemx --version
 Print the version number of plzip on the standard output and exit.
 
+@anchor{--data-size}
 @item -B @var{bytes}
 @itemx --data-size=@var{bytes}
-@anchor{--data-size}
 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
@@ -472,18 +472,18 @@ The following table shows the minimum uncompressed file size needed for
 full use of N processors at a given compression level, using the default
 data size for each level:
 
-@multitable {Processors} {128 MiB} {128 MiB} {128 MiB} {128 MiB} {128 MiB} {128 MiB}
-@headitem Processors @tab 2 @tab 3 @tab 4 @tab 8 @tab 16 @tab 64
+@multitable {Processors} {512 MiB} {512 MiB} {512 MiB} {512 MiB} {512 MiB} {512 MiB}
+@headitem Processors @tab 2 @tab 4 @tab 8 @tab 16 @tab 64 @tab 256
 @item Level
-@item -1 @tab   4 MiB @tab   6 MiB @tab   8 MiB @tab  16 MiB @tab  32 MiB @tab 128 MiB
-@item -2 @tab   6 MiB @tab   9 MiB @tab  12 MiB @tab  24 MiB @tab  48 MiB @tab 192 MiB
-@item -3 @tab   8 MiB @tab  12 MiB @tab  16 MiB @tab  32 MiB @tab  64 MiB @tab 256 MiB
-@item -4 @tab  12 MiB @tab  18 MiB @tab  24 MiB @tab  48 MiB @tab  96 MiB @tab 384 MiB
-@item -5 @tab  16 MiB @tab  24 MiB @tab  32 MiB @tab  64 MiB @tab 128 MiB @tab 512 MiB
-@item -6 @tab  32 MiB @tab  48 MiB @tab  64 MiB @tab 128 MiB @tab 256 MiB @tab   1 GiB
-@item -7 @tab  64 MiB @tab  96 MiB @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab   2 GiB
-@item -8 @tab  96 MiB @tab 144 MiB @tab 192 MiB @tab 384 MiB @tab 768 MiB @tab   3 GiB
-@item -9 @tab 128 MiB @tab 192 MiB @tab 256 MiB @tab 512 MiB @tab   1 GiB @tab   4 GiB
+@item -1 @tab   4 MiB @tab   8 MiB @tab  16 MiB @tab  32 MiB @tab 128 MiB @tab 512 MiB
+@item -2 @tab   6 MiB @tab  12 MiB @tab  24 MiB @tab  48 MiB @tab 192 MiB @tab 768 MiB
+@item -3 @tab   8 MiB @tab  16 MiB @tab  32 MiB @tab  64 MiB @tab 256 MiB @tab   1 GiB
+@item -4 @tab  12 MiB @tab  24 MiB @tab  48 MiB @tab  96 MiB @tab 384 MiB @tab 1.5 GiB
+@item -5 @tab  16 MiB @tab  32 MiB @tab  64 MiB @tab 128 MiB @tab 512 MiB @tab   2 GiB
+@item -6 @tab  32 MiB @tab  64 MiB @tab 128 MiB @tab 256 MiB @tab   1 GiB @tab   4 GiB
+@item -7 @tab  64 MiB @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab   2 GiB @tab   8 GiB
+@item -8 @tab  96 MiB @tab 192 MiB @tab 384 MiB @tab 768 MiB @tab   3 GiB @tab  12 GiB
+@item -9 @tab 128 MiB @tab 256 MiB @tab 512 MiB @tab   1 GiB @tab   4 GiB @tab  16 GiB
 @end multitable
 
 
@@ -499,7 +499,7 @@ for all eternity, if not longer.
 
 If you find a bug in plzip, please send electronic mail to
 @email{lzip-bug@@nongnu.org}. Include the version number, which you can
-find by running @w{@samp{plzip --version}}.
+find by running @w{@code{plzip --version}}.
 
 
 @node Concept index