Merging upstream version 1.13~rc2.

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

1 files changed, 10 insertions, 9 deletions

diff --git a/doc/lzip.texinfo b/doc/lzip.texinfo
index 190f20f..cf7b21e 100644
--- a/doc/lzip.texinfo
+++ b/doc/lzip.texinfo
@@ -1,12 +1,13 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename lzip.info
+@documentencoding ISO-8859-15
 @settitle Lzip Manual
 @finalout
 @c %**end of header
 
-@set UPDATED 12 November 2011
-@set VERSION 1.13-rc1
+@set UPDATED 5 January 2012
+@set VERSION 1.13-rc2
 
 @dircategory Data Compression
 @direntry
@@ -44,7 +45,7 @@ This manual is for Lzip (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2008, 2009, 2010, 2011 Antonio Diaz Diaz.
+Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission
 to copy, distribute and modify it.
@@ -80,7 +81,7 @@ 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 lziprecover,
+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 multivolume
@@ -211,7 +212,7 @@ Print the version number of lzip on the standard output and exit.
 
 @item -b @var{bytes}
 @itemx --member-size=@var{bytes}
-Produce a multimember file and set the member size limit to @var{bytes}.
+Produce a multi-member file and set the member size limit to @var{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.
@@ -275,7 +276,7 @@ is affected at compression time by the choice of dictionary size limit.
 Split the compressed output into several volume files with names
 @samp{original_name00001.lz}, @samp{original_name00002.lz}, etc, and set
 the volume size limit to @var{bytes}. Each volume is a complete, maybe
-multimember, lzip file. Minimum volume size limit is 100kB. Small volume
+multi-member, lzip file. Minimum volume size limit is 100kB. Small volume
 size may degrade compression ratio, so use it only when needed.
 
 @item -t
@@ -405,7 +406,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
 
@@ -432,7 +433,7 @@ lzip -v file
 
 @sp 1
 @noindent
-Example 2: Like example 1 but the created @samp{file.lz} is multimember
+Example 2: Like example 1 but the created @samp{file.lz} is multi-member
 with a member size of 1MiB. The compression ratio is not shown.
 
 @example
@@ -505,7 +506,7 @@ lzip -cd volume_name*.lz | tar -xf -
 @sp 1
 @noindent
 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.
 
 @example