typos;

added .Fl to flags for boot_*

ok deraadt@

9 files changed, 76 insertions, 69 deletions

diff --git a/share/man/man8/man8.alpha/boot_alpha.8 b/share/man/man8/man8.alpha/boot_alpha.8
index eb02ae21ab6..24c7e6866e9 100644
--- a/share/man/man8/man8.alpha/boot_alpha.8
+++ b/share/man/man8/man8.alpha/boot_alpha.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_alpha.8,v 1.6 2002/10/17 23:18:48 miod Exp $
+.\"	$OpenBSD: boot_alpha.8,v 1.7 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 2002, Miodrag Vallat.
 .\" All rights reserved.
@@ -69,27 +69,28 @@ variable.
 Option letters are case insensitive.
 The following option letters are recognized:
 .Bl -tag -width "XXX" -offset indent -compact
-.It a
+.Pp
+.It Cm a
 Boot the system multi-user.
-.It b
+.It Cm b
 Enter the debugger,
 .Xr ddb 4 ,
 as soon as the kernel console has been initialized.
-.It c
+.It Cm c
 Enter the
 .Dq User Kernel Configuration
 mode upon startup
 .Pq Xr boot_config 8 .
-.It d
+.It Cm d
 Create a kernel crash dump immediately after the devices have been configured.
 This option is only available on kernels compiled with
 .Qq option DEBUG .
-.It h
+.It Cm h
 On the next system reboot, always halt the system, even if a reboot is
 required.
-.It n
+.It Cm n
 Prompt for the root filesystem device after the devices have been configured.
-.It s
+.It Cm s
 Boot the system single-user.
 This is the default behaviour of the kernel if no flags are specified.
 .El
diff --git a/share/man/man8/man8.hp300/boot_hp300.8 b/share/man/man8/man8.hp300/boot_hp300.8
index c9e18944c76..17d1ee10528 100644
--- a/share/man/man8/man8.hp300/boot_hp300.8
+++ b/share/man/man8/man8.hp300/boot_hp300.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_hp300.8,v 1.3 2002/10/17 23:18:51 miod Exp $
+.\"	$OpenBSD: boot_hp300.8,v 1.4 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 2002, Miodrag Vallat.
 .\" All rights reserved.
@@ -108,21 +108,22 @@ at the boot prompt.
 .Pp
 The following options are recognized:
 .Bl -tag -width "-XXX" -offset indent -compact
-.It -a
+.Pp
+.It Fl a
 Prompt for the root filesystem device after the devices have been configured.
-.It -b
+.It Fl b
 On the next system reboot, always halt the system, even if a reboot is
 required.
-.It -c
+.It Fl c
 Enter the
 .Dq User Kernel Configuration
 mode upon startup
 .Pq see Xr boot_config 8 .
-.It -d
+.It Fl d
 Enter the debugger,
 .Xr ddb 4 ,
 as soon as the kernel console has been initialized.
-.It -s
+.It Fl s
 Boot the system single-user.
 The system will be booted multi-user unless this option is specified.
 .El
@@ -130,8 +131,9 @@ The system will be booted multi-user unless this option is specified.
 If the user does not enter anything after a few seconds, the bootloader
 will attempt to boot a kernel from the device it was loaded from, with no
 options.
-The following kernel filenames will be tried, in that order:
+The following kernel filenames will be tried, in this order:
 .Bl -item -compact
+.Pp
 .It
 bsd
 .It
diff --git a/share/man/man8/man8.hppa/boot_hppa.8 b/share/man/man8/man8.hppa/boot_hppa.8
index 237ca70d213..9c51a21dcba 100644
--- a/share/man/man8/man8.hppa/boot_hppa.8
+++ b/share/man/man8/man8.hppa/boot_hppa.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_hppa.8,v 1.1 2002/10/17 23:18:51 miod Exp $
+.\"	$OpenBSD: boot_hppa.8,v 1.2 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 2002, Miodrag Vallat.
 .\" All rights reserved.
