Merging upstream version 1.7.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
aa26cf0d1d
commit
6dde429b0a
29 changed files with 107 additions and 73 deletions
|
@ -6,8 +6,8 @@
|
|||
@finalout
|
||||
@c %**end of header
|
||||
|
||||
@set UPDATED 5 April 2017
|
||||
@set VERSION 1.6
|
||||
@set UPDATED 13 February 2018
|
||||
@set VERSION 1.7
|
||||
|
||||
@dircategory Data Compression
|
||||
@direntry
|
||||
|
@ -49,7 +49,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
|
|||
@end menu
|
||||
|
||||
@sp 1
|
||||
Copyright @copyright{} 2009-2017 Antonio Diaz Diaz.
|
||||
Copyright @copyright{} 2009-2018 Antonio Diaz Diaz.
|
||||
|
||||
This manual is free documentation: you have unlimited permission
|
||||
to copy, distribute and modify it.
|
||||
|
@ -59,7 +59,7 @@ to copy, distribute and modify it.
|
|||
@chapter Introduction
|
||||
@cindex introduction
|
||||
|
||||
Zutils is a collection of utilities able to deal with any combination of
|
||||
Zutils is a collection of utilities able to process any combination of
|
||||
compressed and uncompressed files transparently. If any given file,
|
||||
including standard input, is compressed, its decompressed content is
|
||||
used. Compressed files are decompressed on the fly; no temporary files
|
||||
|
@ -421,7 +421,8 @@ standard input.
|
|||
An exit status of 0 means no differences were found, 1 means some
|
||||
differences were found, and 2 means trouble.
|
||||
|
||||
zdiff supports the following options:
|
||||
zdiff supports the following options (some options only work if the diff
|
||||
program used supports them):
|
||||
|
||||
@table @code
|
||||
@item -a
|
||||
|
@ -525,7 +526,8 @@ zgrep [@var{options}] @var{pattern} [@var{files}]
|
|||
An exit status of 0 means at least one match was found, 1 means no
|
||||
matches were found, and 2 means trouble.
|
||||
|
||||
zgrep supports the following options:
|
||||
zgrep supports the following options (some options only work if the grep
|
||||
program used supports them):
|
||||
|
||||
@table @code
|
||||
@item -a
|
||||
|
@ -552,6 +554,10 @@ Only print a count of matching lines per file.
|
|||
@itemx --context=@var{n}
|
||||
Print @var{n} lines of output context.
|
||||
|
||||
@item --color[=@var{when}]
|
||||
Show matched strings in color. @var{when} is @samp{never}, @samp{always}
|
||||
or @samp{auto}.
|
||||
|
||||
@item -e @var{pattern}
|
||||
@itemx --regexp=@var{pattern}
|
||||
Use @var{pattern} as the pattern to match.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue