Merging upstream version 1.15~pre1.

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

3 files changed, 37 insertions, 33 deletions

diff --git a/doc/lzlib.info b/doc/lzlib.info
index 979c477..314c98a 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.14, 20 January 2024).
+This manual is for Lzlib (version 1.15-pre1, 19 April 2024).
 
 * Menu:
 
@@ -127,7 +127,7 @@ using the LZMA coding scheme.
 levels).
 
    The high compression of LZMA comes from combining two basic, well-proven
-compression ideas: sliding dictionaries (LZ77) and markov models (the thing
+compression ideas: sliding dictionaries (LZ77) and Markov models (the thing
 used by every compression algorithm that uses a range encoder or similar
 order-0 entropy coder as its last stage) with segregation of contexts
 according to what the bits are used for.
@@ -647,7 +647,9 @@ File: lzlib.info,  Node: Invoking minilzip,  Next: Data format,  Prev: Error mes
 *******************
 
 Minilzip is a test program for the compression library lzlib, compatible
-with lzip 1.4 or newer.
+(interoperable) with lzip 1.4 or newer. Minilzip is not intended to be
+installed because lzip has more features, but minilzip is well tested and
+you can use it as your main compressor if so you wish.
 
    Lzip is a lossless data compressor with a user interface similar to the
 one of gzip or bzip2. Lzip uses a simplified form of the 'Lempel-Ziv-Markov
@@ -1305,28 +1307,28 @@ Concept index
 
 Tag Table:
 Node: Top215
-Node: Introduction1338
-Node: Library version6778
-Node: Buffering9329
-Node: Parameter limits10554
-Node: Compression functions11508
-Ref: member_size13301
-Ref: sync_flush15063
-Node: Decompression functions19751
-Node: Error codes27308
-Node: Error messages29598
-Node: Invoking minilzip30177
-Node: Data format40595
-Ref: coded-dict-size42041
-Node: Examples43446
-Node: Buffer compression44407
-Node: Buffer decompression45927
-Node: File compression47341
-Node: File decompression48324
-Node: File compression mm49328
-Node: Skipping data errors52357
-Node: Problems53662
-Node: Concept index54223
+Node: Introduction1341
+Node: Library version6781
+Node: Buffering9332
+Node: Parameter limits10557
+Node: Compression functions11511
+Ref: member_size13304
+Ref: sync_flush15066
+Node: Decompression functions19754
+Node: Error codes27311
+Node: Error messages29601
+Node: Invoking minilzip30180
+Node: Data format40774
+Ref: coded-dict-size42220
+Node: Examples43625
+Node: Buffer compression44586
+Node: Buffer decompression46106
+Node: File compression47520
+Node: File decompression48503
+Node: File compression mm49507
+Node: Skipping data errors52536
+Node: Problems53841
+Node: Concept index54402
 
 End Tag Table
 
diff --git a/doc/lzlib.texi b/doc/lzlib.texi
index 75cb7ba..462c840 100644
--- a/doc/lzlib.texi
+++ b/doc/lzlib.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 20 January 2024
-@set VERSION 1.14
+@set UPDATED 19 April 2024
+@set VERSION 1.15-pre1
 
 @dircategory Compression
 @direntry
@@ -158,7 +158,7 @@ Lzlib currently implements two variants of the LZMA algorithm: fast (used by
 option @option{-0} of minilzip) and normal (used by all other compression levels).
 
 The high compression of LZMA comes from combining two basic, well-proven
-compression ideas: sliding dictionaries (LZ77) and markov models (the thing
+compression ideas: sliding dictionaries (LZ77) and Markov models (the thing
 used by every compression algorithm that uses a range encoder or similar
 order-0 entropy coder as its last stage) with segregation of contexts
 according to what the bits are used for.
@@ -735,7 +735,9 @@ The value of @var{lz_errno} normally comes from a call to
 @cindex options
 
 Minilzip is a test program for the compression library lzlib, compatible
-with lzip 1.4 or newer.
+(interoperable) with lzip 1.4 or newer. Minilzip is not intended to be
+installed because lzip has more features, but minilzip is well tested and
+you can use it as your main compressor if so you wish.
 
 @uref{http://www.nongnu.org/lzip/lzip.html,,Lzip}
 is a lossless data compressor with a user interface similar to the one
diff --git a/doc/minilzip.1 b/doc/minilzip.1
index 3532520..22ad101 100644
--- a/doc/minilzip.1
+++ b/doc/minilzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH MINILZIP "1" "January 2024" "minilzip 1.14" "User Commands"
+.TH MINILZIP "1" "April 2024" "minilzip 1.15-pre1" "User Commands"
 .SH NAME
 minilzip \- reduces the size of files
 .SH SYNOPSIS
@@ -7,7 +7,7 @@ minilzip \- reduces the size of files
 [\fI\,options\/\fR] [\fI\,files\/\fR]
 .SH DESCRIPTION
 Minilzip is a test program for the compression library lzlib, compatible
-with lzip 1.4 or newer.
+(interoperable) with lzip 1.4 or newer.
 .PP
 Lzip is a lossless data compressor with a user interface similar to the one
 of gzip or bzip2. Lzip uses a simplified form of the 'Lempel\-Ziv\-Markov
@@ -116,12 +116,12 @@ Report bugs to lzip\-bug@nongnu.org
 Lzlib home page: http://www.nongnu.org/lzip/lzlib.html
 .SH COPYRIGHT
 Copyright \(co 2024 Antonio Diaz Diaz.
-Using lzlib 1.14
-Using LZ_API_VERSION = 1014
 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.
 There is NO WARRANTY, to the extent permitted by law.
+Using lzlib 1.15\-pre1
+Using LZ_API_VERSION = 1015
 .SH "SEE ALSO"
 The full documentation for
 .B minilzip