diff options
| author |   tedu <tedu@openbsd.org> | 2011-06-15 23:47:37 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2011-06-15 23:47:37 +0000 |
| commit | b76c7f091a2e4fd79d3fd8df4c972015e18455bc (patch) | |
| tree | 3d9cbf20e9092cc56d3797528f1093437970f1a6 | |
| parent | Stop providing a bsd.scsi3 kernel on sparc. If you have a system with multiple (diff) | |
| download | wireguard-openbsd-b76c7f091a2e4fd79d3fd8df4c972015e18455bc.tar.xz wireguard-openbsd-b76c7f091a2e4fd79d3fd8df4c972015e18455bc.zip | |
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.
| -rw-r--r-- | bin/cp/cp.1 | 20 | ||||
| -rw-r--r-- | bin/mv/mv.1 | 22 |
2 files changed, 23 insertions, 19 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. diff --git a/bin/mv/mv.1 b/bin/mv/mv.1 index ad7c7bb9204..2907238570e 100644 --- a/bin/mv/mv.1 +++ b/bin/mv/mv.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mv.1,v 1.28 2010/12/28 09:57:38 jmc Exp $ +.\" $OpenBSD: mv.1,v 1.29 2011/06/15 23:47:37 tedu Exp $ .\" $NetBSD: mv.1,v 1.8 1995/03/21 09:06:51 cgd Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 .\" -.Dd $Mdocdate: December 28 2010 $ +.Dd $Mdocdate: June 15 2011 $ .Dt MV 1 .Os .Sh NAME @@ -85,6 +85,11 @@ The options are as follows: .It Fl f Do not prompt for confirmation before overwriting the destination path. +The +.Fl f +option overrides any previous +.Fl f +options. .It Fl i Causes .Nm @@ -93,15 +98,12 @@ overwrite an existing file. If the response from the standard input begins with the character .Dq y , the move is attempted. -.El -.Pp -The last of any -.Fl f -or +The .Fl i -options is the one which affects -.Nm mv Ns 's -behavior. +option overrides any previous +.Fl f +options. +.El .Pp The .Nm |