Merging upstream version 1.14.

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

3 files changed, 33 insertions, 26 deletions

diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index 70e4c67..f62094a 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" "April 2013" "Lziprecover 1.14-rc3" "User Commands"
+.TH LZIPRECOVER "1" "May 2013" "Lziprecover 1.14" "User Commands"
 .SH NAME
 Lziprecover \- recovers data from damaged lzip files
 .SH SYNOPSIS
@@ -59,6 +59,11 @@ be verbose (a 2nd \fB\-v\fR gives more)
 .PP
 Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,
 Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...
+.PP
+Exit status: 0 for a normal exit, 1 for environmental problems (file
+not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or
+invalid input file, 3 for an internal consistency error (eg, bug) which
+caused lziprecover to panic.
 .SH "REPORTING BUGS"
 Report bugs to lzip\-bug@nongnu.org
 .br
diff --git a/doc/lziprecover.info b/doc/lziprecover.info
index 5c2628f..83267d5 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-rc3, 23 April 2013).
+This manual is for Lziprecover (version 1.14, 31 May 2013).
 
 * Menu:
 
@@ -72,11 +72,6 @@ garbage data at the end):
 GNU ddrescue + lziprecover is the best option for recovering data from
 multiple damaged copies. *Note ddrescue-example::, for an example.
 
-   Return values: 0 for a normal exit, 1 for environmental problems
-(file not found, invalid flags, I/O errors, etc), 2 to indicate a
-corrupt or invalid input file, 3 for an internal consistency error (eg,
-bug) which caused lziprecover to panic.
-
 
 File: lziprecover.info,  Node: Invoking Lziprecover,  Next: File Format,  Prev: Introduction,  Up: Top
 
@@ -225,6 +220,12 @@ E        exabyte   (10^18)         |   Ei       exbibyte (2^60)
 Z        zettabyte (10^21)         |   Zi       zebibyte (2^70)
 Y        yottabyte (10^24)         |   Yi       yobibyte (2^80)
 
+
+   Exit status: 0 for a normal exit, 1 for environmental problems (file
+not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or
+invalid input file, 3 for an internal consistency error (eg, bug) which
+caused lziprecover to panic.
+
 
 File: lziprecover.info,  Node: File Format,  Next: Examples,  Prev: Invoking Lziprecover,  Up: Top
 
@@ -282,7 +283,8 @@ additional information before, between, or after them.
 
 `Lzma stream'
      The lzma stream, finished by an end of stream marker. Uses default
-     values for encoder properties.
+     values for encoder properties. See the lzip manual for a full
+     description.
 
 `CRC32 (4 bytes)'
      CRC of the uncompressed original data.
@@ -318,7 +320,7 @@ show status.
 Example 3: Decompress `file.lz' partially until 10KiB of decompressed
 data are produced.
 
-     lziprecover -D 10KiB file.lz
+     lziprecover -D 0,10KiB file.lz
 
 
 Example 4: Decompress `file.lz' partially from decompressed byte 10000
@@ -419,13 +421,13 @@ Concept Index
 
 Tag Table:
 Node: Top231
-Node: Introduction907
-Node: Invoking Lziprecover2938
-Node: File Format8454
-Node: Examples10896
-Ref: ddrescue-example12114
-Node: Problems13894
-Node: Concept Index14444
+Node: Introduction901
+Node: Invoking Lziprecover2685
+Node: File Format8447
+Node: Examples10938
+Ref: ddrescue-example12158
+Node: Problems13938
+Node: Concept Index14488
 
 End Tag Table
 
diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index 9c1612c..142cdae 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 23 April 2013
-@set VERSION 1.14-rc3
+@set UPDATED 31 May 2013
+@set VERSION 1.14
 
 @dircategory Data Compression
 @direntry
@@ -93,11 +93,6 @@ If the cause of file corruption is damaged media, the combination
 @w{GNU ddrescue + lziprecover} is the best option for recovering data
 from multiple damaged copies. @xref{ddrescue-example}, for an example.
 
-Return values: 0 for a normal exit, 1 for environmental problems (file
-not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or
-invalid input file, 3 for an internal consistency error (eg, bug) which
-caused lziprecover to panic.
-
 
 @node Invoking Lziprecover
 @chapter Invoking Lziprecover
@@ -166,7 +161,6 @@ Print total file sizes and ratios. The values produced are correct even
 for multi-member files. Use it together with @samp{-v} to see
 information about the members in the file.
 
-
 @item -m
 @itemx --merge
 Try to produce a correct file merging the good parts of two or more
@@ -251,6 +245,12 @@ Table of SI and binary prefixes (unit multipliers):
 @item Y @tab yottabyte (10^24)        @tab | @tab Yi @tab yobibyte (2^80)
 @end multitable
 
+@sp 1
+Exit status: 0 for a normal exit, 1 for environmental problems (file not
+found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or
+invalid input file, 3 for an internal consistency error (eg, bug) which
+caused lziprecover to panic.
+
 
 @node File Format
 @chapter File Format
@@ -311,7 +311,7 @@ Valid values for dictionary size range from 4KiB to 512MiB.
 
 @item Lzma stream
 The lzma stream, finished by an end of stream marker. Uses default values
-for encoder properties.
+for encoder properties. See the lzip manual for a full description.
 
 @item CRC32 (4 bytes)
 CRC of the uncompressed original data.
@@ -354,7 +354,7 @@ Example 3: Decompress @samp{file.lz} partially until 10KiB of
 decompressed data are produced.
 
 @example
-lziprecover -D 10KiB file.lz
+lziprecover -D 0,10KiB file.lz
 @end example
 
 @sp 1