From 400b2bc13cc374b12ae3265b47fe84e039ce21a1 Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Tue, 2 Jul 2019 16:47:19 +0000
Subject: [PATCH] Sort and unify a bit. Add more macros.

---
 sbin/disklabel/disklabel.8 | 52 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 7c7e4b79d70f..18251873dc09 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: disklabel.8,v 1.69 2019/07/02 16:23:47 mlelstv Exp $
+.\"	$NetBSD: disklabel.8,v 1.70 2019/07/02 16:47:19 wiz Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd September 11, 2016
+.Dd July 2, 2019
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -104,9 +104,9 @@ When writing the label, it can be used to change the drive identification,
 the disk partitions on the drive, or to replace a damaged label.
 .Pp
 The
-.Fl e , i , l , R , w , N ,
+.Fl e , i , l , N , R , W ,
 and
-.Fl W
+.Fl w
 options determine the basic operation.
 If none are specified the label
 is displayed.
@@ -125,21 +125,21 @@ Interactively update the existing label and write it back to the disk.
 .It Fl l
 Show all known file system types (those that can be specified along a
 partition within the label) and exit.
+.It Fl N
+Disallow writes to the disk sector that contains the label.
+This is the default state.
 .It Fl R
 Write (restore) a label by reading it from
 .Ar protofile .
 The file should be in the same format as the default output.
+.It Fl W
+Allow writes to the disk sector that contains the label.
+This state may not persist if no programs have the disk open.
 .It Fl w
 Write a standard label for the specified
 .Ar disktype .
 See
 .Xr disktab 5 .
-.It Fl N
-Disallow writes to the disk sector that contains the label.
-This is the default state.
-.It Fl W
-Allow writes to the disk sector that contains the label.
-This state may not persist if no programs have the disk open.
 .El
 .Pp
 The majority of the rest of the options affect more than one form of the
@@ -192,35 +192,37 @@ even if
 is specified.
 Implies
 .Fl r .
+.It Fl f Ar disktab
+Specify the name of a file to use instead of
+.Pa /etc/disktab .
 .It Fl I
 If a label cannot be read from
 .Ar disk
 request the default one from the kernel.
 Implies
 .Fl r .
-.It Fl f Ar disktab
-Specify the name of a file to use instead of
-.Pa /etc/disktab .
+.It Fl L Ar sector
+Specify the relative sector number of the disklabel
+similar to the environment variable
+.Ev DISKLABELSECTOR .
 .It Fl M Ar machine
 Specify the machine to generate a label for.
 Defaults to the current machine it is compiled for.
 Specific details can be overridden via environment
 and with the options
-.Fl B, L, O, p, m
+.Fl B , L , m , n , O ,
 and
-.Fl n.
-.It Fl L
-num specify the relative sector number of the disklabel
-similar to the environment variable DISKLABELSECTOR.
-.It Fl O
-num specify the relative byte offset of the disklabel.
-similar to the environment variable DISKLABELOFFSET.
-.It Fl P
-num specify the size of the partition table.
+.Fl P .
 .It Fl m
-expect the label to have an MBR.
+Expect the label to have an MBR.
 .It Fl n
-expect the label not to have an MBR.
+Expect the label not to have an MBR.
+.It Fl O Ar offset
+Specify the relative byte offset of the disklabel
+similar to the environment variable
+.Ev DISKLABELOFFSET .
+.It Fl P Ar size
+Specify the size of the partition table.
 .It Fl r
 Read/write the disk directly rather than using
 .Xr ioctl 2