Merging upstream version 1.7.

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

3 files changed, 42 insertions, 37 deletions

diff --git a/doc/lzlib.info b/doc/lzlib.info
index 6ef6f46..5c434d0 100644
--- a/doc/lzlib.info
+++ b/doc/lzlib.info
@@ -11,13 +11,13 @@ File: lzlib.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzlib Manual
 ************
 
-This manual is for Lzlib (version 1.7-rc1, 23 May 2015).
+This manual is for Lzlib (version 1.7, 8 July 2015).
 
 * Menu:
 
-* Introduction::                Purpose and features of Lzlib
+* Introduction::                Purpose and features of lzlib
 * Library version::             Checking library version
-* Buffering::                   Sizes of Lzlib's buffers
+* Buffering::                   Sizes of lzlib's buffers
 * Parameter limits::            Min / max values for some parameters
 * Compression functions::       Descriptions of the compression functions
 * Decompression functions::     Descriptions of the decompression functions
@@ -53,7 +53,8 @@ availability:
      recovery means. The lziprecover program can repair bit-flip errors
      (one of the most common forms of data corruption) in lzip files,
      and provides data recovery capabilities, including error-checked
-     merging of damaged copies of a file.
+     merging of damaged copies of a file.  *note Data safety:
+     (lziprecover)Data safety.
 
    * The lzip format is as simple as possible (but not simpler). The
      lzip manual provides the code of a simple decompressor along with
@@ -112,7 +113,7 @@ the one currently used by lzip could be developed, and the resulting
 sequence could also be coded using the LZMA coding scheme.
 
    Lzlib currently implements two variants of the LZMA algorithm; fast
