From owner-p4-projects@FreeBSD.ORG  Wed May  7 21:38:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8304A1065743; Wed,  7 May 2008 21:38:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29F19106566B
	for <perforce@freebsd.org>; Wed,  7 May 2008 21:38:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 195B18FC13
	for <perforce@freebsd.org>; Wed,  7 May 2008 21:38:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47LcZrg073834
	for <perforce@freebsd.org>; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47LcZSW073832
	for perforce@freebsd.org; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 21:38:35 GMT
Message-Id: <200805072138.m47LcZSW073832@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141305 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2008 21:38:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=141305

Change 141305 by gabor@gabor_server on 2008/05/07 21:38:33

	- Sync man page with todays changes

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.1#4 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#4 (text+ko) ====

@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .Nm grep
 .Bk -words
-.Op Fl abcEFGHhIiLlnoPqRSsUVvwxZ
+.Op Fl abcDEFGHhIiLlnoPqRSsUVvwxZ
 .Op Fl A Ar num
 .Op Fl B Ar num
 .Op Fl C Ns Op Ar num
@@ -47,6 +47,7 @@
 .Op Fl f Ar file
 .Op Fl Fl binary-files Ns = Ns Ar value
 .Op Fl Fl context Ns Op = Ns Ar num
+.Op Fl Fl label
 .Op Fl Fl line-buffered
 .Op Fl Fl null
 .Op Ar pattern
@@ -194,12 +195,8 @@
 .Nm grep
 to behave as traditional
 .Nm grep ) .
-.\"XXX: INCOMPATIBLE .It Fl H
-.\"If
-.\".Fl R
-.\"is specified, follow symbolic links only if they were explicitly listed
-.\"on the command line.
-.\"The default is not to follow symbolic links.
+.It Fl H
+Always print filename headers with output lines.
 .It Fl h , Fl Fl no-filename
 Never print filename headers
 .Pq i.e. filenames
@@ -254,9 +251,12 @@
 specified.
 .It Fl Fl null
 Prints a zero-byte after the file name.
-.\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl o
-.\"Always print filename headers with output lines.
-.\".It Fl Fl line-buffered
+.It Fl o
+If
+.Fl R
+is specified, follow symbolic links only if they were explicitly listed
+on the command line.
+The default is not to follow symbolic links.
 .\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl P
 .\"If
 .\".Fl R