@@ -49,7 +49,7 @@ archive, either on a disk device, or via the network, using the
 .Em bootp
 or
 .Em rboot
-protocols, depening on the PDC version.
+protocols, depending on the PDC version.
 .Ss PDC concepts
 If autoboot is enabled, the PDC will attempt to boot from the specified
 .Dq boot path
@@ -82,7 +82,8 @@ Select from menu:
 .Pp
 which provides the following commands:
 .Bl -tag -width "XXX" -offset indent -compact
-.It b
+.Pp
+.It Cm b
 boot from a device found during the scan,
 either with its short
 .Dq P#
@@ -92,11 +93,11 @@ For example, to boot from the
 disk with id 6 off the built-in (first) controller,
 one would enter
 .Ic b Ar scsi.6.0 .
-.It s
+.It Cm s
 rescan for bootable devices.
-.It a
+.It Cm a
 enter the second part of interactive mode.
-.It x
+.It Cm x
 resume an interrupted boot sequence.
 .El
 .Pp
@@ -105,7 +106,7 @@ The
 mode, recognizable with its
 .Em BOOT_ADMIN>
 prompt, controls the various boot options.
-The complete list of commands depends of the machine and PDC version.
+The complete list of commands depends on the machine and PDC version.
 The following list only mentions commands impacting the boot process.
 .Bl -tag -width AUTOSELECT -offset indent
 .It AUTOSELECT
@@ -113,10 +114,10 @@ Displays or changes the autoboot setting.
 If autoselect is set to
 .Dq on ,
 the PDC will always attempt to boot the first bootable device found in
-that order:
+this order:
 .Bl -enum -offset indent -compact
 .It
-boot device
+Boot device
 .Em path
 setting.
 .It
@@ -175,30 +176,30 @@ screen center (unless you are using a serial console).
 There is only one interactive mode, with a
 .Em BOOT_ADMIN>
 prompt, which provides both boot settings and commands.
-The complete list of commands depends of the machine and PDC version.
+The complete list of commands depends on the machine and PDC version.
 The following list only mentions commands impacting the boot process.
 .Bl -tag -width auto\ search -offset indent
-.It auto\ boot
+.It Ic auto boot
 Displays or changes the autoboot setting.
 If
-.Ev auto\ boot
+.Ev Ic auto boot
 is set to
 .Dq on ,
 the PDC will always attempt to boot.
-The booted device choosen will depend of the
-.Ev auto\ search
+The booted device choosen will depend on the
+.Ev Ic auto search
 setting.
-.It auto\ search
+.It Ic auto search
 Displays or changes the device scan setting.
 If
-.Ev auto\ search
+.Ev Ic auto search
 is set to
 .Dq on ,
 the PDC will attempt to boot the first bootable device found in
-that order:
+this order:
 .Bl -enum -offset indent -compact
 .It
-boot device
+Boot device
 .Em path
 setting.
 .It
@@ -218,20 +219,20 @@ devices connected to secondary controllers,
 the highest ID numbers being preferred.
 .El
 If
-.Ev auto\ search
+.Ev Ic auto search
 is set to
 .Dq off
 and the primary boot path points to a bootable device,
 no device scan will occur.
 .Pp
 Note that setting
-.Ev auto\ search
+.Ev Ic auto search
 to
 .Dq on
 will force autoboot, regardless of the
-.Ev auto\ boot
+.Ev Ic auto boot
 value.
-.It boot
+.It Ic boot
 Boots off the specified device.
 The
 .Dq primary
@@ -242,7 +243,7 @@ path settings may be booted with
 and
 .Ic boot Ar alt
 respectively.
-.It path
+.It Ic path
 Displays or changes the boot and console devices.
 The boot device is defined as the
 .Dq primary
@@ -262,7 +263,7 @@ will list the various path settings.
 .Ss Boot process options
 The
 .Ox
-hppa boot loader program is extensively described is a separate document,
+hppa boot loader program is extensively described in a separate document,
 .Xr boot 8 .
 .Ss Abnormal system termination
 If the system crashes, it will enter the kernel debugger,
