various fixes to sync usage() with SYNOPSIS, and make these pages a bit

more consistent;

feedback/ok miod

10 files changed, 46 insertions, 49 deletions

diff --git a/sys/arch/aviion/stand/installboot/installboot.8 b/sys/arch/aviion/stand/installboot/installboot.8
index 90e6863b41a..64e060687c9 100644
--- a/sys/arch/aviion/stand/installboot/installboot.8
+++ b/sys/arch/aviion/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.1 2013/09/29 17:51:34 miod Exp $
+.\"	$OpenBSD: installboot.8,v 1.2 2013/09/29 21:30:49 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Paul Kranenburg
 .\" All rights reserved.
@@ -36,8 +36,7 @@
 .Nd install a bootstrap on a disk
 .Sh SYNOPSIS
 .Nm installboot
-.Op Fl n
-.Op Fl v
+.Op Fl nv
 .Ar boot
 .Ar rawdev
 .Sh DESCRIPTION
@@ -53,17 +52,17 @@ Be verbose, printing out boot area and boot file information.
 .El
 .Pp
 The arguments are:
-.Bl -tag -width boot
+.Bl -tag -width rawdev
 .It Ar boot
-the name of the boot program to be installed.
+The name of the boot program to be installed.
 .It Ar rawdev
-the name of the raw disk device in which the boot program is to be installed.
+The name of the raw disk device in which the boot program is to be installed.
 It may be abbreviated into a form recognizable by
 .Xr opendev 3 .
 .El
 .Sh EXAMPLES
-.Bd -literal -offset
-/usr/mdec/installboot /usr/mdec/boot sd0
+.Bd -literal
+# /usr/mdec/installboot /usr/mdec/boot sd0
 .Ed
 .Sh SEE ALSO
 .Xr disklabel 8 ,
diff --git a/sys/arch/aviion/stand/installboot/installboot.c b/sys/arch/aviion/stand/installboot/installboot.c
index 14dd06aa2c5..2b165150a7e 100644
--- a/sys/arch/aviion/stand/installboot/installboot.c
+++ b/sys/arch/aviion/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.1 2013/09/29 17:51:34 miod Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.2 2013/09/29 21:30:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -43,7 +43,7 @@ uint8_t buf[VDM_BLOCK_SIZE];
 void
 usage()
 {
-	fprintf(stderr, "usage: installboot [-n] <boot> <device>\n");
+	fprintf(stderr, "usage: installboot [-nv] boot rawdev\n");
 	exit(1);
 }
 
diff --git a/sys/arch/mvme68k/stand/installboot/installboot.8 b/sys/arch/mvme68k/stand/installboot/installboot.8
index 8f343a384bc..ad09d9a185a 100644
--- a/sys/arch/mvme68k/stand/installboot/installboot.8
+++ b/sys/arch/mvme68k/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.17 2010/03/06 16:16:43 jmc Exp $
+.\"	$OpenBSD: installboot.8,v 1.18 2013/09/29 21:30:49 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Paul Kranenburg
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 6 2010 $
+.Dd $Mdocdate: September 29 2013 $
 .Dt INSTALLBOOT 8 mvme68k
 .Os
 .Sh NAME
@@ -36,8 +36,7 @@
 .Nd install a bootstrap on an FFS disk
 .Sh SYNOPSIS
 .Nm installboot
-.Op Fl n
-.Op Fl v
+.Op Fl nv
 .Ar boot
 .Ar bootxx
 .Ar rawdev
@@ -62,12 +61,12 @@ will use to load
 The arguments are:
 .Bl -tag -width bootxx
 .It Ar boot
-the name of the second-stage boot program in the file system
+The name of the second-stage boot program in the file system
 where the first-stage boot program is to be installed.
 .It Ar bootxx
-the name of the prototype file for the first stage boot program.
+The name of the prototype file for the first stage boot program.
 .It Ar rawdev
-the name of the raw device in which the first-stage boot program
+The name of the raw device in which the first-stage boot program
 is to be installed.
 This should correspond to the block device on which the file system containing
 .Ar boot
@@ -75,8 +74,8 @@ is mounted.
 .El
 .Sh EXAMPLES
 .Bd -literal
