Merging upstream version 1.14~rc2.

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

3 files changed, 18 insertions, 15 deletions

diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index d63f6ab..6470174 100644
--- a/doc/lziprecover.1
+++ b/doc/lziprecover.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH LZIPRECOVER "1" "February 2013" "Lziprecover 1.14-rc1" "User Commands"
+.TH LZIPRECOVER "1" "March 2013" "Lziprecover 1.14-rc2" "User Commands"
 .SH NAME
 Lziprecover \- recovers data from damaged lzip files
 .SH SYNOPSIS
diff --git a/doc/lziprecover.info b/doc/lziprecover.info
index 7b24dcb..dd9a65e 100644
--- a/doc/lziprecover.info
+++ b/doc/lziprecover.info
@@ -12,7 +12,7 @@ File: lziprecover.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lziprecover Manual
 ******************
 
-This manual is for Lziprecover (version 1.14-rc1, 27 February 2013).
+This manual is for Lziprecover (version 1.14-rc2, 25 March 2013).
 
 * Menu:
 
@@ -268,6 +268,7 @@ additional information before, between, or after them.
      Bits 4-0 contain the base 2 logarithm of the base size (12 to 29).
      Bits 7-5 contain the number of wedges (0 to 7) to substract from
      the base size to obtain the dictionary size.
+     Example: 0xD3 = (2^19 - 6 * 2^15) = (512KiB - 6 * 32KiB) = 320KiB
      Valid values for dictionary size range from 4KiB to 512MiB.
 
 `Lzma stream'
@@ -282,8 +283,9 @@ additional information before, between, or after them.
 
 `Member size (8 bytes)'
      Total size of the member, including header and trailer. This field
-     acts as a distributed index, and facilitates safe recovery of
-     undamaged members from multi-member files.
+     acts as a distributed index, allows the verification of stream
+     integrity, and facilitates safe recovery of undamaged members from
+     multi-member files.
 
 
 
@@ -408,13 +410,13 @@ Concept Index
 
 Tag Table:
 Node: Top231
-Node: Introduction910
-Node: Invoking Lziprecover2947
-Node: File Format8073
-Node: Examples10394
-Ref: ddrescue-example11612
-Node: Problems13443
-Node: Concept Index13993
+Node: Introduction907
+Node: Invoking Lziprecover2944
+Node: File Format8070
+Node: Examples10512
+Ref: ddrescue-example11730
+Node: Problems13561
+Node: Concept Index14111
 
 End Tag Table
 
diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index 872abb4..676e8d6 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 27 February 2013
-@set VERSION 1.14-rc1
+@set UPDATED 25 March 2013
+@set VERSION 1.14-rc2
 
 @dircategory Data Compression
 @direntry
@@ -297,6 +297,7 @@ wedges between 0 and 7. The size of a wedge is (base_size / 16).@*
 Bits 4-0 contain the base 2 logarithm of the base size (12 to 29).@*
 Bits 7-5 contain the number of wedges (0 to 7) to substract from the
 base size to obtain the dictionary size.@*
+Example: 0xD3 = (2^19 - 6 * 2^15) = (512KiB - 6 * 32KiB) = 320KiB@*
 Valid values for dictionary size range from 4KiB to 512MiB.
 
 @item Lzma stream
@@ -311,8 +312,8 @@ Size of the uncompressed original data.
 
 @item Member size (8 bytes)
 Total size of the member, including header and trailer. This field acts
-as a distributed index, and facilitates safe recovery of undamaged
-members from multi-member files.
+as a distributed index, allows the verification of stream integrity, and
+facilitates safe recovery of undamaged members from multi-member files.
 
 @end table