22 files changed, 112 insertions, 82 deletions
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index bcc1997..547d245e 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -106,7 +106,7 @@ bad sector and whose name is the bad sector number.
 When it is discovered by 
 .Xr fsck 8
 it will ask
-.Dq Li "HOLD BAD BLOCK ?" .
+.Dq Li "HOLD BAD BLOCK \&?" .
 A positive response will cause 
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 7afe98b..fb16eab 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit
@@ -301,7 +301,7 @@ are used to install bootstrap code.  If you are creating a
 .Dq dangerously-dedicated
 partition for compatibility with older PC systems,
 you generally want to specify the raw disk name such as
-.Pa da0.
+.Pa da0 .
 If you are creating a label within an existing DOS slice, you should specify
 the slice name such as
 .Pa da0s1 .
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 7afe98b..fb16eab 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit
@@ -301,7 +301,7 @@ are used to install bootstrap code.  If you are creating a
 .Dq dangerously-dedicated
 partition for compatibility with older PC systems,
 you generally want to specify the raw disk name such as
-.Pa da0.
+.Pa da0 .
 If you are creating a label within an existing DOS slice, you should specify
 the slice name such as
 .Pa da0s1 .
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 00dc7c7..977ee49 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -213,7 +213,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index ee90925..a9f251c 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -241,7 +241,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index edef23e..9c7055a 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -39,7 +39,7 @@
 .Op Fl dvplfyn
 .Op Fl l Ar maxparallel
 .Op Fl t Ar fstype 
-.Op Fl T Ar fstype:fsoptions 
+.Op Fl T Ar fstype : Ns Ar fsoptions 
 .Op Ar special | node ...
 .Sh DESCRIPTION
 The
@@ -106,7 +106,7 @@ Causes
 .Nm
 to assume yes
 as the answer to all operator questions.
-.It Fl T Ar fstype:fsoptions
+.It Fl T Ar fstype : Ns Ar fsoptions 
 List of comma separated file system specific options for the specified
 file system type, in the same format as
 .Xr mount 8 .
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index f64b276..81f1dda 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -204,7 +204,7 @@ or
 .Va atimensec 
 field will be set to zero.
 .Pp
-.It Cm quit, Cm q, Cm exit, Em <EOF>
+.It Cm quit , q , exit , Em <EOF>
 Exit the program.
 .El
 .Sh SEE ALSO
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 00dc7c7..977ee49 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -213,7 +213,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 490316b..e684d4a 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -139,7 +139,10 @@ The following parameters may be set with
 .Nm :
 .Bl -tag -width indent
 .It Cm add
-Another name for the ``alias'' parameter.  Introduced for compatibility
+Another name for the
+.Cm alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm alias
 Establish an additional network address for this interface.
@@ -181,10 +184,15 @@ extra console error logging.
 .It Fl debug
 Disable driver dependent debugging code.
 .It Cm delete
-Another name for the ``-alias'' parameter.
+Another name for the
+.Fl alias
+parameter.
 .It Cm down
-Mark an interface ``down''.  When an interface is
-marked ``down'', the system will not attempt to
+Mark an interface
+.Dq down .
+When an interface is marked
+.Dq down ,
+the system will not attempt to
 transmit messages through that interface. 
 If possible, the interface will be reset to disable reception as well.
 This action does not automatically disable routes using the interface.
@@ -364,13 +372,18 @@ netmasks though
 .Fx
 implements it internally as a set of netmasks.
 .It Cm remove
-Another name for the ``-alias'' parameter.  Introduced for compatibility
+Another name for the
+.Fl alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm phase
 The argument following this specifies the version (phase) of the 
 Appletalk network attached to the interface.
 Values of 1 or 2 are permitted.
-.It Cm link[0-2]
+.It Cm link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect, however,
 they are in general used to select special modes of operation.
@@ -378,7 +391,9 @@ An example
 of this is to enable SLIP compression, or to select the connector type
 for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
