diff --git a/games/pom/pom.6 b/games/pom/pom.6
index e6bc957518c1..60f7b401062f 100644
--- a/games/pom/pom.6
+++ b/games/pom/pom.6
@@ -34,7 +34,6 @@
 .\"
 .Dd May 31, 1993
 .Dt POM 6
-.UC 7
 .Sh NAME
 .Nm pom
 .Nd display the phase of the moon
diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index bf3cf0bef8fa..d6271f1d8dfe 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -195,6 +195,7 @@ functions, an attempt was made to catch or ignore
 .Dv SIGKILL
 or
 .Dv SIGSTOP .
+.El
 .Sh SEE ALSO
 .Xr kill 2 ,
 .Xr sigaction 2 ,
diff --git a/lib/libgssapi/gss_init_sec_context.3 b/lib/libgssapi/gss_init_sec_context.3
index 787aff327217..278dd17979b5 100644
--- a/lib/libgssapi/gss_init_sec_context.3
+++ b/lib/libgssapi/gss_init_sec_context.3
@@ -153,7 +153,7 @@ The values of the
 .Dv GSS_C_MUTUAL_FLAG ,
 .Dv GSS_C_REPLAY_FLAG ,
 .Dv GSS_C_SEQUENCE_FLAG ,
-.Fv GSS_C_CONF_FLAG ,
+.Dv GSS_C_CONF_FLAG ,
 .Dv GSS_C_INTEG_FLAG and
 .Dv GSS_C_ANON_FLAG bits returned via the
 .Fa ret_flags
diff --git a/lib/libgssapi/gss_unwrap.3 b/lib/libgssapi/gss_unwrap.3
index 4cf3c6d22cb6..cc75782310b4 100644
--- a/lib/libgssapi/gss_unwrap.3
+++ b/lib/libgssapi/gss_unwrap.3
@@ -155,6 +155,7 @@ The context_handle parameter did not identify a valid context.
 Generic Security Service Application Program Interface Version 2, Update 1
 .It RFC 2744
 Generic Security Service API Version 2 : C-bindings
+.El
 .Sh HISTORY
 The
 .Nm
diff --git a/lib/libkvm/kvm_getpcpu.3 b/lib/libkvm/kvm_getpcpu.3
index f2deda935ad8..92036ca5fa56 100644
--- a/lib/libkvm/kvm_getpcpu.3
+++ b/lib/libkvm/kvm_getpcpu.3
@@ -96,7 +96,7 @@ will return pointers to that data on the appropriate CPU.
 .Sh CACHING
 .Fn kvm_getmaxcpu
 and
-.Vn kvm_getpcpu
+.Fn kvm_getpcpu
 cache the nlist values for various kernel variables which are
 reused in successive calls.
 You may call either function with