diff --git a/share/man/man8/man8.i386/boot_i386.8 b/share/man/man8/man8.i386/boot_i386.8
index ae6f478478f..03cb5c104c6 100644
--- a/share/man/man8/man8.i386/boot_i386.8
+++ b/share/man/man8/man8.i386/boot_i386.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_i386.8,v 1.7 2002/10/17 23:18:51 miod Exp $
+.\"	$OpenBSD: boot_i386.8,v 1.8 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\"
@@ -45,7 +45,7 @@ This test will find and initialize memory, keyboard, and other devices.
 It will search for and initialize any extension ROMs that are present,
 and then attempt to boot the operating system from an available boot
 drive.
-Failing this, older IBM systems came up in ROM BASIC.
+Failing this, older IBM systems come up in ROM BASIC.
 .Pp
 The newer
 .Tn "PC AT"
@@ -69,7 +69,7 @@ A digression
 into a little piece of history will quickly give light as to why this is so.
 In the beginning, the PC
 .Dq architecture
-came with a single or dual floppy
+came with single or dual floppy
 drives, and no hard drives.
 The only type of bootable sectors on any device were the PBRs.
 They were responsible for loading the rest of the operating
diff --git a/share/man/man8/man8.macppc/boot_macppc.8 b/share/man/man8/man8.macppc/boot_macppc.8
index d887ad657ba..868ab45fd55 100644
--- a/share/man/man8/man8.macppc/boot_macppc.8
+++ b/share/man/man8/man8.macppc/boot_macppc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_macppc.8,v 1.4 2002/11/08 08:08:47 mpech Exp $
+.\"	$OpenBSD: boot_macppc.8,v 1.5 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -117,19 +117,20 @@ specification.
 .Pp
 The following options are recognized:
 .Bl -tag -width "-XXX" -offset indent -compact
-.It -a
+.Pp
+.It Fl a
 Prompt for the root filesystem and swap devices after the devices have
 been configured.
-.It -c
+.It Fl c
 Enter the
 .Dq User Kernel Config
 mode upon startup
 .Pq see Xr boot_config 8 .
-.It -d
+.It Fl d
 Enter the debugger,
 .Xr ddb 4 ,
 as soon as the kernel console has been initialized.
-.It -s
+.It Fl s
 Boot the system single-user.
 The system will be booted multi-user unless this option is specified.
 .El
@@ -162,7 +163,7 @@ default system kernel
 .It Pa /usr/mdec/ofwboot
 system bootstrap (usually installed on a standalone FAT partition or an
 .Tn Apple
-HFS partition, to be readable by openfirmware).
+HFS partition, to be readable by openfirmware)
 .El
 .Sh SEE ALSO
 .Xr ddb 4 ,
diff --git a/share/man/man8/man8.sparc/boot_sparc.8 b/share/man/man8/man8.sparc/boot_sparc.8
index f6bef6df694..84953e63606 100644
--- a/share/man/man8/man8.sparc/boot_sparc.8
+++ b/share/man/man8/man8.sparc/boot_sparc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc.8,v 1.5 2002/10/17 23:18:51 miod Exp $
+.\"	$OpenBSD: boot_sparc.8,v 1.6 2003/02/01 16:38:39 jmc Exp $
 .\"	$NetBSD: boot_sparc.8,v 1.4 1995/04/25 11:37:25 pk Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -166,19 +166,20 @@ and is the factory default.
 .Ss Boot process options
 The following options are recognized:
 .Bl -tag -width "-XXX" -offset indent -compact
-.It -a
+.Pp
+.It Fl a
 Prompt for the root filesystem and swap devices after the devices have
 been configured.
-.It -c
+.It Fl c
 Enter the
 .Dq User Kernel Configuration
 mode upon startup
 .Pq see Xr boot_config 8 .
-.It -d
+.It Fl d
 Enter the debugger ,
 .Xr ddb 4 ,
 as soon as the kernel console has been initialized.
