Merging upstream version 1.9.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 43 insertions, 35 deletions

diff --git a/doc/lzlib.info b/doc/lzlib.info
index a9f47b3..a2a8c68 100644
--- a/doc/lzlib.info
+++ b/doc/lzlib.info
@@ -11,7 +11,7 @@ File: lzlib.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzlib Manual
 ************
 
-This manual is for Lzlib (version 1.8, 17 May 2016).
+This manual is for Lzlib (version 1.9, 11 April 2017).
 
 * Menu:
 
@@ -29,7 +29,7 @@ This manual is for Lzlib (version 1.8, 17 May 2016).
 * Concept index::               Index of concepts
 
 
-   Copyright (C) 2009-2016 Antonio Diaz Diaz.
+   Copyright (C) 2009-2017 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -57,11 +57,11 @@ availability:
      (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
-     a detailed explanation of how it works, so that with the only help
-     of the lzip manual it would be possible for a digital
-     archaeologist to extract the data from a lzip file long after
-     quantum computers eventually render LZMA obsolete.
+     lzip manual provides the source code of a simple decompressor
+     along with a detailed explanation of how it works, so that with
+     the only help of the lzip manual it would be possible for a
+     digital archaeologist to extract the data from a lzip file long
+     after quantum computers eventually render LZMA obsolete.
 
    * Additionally the lzip reference implementation is copylefted, which
      guarantees that it will remain free forever.
@@ -83,7 +83,7 @@ traditional zlib interface.
 
    Compression/decompression is done when the read function is called.
 This means the value returned by the position functions will not be
-updated until a read call, even if a lot of data is written. If you
+updated until a read call, even if a lot of data are written. If you
 want the data to be compressed in advance, just call the read function
 with a SIZE equal to 0.
 
@@ -128,6 +128,10 @@ Markov (for the definition of Markov chains), G.N.N. Martin (for the
 definition of range encoding), Igor Pavlov (for putting all the above
 together in LZMA), and Julian Seward (for bzip2's CLI).
 
+   LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may
+never have been compressed. Decompressed is used to refer to data which
+have undergone the process of decompression.
+
 
 File: lzlib.info,  Node: Library version,  Next: Buffering,  Prev: Introduction,  Up: Top
 
@@ -258,7 +262,7 @@ calling 'LZ_compress_errno' before using it.
      Frees all dynamically allocated data structures for this stream.
      This function discards any unprocessed input and does not flush
      any pending output. After a call to 'LZ_compress_close', ENCODER
-     can no more be used as an argument to any LZ_compress function.
+     can no longer be used as an argument to any LZ_compress function.
 
  -- Function: int LZ_compress_finish ( struct LZ_Encoder * const
           ENCODER )
@@ -375,7 +379,7 @@ verified by calling 'LZ_decompress_errno' before using it.
      Frees all dynamically allocated data structures for this stream.
      This function discards any unprocessed input and does not flush
      any pending output. After a call to 'LZ_decompress_close', DECODER
-     can no more be used as an argument to any LZ_decompress function.
+     can no longer be used as an argument to any LZ_decompress function.
 
  -- Function: int LZ_decompress_finish ( struct LZ_Decoder * const
           DECODER )
@@ -786,18 +790,18 @@ Concept index
 
 Tag Table:
 Node: Top220
-Node: Introduction1301
-Node: Library version5918
-Node: Buffering6563
-Node: Parameter limits7783
-Node: Compression functions8742
-Node: Decompression functions15282
-Node: Error codes21450
-Node: Error messages23425
-Node: Data format24004
-Node: Examples26569
-Node: Problems30650
-Node: Concept index31222
+Node: Introduction1303
+Node: Library version6115
+Node: Buffering6760
+Node: Parameter limits7980
+Node: Compression functions8939
+Node: Decompression functions15481
+Node: Error codes21651
+Node: Error messages23626
+Node: Data format24205
+Node: Examples26770
+Node: Problems30851
+Node: Concept index31423
 
 End Tag Table
 
diff --git a/doc/lzlib.texi b/doc/lzlib.texi
index bc3b9fe..8b4aaaf 100644
--- a/doc/lzlib.texi
+++ b/doc/lzlib.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 17 May 2016
-@set VERSION 1.8
+@set UPDATED 11 April 2017
+@set VERSION 1.9
 
 @dircategory Data Compression
 @direntry
@@ -50,7 +50,7 @@ This manual is for Lzlib (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2016 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2017 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -83,10 +83,10 @@ including error-checked merging of damaged copies of a file.
 
 @item
 The lzip format is as simple as possible (but not simpler). The lzip
-manual provides the code of a simple decompressor along with a detailed
-explanation of how it works, so that with the only help of the lzip
-manual it would be possible for a digital archaeologist to extract the
-data from a lzip file long after quantum computers eventually render
+manual provides the source code of a simple decompressor along with a
+detailed explanation of how it works, so that with the only help of the
+lzip manual it would be possible for a digital archaeologist to extract
+the data from a lzip file long after quantum computers eventually render
 LZMA obsolete.
 
 @item
@@ -111,7 +111,7 @@ traditional zlib interface.
 
 Compression/decompression is done when the read function is called. This
 means the value returned by the position functions will not be updated
-until a read call, even if a lot of data is written. If you want the
+until a read call, even if a lot of data are written. If you want the
 data to be compressed in advance, just call the read function with a
 @var{size} equal to 0.
 
@@ -155,6 +155,10 @@ the definition of Markov chains), G.N.N. Martin (for the definition of
 range encoding), Igor Pavlov (for putting all the above together in
 LZMA), and Julian Seward (for bzip2's CLI).
 
+LANGUAGE NOTE: Uncompressed = not compressed = plain data; it may never
+have been compressed. Decompressed is used to refer to data which have
+undergone the process of decompression.
+
 
 @node Library version
 @chapter Library version
@@ -293,7 +297,7 @@ for example INT64_MAX.
 Frees all dynamically allocated data structures for this stream. This
 function discards any unprocessed input and does not flush any pending
 output. After a call to @samp{LZ_compress_close}, @var{encoder} can no
-more be used as an argument to any LZ_compress function.
+longer be used as an argument to any LZ_compress function.
 @end deftypefun
 
 
@@ -427,7 +431,7 @@ pointer must not be used and should be freed with
 Frees all dynamically allocated data structures for this stream. This
 function discards any unprocessed input and does not flush any pending
 output. After a call to @samp{LZ_decompress_close}, @var{decoder} can no
-more be used as an argument to any LZ_decompress function.
+longer be used as an argument to any LZ_decompress function.
 @end deftypefun
 
 
diff --git a/doc/minilzip.1 b/doc/minilzip.1
index b5ebf78..3fefa02 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 2016" "minilzip 1.8" "User Commands"
+.TH MINILZIP "1" "April 2017" "minilzip 1.9" "User Commands"
 .SH NAME
 minilzip \- reduces the size of files
 .SH SYNOPSIS
@@ -87,8 +87,8 @@ Report bugs to lzip\-bug@nongnu.org
 .br
 Lzlib home page: http://www.nongnu.org/lzip/lzlib.html
 .SH COPYRIGHT
-Copyright \(co 2016 Antonio Diaz Diaz.
-Using lzlib 1.8
+Copyright \(co 2017 Antonio Diaz Diaz.
+Using lzlib 1.9
 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.