Merging upstream version 1.7.

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

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