Merging upstream version 1.1.

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

3 files changed, 19 insertions, 19 deletions

diff --git a/doc/clzip.1 b/doc/clzip.1
index 42e2126..fa126e6 100644
--- a/doc/clzip.1
+++ b/doc/clzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH CLZIP "1" "December 2010" "Clzip 1.1-rc2" "User Commands"
+.TH CLZIP "1" "January 2011" "Clzip 1.1" "User Commands"
 .SH NAME
 Clzip \- reduces the size of files
 .SH SYNOPSIS
@@ -31,7 +31,7 @@ overwrite existing output files
 keep (don't delete) input files
 .TP
 \fB\-m\fR, \fB\-\-match\-length=\fR<n>
-set match length limit in bytes [80]
+set match length limit in bytes [36]
 .TP
 \fB\-o\fR, \fB\-\-output=\fR<file>
 if reading stdin, place the output into <file>
@@ -69,7 +69,7 @@ Report bugs to lzip\-bug@nongnu.org
 .br
 Clzip home page: http://www.nongnu.org/lzip/clzip.html
 .SH COPYRIGHT
-Copyright \(co 2010 Antonio Diaz Diaz.
+Copyright \(co 2011 Antonio Diaz Diaz.
 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.
diff --git a/doc/clzip.info b/doc/clzip.info
index b7ad665..861aac7 100644
--- a/doc/clzip.info
+++ b/doc/clzip.info
@@ -12,7 +12,7 @@ File: clzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Clzip Manual
 ************
 
-This manual is for Clzip (version 1.1-rc2, 7 December 2010).
+This manual is for Clzip (version 1.1, 11 January 2011).
 
 * Menu:
 
@@ -25,7 +25,7 @@ This manual is for Clzip (version 1.1-rc2, 7 December 2010).
 * Concept Index::         Index of concepts
 
 
-   Copyright (C) 2010 Antonio Diaz Diaz.
+   Copyright (C) 2010, 2011 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -73,8 +73,8 @@ multivolume compressed tar archives.
    The amount of memory required for compression is about 5 MiB plus 1
 or 2 times the dictionary size limit (1 if input file size is less than
 dictionary size limit, else 2) plus 8 times the dictionary size really
-used. For decompression it is a little more than the dictionary size
-really used.
+used. The amount of memory required for decompression is only a few tens
+of KiB larger than the dictionary size really used.
 
    Clzip will automatically use the smallest possible dictionary size
 without exceeding the given limit. Keep in mind that the decompression
@@ -477,12 +477,12 @@ Concept Index
 
 Tag Table:
 Node: Top226
-Node: Introduction905
-Node: Algorithm4439
-Node: Invoking Clzip6963
-Node: File Format11904
-Node: Examples13860
-Node: Problems15629
-Node: Concept Index16155
+Node: Introduction907
+Node: Algorithm4484
+Node: Invoking Clzip7008
+Node: File Format11949
+Node: Examples13905
+Node: Problems15674
+Node: Concept Index16200
 
 End Tag Table
diff --git a/doc/clzip.texinfo b/doc/clzip.texinfo
index 55cbb79..1177d8a 100644
--- a/doc/clzip.texinfo
+++ b/doc/clzip.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 7 December 2010
-@set VERSION 1.1-rc2
+@set UPDATED 11 January 2011
+@set VERSION 1.1
 
 @dircategory Data Compression
 @direntry
@@ -44,7 +44,7 @@ This manual is for Clzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2010 Antonio Diaz Diaz.
+Copyright @copyright{} 2010, 2011 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -91,8 +91,8 @@ compressed tar archives.
 The amount of memory required for compression is about 5 MiB plus 1 or 2
 times the dictionary size limit (1 if input file size is less than
 dictionary size limit, else 2) plus 8 times the dictionary size really
-used. For decompression it is a little more than the dictionary size
-really used.
+used. The amount of memory required for decompression is only a few tens
+of KiB larger than the dictionary size really used.
 
 Clzip will automatically use the smallest possible dictionary size
 without exceeding the given limit. Keep in mind that the decompression