-cp /usr/mdec/bootsd /boot
-/usr/mdec/installboot /boot /usr/mdec/bootxx /dev/rsd0a
+# cp /usr/mdec/bootsd /boot
+# /usr/mdec/installboot /boot /usr/mdec/bootxx /dev/rsd0a
 .Ed
 .Sh SEE ALSO
 .Xr disklabel 8 ,
diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c
index 91bb3438e9a..32bafbed74f 100644
--- a/sys/arch/mvme68k/stand/installboot/installboot.c
+++ b/sys/arch/mvme68k/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.16 2012/12/31 21:35:32 miod Exp $ */
+/*	$OpenBSD: installboot.c,v 1.17 2013/09/29 21:30:49 jmc Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -80,7 +80,7 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: installboot [-n] [-v] [-h] <boot> <proto> <device>\n");
+	    "usage: installboot [-nv] boot bootxx rawdev\n");
 	exit(1);
 }
 
diff --git a/sys/arch/mvme88k/stand/installboot/installboot.8 b/sys/arch/mvme88k/stand/installboot/installboot.8
index ac0551d38e3..925b8cd147c 100644
--- a/sys/arch/mvme88k/stand/installboot/installboot.8
+++ b/sys/arch/mvme88k/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.14 2010/03/06 16:16:43 jmc Exp $
+.\"	$OpenBSD: installboot.8,v 1.15 2013/09/29 21:30:49 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Paul Kranenburg
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 6 2010 $
+.Dd $Mdocdate: September 29 2013 $
 .Dt INSTALLBOOT 8 mvme88k
 .Os
 .Sh NAME
@@ -36,8 +36,7 @@
 .Nd install a bootstrap on an FFS disk
 .Sh SYNOPSIS
 .Nm installboot
-.Op Fl n
-.Op Fl v
+.Op Fl nv
 .Ar boot
 .Ar bootxx
 .Ar rawdev
@@ -62,21 +61,21 @@ will use to load
 The arguments are:
 .Bl -tag -width bootxx
 .It Ar boot
-the name of the second-stage boot program in the file system
+The name of the second-stage boot program in the file system
 where the first-stage boot program is to be installed.
 .It Ar bootxx
-the name of the prototype file for the first stage boot program.
+The name of the prototype file for the first stage boot program.
 .It Ar rawdev
-the name of the raw device in which the first-stage boot program
+The name of the raw device in which the first-stage boot program
 is to be installed.
 This should correspond to the block device on which the file system containing
 .Ar boot
 is mounted.
 .El
 .Sh EXAMPLES
-.Bd -literal -offset
-cp /usr/mdec/bootsd /boot
-/usr/mdec/installboot /boot /usr/mdec/bootxx /dev/rsd0a
+.Bd -literal
+# cp /usr/mdec/bootsd /boot
+# /usr/mdec/installboot /boot /usr/mdec/bootxx /dev/rsd0a
 .Ed
 .Sh SEE ALSO
 .Xr disklabel 8 ,
diff --git a/sys/arch/mvme88k/stand/installboot/installboot.c b/sys/arch/mvme88k/stand/installboot/installboot.c
index 01dec8b3486..ffa7bac8aaa 100644
--- a/sys/arch/mvme88k/stand/installboot/installboot.c
+++ b/sys/arch/mvme88k/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.14 2011/03/13 00:13:53 deraadt Exp $ */
+/*	$OpenBSD: installboot.c,v 1.15 2013/09/29 21:30:50 jmc Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -81,7 +81,7 @@ static void
 usage()
 {
 	fprintf(stderr,
-		"usage: installboot [-n] [-v] [-h] <boot> <proto> <device>\n");
+		"usage: installboot [-nv] boot bootxx rawdev\n");
 	exit(1);
 }
 
diff --git a/sys/arch/sparc/stand/installboot/installboot.8 b/sys/arch/sparc/stand/installboot/installboot.8
index a08e687c2de..3c409e2762b 100644
--- a/sys/arch/sparc/stand/installboot/installboot.8
+++ b/sys/arch/sparc/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.10 2010/03/06 16:16:43 jmc Exp $
+.\"	$OpenBSD: installboot.8,v 1.11 2013/09/29 21:30:50 jmc Exp $
 .\"	$NetBSD: installboot.8,v 1.1 1995/09/30 21:32:14 pk Exp $
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 6 2010 $
+.Dd $Mdocdate: September 29 2013 $
 .Dt INSTALLBOOT 8 sparc
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd install a bootstrap on an FFS filesystem partition
 .Sh SYNOPSIS
 .Nm installboot
-.Op Fl nvh
+.Op Fl hnv
 .Op Fl a Ar karch
 .Ar boot
 .Ar bootxx
@@ -113,12 +113,12 @@ Verbose mode.
 The arguments are:
 .Bl -tag -width bootxx
 .It Ar boot
-the name of the second-stage boot program in the file system
+The name of the second-stage boot program in the file system
 where the first-stage boot program is to be installed.
 .It Ar bootxx
-the name of the prototype file for the first stage boot program.
+The name of the prototype file for the first stage boot program.
 .It Ar device
-the name of the raw device in which the first-stage boot program
+The name of the raw device in which the first-stage boot program
 is to be installed.
 This should correspond to the block device on which the file system containing
 .Ar boot
@@ -132,7 +132,7 @@ using the file
 .Pa /boot
 as the second-level boot program:
 .Bd -literal -offset indent
-installboot /boot /usr/mdec/bootxx /dev/rsd0a
+# installboot /boot /usr/mdec/bootxx /dev/rsd0a
 .Ed
 .Sh SEE ALSO
 .Xr disklabel 8 ,
diff --git a/sys/arch/sparc/stand/installboot/installboot.c b/sys/arch/sparc/stand/installboot/installboot.c
index 2d04b870155..3e09bcbe779 100644
--- a/sys/arch/sparc/stand/installboot/installboot.c
+++ b/sys/arch/sparc/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.7 2011/03/13 00:13:53 deraadt Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.8 2013/09/29 21:30:50 jmc Exp $	*/
 /*	$NetBSD: installboot.c,v 1.1 1997/06/01 03:39:45 mrg Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ static void
 usage()
 {
 	fprintf(stderr,
-		"usage: installboot [-n] [-v] [-h] [-s isofsblk -e isofseblk] [-a <karch>] <boot> <proto> <device>\n");
+		"usage: installboot [-hnv] [-a karch] [-s isofsblk -e isofseblk] boot bootxx rawdev\n");
 	exit(1);
 }
 
diff --git a/sys/arch/sparc64/stand/installboot/installboot.8 b/sys/arch/sparc64/stand/installboot/installboot.8
index 4996efcb050..d08ab774d88 100644
--- a/sys/arch/sparc64/stand/installboot/installboot.8
+++ b/sys/arch/sparc64/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: installboot.8,v 1.11 2012/01/01 16:11:13 jsing Exp $
+.\"	$OpenBSD: installboot.8,v 1.12 2013/09/29 21:30:50 jmc Exp $
 .\"	$NetBSD: installboot.8,v 1.1 1995/09/30 21:32:14 pk Exp $
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 1 2012 $
+.Dd $Mdocdate: September 29 2013 $
 .Dt INSTALLBOOT 8 sparc64
 .Os
 .Sh NAME
@@ -74,11 +74,11 @@ Verbose mode.
 .El
 .Pp
 The arguments are:
-.Bl -tag -width ofwboot
+.Bl -tag -width bootblk
 .It Ar bootblk
-the name of the file containing the first-stage bootblock.
+The name of the file containing the first-stage bootblock.
 .It Ar device
-the name of the raw device in which the first-stage boot program
+The name of the raw device in which the first-stage boot program
 is to be installed.
 This should correspond to the block device on which the file system containing
 .Ar ofwboot
diff --git a/sys/arch/sparc64/stand/installboot/installboot.c b/sys/arch/sparc64/stand/installboot/installboot.c
index ee05750e12c..601456162f2 100644
--- a/sys/arch/sparc64/stand/installboot/installboot.c
+++ b/sys/arch/sparc64/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.16 2012/02/12 00:53:10 deraadt Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.17 2013/09/29 21:30:50 jmc Exp $	*/
 /*	$NetBSD: installboot.c,v 1.8 2001/02/19 22:48:59 cgd Exp $ */
 
 /*-
@@ -68,7 +68,7 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "Usage: %s [-nv] <bootblk> <device>\n", __progname);
+	fprintf(stderr, "usage: %s [-nv] bootblk device\n", __progname);
 	exit(1);
 }