summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-10-22 15:27:16 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-10-22 15:27:16 +0000
commitac2693370b468f2320c8b8b9f28e998beace1130 (patch)
tree968ffd8b762d2bc64784f4f8a836c0959f702c7b
parent3637b143870a00fdd912ed644512745e7056d511 (diff)
tweak previous; ok marco
-rw-r--r--sbin/bioctl/bioctl.88
-rw-r--r--sbin/bioctl/bioctl.c7
2 files changed, 7 insertions, 8 deletions
diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index a3246acc736..3d0c227c3b8 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bioctl.8,v 1.74 2009/10/21 22:35:27 marco Exp $
+.\" $OpenBSD: bioctl.8,v 1.75 2009/10/22 15:27:15 jmc 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: October 21 2009 $
+.Dd $Mdocdate: October 22 2009 $
.Dt BIOCTL 8
.Os
.Sh NAME
@@ -126,9 +126,9 @@ digits to four or less.
Enumerate the selected RAID devices.
This is the default if no other option is given.
.It Fl p Ar passfile
-Passphrase file used for crypto volume bring-up.
+Passphrase file used when crypto volumes are brought up.
This file must be root owned and have 0600 permissions.
-This can not be used during the initial creation of the crypto volume.
+It cannot be used during the initial creation of the crypto volume.
.It Fl q
Show vendor, product, revision, and serial number for the given disk.
.It Fl R Ar device \*(Ba channel:target[.lun]
diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index 33f68a74306..509b9fbdfda 100644
--- a/sbin/bioctl/bioctl.c
+++ b/sbin/bioctl/bioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioctl.c,v 1.82 2009/10/21 22:31:17 marco Exp $ */
+/* $OpenBSD: bioctl.c,v 1.83 2009/10/22 15:27:15 jmc Exp $ */
/*
* Copyright (c) 2004, 2005 Marco Peereboom
@@ -250,9 +250,8 @@ usage(void)
"device\n"
" %s [-dhiqv] "
"[-C flag[,flag,...]] [-c raidlevel]\n"
- "\t[-l special[,special,...]] "
- "[-R device | channel:target[.lun]\n"
- "\t[-p passfile] [-r rounds] "
+ "\t[-l special[,special,...]] [-p passfile]\n"
+ "\t[-R device | channel:target[.lun] [-r rounds] "
"device\n", __progname, __progname);
exit(1);