-.It Fl link[0-2]
+.It Fl link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Disable special processing at the link level with the specified interface.
 .It Cm up
 Mark an interface
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index d24470b..84c1216 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -161,7 +161,7 @@ TCP packets only.
 Discard packets that match this rule,
 and try to send a TCP reset (RST) notice.
 The search terminates
-.Em (not working yet) .
+.Em ( "not working yet" ) .
 .It Ar count
 Update counters for all packets that match rule.
 The search continues with the next rule.
@@ -223,10 +223,10 @@ may be specified as:
 .Bl -hang -offset flag -width 16n
 .It Ar ipv6no
 An ipv6number of the form
-.Li fec0::1:2:3:4.
+.Li fec0::1:2:3:4 .
 .It Ar ipv6no/prefixlen
 An ipv6number with a prefix length of the form
-.Li fec0::1:2:3:4/112.
+.Li fec0::1:2:3:4/112 .
 .El
 .Pp
 The sense of the match can be inverted by preceding an address with the
@@ -273,7 +273,7 @@ the interface using
 .Bl -hang -offset flag -width 16n
 .It Ar via ifX
 Packet must be going through interface
-.Ar ifX.
+.Ar ifX .
 .It Ar via if*
 Packet must be going through interface
 .Ar ifX ,
@@ -362,7 +362,7 @@ The supported IPv6 options are:
 The absence of a particular option may be denoted
 with a
 .Dq \&!
-.Em (not working yet).
+.Em ( "not working yet" ) .
 .It established
 Matches packets that have the RST or ACK bits set.
 TCP packets only.
@@ -418,7 +418,7 @@ firewalls.
 If you are logged in over a network, loading the KLD version of
 .Nm
 is probably not as straightforward as you would think
-.Em (not supported).
+.Em ( "not supported" ) .
 I recommend this command line:
 .Bd -literal -offset center
 kldload /modules/ip6fw_mod.o && \e
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index 937da35..423414e 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -47,7 +47,7 @@ uses the
 .Xr sysctl 3
 interface to retrieve data from the kernel and requires that at least
 the
-.Ar machdep.uc_devlist
+.Va machdep.uc_devlist
 symbol be present.  If it's not, you may need to update your kernel
 before using this utility.
 .Pp
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 80d2eb2..da10b79 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -39,7 +39,7 @@
 The
 .Nm
 loads the file 
-.Ar filename.ko
+.Ar filename Ns Pa .ko
 into the kernel using the kernel linker.
 .Pp
 The following option is available:
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 3702d32..ac811d1 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -40,7 +40,7 @@
 .Op Fl aout | Fl elf
 .Op Fl Rimrsv
 .Op Fl f Ar hints_file
-.Op Ar directory | file Ar ...
+.Op Ar directory | Ar
 .Sh DESCRIPTION
 .Nm
 is used to prepare a set of
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index cbbd8b0..694a348 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -82,7 +82,7 @@ major device number to use for a particular device, check the file
 to see if the device is known, or check
 the system dependent device configuration file:
 .Bd -filled -offset indent
-.Dq Pa /usr/src/sys/conf/device. Ns Em architecture
+.Dq Pa /usr/src/sys/conf/device. Ns Aq Ar architecture
 .Ed
 .Pp
 (for example
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 21a639f..40690d0 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -54,16 +54,17 @@
 .Op Fl t Ar timeout
 .Op Fl w Ar writesize
 .Op Fl x Ar retrans
-.Ar rhost:path node
+.Ar rhost : Ns Ar path node
 .Sh DESCRIPTION
 The
 .Nm
 command
 calls the
 .Xr mount 2
-system call to prepare and graft a remote nfs file system (rhost:path)
+system call to prepare and graft a remote nfs file system
+.Pq Ar rhost : Ns Ar path
 on to the file system tree at the point
-.Ar node.
+.Ar node .
 This command is normally executed by
 .Xr mount 8 .
 It implements the mount protocol as described in RFC 1094, Appendix A and
@@ -253,7 +254,7 @@ Same as
 .Fl s .
 .It tcp
 Same as
-.Fl T.
+.Fl T .
 .El
 .It Fl q
 Use the leasing extensions to the NFS Version 3 protocol
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index 196dfe1..affbe4a 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -71,7 +71,7 @@ For native IP you will need also
 option.
 .It Fl U Ar user
 Name of user used in login sequence.
-.It Fl "[connection options]"
+.It Fl connection\ options
 See
 .Xr ncplogin 1
 for details.
@@ -100,7 +100,7 @@ Same as 'l' but file system tries to be case insensitive.
 May not work well.
 .It n
 No case conversion is performed. 
-.Em Warning!
+.Em Warning !
 Use this option with DOS name space only as a last resort,
 because creating a lower case name in the DOS name space
 can lead to unpredictable results.
@@ -159,7 +159,8 @@ See
 for details.
 If this option is omitted, connection permissions
 assumed the same as directory mode
-.Pf ( Fl d Ns ) option.
+.Pq Fl d
+option.
 .El
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 8c42a6f..8b16942 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -191,7 +191,7 @@ A
 .Sm on
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle (
-.Tn WebNFS Ns ).
+.Tn WebNFS ) .
 This is to mimic the behavior of URLs.
 If no
 .Fl index
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 7a1f6de..5c7f771 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -225,7 +225,7 @@ to appear from the specified
 .Ar targetPORT Ns Oo , Ns
 .Ar targetIP Ns : Ns Xo
 .Ar targetPORT Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Xc
 .Xc
@@ -239,7 +239,7 @@ to appear from the specified
 .It Fl redirect_address Xo
 .Ar localIP Ns Oo , Ns
 .Ar localIP Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Ar publicIP
 .Xc
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index ee90925..a9f251c 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -241,7 +241,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 7f449bd..836401d 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -48,12 +48,12 @@
 .Nd
 system bootstrapping procedures
 .Sh DESCRIPTION
-.Sy Power fail and crash recovery.
+.Sy Power fail and crash recovery .
 Normally, the system will reboot itself at power-up or after crashes.
 An automatic consistency check of the file systems will be performed,
 and unless this fails, the system will resume multi-user operations.
 .Pp
-.Sy Cold starts.
+.Sy Cold starts .
 Most i386 PCs attempt to boot first from floppy disk drive 0 (sometimes
 known as drive A:) and, failing that, from hard disk drive 0 (sometimes
 known as drive C:, or as drive 0x80 to the BIOS).  Some BIOSes allow
@@ -73,18 +73,18 @@ either by specifying a kernel name in the boot block parameter
 file,
 .Pa /boot.config ,
 or by hitting a key during a brief pause (while one of the characters
-.Dv - ,
-.Dv \e ,
-.Dv \&| ,
+.Sy - ,
+.Sy \e ,
+.Sy \&| ,
 or
-.Dv /
+.Sy /
 is displayed) before
 .Xr loader 8
 is invoked.  Booting will also be attempted at stage two, if the
 third stage cannot be loaded.
 .Pp
 The remainder of this subsection deals only with the boot blocks.  The
-.Pa loader
+.Xr loader 8
 program is documented separately.
 .Pp
 After the boot blocks have been loaded,
@@ -104,26 +104,32 @@ This boot may be aborted by typing any character on the keyboard
 at the
 .Ql boot:
 prompt.  At this time, the following input will be accepted:
-.Bl -tag -width 10x
-.It \&?
+.Bl -tag -width indent
+.It Ic \&?
 Give a short listing of the files in the root directory of the default
 boot device, as a hint about available boot files.  (A
-.Dv \&?
+.Ic ?\&
 may also be specified as the last segment of a path, in which case
 the listing will be of the relevant subdirectory.)
 .Pp
-.It bios_drive:interface(unit,part) filename Op Fl aCcDdghPrsv
+.It Xo
+.Ar bios_drive : Ns Ar interface Ns Po
+.Ar unit , Ns Ar part Pc
+.Ar filename
+.Op Fl aCcDdghPrsv
+.Xc
 Specify boot file and flags.
-.Bl -tag -width 10x -compact
-.It bios_drive
+.Bl -tag -width indent
+.It Ar bios_drive
 The drive number as recognized by the BIOS. 
 0 for the first drive, 1 for the second drive, etc.
-.It interface
+.It Ar interface
 The type of controller to boot from.  Note that the controller is required
 to have BIOS support since the BIOS services are used to load the
 boot file image.
 .Pp
 The supported interfaces are:
+.Pp
 .Bl -tag -width "adXX" -compact
 .It ad
 ST506, IDE, ESDI, RLL disks on a WD100[2367] or lookalike
@@ -135,10 +141,10 @@ SCSI disk on any supported SCSI controller
 .\".It cd
 .\"boot from CDROM
 .El
-.It unit
+.It Ar unit
 The unit number of the drive on the interface being used.
 0 for the first drive, 1 for the second drive, etc.
-.It part
+.It Ar part
 The partition letter inside the BSD portion of the disk.  See
 .Xr disklabel 8 .
 By convention, only partition
@@ -149,13 +155,14 @@ any slice can be booted from, with the default being the active slice
 or, otherwise, the first
 .Fx
 slice.
-.It filename
+.It Ar filename
 The pathname of the file to boot (relative to the root directory
 on the specified partition).  Defaults to
 .Pa /kernel .
 Symbolic links are not supported (hard links are).
 .It Fl acCdDghPrsv
 Boot flags:
+.Pp
 .Bl -tag -width "-CXX" -compact
 .It Fl a
 during kernel initialization,
@@ -164,8 +171,9 @@ ask for the device to mount as as the root file system.
 boot from CDROM.
 .It Fl c
 run UserConfig to modify hardware parameters for the loaded
-kernel.  If the kernel was built with one of USERCONFIG,
-INTRO_USERCONFIG, VISUAL_USERCONFIG options,
+kernel.  If the kernel was built with one of
+.Dv USERCONFIG , INTRO_USERCONFIG , VISUAL_USERCONFIG
+options,
 remain in UserConfig regardless of any
 .Ic quit
 commands present in the script.
@@ -237,7 +245,7 @@ to set defaults.  Enter them in one line just as you type at the
 .Ql boot:
 prompt.
 .Sh FILES
-.Bl -tag -width /kernel.old.config -compact
+.Bl -tag -width /boot/loader -compact
 .It Pa /boot.config
 parameters for the boot blocks (optional)
 .It Pa /boot/boot1
@@ -291,7 +299,8 @@ Seek failed
 Timeout
 .El
 .Pp
-IMPORTANT NOTE: Because of limitations imposed by the conventional
+.Sy "IMPORTANT NOTE" :
+Because of limitations imposed by the conventional
 disk interface provided by the BIOS, all boot-related files and
 structures (including the kernel) that need to be accessed during the
 boot phase must reside on the disk at or below cylinder 1023 (as the
@@ -300,7 +309,9 @@ BIOS understands the geometry).  When a
 is reported by the second-stage bootstrap, it generally means that this
 requirement has not been adhered to.
 .Sh BUGS
-The disklabel format used by this version of
+The
+.Xr disklabel 5
+format used by this version of
 .Bx
 is quite
 different from that of other architectures.
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index eec5ebd..ebdf42a 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -42,10 +42,10 @@
 .Nm
 .Op Fl d
 .Op Fl b Ar speed
-[
+.Oo
 .Fl s Ar string1
-.Op Fl s Ar string2 Op Ar ...
-]
+.Op Fl s Ar string2 Op Ar ...\&
+.Oc
 .Op Fl h
 .Op Fl l
 .Op Fl L
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 25aa7c1..9868eba 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -45,7 +45,7 @@
 .Nm
 .Op Fl bNn
 .Fl w
-.Ar name=value ...
+.Ar name Ns = Ns Ar value ...
 .Nm
 .Op Fl bNn
 .Fl aAX
@@ -87,7 +87,9 @@ set psize=`sysctl -n hw.pagesize`
 Force the value of the variable(s) to be output in raw, binary
 format.  No names are printed and no terminating newlines are output.
 This is mostly useful with a single variable.
-.It Fl w Ar name=value ...
+.It Fl w Xo
+.Ar name Ns = Ns Ar value ...
+.Xc
 Set the MIB
 .Ar name
 to the new