diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8
index b61ea82e5b38..1b14870f0d5c 100644
--- a/lib/geom/part/gpart.8
+++ b/lib/geom/part/gpart.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2023
+.Dd June 1, 2023
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -566,7 +566,9 @@ Requires the
 .Cm GEOM_PART_BSD
 kernel option.
 .It Cm BSD64
-64-bit implementation of BSD disklabel used in DragonFlyBSD to subdivide MBR
+64-bit implementation of BSD disklabel used in
+.Dx
+to subdivide MBR
 or GPT partitions.
 Requires the
 .Cm GEOM_PART_BSD64
@@ -772,50 +774,67 @@ See
 .Sx CAVEATS
 section below.
 .It Cm dragonfly-label32
-A DragonFlyBSD partition subdivided into filesystems with a
+A
+.Dx
+partition subdivided into filesystems with a
 .Bx
 disklabel.
 The scheme-specific type is
 .Qq Li "!9d087404-1ca5-11dc-8817-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-label64
-A DragonFlyBSD partition subdivided into filesystems with a
+A
+.Dx
+partition subdivided into filesystems with a
 disklabel64.
 The scheme-specific type is
 .Qq Li "!3d48ce54-1d16-11dc-8696-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-legacy
-A legacy partition type used in DragonFlyBSD.
+A legacy partition type used in
+.Dx .
 The scheme-specific type is
 .Qq Li "!bd215ab2-1d16-11dc-8696-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-ccd
-A DragonFlyBSD partition used with Concatenated Disk driver.
+A
+.Dx
+partition used with Concatenated Disk driver.
 The scheme-specific type is
 .Qq Li "!dbd5211b-1ca5-11dc-8817-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-hammer
-A DragonFlyBSD partition that contains a Hammer filesystem.
+A
+.Dx
+partition that contains a Hammer filesystem.
 The scheme-specific type is
 .Qq Li "!61dc63ac-6e38-11dc-8513-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-hammer2
-A DragonFlyBSD partition that contains a Hammer2 filesystem.
+A
+.Dx
+partition that contains a Hammer2 filesystem.
 The scheme-specific type is
 .Qq Li "!5cbb9ad1-862d-11dc-a94d-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-swap
-A DragonFlyBSD partition dedicated to swap space.
+A
+.Dx
+partition dedicated to swap space.
 The scheme-specific type is
 .Qq Li "!9d58fdbd-1ca5-11dc-8817-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-ufs
-A DragonFlyBSD partition that contains an UFS1 filesystem.
+A
+.Dx
+partition that contains an UFS1 filesystem.
 The scheme-specific type is
 .Qq Li "!9d94ce7c-1ca5-11dc-8817-01301bb8a9f5"
 for GPT.
 .It Cm dragonfly-vinum
-A DragonFlyBSD partition used with Logical Volume Manager.
+A
+.Dx
+partition used with Logical Volume Manager.
 The scheme-specific type is
 .Qq Li "!9dd4478f-1ca5-11dc-8817-01301bb8a9f5"
 for GPT.
@@ -906,32 +925,44 @@ The scheme-specific type is
 .Qq Li "!5808c8aa-7e8f-42e0-85d2-e1e90434cfb3"
 for GPT.
 .It Cm netbsd-ccd
-A NetBSD partition used with Concatenated Disk driver.
+A
+.Nx
+partition used with Concatenated Disk driver.
 The scheme-specific type is
 .Qq Li "!2db519c4-b10f-11dc-b99b-0019d1879648"
 for GPT.
 .It Cm netbsd-cgd
-An encrypted NetBSD partition.
+An encrypted
+.Nx
+partition.
 The scheme-specific type is
 .Qq Li "!2db519ec-b10f-11dc-b99b-0019d1879648"
 for GPT.
 .It Cm netbsd-ffs
-A NetBSD partition that contains an UFS filesystem.
+A
+.Nx
+partition that contains an UFS filesystem.
 The scheme-specific type is
 .Qq Li "!49f48d5a-b10e-11dc-b99b-0019d1879648"
 for GPT.
 .It Cm netbsd-lfs
-A NetBSD partition that contains an LFS filesystem.
+A
+.Nx
+partition that contains an LFS filesystem.
 The scheme-specific type is
 .Qq Li "!49f48d82-b10e-11dc-b99b-0019d1879648"
 for GPT.
 .It Cm netbsd-raid
-A NetBSD partition used in a software RAID configuration.
+A
+.Nx
+partition used in a software RAID configuration.
 The scheme-specific type is
 .Qq Li "!49f48daa-b10e-11dc-b99b-0019d1879648"
 for GPT.
 .It Cm netbsd-swap
-A NetBSD partition dedicated to swap space.
+A
+.Nx
+partition dedicated to swap space.
 The scheme-specific type is
 .Qq Li "!49f48d32-b10e-11dc-b99b-0019d1879648"
 for GPT.
@@ -1445,7 +1476,6 @@ label:
 /sbin/gpart bootcode -b /boot/boot ada0s1
 .Ed
 .Ss VTOC8
-.Pp
 Create a VTOC8 scheme on
 .Pa da0 :
 .Bd -literal -offset indent
@@ -1498,7 +1528,6 @@ This is equivalent to the previous example:
 /sbin/gpart destroy -F da0
 .Ed
 .Ss Backup and Restore
-.Pp
 Create a backup of the partition table from
 .Pa da0 :
 .Bd -literal -offset indent
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index b8ed66c4dcb5..066976b61426 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2023
+.Dd June 1, 2023
 .Dt CAM 3
 .Os
 .Sh NAME
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 5201063136e1..70943e04032a 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2023
+.Dd June 1, 2023
 .Dt CAMCONTROL 8
 .Os
 .Sh NAME