-(used by option -0 of minilzip) and normal (used by all other
+(used by option '-0' of minilzip) and normal (used by all other
 compression levels).
 
    The high compression of LZMA comes from combining two basic,
@@ -243,7 +244,7 @@ calling 'LZ_compress_errno' before using it.
 
      If DICTIONARY_SIZE is 65535 and MATCH_LEN_LIMIT is 16, the fast
      variant of LZMA is chosen, which produces identical compressed
-     output as 'lzip -0'. (The DICTIONARY_SIZE used will be rounded
+     output as 'lzip -0'. (The dictionary size used will be rounded
      upwards to 64 KiB).
 
      MEMBER_SIZE sets the member size limit in bytes. Minimum member
@@ -747,12 +748,12 @@ File: lzlib.info,  Node: Problems,  Next: Concept index,  Prev: Examples,  Up: T
 11 Reporting bugs
 *****************
 
-There are probably bugs in Lzlib. There are certainly errors and
+There are probably bugs in lzlib. There are certainly errors and
 omissions in this manual. If you report them, they will get fixed. If
 you don't, no one will ever know about them and they will remain unfixed
 for all eternity, if not longer.
 
-   If you find a bug in Lzlib, please send electronic mail to
+   If you find a bug in lzlib, please send electronic mail to
 <lzip-bug@nongnu.org>. Include the version number, which you can find
 by running 'minilzip --version' or in 'LZ_version_string' from
 'lzlib.h'.
@@ -784,18 +785,18 @@ Concept index
 
 Tag Table:
 Node: Top220
-Node: Introduction1305
-Node: Library version5869
-Node: Buffering6514
-Node: Parameter limits7734
-Node: Compression functions8693
-Node: Decompression functions15237
-Node: Error codes21405
-Node: Error messages23344
-Node: Data format23923
-Node: Examples26469
-Node: Problems30555
-Node: Concept index31127
+Node: Introduction1301
+Node: Library version5918
+Node: Buffering6563
+Node: Parameter limits7783
+Node: Compression functions8742
+Node: Decompression functions15286
+Node: Error codes21454
+Node: Error messages23393
+Node: Data format23972
+Node: Examples26518
+Node: Problems30604
+Node: Concept index31176
 
 End Tag Table
 
diff --git a/doc/lzlib.texi b/doc/lzlib.texi
index 228d747..4c0f370 100644
--- a/doc/lzlib.texi
+++ b/doc/lzlib.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 23 May 2015
-@set VERSION 1.7-rc1
+@set UPDATED 8 July 2015
+@set VERSION 1.7
 
 @dircategory Data Compression
 @direntry
@@ -35,9 +35,9 @@
 This manual is for Lzlib (version @value{VERSION}, @value{UPDATED}).
 
 @menu
-* Introduction::                Purpose and features of Lzlib
+* Introduction::                Purpose and features of lzlib
 * Library version::             Checking library version
-* Buffering::                   Sizes of Lzlib's buffers
+* Buffering::                   Sizes of lzlib's buffers
 * Parameter limits::            Min / max values for some parameters
 * Compression functions::       Descriptions of the compression functions
 * Decompression functions::     Descriptions of the decompression functions
@@ -72,10 +72,14 @@ availability:
 @itemize @bullet
 @item
 The lzip format provides very safe integrity checking and some data
-recovery means. The lziprecover program can repair bit-flip errors (one
-of the most common forms of data corruption) in lzip files, and provides
-data recovery capabilities, including error-checked merging of damaged
-copies of a file.
+recovery means. The
+@uref{http://www.nongnu.org/lzip/manual/lziprecover_manual.html#Data-safety,,lziprecover}
+program can repair bit-flip errors (one of the most common forms of data
+corruption) in lzip files, and provides data recovery capabilities,
+including error-checked merging of damaged copies of a file.
+@ifnothtml
+@ref{Data safety,,,lziprecover}.
+@end ifnothtml
 
 @item
 The lzip format is as simple as possible (but not simpler). The lzip
@@ -128,7 +132,7 @@ data, so the library should never crash even in case of corrupted input.
 
 In spite of its name (Lempel-Ziv-Markov chain-Algorithm), LZMA is not a
 concrete algorithm; it is more like "any algorithm using the LZMA coding
-scheme". For example, the option '-0' of lzip uses the scheme in almost
+scheme". For example, the option @samp{-0} of lzip uses the scheme in almost
 the simplest way possible; issuing the longest match it can find, or a
 literal byte if it can't find a match. Inversely, a much more elaborated
 way of finding coding sequences of minimum size than the one currently
@@ -136,7 +140,7 @@ used by lzip could be developed, and the resulting sequence could also
 be coded using the LZMA coding scheme.
 
 Lzlib currently implements two variants of the LZMA algorithm; fast
-(used by option -0 of minilzip) and normal (used by all other
+(used by option @samp{-0} of minilzip) and normal (used by all other
 compression levels).
 
 The high compression of LZMA comes from combining two basic, well-proven
@@ -274,8 +278,8 @@ ratios but longer compression times.
 
 If @var{dictionary_size} is 65535 and @var{match_len_limit} is 16, the
 fast variant of LZMA is chosen, which produces identical compressed
-output as @code{lzip -0}. (The @var{dictionary_size} used will be
-rounded upwards to 64 KiB).
+output as @code{lzip -0}. (The dictionary size used will be rounded
+upwards to 64 KiB).
 
 @var{member_size} sets the member size limit in bytes. Minimum member
 size limit is 100 kB. Small member size may degrade compression ratio, so
@@ -852,12 +856,12 @@ next member in case of data error.
 @cindex bugs
 @cindex getting help
 
-There are probably bugs in Lzlib. There are certainly errors and
+There are probably bugs in lzlib. There are certainly errors and
 omissions in this manual. If you report them, they will get fixed. If
 you don't, no one will ever know about them and they will remain unfixed
 for all eternity, if not longer.
 
-If you find a bug in Lzlib, please send electronic mail to
+If you find a bug in lzlib, please send electronic mail to
 @email{lzip-bug@@nongnu.org}. Include the version number, which you can
 find by running @w{@code{minilzip --version}} or in
 @samp{LZ_version_string} from @samp{lzlib.h}.
diff --git a/doc/minilzip.1 b/doc/minilzip.1
index 3c6b282..afa198d 100644
--- a/doc/minilzip.1
+++ b/doc/minilzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH MINILZIP "1" "May 2015" "minilzip 1.7-rc1" "User Commands"
+.TH MINILZIP "1" "July 2015" "minilzip 1.7" "User Commands"
 .SH NAME
 minilzip \- reduces the size of files
 .SH SYNOPSIS
@@ -28,7 +28,7 @@ decompress
 overwrite existing output files
 .TP
 \fB\-F\fR, \fB\-\-recompress\fR
-force recompression of compressed files
+force re\-compression of compressed files
 .TP
 \fB\-k\fR, \fB\-\-keep\fR
 keep (don't delete) input files
@@ -82,7 +82,7 @@ Report bugs to lzip\-bug@nongnu.org
 Lzlib home page: http://www.nongnu.org/lzip/lzlib.html
 .SH COPYRIGHT
 Copyright \(co 2015 Antonio Diaz Diaz.
-Using lzlib 1.7\-rc1
+Using lzlib 1.7
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.