Merging upstream version 1.4~pre2.

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

1 files changed, 8 insertions, 5 deletions

diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 20574aa..e032217 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
-.TH ZGREP "1" "August 2014" "zgrep (zutils) 1.3" "User Commands"
+.TH ZGREP "1" "April 2015" "zgrep (zutils) 1.4-pre2" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -57,9 +57,6 @@ obtain patterns from <file>
 \fB\-F\fR, \fB\-\-fixed\-strings\fR
 <pattern> is a set of newline\-separated strings
 .TP
-\fB\-\-format=\fR<fmt>
-force given format (bz2, gz, lz, xz)
-.TP
 \fB\-h\fR, \fB\-\-no\-filename\fR
 suppress the prefixing filename on output
 .TP
@@ -81,6 +78,9 @@ only print names of files containing no matches
 \fB\-m\fR, \fB\-\-max\-count=\fR<n>
 stop after <n> matches
 .TP
+\fB\-M\fR, \fB\-\-format=\fR<list>
+exclude formats not in <list>
+.TP
 \fB\-n\fR, \fB\-\-line\-number\fR
 print the line number of each line
 .TP
@@ -90,6 +90,9 @@ don't read runtime configuration file
 \fB\-o\fR, \fB\-\-only\-matching\fR
 show only the part of a line matching <pattern>
 .TP
+\fB\-O\fR, \fB\-\-force\-format=\fR<fmt>
+force given format (bz2, gz, lz, xz)
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR
 suppress all messages
 .TP
@@ -127,7 +130,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2014 Antonio Diaz Diaz.
+Copyright \(co 2015 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.