diff --git a/share/man/man4/hms.4 b/share/man/man4/hms.4
index eb413e943976..f3e798dc43aa 100644
--- a/share/man/man4/hms.4
+++ b/share/man/man4/hms.4
@@ -93,7 +93,7 @@ input event device node.
 .Xr iichid 4 ,
 .Xr usbhid 4 ,
 .Xr xorg.conf 5 Pq Pa ports/x11/xorg
-.\.Xr moused 8
+.\".Xr moused 8
 .Sh BUGS
 .Nm
 cannot act like
diff --git a/share/man/man4/iic_gpiomux.4 b/share/man/man4/iic_gpiomux.4
index a6d59ff2d37c..fe660b006b72 100644
--- a/share/man/man4/iic_gpiomux.4
+++ b/share/man/man4/iic_gpiomux.4
@@ -79,7 +79,7 @@ driver conforms to the standard
 bindings document.
 .Sh SEE ALSO
 .Xr iicbus 4 ,
-.Xr iicmux 4 ,
+.Xr iicmux 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ntb_hw_plx.4 b/share/man/man4/ntb_hw_plx.4
index 23d27a22bcba..a592f0b91b05 100644
--- a/share/man/man4/ntb_hw_plx.4
+++ b/share/man/man4/ntb_hw_plx.4
@@ -107,8 +107,8 @@ generally supported by the driver, it require PCI hotplug handling on the
 Root Port, that may be difficult or cause different kinds of problems.
 .Sh SEE ALSO
 .Xr if_ntb 4 ,
-.Xr ntb_transport 4 ,
 .Xr ntb 4 ,
+.Xr ntb_transport 4
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/share/man/man4/pwmc.4 b/share/man/man4/pwmc.4
index 537a22faa8a9..06953d671a03 100644
--- a/share/man/man4/pwmc.4
+++ b/share/man/man4/pwmc.4
@@ -106,7 +106,6 @@ struct pwm_state {
 	bool		enable;
 };
 .Ed
-.Pp
 .Bl -tag -width period
 .It Va period
 The duration, in nanoseconds, of one complete on-off cycle.
diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5
index d293e93fdcd6..f8d8ee97c668 100644
--- a/share/man/man5/motd.5
+++ b/share/man/man5/motd.5
@@ -25,7 +25,7 @@ and the contents are written to
 .Pa /var/run/motd
 can be updated without a system reboot by manually restarting the
 motd service after updating
-.Pa /etc/motd.template:
+.Pa /etc/motd.template :
 .Bd -literal -offset -ident -compact
 service motd restart
 .Ed
diff --git a/share/man/man5/os-release.5 b/share/man/man5/os-release.5
index a16ca33112d0..f578f8a52ce5 100644
--- a/share/man/man5/os-release.5
+++ b/share/man/man5/os-release.5
@@ -118,6 +118,7 @@ Symbolic link to actual
 file.
 .It Pa /var/run/os-release
 Generated os-release file describing the currently running system.
+.El
 .Sh SEE ALSO
 .Bl -tag -width XXXXXXXXXX -compact
 .It CPE Specification
@@ -126,6 +127,7 @@ Generated os-release file describing the currently running system.
 .Lk https://tools.ietf.org/html/rfc3986
 .It os-release Specification
 .Lk https://www.linux.org/docs/man5/os-release.html
+.El
 .Sh HISTORY
 This file first appeared in
 .Fx 13.0 .
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 63b8acaef358..8dcc85c7b440 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1918,7 +1918,6 @@ For example:
 pass in proto tcp to port 25 queue mail
 pass in proto tcp to port 22 queue(ssh_bulk, ssh_prio)
 .Ed
-.Pp
 .It Cm set prio Ar priority | Pq Ar priority , priority
 Packets matching this rule will be assigned a specific queueing priority.
 Priorities are assigned as integers 0 through 7.
@@ -1935,7 +1934,6 @@ For example:
 pass in proto tcp to port 25 set prio 2
 pass in proto tcp to port 22 set prio (2, 5)
 .Ed
-.Pp
 .It Ar tag Aq Ar string
 Packets matching this rule will be tagged with the
 specified string.
@@ -1998,7 +1996,6 @@ block in proto icmp probability 20%
 .Ed
 .It Ar prio Aq Ar number
 Only match packets which have the given queueing priority assigned.
-.Pp
 .El
 .Sh ROUTING
 If a packet matches a rule with a route option set, the packet filter will
@@ -2110,7 +2107,6 @@ nat on $gif_mape_if from $int_if:network to any \e
 .Ed
 .Pp
 sets PSID offset 6, PSID length 8, PSID 0x34.
-.Ed
 .El
 .Pp
 Additionally, the
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 6070678c69a4..2f124dd1cf3c 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -232,7 +232,7 @@ to protect only the service itself, and
 to protect the service and all child processes.
 .Pp
 Please note rc scripts that redefine
