Merging upstream version 1.13.

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

3 files changed, 58 insertions, 29 deletions

diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
index f8e6148..862cbe0 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" "November 2011" "Lziprecover 1.13-rc2" "User Commands"
+.TH LZIPRECOVER "1" "February 2012" "Lziprecover 1.13" "User Commands"
 .SH NAME
 Lziprecover \- recovers data from damaged lzip files
 .SH SYNOPSIS
@@ -46,7 +46,7 @@ suppress all messages
 try to repair a small error in file
 .TP
 \fB\-s\fR, \fB\-\-split\fR
-split multimember file in single\-member files
+split multi\-member file in single\-member files
 .TP
 \fB\-t\fR, \fB\-\-test\fR
 test compressed file integrity
@@ -61,7 +61,7 @@ Report bugs to lzip\-bug@nongnu.org
 .br
 Lziprecover home page: http://www.nongnu.org/lzip/lziprecover.html
 .SH COPYRIGHT
-Copyright \(co 2011 Antonio Diaz Diaz.
+Copyright \(co 2012 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/lziprecover.info b/doc/lziprecover.info
index 621f5cf..73830cf 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.13-rc2, 20 November 2011).
+This manual is for Lziprecover (version 1.13, 24 February 2012).
 
 * Menu:
 
@@ -24,7 +24,7 @@ This manual is for Lziprecover (version 1.13-rc2, 20 November 2011).
 * Concept Index::         Index of concepts
 
 
-   Copyright (C) 2009, 2010, 2011 Antonio Diaz Diaz.
+   Copyright (C) 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -46,6 +46,13 @@ the compressors in the lzip family; lzip, plzip, minilzip/lzlib, clzip
 and pdlzip. This recovery capability contributes to make the lzip format
 one of the best options for long-term data archiving.
 
+   Lziprecover is able to efficiently extract a range of bytes from a
+multi-member file, because it only decompresses the members containing
+the desired data.
+
+   Lziprecover can print correct total file sizes and ratios even for
+multi-member files.
+
    When recovering data, lziprecover takes as arguments the names of the
 damaged files and writes zero or more recovered files depending on the
 operation selected and whether the recovery succeeded or not. The
@@ -111,7 +118,7 @@ The format for running lziprecover is:
      `--output' option is used. In order to guarantee the correctness
      of the data produced, all members containing any part of the
      desired data are decompressed and their integrity is verified.
-     This operation is more efficient in multimember files because it
+     This operation is more efficient in multi-member files because it
      only decompresses the members containing the desired data.
 
 `-f'
@@ -125,7 +132,7 @@ The format for running lziprecover is:
 `-l'
 `--list'
      Print total file sizes and ratios. The values produced are correct
-     even for multimember files.
+     even for multi-member files.
 
 `-m'
 `--merge'
@@ -266,7 +273,7 @@ additional information before, between, or after them.
 
 `Member size (8 bytes)'
      Total size of the member, including header and trailer. This
-     facilitates safe recovery of undamaged members from multimember
+     facilitates safe recovery of undamaged members from multi-member
      files.
 
 
@@ -291,13 +298,13 @@ show status.
 Example 3: Decompress `file.lz' partially until 10KiB of decompressed
 data are produced.
 
-     lziprecover -cd file.lz | dd bs=1024 count=10
+     lziprecover -D 10KiB file.lz
 
 
 Example 4: Decompress `file.lz' partially from decompressed byte 10000
 to decompressed byte 15000 (5000 bytes are produced).
 
-     lziprecover -cd file.lz | dd bs=1000 skip=10 count=5
+     lziprecover -D 10000-15000 file.lz
 
 
 Example 5: Repair a one-byte corruption in the single-member file
@@ -317,8 +324,9 @@ the integrity of the resulting files.
      lziprecover -tv rec*file.lz
 
 
-Example 7: Recover a compressed backup from two copies on CD-ROM (see
-the GNU ddrescue manual for details about ddrescue)
+Example 7: Recover a compressed backup from two copies on CD-ROM with
+error-checked merging of copies (*Note GNU ddrescue manual:
+(ddrescue)Top, for details about ddrescue).
 
      ddrescue -b2048 /dev/cdrom cdimage1 logfile1
      mount -t iso9660 -o loop,ro cdimage1 /mnt/cdimage
@@ -391,12 +399,17 @@ Concept Index
 
 Tag Table:
 Node: Top231
-Node: Introduction898
-Node: Invoking Lziprecover2684
-Node: File Format7727
-Node: Examples9733
-Ref: ddrescue-example10986
-Node: Problems12765
-Node: Concept Index13315
+Node: Introduction900
+Node: Invoking Lziprecover2937
+Node: File Format7982
+Node: Examples9989
+Ref: ddrescue-example11207
+Node: Problems13038
+Node: Concept Index13588
 
 End Tag Table
+
+
+Local Variables:
+coding: iso-8859-15
+End:
diff --git a/doc/lziprecover.texinfo b/doc/lziprecover.texinfo
index 9086787..22eea8a 100644
--- a/doc/lziprecover.texinfo
+++ b/doc/lziprecover.texinfo
@@ -1,12 +1,13 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename lziprecover.info
+@documentencoding ISO-8859-15
 @settitle Lziprecover Manual
 @finalout
 @c %**end of header
 
-@set UPDATED 20 November 2011
-@set VERSION 1.13-rc2
+@set UPDATED 24 February 2012
+@set VERSION 1.13
 
 @dircategory Data Compression
 @direntry
@@ -43,7 +44,7 @@ This manual is for Lziprecover (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009, 2010, 2011 Antonio Diaz Diaz.
+Copyright @copyright{} 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -64,6 +65,13 @@ the compressors in the lzip family; lzip, plzip, minilzip/lzlib, clzip
 and pdlzip. This recovery capability contributes to make the lzip format
 one of the best options for long-term data archiving.
 
+Lziprecover is able to efficiently extract a range of bytes from a
+multi-member file, because it only decompresses the members containing
+the desired data.
+
+Lziprecover can print correct total file sizes and ratios even for
+multi-member files.
+
 When recovering data, lziprecover takes as arguments the names of the
 damaged files and writes zero or more recovered files depending on the
 operation selected and whether the recovery succeeded or not. The
@@ -133,7 +141,7 @@ produced bytes are sent to standard output unless the @samp{--output}
 option is used. In order to guarantee the correctness of the data
 produced, all members containing any part of the desired data are
 decompressed and their integrity is verified. This operation is more
-efficient in multimember files because it only decompresses the members
+efficient in multi-member files because it only decompresses the members
 containing the desired data.
 
 @item -f
@@ -147,7 +155,7 @@ Keep (don't delete) input files during decompression.
 @item -l
 @itemx --list
 Print total file sizes and ratios. The values produced are correct even
-for multimember files.
+for multi-member files.
 
 @item -m
 @itemx --merge
@@ -295,7 +303,7 @@ Size of the uncompressed original data.
 
 @item Member size (8 bytes)
 Total size of the member, including header and trailer. This facilitates
-safe recovery of undamaged members from multimember files.
+safe recovery of undamaged members from multi-member files.
 
 @end table
 
@@ -327,7 +335,7 @@ Example 3: Decompress @samp{file.lz} partially until 10KiB of
 decompressed data are produced.
 
 @example
-lziprecover -cd file.lz | dd bs=1024 count=10
+lziprecover -D 10KiB file.lz
 @end example
 
 @sp 1
@@ -336,7 +344,7 @@ Example 4: Decompress @samp{file.lz} partially from decompressed byte
 10000 to decompressed byte 15000 (5000 bytes are produced).
 
 @example
-lziprecover -cd file.lz | dd bs=1000 skip=10 count=5
+lziprecover -D 10000-15000 file.lz
 @end example
 
 @sp 1
@@ -365,8 +373,16 @@ lziprecover -tv rec*file.lz
 @sp 1
 @anchor{ddrescue-example}
 @noindent
-Example 7: Recover a compressed backup from two copies on CD-ROM (see
-the GNU ddrescue manual for details about ddrescue)
+Example 7: Recover a compressed backup from two copies on CD-ROM with
+error-checked merging of copies
+@ifnothtml
+(@xref{Top,GNU ddrescue manual,,ddrescue},
+@end ifnothtml
+@ifhtml
+(See the
+@uref{http://www.gnu.org/software/ddrescue/manual/ddrescue_manual.html,,ddrescue manual}
+@end ifhtml
+for details about ddrescue).
 
 @example
 ddrescue -b2048 /dev/cdrom cdimage1 logfile1