Index: sbin/devmatch/devmatch.8
===================================================================
--- sbin/devmatch/devmatch.8
+++ sbin/devmatch/devmatch.8
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 21, 2021
+.Dd June 5, 2022
 .Dt DEVMATCH 8
 .Os
 .Sh NAME
@@ -31,13 +31,12 @@
 .Nd print information about unattached devices
 .Sh SYNOPSIS
 .Nm
-.Op Fl adhpuv
-.Op Fl -all
-.Op Fl -dump
-.Op Fl -hints Ar file
-.Op Fl -nomatch Ar event
-.Op Fl -unbound
-.Op Fl -verbose
+.Op Fl a | -all
+.Op Fl d | -dump
+.Op Oo Fl h | -hints Oc Ar file
+.Op Oo Fl p | -nomatch Oc Ar event
+.Op Fl u | -unbound
+.Op Fl v | -verbose
 .Sh DESCRIPTION
 The
 .Nm
@@ -62,7 +61,7 @@
 for matching instead of searching the device tree.
 .It Fl u Fl -unbound
 Attempt to produce a list of those drivers with PNP info whose driver
-tables with that PNP info can not be found.
+tables with that PNP info cannot be found.
 .It Fl v Fl -verbose
 Produce more verbose output.
 .El
@@ -91,7 +90,8 @@
 The PNP string's attributes are evaluated once per PNP entry on that
 bus rather than once.
 .Pp
-The term PNP is overloaded in FreeBSD.
+The term PNP is overloaded in
+.Fx .
 It means, generically, the identifying data the bus provides about a
 device.
 While this include old ISA PNP identifiers, it also includes the