-.Bd
+.Bd -literal
 ${name}_cmd
 .Ed
 such as PostgreSQL will not inherit the OOM killer protection.
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 95e65c11e0d1..cf16934e8bf3 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -975,7 +975,6 @@ option should be used rather than this in most cases.
 Enable building
 .Xr loader 8
 with support for verification based on certificates obtained from UEFI.
-.Pp
 .It Va WITH_LOADER_FIREWIRE
 Enable firewire support in /boot/loader on x86.
 This option is a nop on all other platforms.
@@ -1653,7 +1652,7 @@ is used.
 .Pp
 This option is transitional and will be removed before the 12.0 release,
 at which time
-.va WITH_UNIFIED_OBJDIR
+.Va WITH_UNIFIED_OBJDIR
 will be enabled permanently.
 .Pp
 This must be set in the environment, make command line, or
diff --git a/share/man/man7/crypto.7 b/share/man/man7/crypto.7
index 01ff339fa31f..11f291859a12 100644
--- a/share/man/man7/crypto.7
+++ b/share/man/man7/crypto.7
@@ -169,7 +169,6 @@ AES Galois/Counter Mode
 AES Counter with CBC-MAC
 .It Dv CRYPTO_CHACHA20_POLY1305 Ta 12, 8 Ta 32 Ta 16 Ta
 ChaCha20-Poly1305
-.El
 .It Dv CRYPTO_XCHACHA20_POLY1305 Ta 24 Ta 32 Ta 16 Ta
 XChaCha20-Poly1305
 .El
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 6e382140f106..4ffa418d1dbb 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -719,6 +719,7 @@ Try to enable other debugging features like debug build type or verbose logging.
 However, this is port-specific and the ports framework might not be aware of
 each supported debugging feature a given piece of software has to offer).
 .El
+.El
 .Sh SEE ALSO
 .Xr make 1 ,
 .Xr make.conf 5 ,
diff --git a/share/man/man9/VOP_COPY_FILE_RANGE.9 b/share/man/man9/VOP_COPY_FILE_RANGE.9
index e085898f42da..5ef3b2609572 100644
--- a/share/man/man9/VOP_COPY_FILE_RANGE.9
+++ b/share/man/man9/VOP_COPY_FILE_RANGE.9
@@ -46,6 +46,7 @@ in a single file system
 .Fa "struct ucred *incred"
 .Fa "struct ucred *outcred"
 .Fa "struct thread *fsize_td"
+.Fc
 .Sh DESCRIPTION
 This entry point copies a byte range from one regular file to another
 or within one file in a single file system.
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 66c5a12f990b..7a8d7a5c328a 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -70,6 +70,7 @@ struct componentname {
 	long	cn_namelen;	/* length of looked up component */
 };
 .Ed
+.El
 .Pp
 Convert a component of a pathname into a pointer to a locked vnode.
 This is a very central and rather complicated routine.
diff --git a/share/man/man9/backlight.9 b/share/man/man9/backlight.9
index 5151ab1e91da..d0c09f75373b 100644
--- a/share/man/man9/backlight.9
+++ b/share/man/man9/backlight.9
@@ -66,6 +66,7 @@ struct.
 .Sh FILES
 .Bl -tag -width "/dev/backlight/*"
 .It Pa /dev/backlight/*
+.El
 .Sh HISTORY
 The
 .Nm backlight
diff --git a/share/man/man9/iflib.9 b/share/man/man9/iflib.9
index 91baa12b46cd..263cc2c9ec15 100644
--- a/share/man/man9/iflib.9
+++ b/share/man/man9/iflib.9
@@ -32,6 +32,7 @@ based drivers.
 Device-dependent transmit and receive functions, used when writing new
 .Nm
 based drivers.
+.El
 .Sh SEE ALSO
 .Xr iflib 4 ,
 .Xr iflibdd 9 ,
diff --git a/share/man/man9/rmlock.9 b/share/man/man9/rmlock.9
index 6d128f986968..283bd1b4fbb2 100644
--- a/share/man/man9/rmlock.9
+++ b/share/man/man9/rmlock.9
@@ -345,6 +345,7 @@ This functions destroys a lock previously initialized with
 The
 .Fa rms
 lock must be unlocked.
+.El
 .Sh SEE ALSO
 .Xr locking 9 ,
 .Xr mutex 9 ,
diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9
index 048f574aef2b..d5986ce7b7c3 100644
--- a/share/man/man9/vm_map_protect.9
+++ b/share/man/man9/vm_map_protect.9
@@ -131,6 +131,7 @@ but the specified
 .Fa new_prot
 is not a subset of
 .Fa new_maxprot .
+.El
 .Sh SEE ALSO
 .Xr vm_map 9
 .Sh AUTHORS