trash some old leftover macros and replace them with -mdoc macros

1 files changed, 42 insertions, 25 deletions

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 88de346bd54..c4cb020c543 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.30 1999/05/23 14:11:14 aaron Exp $
+.\"	$OpenBSD: disklabel.8,v 1.31 1999/07/04 18:59:38 aaron Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -81,7 +81,7 @@
 .Op Fl n
 .Op Fl v
 .Ar disk
-.sp
+.Pp
 .Nm disklabel
 .Fl B
 .Op Fl n
@@ -241,7 +241,9 @@ With the
 flag,
 .Nm
 is capable of restoring a disk label that was formatted
-in a prior operation and saved in an ASCII file.
+in a prior operation and saved in an
+.Tn ASCII
+file.
 The prototype file used to create the label should be in the same format
 as that produced when reading or editing a label.
 Comments are delimited by
@@ -268,22 +270,27 @@ will drop you into a simple initial label editor.  This mode is
 only intended for new disks as it will move partitions around as
 necessary to maintain a contiguous pool of free blocks.  Some commands
 or prompts take an optional unit.  Available units are
-.Dq b
+.Sq b
 for bytes,
-.Dq c
+.Sq c
 for cylinders,
-.Dq k
+.Sq k
 for kilobytes,
-.Dq m
+.Sq m
 for megabytes,
 and
-.Dq g
+.Sq g
 for gigabytes.  Quantities will be rounded to the nearest
 cylinder when units are specified for sizes (or offsets).  Commands
-may be aborted by entering ^D (Control-D).  Entering ^D at the main
-.Dq \&>
+may be aborted by entering
+.Ql ^D
+(Control-D).
+Entering
+.Ql ^D
+at the main
+.Ql >
 prompt will exit the editor.  At prompts that request a size,
-.Dq \&*
+.Ql *
 may be entered to indicate the rest of the available space.
 The editor commands are as follows:
 .Bl -tag -width "p [unit] "
@@ -314,7 +321,7 @@ Set OpenBSD disk boundaries.  This option tells
 which parts of the disk it is allowed to modify.  This option is
 probably only useful for ports with fdisk partition tables where the
 ending sector in the MBR is incorrect.  The user may enter
-.Dq \&*
+.Ql *
 at the
 .Dq Size
 prompt to indicate the entire size of the disk (minus
@@ -332,16 +339,16 @@ one.
 Change the size of an existing partition.  If no partition is
 specified, the user will be prompted for one.  The new size may be
 in terms of the aforementioned units and may also be prefixed with
-.Dq +
+.Ql +
 or
-.Dq -
+.Ql -
 to change the size by a relative amount.
 .It d Op part
 Delete an existing partition (or
-.Dq *
+.Ql *
 to delete all partitions).  If no partition is specified, the
 user will be prompted for one.  You may not delete the
-.Dq c
+.Ql c
 partition.
 .It g Op d|b|u
 Set disk geometry based on what the
@@ -370,7 +377,9 @@ was invoked with the
 .Fl f
 flag.
 .It s Op path
-Save the label to a file in ASCII format (suitable for loading via
+Save the label to a file in
+.Tn ASCII
+format (suitable for loading via
 the
 .Fl R
 option).  If no path is specified, the user will be prompted for
@@ -519,12 +528,12 @@ to be decreased or the offset of a partition to be changed while
 it is open.  Some device drivers create a label containing only a
 single large partition if a disk is unlabeled; thus, the label must
 be written to the
-.Dq a
+.Sq a
 partition of the disk while it is open.
 This sometimes requires the desired label to be set in two steps,
 the first one creating at least one other partition, and the second
 setting the label on the new partition while shrinking the
-.Dq a
+.Sq a
 partition.
 .Pp
 On some machines the bootstrap code may not fit entirely in the
@@ -534,11 +543,19 @@ not be possible to have filesystems on some partitions of a
 disk.  When installing bootstrap code,
 .Nm
 checks for these cases.  If the installed boot code would overlap
-a partition of type FS_UNUSED it is marked as type FS_BOOT.  The
+a partition of type
+.Dv FS_UNUSED
+it is marked as type
+.Dv FS_BOOT .
+The
 .Xr newfs 8
-utility will disallow creation of filesystems on FS_BOOT partitions.
-Conversely, if a partition has a type other than FS_UNUSED or
-FS_BOOT,
+utility will disallow creation of filesystems on
+.Dv FS_BOOT
+partitions.
+Conversely, if a partition has a type other than
+.Dv FS_UNUSED
+or
+.Dv FS_BOOT ,
 .Nm
 will not install bootstrap code that overlaps it.
 .Sh NOTES
@@ -553,9 +570,9 @@ but this usage is deprecated.
 .Sh BUGS
 When a disk name is given without a full pathname, the constructed
 device name uses the
-.Dq a
+.Sq a
 partition on the tahoe, the
-.Dq c
+.Sq c
 partition on all others.  In
 .Fl E
 mode,