Merging upstream version 1.13~rc2.

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

1 files changed, 21 insertions, 16 deletions

diff --git a/doc/lzip.info b/doc/lzip.info
index 2981447..5d2c6ec 100644
--- a/doc/lzip.info
+++ b/doc/lzip.info
@@ -11,7 +11,7 @@ File: lzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzip Manual
 ***********
 
-This manual is for Lzip (version 1.13-rc1, 12 November 2011).
+This manual is for Lzip (version 1.13-rc2, 5 January 2012).
 
 * Menu:
 
@@ -24,7 +24,7 @@ This manual is for Lzip (version 1.13-rc1, 12 November 2011).
 * Concept Index::         Index of concepts
 
 
-   Copyright (C) 2008, 2009, 2010, 2011 Antonio Diaz Diaz.
+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to
 copy, distribute and modify it.
@@ -61,7 +61,7 @@ two or more compressed files. The result is the concatenation of the
 corresponding uncompressed files. Integrity testing of concatenated
 compressed files is also supported.
 
-   Lzip can produce multimember files and safely recover, with
+   Lzip can produce multi-member files and safely recover, with
 lziprecover, the undamaged members in case of file damage. Lzip can
 also split the compressed output in volumes of a given size, even when
 reading from standard input. This allows the direct creation of
@@ -185,7 +185,7 @@ The format for running lzip is:
 
 `-b BYTES'
 `--member-size=BYTES'
-     Produce a multimember file and set the member size limit to BYTES.
+     Produce a multi-member file and set the member size limit to BYTES.
      Minimum member size limit is 100kB. Small member size may degrade
      compression ratio, so use it only when needed. The default is to
      produce single-member files.
@@ -254,7 +254,7 @@ The format for running lzip is:
      Split the compressed output into several volume files with names
      `original_name00001.lz', `original_name00002.lz', etc, and set the
      volume size limit to BYTES. Each volume is a complete, maybe
-     multimember, lzip file. Minimum volume size limit is 100kB. Small
+     multi-member, lzip file. Minimum volume size limit is 100kB. Small
      volume size may degrade compression ratio, so use it only when
      needed.
 
@@ -377,7 +377,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.
 
 
@@ -401,8 +401,8 @@ and show the compression ratio.
      lzip -v file
 
 
-Example 2: Like example 1 but the created `file.lz' is multimember with
-a member size of 1MiB. The compression ratio is not shown.
+Example 2: Like example 1 but the created `file.lz' is multi-member
+with a member size of 1MiB. The compression ratio is not shown.
 
      lzip -b 1MiB file
 
@@ -449,7 +449,7 @@ Example 9: Extract a multivolume compressed tar archive.
 
 
 Example 10: Create a multivolume compressed backup of a big database
-file with a volume size of 650MB, where each volume is a multimember
+file with a volume size of 650MB, where each volume is a multi-member
 file with a member size of 32MiB.
 
      lzip -b 32MiB -S 650MB big_db
@@ -493,12 +493,17 @@ Concept Index
 
 Tag Table:
 Node: Top224
-Node: Introduction917
-Node: Algorithm4417
-Node: Invoking Lzip6935
-Node: File Format12285
-Node: Examples14277
-Node: Problems16221
-Node: Concept Index16743
+Node: Introduction921
+Node: Algorithm4422
+Node: Invoking Lzip6940
+Node: File Format12292
+Node: Examples14285
+Node: Problems16231
+Node: Concept Index16753
 
 End Tag Table
+
+
+Local Variables:
+coding: iso-8859-15
+End: