Do not use ".Ar device" for both an option argument and for the operand.

Instead, use ".Ar chunk" for the -R option argument just like it is
already done for -l and -O.
While here, polish a few minor details in the vicinity of the word "device".
OK kn@

2 files changed, 16 insertions, 12 deletions

diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index c2b3a3c256c..38b59584a74 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bioctl.8,v 1.107 2020/09/28 17:03:34 solene Exp $
+.\"	$OpenBSD: bioctl.8,v 1.108 2020/10/30 13:55:48 schwarze Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Marco Peereboom
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 28 2020 $
+.Dd $Mdocdate: October 30 2020 $
 .Dt BIOCTL 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Op Fl a Ar alarm-function
 .Op Fl b Ar channel : Ns Ar target Ns Op Pf . Ar lun
 .Op Fl H Ar channel : Ns Ar target Ns Op Pf . Ar lun
-.Op Fl R Ar device | channel : Ns Ar target Ns Op Pf . Ar lun
+.Op Fl R Ar chunk | channel : Ns Ar target Ns Op Pf . Ar lun
 .Op Fl t Ar patrol-function
 .Op Fl u Ar channel : Ns Ar target Ns Op Pf . Ar lun
 .Ar device
@@ -128,9 +128,9 @@ Enumerate the selected RAID devices.
 This is the default if no other option is given.
 .It Fl q
 Show vendor, product, revision, and serial number for the given disk.
-.It Fl R Ar device | channel : Ns Ar target Ns Op Pf . Ar lun
+.It Fl R Ar chunk | channel : Ns Ar target Ns Op Pf . Ar lun
 Manually kick off a rebuild of a degraded RAID volume, using
-.Ar device
+.Ar chunk
 or
 .Ar channel : Ns Ar target Ns Op Pf . Ar lun
 as a new chunk (with
@@ -139,8 +139,9 @@ a partition of fstype
 .Dq RAID ) ,
 replacing the offline chunk in the volume;
 it is not possible to change the number of chunks.
-.Ar device
-must be specified as a full path to the chunk device file (e.g. /dev/wd0d).
+The
+.Ar chunk
+must be specified as a full path to a device file (e.g. /dev/wd0d).
 A RAID volume rather than a RAID controller is expected as the final argument.
 .It Fl t Ar patrol-function
 Control the RAID card's patrol functionality, if supported.
@@ -202,7 +203,9 @@ Create a new
 .Xr softraid 4
 volume of level
 .Ar raidlevel .
-The device must be
+The
+.Ar device
+must be
 .Dq softraid0 ;
 it supports multiple volumes.
 .Pp
@@ -254,8 +257,9 @@ or
 to offline.
 The state of the RAID volume will change in the same way that it would if the
 disk physically went offline.
+The
 .Ar chunk
-must be specified as a full path to the chunk device file (e.g. /dev/wd0d).
+must be specified as a full path to a device file (e.g. /dev/wd0d).
 A RAID volume rather than a RAID controller is expected as the
 .Ar device
 argument.
diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index 0bbfa24f1ba..4cfc7698392 100644
--- a/sbin/bioctl/bioctl.c
+++ b/sbin/bioctl/bioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioctl.c,v 1.144 2020/04/25 14:37:43 krw Exp $ */
+/* $OpenBSD: bioctl.c,v 1.145 2020/10/30 13:55:48 schwarze Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Marco Peereboom
@@ -280,7 +280,7 @@ usage(void)
 		"usage: %s [-hiqv] [-a alarm-function] "
 		"[-b channel:target[.lun]]\n"
 		"\t[-H channel:target[.lun]] "
-		"[-R device | channel:target[.lun]]\n"
+		"[-R chunk | channel:target[.lun]]\n"
 		"\t[-t patrol-function] "
 		"[-u channel:target[.lun]] "
 		"device\n"
@@ -288,7 +288,7 @@ usage(void)
 		"[-C flag[,flag,...]] [-c raidlevel] [-k keydisk]\n"
 		"\t[-l special[,special,...]] "
 		"[-O device | channel:target[.lun]]\n"
-		"\t[-p passfile] [-R device | channel:target[.lun]]\n"
+		"\t[-p passfile] [-R chunk | channel:target[.lun]]\n"
 		"\t[-r rounds] "
 		"device\n", __progname, __progname);