From owner-svn-src-all@FreeBSD.ORG  Mon Oct  4 06:17:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36185106566B;
	Mon,  4 Oct 2010 06:17:46 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25C878FC1D;
	Mon,  4 Oct 2010 06:17:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o946HkDb002411;
	Mon, 4 Oct 2010 06:17:46 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o946HkOO002409;
	Mon, 4 Oct 2010 06:17:46 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201010040617.o946HkOO002409@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 4 Oct 2010 06:17:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213398 - head/bin/rm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Oct 2010 06:17:46 -0000

Author: delphij
Date: Mon Oct  4 06:17:45 2010
New Revision: 213398
URL: http://svn.freebsd.org/changeset/base/213398

Log:
  Clarify the combination effect of -P and -f to make it clear.
  
  Submitted by:	arundel
  MFC after:	2 weeks

Modified:
  head/bin/rm/rm.1

Modified: head/bin/rm/rm.1
==============================================================================
--- head/bin/rm/rm.1	Mon Oct  4 05:56:29 2010	(r213397)
+++ head/bin/rm/rm.1	Mon Oct  4 06:17:45 2010	(r213398)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd December 26, 2006
+.Dd October 3, 2010
 .Dt RM 1
 .Os
 .Sh NAME
@@ -88,9 +88,13 @@ yet provides almost the same level of pr
 Overwrite regular files before deleting them.
 Files are overwritten three times, first with the byte pattern 0xff,
 then 0x00, and then 0xff again, before they are deleted.
-Files with multiple links will not be overwritten nor deleted unless
+Files with multiple links will not be overwritten nor deleted
+and a warning will be issued.
+If the
 .Fl f
-is specified, a warning is generated instead.
+option is specified, files with multiple links will also be overwritten
+and deleted.
+No warning will be issued.
 .Pp
 Specifying this flag for a read only file will cause
 .Nm