Merging upstream version 1.15.

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

3 files changed, 25 insertions, 24 deletions

diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index f6712d1..cda6779 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" "July 2013" "Lziprecover 1.15-rc1" "User Commands"
+.TH LZIPRECOVER "1" "September 2013" "Lziprecover 1.15" "User Commands"
 .SH NAME
 Lziprecover \- recovers data from damaged lzip files
 .SH SYNOPSIS
diff --git a/doc/lziprecover.info b/doc/lziprecover.info
index a15f890..5f8ad08 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.15-rc1, 29 July 2013).
+This manual is for Lziprecover (version 1.15, 14 September 2013).
 
 * Menu:
 
@@ -325,7 +325,7 @@ additional information before, between, or after them.
 
 `ID string'
      A four byte string, identifying the lzip format, with the value
-     "LZIP".
+     "LZIP" (0x4C, 0x5A, 0x49, 0x50).
 
 `VN (version number, 1 byte)'
      Just in case something needs to be modified in the future. 1 for
@@ -340,8 +340,8 @@ 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.
+     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.
 
 `Lzma stream'
      The lzma stream, finished by an end of stream marker. Uses default
@@ -379,7 +379,7 @@ show status.
      lziprecover -tv file.lz
 
 
-Example 3: Decompress `file.lz' partially until 10KiB of decompressed
+Example 3: Decompress `file.lz' partially until 10 KiB of decompressed
 data are produced.
 
      lziprecover -D 0,10KiB file.lz
@@ -467,7 +467,7 @@ programs with a suitable command line syntax.
 
 `-V'
 `--version'
-     Print the version number of lziprecover on the standard output and
+     Print the version number of unzcrash on the standard output and
      exit.
 
 `-b RANGE'
@@ -541,16 +541,16 @@ Concept index
 
 Tag Table:
 Node: Top228
-Node: Introduction1095
-Node: Invoking lziprecover3248
-Node: Repairing files8686
-Node: Merging files9405
-Node: File format11176
-Node: Examples13660
-Ref: ddrescue-example14860
-Node: Unzcrash15969
-Node: Problems18344
-Node: Concept index18894
+Node: Introduction1096
+Node: Invoking lziprecover3249
+Node: Repairing files8687
+Node: Merging files9406
+Node: File format11177
+Node: Examples13687
+Ref: ddrescue-example14888
+Node: Unzcrash15997
+Node: Problems18369
+Node: Concept index18919
 
 End Tag Table
 
diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index e2aed0a..3dbceb9 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 29 July 2013
-@set VERSION 1.15-rc1
+@set UPDATED 14 September 2013
+@set VERSION 1.15
 
 @dircategory Data Compression
 @direntry
@@ -356,7 +356,8 @@ All multibyte values are stored in little endian order.
 
 @table @samp
 @item ID string
-A four byte string, identifying the lzip format, with the value "LZIP".
+A four byte string, identifying the lzip format, with the value "LZIP"
+(0x4C, 0x5A, 0x49, 0x50).
 
 @item VN (version number, 1 byte)
 Just in case something needs to be modified in the future. 1 for now.
@@ -369,8 +370,8 @@ 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.
+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
@@ -413,7 +414,7 @@ lziprecover -tv file.lz
 
 @sp 1
 @noindent
-Example 3: Decompress @samp{file.lz} partially until 10KiB of
+Example 3: Decompress @samp{file.lz} partially until 10 KiB of
 decompressed data are produced.
 
 @example
@@ -529,7 +530,7 @@ Print an informative help message describing the options and exit.
 
 @item -V
 @itemx --version
-Print the version number of lziprecover on the standard output and exit.
+Print the version number of unzcrash on the standard output and exit.
 
 @item -b @var{range}
 @itemx --bits=@var{range}