Merging upstream version 0.2.

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

3 files changed, 29 insertions, 14 deletions

diff --git a/doc/plzip.1 b/doc/plzip.1
index 4a812c0..0fefe38 100644
--- a/doc/plzip.1
+++ b/doc/plzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH PLZIP "1" "December 2009" "Plzip 0.1" "User Commands"
+.TH PLZIP "1" "January 2010" "Plzip 0.2" "User Commands"
 .SH NAME
 Plzip \- data compressor based on the LZMA algorithm
 .SH SYNOPSIS
@@ -21,12 +21,27 @@ send output to standard output
 \fB\-d\fR, \fB\-\-decompress\fR
 decompress
 .TP
+\fB\-f\fR, \fB\-\-force\fR
+overwrite existing output files
+.TP
+\fB\-k\fR, \fB\-\-keep\fR
+keep (don't delete) input files
+.TP
+\fB\-m\fR, \fB\-\-match\-length=\fR<n>
+set match length limit in bytes [80]
+.TP
 \fB\-n\fR, \fB\-\-threads=\fR<n>
 set the number of (de)compression threads
 .TP
+\fB\-o\fR, \fB\-\-output=\fR<file>
+if reading stdin, place the output into <file>
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR
 suppress all messages
 .TP
+\fB\-s\fR, \fB\-\-dictionary\-size=\fR<n>
+set dictionary size limit in bytes [8MiB]
+.TP
 \fB\-t\fR, \fB\-\-test\fR
 test compressed file integrity
 .TP
@@ -48,11 +63,11 @@ Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
 Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
 .SH "REPORTING BUGS"
 Report bugs to lzip\-bug@nongnu.org
-Lzip home page: http://www.nongnu.org/lzip/lzip.html
+Plzip home page: http://www.nongnu.org/lzip/plzip.html
 .SH COPYRIGHT
 Copyright \(co 2009 Laszlo Ersek.
 .br
-Copyright \(co 2009 Antonio Diaz Diaz.
+Copyright \(co 2010 Antonio Diaz Diaz.
 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 68fa5fa..ca7bda4 100644
--- a/doc/plzip.info
+++ b/doc/plzip.info
@@ -12,7 +12,7 @@ File: plzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Plzip Manual
 ************
 
-This manual is for Plzip (version 0.1, 5 December 2009).
+This manual is for Plzip (version 0.2, 17 January 2010).
 
 * Menu:
 
@@ -23,7 +23,7 @@ This manual is for Plzip (version 0.1, 5 December 2009).
 * Concept Index::	Index of concepts
 
 
-   Copyright (C) 2008, 2009 Antonio Diaz Diaz.
+   Copyright (C) 2009, 2010 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -36,7 +36,7 @@ File: plzip.info,  Node: Introduction,  Next: Invoking Plzip,  Prev: Top,  Up: T
 
 Plzip is a parallel version of the lzip data compressor. Currently only
 compression is performed in parallel. Parallel decompression is planned
-to be implemented soon.
+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
@@ -295,9 +295,9 @@ Concept Index
 Tag Table:
 Node: Top227
 Node: Introduction750
-Node: Invoking Plzip3401
-Node: File Format6746
-Node: Problems8702
-Node: Concept Index9231
+Node: Invoking Plzip3402
+Node: File Format6747
+Node: Problems8703
+Node: Concept Index9232
 
 End Tag Table
diff --git a/doc/plzip.texinfo b/doc/plzip.texinfo
index 78ccce5..7712600 100644
--- a/doc/plzip.texinfo
+++ b/doc/plzip.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 5 December 2009
-@set VERSION 0.1
+@set UPDATED 17 January 2010
+@set VERSION 0.2
 
 @dircategory Data Compression
 @direntry
@@ -40,7 +40,7 @@ This manual is for Plzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2008, 2009 Antonio Diaz Diaz.
+Copyright @copyright{} 2009, 2010 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -52,7 +52,7 @@ to copy, distribute and modify it.
 
 Plzip is a parallel version of the lzip data compressor. Currently only
 compression is performed in parallel. Parallel decompression is planned
-to be implemented soon.
+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