From f848ee46f69e6a829fce8f4db09e4b0621a7b9b3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:39:23 +0100 Subject: Merging upstream version 1.3. Signed-off-by: Daniel Baumann --- doc/zcat.1 | 6 +++--- doc/zcmp.1 | 8 ++++---- doc/zdiff.1 | 8 ++++---- doc/zgrep.1 | 6 +++--- doc/ztest.1 | 6 +++--- doc/zupdate.1 | 6 +++--- doc/zutils.info | 26 +++++++++++++------------- doc/zutils.texi | 7 +++---- 8 files changed, 36 insertions(+), 37 deletions(-) (limited to 'doc') diff --git a/doc/zcat.1 b/doc/zcat.1 index 975a53a..bfb6471 100644 --- a/doc/zcat.1 +++ b/doc/zcat.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZCAT "1" "July 2014" "zcat (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZCAT "1" "August 2014" "zcat (zutils) 1.3" "User Commands" .SH NAME zcat \- decompress and concatenate files to standard output .SH SYNOPSIS .B zcat -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Zcat copies each given file ("\-" means standard input), to standard output. If any given file is compressed, its decompressed content is diff --git a/doc/zcmp.1 b/doc/zcmp.1 index 2710610..07801e0 100644 --- a/doc/zcmp.1 +++ b/doc/zcmp.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZCMP "1" "July 2014" "zcmp (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZCMP "1" "August 2014" "zcmp (zutils) 1.3" "User Commands" .SH NAME zcmp \- decompress and compare two files byte by byte .SH SYNOPSIS .B zcmp -[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] +[\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR] .SH DESCRIPTION Zcmp compares two files ("\-" means standard input), and if they differ, tells the first byte and line number where they differ. Bytes @@ -39,7 +39,7 @@ output version information and exit \fB\-b\fR, \fB\-\-print\-bytes\fR print differing bytes .TP -\fB\-\-format\fR=\fI[\fR][,] +\fB\-\-format\fR=\fI\,[\/\fR][,] force given formats (bz2, gz, lz, xz) .TP \fB\-i\fR, \fB\-\-ignore\-initial=\fR[,] diff --git a/doc/zdiff.1 b/doc/zdiff.1 index 28559cb..5675471 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZDIFF "1" "July 2014" "zdiff (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZDIFF "1" "August 2014" "zdiff (zutils) 1.3" "User Commands" .SH NAME zdiff \- decompress and compare two files line by line .SH SYNOPSIS .B zdiff -[\fIoptions\fR] \fIfile1 \fR[\fIfile2\fR] +[\fI\,options\/\fR] \fI\,file1 \/\fR[\fI\,file2\/\fR] .SH DESCRIPTION Zdiff compares two files ("\-" means standard input), and if they differ, shows the differences line by line. If any given file is @@ -57,7 +57,7 @@ try hard to find a smaller set of changes \fB\-E\fR, \fB\-\-ignore\-tab\-expansion\fR ignore changes due to tab expansion .TP -\fB\-\-format\fR=\fI[\fR][,] +\fB\-\-format\fR=\fI\,[\/\fR][,] force given formats (bz2, gz, lz, xz) .TP \fB\-i\fR, \fB\-\-ignore\-case\fR diff --git a/doc/zgrep.1 b/doc/zgrep.1 index f832883..20574aa 100644 --- a/doc/zgrep.1 +++ b/doc/zgrep.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZGREP "1" "July 2014" "zgrep (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZGREP "1" "August 2014" "zgrep (zutils) 1.3" "User Commands" .SH NAME zgrep \- search compressed files for a regular expression .SH SYNOPSIS .B zgrep -[\fIoptions\fR] \fI \fR[\fIfiles\fR] +[\fI\,options\/\fR] \fI\, \/\fR[\fI\,files\/\fR] .SH DESCRIPTION Zgrep is a front end to the grep program that allows transparent search on any combination of compressed and uncompressed files. If any given diff --git a/doc/ztest.1 b/doc/ztest.1 index e43fc6a..66ddc70 100644 --- a/doc/ztest.1 +++ b/doc/ztest.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZTEST "1" "July 2014" "ztest (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZTEST "1" "August 2014" "ztest (zutils) 1.3" "User Commands" .SH NAME ztest \- verify integrity of compressed files .SH SYNOPSIS .B ztest -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Ztest verifies the integrity of the specified compressed files. Uncompressed files are ignored. If no files are specified, the integrity diff --git a/doc/zupdate.1 b/doc/zupdate.1 index 6cb7cde..4f862f2 100644 --- a/doc/zupdate.1 +++ b/doc/zupdate.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH ZUPDATE "1" "July 2014" "zupdate (zutils) 1.3-rc1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1. +.TH ZUPDATE "1" "August 2014" "zupdate (zutils) 1.3" "User Commands" .SH NAME zupdate \- recompress bzip2, gzip, xz files to lzip files .SH SYNOPSIS .B zupdate -[\fIoptions\fR] [\fIfiles\fR] +[\fI\,options\/\fR] [\fI\,files\/\fR] .SH DESCRIPTION Zupdate recompresses files from bzip2, gzip, and xz formats to lzip format. The originals are compared with the new files and then deleted. diff --git a/doc/zutils.info b/doc/zutils.info index 9db1862..ac3c7a5 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.3-rc1, 27 July 2014). +This manual is for Zutils (version 1.3, 30 August 2014). * Menu: @@ -29,7 +29,7 @@ This manual is for Zutils (version 1.3-rc1, 27 July 2014). * Concept index:: Index of concepts - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute and modify it. @@ -708,17 +708,17 @@ Concept index  Tag Table: Node: Top222 -Node: Introduction1155 -Node: Common options3502 -Node: The zutilsrc file4751 -Node: Zcat5677 -Node: Zcmp7599 -Node: Zdiff9923 -Node: Zgrep12426 -Node: Ztest15394 -Node: Zupdate16618 -Node: Problems19006 -Node: Concept index19540 +Node: Introduction1128 +Node: Common options3475 +Node: The zutilsrc file4724 +Node: Zcat5650 +Node: Zcmp7572 +Node: Zdiff9896 +Node: Zgrep12399 +Node: Ztest15367 +Node: Zupdate16591 +Node: Problems18979 +Node: Concept index19513  End Tag Table diff --git a/doc/zutils.texi b/doc/zutils.texi index dee89b3..6737c72 100644 --- a/doc/zutils.texi +++ b/doc/zutils.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 27 July 2014 -@set VERSION 1.3-rc1 +@set UPDATED 30 August 2014 +@set VERSION 1.3 @dircategory Data Compression @direntry @@ -49,8 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}). @end menu @sp 1 -Copyright @copyright{} 2009, 2010, 2011, 2012, 2013, 2014 -Antonio Diaz Diaz. +Copyright @copyright{} 2009-2014 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute and modify it. -- cgit v1.2.3