Merging upstream version 1.5.

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

3 files changed, 12 insertions, 12 deletions

diff --git a/doc/clzip.1 b/doc/clzip.1
index 5c1bd8c..a365d55 100644
--- a/doc/clzip.1
+++ b/doc/clzip.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH CLZIP "1" "August 2013" "Clzip 1.5-rc1" "User Commands"
+.TH CLZIP "1" "September 2013" "Clzip 1.5" "User Commands"
 .SH NAME
 Clzip \- reduces the size of files
 .SH SYNOPSIS
diff --git a/doc/clzip.info b/doc/clzip.info
index f7a9f4a..227a396 100644
--- a/doc/clzip.info
+++ b/doc/clzip.info
@@ -12,7 +12,7 @@ File: clzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Clzip Manual
 ************
 
-This manual is for Clzip (version 1.5-rc1, 1 August 2013).
+This manual is for Clzip (version 1.5, 17 September 2013).
 
 * Menu:
 
@@ -281,7 +281,7 @@ The format for running clzip is:
 `--verbose'
      Verbose mode.
      When compressing, show the compression ratio for each file
-     processed. A second -v shows the progress of compression.
+     processed. A second `-v' shows the progress of compression.
      When decompressing or testing, further -v's (up to 4) increase the
      verbosity level, showing status, compression ratio, dictionary
      size, and trailer contents (CRC, data size, member size).
@@ -484,7 +484,7 @@ file with a member size of 32 MiB.
 
 File: clzip.info,  Node: Problems,  Next: Concept index,  Prev: Examples,  Up: Top
 
-6 Reporting Bugs
+6 Reporting bugs
 ****************
 
 There are probably bugs in clzip. There are certainly errors and
@@ -523,10 +523,10 @@ Node: Top212
 Node: Introduction914
 Node: Algorithm5091
 Node: Invoking clzip7590
-Node: File format13187
-Node: Examples15692
-Node: Problems17660
-Node: Concept index18186
+Node: File format13189
+Node: Examples15694
+Node: Problems17662
+Node: Concept index18188
 
 End Tag Table
 
diff --git a/doc/clzip.texinfo b/doc/clzip.texinfo
index ac684be..95bfe68 100644
--- a/doc/clzip.texinfo
+++ b/doc/clzip.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 1 August 2013
-@set VERSION 1.5-rc1
+@set UPDATED 17 September 2013
+@set VERSION 1.5
 
 @dircategory Data Compression
 @direntry
@@ -301,7 +301,7 @@ Use it together with @samp{-v} to see information about the file.
 @itemx --verbose
 Verbose mode.@*
 When compressing, show the compression ratio for each file processed. A
-second -v shows the progress of compression.@*
+second @samp{-v} shows the progress of compression.@*
 When decompressing or testing, further -v's (up to 4) increase the
 verbosity level, showing status, compression ratio, dictionary size,
 and trailer contents (CRC, data size, member size).
@@ -541,7 +541,7 @@ clzip -b 32MiB -S 650MB big_db
 
 
 @node Problems
-@chapter Reporting Bugs
+@chapter Reporting bugs
 @cindex bugs
 @cindex getting help