consistently specify that -f and -i override previous options in each

option's description.  jmc points out this works better than deferring
such information to a post-options sentence.

1 files changed, 11 insertions, 9 deletions

diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 4f0e4165885..951bc302e12 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cp.1,v 1.33 2011/06/15 18:17:10 tedu Exp $
+.\"	$OpenBSD: cp.1,v 1.34 2011/06/15 23:47:37 tedu Exp $
 .\"	$NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -78,6 +78,11 @@ The options are as follows:
 For each existing destination pathname, remove it and
 create a new file, without prompting for confirmation,
 regardless of its permissions.
+The
+.Fl f
+option overrides any previous
+.Fl i
+options.
 .It Fl H
 If the
 .Fl R
@@ -89,6 +94,11 @@ that would overwrite an existing file.
 If the response from the standard input begins with the character
 .Sq Li y ,
 the file copy is attempted.
+The
+.Fl i
+option overrides any previous
+.Fl f
+options.
 .It Fl L
 If the
 .Fl R
@@ -137,14 +147,6 @@ or
 instead.
 .El
 .Pp
-The last of any
-.Fl f
-or
-.Fl i
-options is the one which affects
-.Nm cp Ns 's
-behavior.
-.Pp
 For each destination file that already exists, its contents are
 overwritten if permissions allow, but its mode, user ID, and group
 ID are unchanged.