Merging upstream version 1.6~pre2.

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

3 files changed, 29 insertions, 28 deletions

diff --git a/doc/lzlib.info b/doc/lzlib.info
index dd67c12..1344ced 100644
--- a/doc/lzlib.info
+++ b/doc/lzlib.info
@@ -1,9 +1,8 @@
-This is lzlib.info, produced by makeinfo version 4.13+ from
-lzlib.texinfo.
+This is lzlib.info, produced by makeinfo version 4.13+ from lzlib.texi.
 
 INFO-DIR-SECTION Data Compression
 START-INFO-DIR-ENTRY
-* Lzlib: (lzlib).               Compression library for lzip files
+* Lzlib: (lzlib).               Compression library for the lzip format
 END-INFO-DIR-ENTRY
 
 
@@ -12,7 +11,7 @@ File: lzlib.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzlib Manual
 ************
 
-This manual is for Lzlib (version 1.6-pre1, 7 October 2013).
+This manual is for Lzlib (version 1.6-pre2, 30 January 2014).
 
 * Menu:
 
@@ -30,7 +29,7 @@ This manual is for Lzlib (version 1.6-pre1, 7 October 2013).
 * Concept index::               Index of concepts
 
 
-   Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -736,19 +735,19 @@ Concept index
 
 
 Tag Table:
-Node: Top218
-Node: Introduction1326
-Node: Library version3907
-Node: Buffering4552
-Node: Parameter limits5675
-Node: Compression functions6634
-Node: Decompression functions12847
-Node: Error codes19008
-Node: Error messages20947
-Node: Data format21526
-Node: Examples24175
-Node: Problems28258
-Node: Concept index28830
+Node: Top220
+Node: Introduction1335
+Node: Library version3916
+Node: Buffering4561
+Node: Parameter limits5684
+Node: Compression functions6643
+Node: Decompression functions12856
+Node: Error codes19017
+Node: Error messages20956
+Node: Data format21535
+Node: Examples24184
+Node: Problems28267
+Node: Concept index28839
 
 End Tag Table
 
diff --git a/doc/lzlib.texinfo b/doc/lzlib.texi
index 8fafc66..88f0b16 100644
--- a/doc/lzlib.texinfo
+++ b/doc/lzlib.texi
@@ -6,19 +6,19 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 7 October 2013
-@set VERSION 1.6-pre1
+@set UPDATED 30 January 2014
+@set VERSION 1.6-pre2
 
 @dircategory Data Compression
 @direntry
-* Lzlib: (lzlib).               Compression library for lzip files
+* Lzlib: (lzlib).               Compression library for the lzip format
 @end direntry
 
 
 @ifnothtml
 @titlepage
 @title Lzlib
-@subtitle Compression library for lzip files
+@subtitle Compression library for the lzip format
 @subtitle for Lzlib version @value{VERSION}, @value{UPDATED}
 @author by Antonio Diaz Diaz
 
@@ -50,7 +50,8 @@ This manual is for Lzlib (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+Copyright @copyright{} 2009, 2010, 2011, 2012, 2013, 2014
+Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -625,8 +626,9 @@ Example: 0xD3 = 2^19 - 6 * 2^15 = 512 KiB - 6 * 32 KiB = 320 KiB@*
 Valid values for dictionary size range from 4 KiB to 512 MiB.
 
 @item Lzma stream
-The lzma stream, finished by an end of stream marker. Uses default values
-for encoder properties. See the lzip manual for a full description.@*
+The lzma stream, finished by an end of stream marker. Uses default
+values for encoder properties. See the lzip manual for a full
+description.@*
 Lzip only uses the LZMA marker @samp{2} ("End Of Stream" marker). Lzlib
 also uses the LZMA marker @samp{3} ("Sync Flush" marker).
 
diff --git a/doc/minilzip.1 b/doc/minilzip.1
index 6217975..0535797 100644
--- a/doc/minilzip.1
+++ b/doc/minilzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH MINILZIP "1" "October 2013" "Minilzip 1.6-pre1" "User Commands"
+.TH MINILZIP "1" "January 2014" "Minilzip 1.6-pre2" "User Commands"
 .SH NAME
 Minilzip \- reduces the size of files
 .SH SYNOPSIS
@@ -82,8 +82,8 @@ Report bugs to lzip\-bug@nongnu.org
 .br
 Lzlib home page: http://www.nongnu.org/lzip/lzlib.html
 .SH COPYRIGHT
-Copyright \(co 2013 Antonio Diaz Diaz.
-Using Lzlib 1.6\-pre1
+Copyright \(co 2014 Antonio Diaz Diaz.
+Using Lzlib 1.6\-pre2
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.