From b149de385358aae454e84aaa2ae0182793af8c2b Mon Sep 17 00:00:00 2001
From: wosch <wosch@FreeBSD.org>
Date: Fri, 8 Mar 1996 06:58:08 +0000
Subject: Option -f implemented (remove + create) option -f and -i are
 exclusive respond `Y' is equal to `y' fix usage string remove isatty(3) check

Reviewed by:	pst
---
 bin/cp/cp.1 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'bin/cp/cp.1')

diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index fad0c0a..0c5230e 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp $
+.\"	$Id: cp.1,v 1.3 1996/02/18 18:48:24 wosch Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -47,14 +47,16 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fip
+.Op Fl f | i
+.Op Fl p
 .Ar source_file target_file
 .Nm cp
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fip
+.Op Fl f | i
+.Op Fl p
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
@@ -105,18 +107,25 @@ For each existing destination pathname, remove it and
 create a new file, without prompting for confirmation
 regardless of its permissions.
 (The
-.Fl i
-option is ignored if the
 .Fl f
-option is specified.)
+option overrides any previous
+.Fl i
+options.)
 .It Fl i
 Causes
 .Nm cp
 to write a prompt to the standard error output before copying a file
 that would overwrite an existing file.
 If the response from the standard input begins with the character
-.Sq Li y ,
+.Sq Li y 
+or
+.Sq Li Y ,
 the file copy is attempted.
+(The
+.Fl i
+option overrides any previous
+.Fl f
+options.)
 .It Fl p
 Causes
 .Nm cp
-- 
cgit v1.1