Merging upstream version 1.6.

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

3 files changed, 31 insertions, 19 deletions

diff --git a/doc/clzip.1 b/doc/clzip.1
index 040900d..2c64982 100644
--- a/doc/clzip.1
+++ b/doc/clzip.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH CLZIP "1" "June 2014" "clzip 1.6-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH CLZIP "1" "August 2014" "clzip 1.6" "User Commands"
 .SH NAME
 clzip \- reduces the size of files
 .SH SYNOPSIS
 .B clzip
-[\fIoptions\fR] [\fIfiles\fR]
+[\fI\,options\/\fR] [\fI\,files\/\fR]
 .SH DESCRIPTION
 Clzip \- LZMA lossless data compressor.
 .SH OPTIONS
diff --git a/doc/clzip.info b/doc/clzip.info
index d349d80..0942986 100644
--- a/doc/clzip.info
+++ b/doc/clzip.info
@@ -11,7 +11,7 @@ File: clzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Clzip Manual
 ************
 
-This manual is for Clzip (version 1.6-rc1, 30 June 2014).
+This manual is for Clzip (version 1.6, 28 August 2014).
 
 * Menu:
 
@@ -24,7 +24,7 @@ This manual is for Clzip (version 1.6-rc1, 30 June 2014).
 * Concept index::          Index of concepts
 
 
-   Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+   Copyright (C) 2010-2014 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -39,7 +39,7 @@ Clzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Clzip decompresses almost as fast as gzip,
 compresses most files more than bzip2, and is better than both from a
 data recovery perspective. Clzip is a clean implementation of the LZMA
-(Lempel-Ziv-Markov chain-Algorithm) algorithm.
+(Lempel-Ziv-Markov chain-Algorithm) "algorithm".
 
    Clzip uses the lzip file format; the files produced by clzip are
 fully compatible with lzip-1.4 or newer, and can be rescued with
@@ -65,6 +65,11 @@ into account both data integrity and decoder availability:
    * Additionally lzip is copylefted, which guarantees that it will
      remain free forever.
 
+   A nice feature of the lzip format is that a corrupt byte is easier to
+repair the nearer it is from the beginning of the file. Therefore, with
+the help of lziprecover, losing an entire archive just because of a
+corrupt byte near the beginning is a thing of the past.
+
    The member trailer stores the 32-bit CRC of the original data, the
 size of the original data and the size of the member. These values,
 together with the value remaining in the range decoder and the
@@ -79,7 +84,8 @@ uncompressed data.
 
    Clzip uses the same well-defined exit status values used by lzip and
 bzip2, which makes it safer than compressors returning ambiguous warning
-values (like gzip) when it is used as a back end for tar or zutils.
+values (like gzip) when it is used as a back end for other programs like
+tar or zutils.
 
    The amount of memory required for compression is about 1 or 2 times
 the dictionary size limit (1 if input file size is less than dictionary
@@ -540,13 +546,13 @@ Concept index
 
 Tag Table:
 Node: Top210
-Node: Introduction917
-Node: Algorithm5824
-Node: Invoking clzip8630
-Node: File format14227
-Node: Examples16732
-Node: Problems18701
-Node: Concept index19227
+Node: Introduction896
+Node: Algorithm6095
+Node: Invoking clzip8901
+Node: File format14498
+Node: Examples17003
+Node: Problems18972
+Node: Concept index19498
 
 End Tag Table
 
diff --git a/doc/clzip.texi b/doc/clzip.texi
index 5f4e8ca..1640d18 100644
--- a/doc/clzip.texi
+++ b/doc/clzip.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 30 June 2014
-@set VERSION 1.6-rc1
+@set UPDATED 28 August 2014
+@set VERSION 1.6
 
 @dircategory Data Compression
 @direntry
@@ -45,7 +45,7 @@ This manual is for Clzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
+Copyright @copyright{} 2010-2014 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -59,7 +59,7 @@ Clzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Clzip decompresses almost as fast as gzip,
 compresses most files more than bzip2, and is better than both from a
 data recovery perspective. Clzip is a clean implementation of the LZMA
-(Lempel-Ziv-Markov chain-Algorithm) algorithm.
+(Lempel-Ziv-Markov chain-Algorithm) "algorithm".
 
 Clzip uses the lzip file format; the files produced by clzip are fully
 compatible with lzip-1.4 or newer, and can be rescued with lziprecover.
@@ -90,6 +90,11 @@ Additionally lzip is copylefted, which guarantees that it will remain
 free forever.
 @end itemize
 
+A nice feature of the lzip format is that a corrupt byte is easier to
+repair the nearer it is from the beginning of the file. Therefore, with
+the help of lziprecover, losing an entire archive just because of a
+corrupt byte near the beginning is a thing of the past.
+
 The member trailer stores the 32-bit CRC of the original data, the size
 of the original data and the size of the member. These values, together
 with the value remaining in the range decoder and the end-of-stream
@@ -103,7 +108,8 @@ wrong. It can't help you recover the original uncompressed data.
 
 Clzip uses the same well-defined exit status values used by lzip and
 bzip2, which makes it safer than compressors returning ambiguous warning
-values (like gzip) when it is used as a back end for tar or zutils.
+values (like gzip) when it is used as a back end for other programs like
+tar or zutils.
 
 The amount of memory required for compression is about 1 or 2 times the
 dictionary size limit (1 if input file size is less than dictionary size