diff --git a/lib/librpcsec_gss/rpcsec_gss.3 b/lib/librpcsec_gss/rpcsec_gss.3
index dfc95ec972f3..e688afb20cc6 100644
--- a/lib/librpcsec_gss/rpcsec_gss.3
+++ b/lib/librpcsec_gss/rpcsec_gss.3
@@ -173,6 +173,7 @@ typedef struct {
 #define RPC_GSS_ER_SUCCESS	0	/* no error */
 #define RPC_GSS_ER_SYSTEMERROR	1	/* system error */
 .Ed
+.El
 .Sh INDEX
 .Bl -tag -width "MMMM"
 .It Xr rpc_gss_seccreate 3
diff --git a/lib/msun/man/cimag.3 b/lib/msun/man/cimag.3
index 18fefc473d13..6661ad2e908b 100644
--- a/lib/msun/man/cimag.3
+++ b/lib/msun/man/cimag.3
@@ -118,4 +118,4 @@ functions first appeared in
 The
 .Fn cproj
 functions appeared in
-.Fx 8.0.
+.Fx 8.0 .
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index 5eb124f651e6..f9d7aecc0648 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -240,7 +240,7 @@ and the
 and
 .Fl W
 options were introduced in
-.Fx 7 .
+.Fx 8.0 .
 .Pp
 .Sh BUGS
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 5ba2ad76fa3f..d5f60f279c5e 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -82,7 +82,7 @@ is zero, parallel passes are run as per
 .Xr fsck 8 .
 This option is deprecated and parallel passes are always run
 as per
-.Xf fsck 8.
+.Xr fsck 8 .
 .It Fl u
 Only user quotas listed in
 .Pa /etc/fstab
diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4
index cc61527a1dc0..6d93ff9a887a 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -57,7 +57,7 @@ information about GUIDs found in the system.
 WMI status device.
 .El
 .Sh EXAMPLES
-.Bd Literal
+.Bd -literal
 # cat /dev/wmistat
 GUID                                  INST EXPE METH STR EVENT OID
 {5FB7F034-2C63-45E9-BE91-3D44E2C707E4}   1 NO   WMAA NO  NO    AA
diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index 55fb8c1b0c92..8a568428d406 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -121,7 +121,7 @@ They have been applied to the following hardware drivers:
 .Xr an 4 ,
 .Xr ath 4 ,
 .Xr aue 4 ,
-.Xt axe 4 ,
+.Xr axe 4 ,
 .Xr bce 4 ,
 .Xr bfe 4 ,
 .Xr bge 4 ,
diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4
index fb6fc7730cd8..6d1ca7c4b078 100644
--- a/share/man/man4/amdtemp.4
+++ b/share/man/man4/amdtemp.4
@@ -75,6 +75,5 @@ The
 driver first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
-.An
 .An Rui Paulo Aq rpaulo@FreeBSD.org
 .An Norikatsu Shigemura Aq nork@FreeBSD.org
diff --git a/share/man/man4/cxgb.4 b/share/man/man4/cxgb.4
index 155df3865f74..97f72b570d99 100644
--- a/share/man/man4/cxgb.4
+++ b/share/man/man4/cxgb.4
@@ -92,8 +92,6 @@ Tunables can be set at the
 .Xr loader 8
 prompt before booting the kernel or stored in
 .Xr loader.conf 5 .
-.Bl -tag -width indent
-.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "cxgb%d: Unable to allocate bus resource: memory"
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 89bfcc452f5b..6f7412e42061 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -697,7 +697,7 @@ Show information from the local APIC registers for this CPU.
 .It Ic show Cm lock Ar addr
 Show lock structure.
 The output format is as follows:
-.Bl -tag -offset 0 -width "flags"
+.Bl -tag -width "flags"
 .It Ic class:
 Class of the lock.
 Possible types include
diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4
index 1697b2f30080..484a2135531e 100644
--- a/share/man/man4/iscsi_initiator.4
+++ b/share/man/man4/iscsi_initiator.4
@@ -73,7 +73,7 @@ is the IP address of the target of session
 .Em n .
 .It Va net.iscsi.n.stats
 are some statistics for session
-.EM n
+.Em n
 .It Va net.iscsi.n.pid
 is the 
 .Em "process id"
diff --git a/share/man/man4/textdump.4 b/share/man/man4/textdump.4
index 4b12fe9aa7ae..9c45f0f0fe1e 100644
--- a/share/man/man4/textdump.4
+++ b/share/man/man4/textdump.4
@@ -74,7 +74,7 @@ May be disabled by clearing the
 sysctl.
 .It Pa config.txt
 Kernel configuration, if
-.Od options INCLUDE_CONFIG_FILE
+.Cd options INCLUDE_CONFIG_FILE
 has been compiled into the kernel.
 May be disabled by clearing the
 .Dv debug.ddb.textdump.do_config
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 7bd4732f0139..644c37dfb55e 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -46,7 +46,6 @@ In
 .Cd hint.uart.0.baud="38400"
 .Cd hint.uart.0.port="0x3f8"
 .Cd hint.uart.0.flags="0x10"
-.Ed
 .Pp
 With
 .Ar flags
diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9
index ce43346b7a14..81292f58db79 100644
--- a/share/man/man9/fail.9
+++ b/share/man/man9/fail.9
@@ -84,7 +84,7 @@ below.
 The remaining
 .Fn KFAIL_POINT_*
 macros are wrappers around common error injection paths:
-.Bl -tag -width 8
+.Bl -inset
 .It Fn KFAIL_POINT_RETURN parent name
 is the equivalent of
 .Sy KFAIL_POINT_CODE(..., return RETURN_VALUE)
@@ -96,8 +96,7 @@ is the equivalent of
 .Sy KFAIL_POINT_CODE(..., error_var = RETURN_VALUE)
 .It Fn KFAIL_POINT_GOTO parent name error_var label
 is the equivalent of
-.Sy KFAIL_POINT_CODE(...,
-  { error_var = RETURN_VALUE; goto label;})
+.Sy KFAIL_POINT_CODE(..., { error_var = RETURN_VALUE; goto label;})
 .El
 .Sh SYSCTL VARIABLES
 The
diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1
index 8baab7a228d7..819e2f29c7c2 100644
--- a/usr.bin/tar/bsdtar.1
+++ b/usr.bin/tar/bsdtar.1
@@ -416,7 +416,7 @@ The pattern has the format /old/new/[gps].
 old is a basic regular expression.
 If it doesn't apply, the pattern is skipped.
 new is the replacement string of the matched part.
-~ is substituted with the match, \1 to \9 with the content of
+~ is substituted with the match, \e1 to \e9 with the content of
 the corresponding captured group.
 The optional trailing g specifies that matching should continue
 after the matched part and stopped on the first unmatched pattern.
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 9c8120f963c6..1d684b0c8f6c 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -149,7 +149,7 @@ other than 3AM, to avoid overly imposing an uneven load
 on the server(s) hosting the updates.
 .It
 In spite of its name,
-.Cm
+.Nm
 IDS should not be relied upon as an "Intrusion Detection
 System", since if the system has been tampered with
 it cannot be trusted to operate correctly.
diff --git a/usr.sbin/pkg_install/updating/pkg_updating.1 b/usr.sbin/pkg_install/updating/pkg_updating.1
index 0c35f9a2979b..998b4c4a8272 100644
--- a/usr.sbin/pkg_install/updating/pkg_updating.1
+++ b/usr.sbin/pkg_install/updating/pkg_updating.1
@@ -44,34 +44,25 @@ Defines a alternative location of the UPDATING
 Print help message.
 .El
 .Sh EXAMPLES
-.Bl -tag -width indent
 Shows all entries of all installed ports:
-.Pp
 .Dl % pkg_updating
 .Pp
 Shows all entries of all installed ports since 2007-01-01:
-.Pp
 .Dl % pkg_updating -d 20070101
 .Pp
 Shows all entries for all apache and mysql ports:
-.Pp
 .Dl % pkg_updating apache mysql
 .Pp
 Shows all apache entries since 2006-01-01:
-.Pp
 .Dl % pkg_updating -d 20060101 apache
 .Pp
 Defines that the UPDATING file is in /tmp and shows all entries of all
 installed ports:
-.Pp
 .Dl % pkg_updating -f /tmp/UPDATING
 .Pp
 Fetch UPDATING file from ftp mirror and show all entries of all
 installed ports:
-.Pp
 .Dl % pkg_updating -f ftp://ftp.freebsd.org/pub/FreeBSD/ports/packages/UPDATING
-.Pp
-.El
 .Sh ENVIRONMENT
 .Bl -tag -width PKG_DBDIR
 .It Ev PKG_DBDIR
diff --git a/usr.sbin/pmcannotate/pmcannotate.8 b/usr.sbin/pmcannotate/pmcannotate.8
index 38a413ac5f92..adadae437fa1 100644
--- a/usr.sbin/pmcannotate/pmcannotate.8
+++ b/usr.sbin/pmcannotate/pmcannotate.8
@@ -86,6 +86,7 @@ This directory specifies where
 should look for the kernel and its modules.
 The default is
 .Pa /boot/kernel .
+.El
 .Sh LIMITATIONS
 As long as
 .Nm
diff --git a/usr.sbin/uhsoctl/uhsoctl.1 b/usr.sbin/uhsoctl/uhsoctl.1
index 932cefa92610..e01c1a2af497 100644
--- a/usr.sbin/uhsoctl/uhsoctl.1
+++ b/usr.sbin/uhsoctl/uhsoctl.1
@@ -94,11 +94,9 @@ on interface
 and use PIN
 .Dq 1234
 to enable the SIM card.
-
 .Dl "uhsoctl -a apn.example.com -p 1234 uhso0"
-
-Disconnect from a previously established connection
-
+.Pp
+Disconnect from a previously established connection.
 .Dl "uhsoctl -d uhso0"
 .Sh SEE ALSO
 .Xr uhso 4