Merging upstream version 0.4.

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

3 files changed, 28 insertions, 23 deletions

diff --git a/doc/plzip.1 b/doc/plzip.1
index feb0aa1..148c95b 100644
--- a/doc/plzip.1
+++ b/doc/plzip.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH PLZIP "1" "January 2010" "Plzip 0.3" "User Commands"
+.TH PLZIP "1" "January 2010" "Plzip 0.4" "User Commands"
 .SH NAME
 Plzip \- data compressor based on the LZMA algorithm
 .SH SYNOPSIS
 .B plzip
 [\fIoptions\fR] [\fIfiles\fR]
 .SH DESCRIPTION
-Plzip \- A parallel version of the lzip data compressor.
+Plzip \- A parallel compressor compatible with lzip.
 .SH OPTIONS
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -71,6 +71,7 @@ Plzip home page: http://www.nongnu.org/lzip/plzip.html
 Copyright \(co 2009 Laszlo Ersek.
 .br
 Copyright \(co 2010 Antonio Diaz Diaz.
+Using Lzlib 0.9-rc1
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/plzip.info b/doc/plzip.info
index 9a48fcb..c4dc967 100644
--- a/doc/plzip.info
+++ b/doc/plzip.info
@@ -3,7 +3,7 @@ plzip.texinfo.
 
 INFO-DIR-SECTION Data Compression
 START-INFO-DIR-ENTRY
-* Plzip: (plzip).               Parallel version of the lzip data compressor
+* Plzip: (plzip).               Parallel compressor compatible with lzip
 END-INFO-DIR-ENTRY
 
 
@@ -12,7 +12,7 @@ File: plzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Plzip Manual
 ************
 
-This manual is for Plzip (version 0.3, 24 January 2010).
+This manual is for Plzip (version 0.4, 31 January 2010).
 
 * Menu:
 
@@ -34,11 +34,13 @@ File: plzip.info,  Node: Introduction,  Next: Invoking Plzip,  Prev: Top,  Up: T
 1 Introduction
 **************
 
-Plzip is a parallel version of the lzip data compressor. The files
-produced by plzip are fully compatible with lzip-1.4 or newer. Plzip is
-intended for faster compression/decompression of big files on
-multiprocessor machines. Currently only compression is performed in
-parallel. Parallel decompression is planned to be implemented later.
+Plzip is a massively parallel (multithreaded) data compressor compatible
+with the lzip file format. The files produced by plzip are fully
+compatible with lzip-1.4 or newer. Plzip is intended for faster
+compression/decompression of big files on multiprocessor machines. On
+files big enough, plzip can use hundreds of processors. Currently only
+compression is performed in parallel. Parallel decompression is planned
+to be implemented later.
 
    Lzip is a lossless data compressor based on the LZMA algorithm, with
 very safe integrity checking and a user interface similar to the one of
@@ -303,11 +305,11 @@ Concept Index
 
 
 Tag Table:
-Node: Top227
-Node: Introduction750
-Node: Invoking Plzip3571
-Node: File Format7260
-Node: Problems9216
-Node: Concept Index9745
+Node: Top223
+Node: Introduction746
+Node: Invoking Plzip3669
+Node: File Format7358
+Node: Problems9314
+Node: Concept Index9843
 
 End Tag Table
diff --git a/doc/plzip.texinfo b/doc/plzip.texinfo
index 04bf822..12ac4c8 100644
--- a/doc/plzip.texinfo
+++ b/doc/plzip.texinfo
@@ -5,12 +5,12 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 24 January 2010
-@set VERSION 0.3
+@set UPDATED 31 January 2010
+@set VERSION 0.4
 
 @dircategory Data Compression
 @direntry
-* Plzip: (plzip).               Parallel version of the lzip data compressor
+* Plzip: (plzip).               Parallel compressor compatible with lzip
 @end direntry
 
 
@@ -50,11 +50,13 @@ to copy, distribute and modify it.
 @chapter Introduction
 @cindex introduction
 
-Plzip is a parallel version of the lzip data compressor. The files
-produced by plzip are fully compatible with lzip-1.4 or newer. Plzip is
-intended for faster compression/decompression of big files on
-multiprocessor machines. Currently only compression is performed in
-parallel. Parallel decompression is planned to be implemented later.
+Plzip is a massively parallel (multithreaded) data compressor compatible
+with the lzip file format. The files produced by plzip are fully
+compatible with lzip-1.4 or newer. Plzip is intended for faster
+compression/decompression of big files on multiprocessor machines. On
+files big enough, plzip can use hundreds of processors. Currently only
+compression is performed in parallel. Parallel decompression is planned
+to be implemented later.
 
 Lzip is a lossless data compressor based on the LZMA algorithm, with
 very safe integrity checking and a user interface similar to the one of