-.It -s
+.It Fl s
 Boot the system single-user.
 The system will be booted multi-user unless this option is specified.
 .El
@@ -199,7 +200,7 @@ during the next multi-user boot cycle), and after the dump is complete
 If the
 .Xr sysctl 8
 variable
-.Ev ddb.console
+.Ev Em ddb.console
 is enabled, at any time you can break back to the ROM by pressing the
 .Dq L1
 .Pq also known as the Dq stop key
diff --git a/share/man/man8/man8.sparc64/boot_sparc64.8 b/share/man/man8/man8.sparc64/boot_sparc64.8
index 8a6e3144b88..a5708136f51 100644
--- a/share/man/man8/man8.sparc64/boot_sparc64.8
+++ b/share/man/man8/man8.sparc64/boot_sparc64.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc64.8,v 1.3 2002/10/17 23:18:51 miod Exp $
+.\"	$OpenBSD: boot_sparc64.8,v 1.4 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,7 +67,7 @@ tape drive
 .Pp
 The UltraSPARC
 .Tn Open Firmware
-will normally look for a bootloader on the device specified by hde
+will normally look for a bootloader on the device specified by the
 .Ev Em boot-device
 variable.
 The
@@ -92,19 +92,20 @@ and is the factory default.
 .Ss Boot process options
 The following options are recognized:
 .Bl -tag -width "-XXX" -offset indent -compact
-.It -a
+.Pp
+.It Fl a
 Prompt for the root filesystem and swap devices after the devices have
 been configured.
-.It -c
+.It Fl c
 Enter the
 .Dq User Kernel Configuration
 mode upon startup
 .Pq see Xr boot_config 8 .
-.It -d
-Enter the debugger ,
+.It Fl d
+Enter the debugger,
 .Xr ddb 4 ,
 as soon as the kernel console has been initialized.
-.It -s
+.It Fl s
 Boot the system single-user.
 The system will be booted multi-user unless this option is specified.
 .El
@@ -112,7 +113,7 @@ The system will be booted multi-user unless this option is specified.
 If the
 .Xr sysctl 8
 variable
-.Ev ddb.console
+.Ev Em ddb.console
 is enabled, at any time you can break back to the ROM by pressing the
 .Dq L1
 and
diff --git a/sys/arch/hppa/stand/boot/boot.8 b/sys/arch/hppa/stand/boot/boot.8
index 7c3c0933cbd..28bf06ffd4b 100644
--- a/sys/arch/hppa/stand/boot/boot.8
+++ b/sys/arch/hppa/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.5 2002/09/16 07:58:13 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.6 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2002 Michael Shalayeff
@@ -98,10 +98,10 @@ program, followed by the
 .Pp
 .Dl boot>
 .Pp
-prompt, which means you are in the interactive mode and may enter commands.
+prompt, which means you are in interactive mode and may enter commands.
 If you do not,
 .Nm
-will proceed to loading the kernel with the current parameters after the
+will proceed to load the kernel with the current parameters after the
 timeout period has expired.
 .El
 .Sh COMMANDS
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index b4dec8cd459..1019d8d713e 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.30 2002/09/16 07:58:15 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.31 2003/02/01 16:38:39 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -48,7 +48,7 @@ this program is loaded by the
 .Xr biosboot 8
 primary bootstrap loader and provides a convenient way to load the kernel.
 This program acts as an enhanced boot monitor for PC systems, providing
-common interface for the kernel to start from.
+a common interface for the kernel to start from.
 .Pp
 Basic operations include:
 .Pp
@@ -124,10 +124,10 @@ program, followed by the
 .Pp
 .Dl boot>
 .Pp
-prompt, which means you are in the interactive mode and may enter commands.
+prompt, which means you are in interactive mode and may enter commands.
 If you do not,
 .Nm
-will proceed to loading the kernel with the current parameters after the
+will proceed to load the kernel with the current parameters after the
 timeout period has expired.
 .El
 .Sh COMMANDS