Merging upstream version 1.4~rc1.

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

doc/pdlzip.1

@@ -1,10 +1,10 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH PDLZIP "1" "January 2012" "Pdlzip 1.3" "User Commands"
+.TH PDLZIP "1" "February 2013" "Pdlzip 1.4-rc1" "User Commands"
 .SH NAME
 Pdlzip \- reduces the size of files
 .SH SYNOPSIS
 .B pdlzip
-[\fIoptions\fR] [\fIfile\fR]
+[\fIoptions\fR] [\fIfiles\fR]
 .SH DESCRIPTION
 Pdlzip \- A "public domain" version of the lzip data compressor
 also able to decompress legacy lzma\-alone (.lzma) files.
@@ -22,9 +22,21 @@ 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\-F\fR, \fB\-\-recompress\fR
+force recompression of compressed files
+.TP
+\fB\-k\fR, \fB\-\-keep\fR
+keep (don't delete) input files
+.TP
 \fB\-m\fR, \fB\-\-match\-length=\fR<bytes>
 set match length limit in bytes [36]
 .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
@@ -46,7 +58,7 @@ alias for \fB\-1\fR
 \fB\-\-best\fR
 alias for \fB\-9\fR
 .PP
-If no file name is given, pdlzip compresses or decompresses
+If no file names are given, pdlzip compresses or decompresses
 from standard input to standard output.
 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...
@@ -59,7 +71,7 @@ Report bugs to lzip\-bug@nongnu.org
 .br
 Pdlzip home page: http://www.nongnu.org/lzip/pdlzip.html
 .SH COPYRIGHT
-Copyright \(co 2012 Antonio Diaz Diaz.
+Copyright \(co 2013 Antonio Diaz Diaz.
 Public Domain 2009 Igor Pavlov.
 .br
 This is free software: you are free to change and redistribute it.