From c040b46a29aa27e1b969f0190c117981d7720c6a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sun, 8 Nov 2015 05:27:57 +0100
Subject: Merging upstream version 1.1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 doc/zcat.1         |  2 +-
 doc/zcmp.1         |  2 +-
 doc/zdiff.1        |  2 +-
 doc/zgrep.1        |  2 +-
 doc/ztest.1        |  2 +-
 doc/zutils.info    | 22 +++++++++++-----------
 doc/zutils.texinfo |  5 +++--
 7 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'doc')

diff --git a/doc/zcat.1 b/doc/zcat.1
index 4312728..fce9e04 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCAT "1" "July 2013" "Zcat (zutils) 1.1-rc2" "User Commands"
+.TH ZCAT "1" "August 2013" "Zcat (zutils) 1.1" "User Commands"
 .SH NAME
 Zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index e171601..ccb6692 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZCMP "1" "July 2013" "Zcmp (zutils) 1.1-rc2" "User Commands"
+.TH ZCMP "1" "August 2013" "Zcmp (zutils) 1.1" "User Commands"
 .SH NAME
 Zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index 260d8dd..4cdcdb3 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZDIFF "1" "July 2013" "Zdiff (zutils) 1.1-rc2" "User Commands"
+.TH ZDIFF "1" "August 2013" "Zdiff (zutils) 1.1" "User Commands"
 .SH NAME
 Zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index cc85d0a..275221f 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZGREP "1" "July 2013" "Zgrep (zutils) 1.1-rc2" "User Commands"
+.TH ZGREP "1" "August 2013" "Zgrep (zutils) 1.1" "User Commands"
 .SH NAME
 Zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
diff --git a/doc/ztest.1 b/doc/ztest.1
index f9c4825..02b15e2 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH ZTEST "1" "July 2013" "Ztest (zutils) 1.1-rc2" "User Commands"
+.TH ZTEST "1" "August 2013" "Ztest (zutils) 1.1" "User Commands"
 .SH NAME
 Ztest \- verify integrity of compressed files
 .SH SYNOPSIS
diff --git a/doc/zutils.info b/doc/zutils.info
index 866d975..4cba8af 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -12,7 +12,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.1-rc2, 7 July 2013).
+This manual is for Zutils (version 1.1, 2 August 2013).
 
 * Menu:
 
@@ -626,16 +626,16 @@ Concept index
 
 Tag Table:
 Node: Top224
-Node: Introduction1097
-Node: Common options3155
-Node: The zutilsrc file4404
-Node: Zcat5330
-Node: Zcmp7252
-Node: Zdiff9576
-Node: Zgrep12079
-Node: Ztest14916
-Node: Problems16141
-Node: Concept index16670
+Node: Introduction1095
+Node: Common options3153
+Node: The zutilsrc file4402
+Node: Zcat5328
+Node: Zcmp7250
+Node: Zdiff9574
+Node: Zgrep12077
+Node: Ztest14914
+Node: Problems16139
+Node: Concept index16668
 
 End Tag Table
 
diff --git a/doc/zutils.texinfo b/doc/zutils.texinfo
index 61a8762..ea635ba 100644
--- a/doc/zutils.texinfo
+++ b/doc/zutils.texinfo
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 7 July 2013
-@set VERSION 1.1-rc2
+@set UPDATED 2 August 2013
+@set VERSION 1.1
 
 @dircategory Data Compression
 @direntry
@@ -177,6 +177,7 @@ format, with the syntax:
 where <format> is one of @samp{bz2}, @samp{gz}, @samp{lz} or @samp{xz}.
 @end enumerate
 
+
 @node Zcat
 @chapter Zcat
 @cindex zcat
-- 
cgit v1.2.3