- -R before -r in SYNOPSIS/usage()

- avoid marking up `|'

diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index ed77789..5dbaa4d 100644 (file)
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: bioctl.8,v 1.60 2008/08/22 02:00:12 marco Exp $
+.\"    $OpenBSD: bioctl.8,v 1.61 2008/08/22 06:41:36 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Marco Peereboom
 .\"
@@ -39,8 +39,8 @@
 .Op Fl c Ar raidlevel
 .Op Fl H Ar channel:target[.lun]
 .Op Fl l Ar special[,special,...]
+.Op Fl R Ar device\*(Bachannel:target[.lun]
 .Op Fl r Ar rounds
-.Op Fl R Ar device|channel:target[.lun]
 .Op Fl u Ar channel:target[.lun]
 .Ar device
 .Ek
@@ -143,18 +143,20 @@ Requires
 .Fl c .
 .It Fl q
 Show vendor, product, revision, and serial number for the given disk.
+.It Fl R Ar device\*(Bachannel:target[.lun]
+Manually kick off a rebuild using
+.Ar device
+or
+.Ar channel:target[.lun]
+on the provided drive name.
+This command requires a drive by name (e.g. sd1) instead of a controller
+by name (e.g. softraid0).
 .It Fl r Ar rounds
 When creating an encrypted volume, specifies the number of iterations of
 the algorithm used to convert a passphrase into a key.
 Higher iteration counts take more time, but offer more resistance to key
 guessing attacks.
 The minimum is 1000 rounds and the default is 8192.
-.It Fl R Ar device|channel:target[.lun]
-Manually kick off a rebuild using device or
-.Ar channel:target[.lun]
-on the provided drive name.
-This command requires a drive by name (e.g. sd1) instead of a controller
-by name (e.g. softraid0).
 .It Fl u Ar channel:target[.lun]
 Instruct the device at
 .Ar channel:target[.lun]

diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index b9cee80..edec7af 100644 (file)
--- a/sbin/bioctl/bioctl.c
+++ b/sbin/bioctl/bioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioctl.c,v 1.75 2008/08/22 02:00:12 marco Exp $       */
+/* $OpenBSD: bioctl.c,v 1.76 2008/08/22 06:41:36 jmc Exp $       */
 
 /*
  * Copyright (c) 2004, 2005 Marco Peereboom
@@ -240,9 +240,9 @@ usage(void)
                "[-b channel:target[.lun]]\n"
                "\t[-C flag[,flag,...]] [-c raidlevel] "
                "[-H channel:target[.lun]]\n"
-               "\t[-l special[,special,...]] [-r rounds] "
+               "\t[-l special[,special,...]] "
                "[-R device|channel:target[.lun]\n"
-               "\t[-u channel:target[.lun]] "
+               "\t[-r rounds] [-u channel:target[.lun]] "
                "device\n", __progname);
        
        exit(1);