diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
index 55559ae7222..278fee88463 100644
--- a/lib/libc/gen/posix_spawn.3
+++ b/lib/libc/gen/posix_spawn.3
@@ -446,12 +446,12 @@ action.
 .Xr sched_setscheduler 2 ,
 .Xr setpgid 2 ,
 .Xr vfork 2 ,
+.Xr posix_spawn_file_actions_addchdir_np 3 ,
 .Xr posix_spawn_file_actions_addclose 3 ,
 .Xr posix_spawn_file_actions_addclosefrom_np 3 ,
 .Xr posix_spawn_file_actions_adddup2 3 ,
-.Xr posix_spawn_file_actions_addopen 3 ,
-.Xr posix_spawn_file_actions_addchdir_np 3 ,
 .Xr posix_spawn_file_actions_addfchdir_np 3 ,
+.Xr posix_spawn_file_actions_addopen 3 ,
 .Xr posix_spawn_file_actions_destroy 3 ,
 .Xr posix_spawn_file_actions_init 3 ,
 .Xr posix_spawnattr_destroy 3 ,
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 15bafa23a98..087cbe4b84e 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -74,10 +74,10 @@ setproctitle("talking to %s", inet_ntoa(addr));
 .Sh SEE ALSO
 .Xr ps 1 ,
 .Xr w 1 ,
-.Xr setprogname 3 ,
 .Xr kvm 3 ,
 .Xr kvm_getargv 3 ,
-.Xr printf 3
+.Xr printf 3 ,
+.Xr setprogname 3
 .Sh STANDARDS
 The
 .Fn setproctitle
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index bb1a0505faf..dc3034db1d6 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -85,7 +85,6 @@ See the specific manual pages for more information.
 .Xr memccpy 3 ,
 .Xr memchr 3 ,
 .Xr memcmp 3 ,
-.Xr memccpy 3 ,
 .Xr memcpy 3 ,
 .Xr memmove 3 ,
 .Xr memset 3
diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libc/sys/fhreadlink.2
index 222142de223..2d8db95685d 100644
--- a/lib/libc/sys/fhreadlink.2
+++ b/lib/libc/sys/fhreadlink.2
@@ -86,8 +86,8 @@ The file handle
 is no longer valid
 .El
 .Sh SEE ALSO
-.Xr fhstat 2 ,
 .Xr fhlink 2 ,
+.Xr fhstat 2
 .Sh HISTORY
 The
 .Fn fhreadlink
diff --git a/lib/libc/sys/getrlimitusage.2 b/lib/libc/sys/getrlimitusage.2
index 2e3dc744ab2..e82e7b4443f 100644
--- a/lib/libc/sys/getrlimitusage.2
+++ b/lib/libc/sys/getrlimitusage.2
@@ -92,7 +92,7 @@ and
 .Sh SEE ALSO
 .Xr procstat 1 ,
 .Xr getrlimit 2 ,
-.Xr setrlimit 2 .
+.Xr setrlimit 2
 .Sh HISTORY
 The
 .Fn getrlimitusage
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 3e2206aefe7..9c2b2f8f925 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -284,13 +284,10 @@ The socket type is not supported by the protocol.
 .Xr accept 2 ,
 .Xr bind 2 ,
 .Xr connect 2 ,
-.Xr divert 4 ,
 .Xr getpeername 2 ,
 .Xr getsockname 2 ,
 .Xr getsockopt 2 ,
 .Xr ioctl 2 ,
-.Xr ip 4 ,
-.Xr ip6 4 ,
 .Xr listen 2 ,
 .Xr read 2 ,
 .Xr recv 2 ,
@@ -301,6 +298,9 @@ The socket type is not supported by the protocol.
 .Xr write 2 ,
 .Xr CMSG_DATA 3 ,
 .Xr getprotoent 3 ,
+.Xr divert 4 ,
+.Xr ip 4 ,
+.Xr ip6 4 ,
 .Xr netgraph 4 ,
 .Xr protocols 5
 .Rs
diff --git a/lib/libc/sys/thr_kill.2 b/lib/libc/sys/thr_kill.2
index a18e53e6100..3252de13ed8 100644
--- a/lib/libc/sys/thr_kill.2
+++ b/lib/libc/sys/thr_kill.2
@@ -109,12 +109,12 @@ The current process does not have sufficient privilege to check existence or
 send a signal to the specified process.
 .El
 .Sh SEE ALSO
+.Xr _umtx_op 2 ,
 .Xr kill 2 ,
 .Xr thr_exit 2 ,
 .Xr thr_new 2 ,
 .Xr thr_self 2 ,
 .Xr thr_set_name 2 ,
-.Xr _umtx_op 2 ,
 .Xr pthread_kill 3 ,
 .Xr signal 3
 .Sh STANDARDS
diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3
index 2bcb6a64baa..7b5ceb025d6 100644
--- a/lib/libc/x86/sys/pkru.3
+++ b/lib/libc/x86/sys/pkru.3
@@ -195,7 +195,7 @@ and the range already has defined protection keys.
 .Xr mmap 2 ,
 .Xr mprotect 2 ,
 .Xr munmap 2 ,
-.Xr sysarch 2 .
+.Xr sysarch 2
 .Sh STANDARDS
 The
 .Nm
diff --git a/lib/libjail/jail.3 b/lib/libjail/jail.3
index 3c3c24d75dc..820e378eb62 100644
--- a/lib/libjail/jail.3
+++ b/lib/libjail/jail.3
@@ -270,8 +270,8 @@ A parameter is of an unknown type.
 .El
 .Sh SEE ALSO
 .Xr jail 2 ,
-.Xr jail 3lua ,
 .Xr sysctl 3 ,
+.Xr jail 3lua ,
 .Xr jail 8
 .Sh HISTORY
 The
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.8 b/lib/libpam/modules/pam_chroot/pam_chroot.8
index e65c513b7b7..1f614264ba8 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.8
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.8
@@ -78,8 +78,8 @@ Specify the chroot directory to use if one could not be derived from
 the user's home directory.
 .El
 .Sh SEE ALSO
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_deny/pam_deny.8 b/lib/libpam/modules/pam_deny/pam_deny.8
index 530bae05c1f..5d70bde200d 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.8
+++ b/lib/libpam/modules/pam_deny/pam_deny.8
@@ -73,6 +73,6 @@ reasons why the user's
 authentication attempt was declined.
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr syslog 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
diff --git a/lib/libpam/modules/pam_echo/pam_echo.8 b/lib/libpam/modules/pam_echo/pam_echo.8
index c38d4d8cee5..19c083917bb 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.8
+++ b/lib/libpam/modules/pam_echo/pam_echo.8
@@ -77,8 +77,8 @@ expands to the character following the
 .Cm %
 character.
 .Sh SEE ALSO
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_exec/pam_exec.8 b/lib/libpam/modules/pam_exec/pam_exec.8
index c7716295573..be566600355 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.8
+++ b/lib/libpam/modules/pam_exec/pam_exec.8
@@ -148,15 +148,15 @@ Each valid codes numerical value is available as an environment variable
 etc).
 This is useful in shell scripts for instance.
 .Sh SEE ALSO
-.Xr pam_get_item 3 ,
-.Xr pam.conf 5 ,
 .Xr pam 3 ,
+.Xr pam_get_item 3 ,
 .Xr pam_sm_acct_mgmt 3 ,
 .Xr pam_sm_authenticate 3 ,
 .Xr pam_sm_chauthtok 3 ,
 .Xr pam_sm_close_session 3 ,
 .Xr pam_sm_open_session 3 ,
-.Xr pam_sm_setcred 3
+.Xr pam_sm_setcred 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
index a5c810fd2de..d5a0f0f1fd2 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
@@ -82,9 +82,9 @@ will succeed if and only if the user is not listed in
 .Pa /etc/ftpusers .
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr ftpusers 5 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_group/pam_group.8 b/lib/libpam/modules/pam_group/pam_group.8
index ed96d45db50..315aaa6cc26 100644
--- a/lib/libpam/modules/pam_group/pam_group.8
+++ b/lib/libpam/modules/pam_group/pam_group.8
@@ -86,8 +86,8 @@ options are mutually exclusive, and that
 .Nm
 will fail if both are specified.
 .Sh SEE ALSO
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8
index 541fd299ba8..c626187d5b1 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.8
+++ b/lib/libpam/modules/pam_guest/pam_guest.8
@@ -80,10 +80,10 @@ password.
 Requires the guest user to type in the guest account name as password.
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_getenv 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.8 b/lib/libpam/modules/pam_krb5/pam_krb5.8
index b59fdbdee9c..7c177096127 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.8
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.8
@@ -222,9 +222,9 @@ file containing Kerberos principals that are allowed access.
 .Sh SEE ALSO
 .Xr kdestroy 1 ,
 .Xr passwd 1 ,
+.Xr pam 3 ,
 .Xr syslog 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
 .Sh NOTES
 Applications should not call
 .Fn pam_authenticate
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.8 b/lib/libpam/modules/pam_ksu/pam_ksu.8
index 36d6936423b..ace570ea5b5 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.8
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.8
@@ -115,6 +115,6 @@ the user is prompted for another password.
 .El
 .Sh SEE ALSO
 .Xr su 1 ,
+.Xr pam 3 ,
 .Xr syslog 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.8 b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
index 6e5ba8770ad..e924016151f 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.8
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
@@ -84,11 +84,11 @@ Ignore I/O failures.
 .Xr last 1 ,
 .Xr w 1 ,
 .Xr getutxent 3 ,
+.Xr pam 3 ,
 .Xr ulog_login 3 ,
 .Xr ulog_logout 3 ,
 .Xr pam.conf 5 ,
-.Xr lastlogin 8 ,
-.Xr pam 3
+.Xr lastlogin 8
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.8 b/lib/libpam/modules/pam_nologin/pam_nologin.8
index 30f87a65b63..ff49749e50f 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.8
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.8
@@ -81,8 +81,8 @@ reasons why the user's
 login attempt was declined.
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr syslog 3 ,
 .Xr login.conf 5 ,
 .Xr nologin 5 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
index f2ec1747d1f..755e9352042 100644
--- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
+++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
@@ -248,8 +248,8 @@ is that the former is incompatible with
 .El
 .Sh SEE ALSO
 .Xr getpwnam 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_permit/pam_permit.8 b/lib/libpam/modules/pam_permit/pam_permit.8
index f0b2f552706..270eaee8361 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.8
+++ b/lib/libpam/modules/pam_permit/pam_permit.8
@@ -68,6 +68,6 @@ debugging information at
 level.
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr syslog 3 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 6b2d1ef1fa5..abc916dcfff 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -123,9 +123,9 @@ The standard RADIUS client configuration file for
 .Nm
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr passwd 5 ,
-.Xr radius.conf 5 ,
-.Xr pam 3
+.Xr radius.conf 5
 .Sh HISTORY
 The
 .Nm
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.8 b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
index ea005738840..1f9716b9a0c 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.8
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
@@ -78,9 +78,9 @@ was declined.
 do not automatically fail if the target user's UID is 0.
 .El
 .Sh SEE ALSO
+.Xr pam 3 ,
 .Xr hosts.equiv 5 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.8 b/lib/libpam/modules/pam_rootok/pam_rootok.8
index d1ab8226e2c..fd0a6dd3791 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.8
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.8
@@ -69,5 +69,5 @@ authentication attempt was declined.
 .El
 .Sh SEE ALSO
 .Xr getuid 2 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.8 b/lib/libpam/modules/pam_securetty/pam_securetty.8
index b1997900097..582389cf101 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.8
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.8
@@ -84,7 +84,7 @@ authentication attempt was declined.
 .El
 .Sh SEE ALSO
 .Xr getttynam 3 ,
+.Xr pam 3 ,
 .Xr syslog 3 ,
 .Xr pam.conf 5 ,
-.Xr ttys 5 ,
-.Xr pam 3
+.Xr ttys 5
diff --git a/lib/libpam/modules/pam_self/pam_self.8 b/lib/libpam/modules/pam_self/pam_self.8
index c3623998f0b..f875d671286 100644
--- a/lib/libpam/modules/pam_self/pam_self.8
+++ b/lib/libpam/modules/pam_self/pam_self.8
@@ -80,8 +80,8 @@ do not automatically fail if the current real user ID is 0.
 .El
 .Sh SEE ALSO
 .Xr getuid 2 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index e63930eb534..3ef44d8b687 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -138,8 +138,8 @@ SSH2 Ed25519 key
 .El
 .Sh SEE ALSO
 .Xr ssh-agent 1 ,
-.Xr pam.conf 5 ,
-.Xr pam 3
+.Xr pam 3 ,
+.Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
diff --git a/lib/libpam/modules/pam_unix/pam_unix.8 b/lib/libpam/modules/pam_unix/pam_unix.8
index 170cf65f34d..5c2ae5cf52e 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.8
+++ b/lib/libpam/modules/pam_unix/pam_unix.8
@@ -201,10 +201,10 @@ password database.
 .Xr getlogin 2 ,
 .Xr crypt 3 ,
 .Xr getpwent 3 ,
+.Xr pam 3 ,
 .Xr syslog 3 ,
 .Xr nsswitch.conf 5 ,
 .Xr passwd 5 ,
-.Xr pam 3 ,
 .Xr pw 8 ,
 .Xr yp 8
 .Sh BUGS
diff --git a/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 b/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3
index e5995bff832..4eb25187f0d 100644
--- a/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3
+++ b/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3
@@ -46,5 +46,5 @@ to the stream
 .Fa fp .
 In particular, the embedded PR-SCTP policies are handled.
 .Sh SEE ALSO
-.Xr sysdecode 3
+.Xr sysdecode 3 ,
 .Xr sysdecode_sctp_pr_policy 3
diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3
index 7d0c7669654..6d33f4c378c 100644
--- a/lib/libthr/libthr.3
+++ b/lib/libthr/libthr.3
@@ -325,15 +325,15 @@ anyway.
 .Sh SEE ALSO
 .Xr ktrace 1 ,
 .Xr ld-elf.so.1 1 ,
-.Xr getrlimit 2 ,
+.Xr _umtx_op 2 ,
 .Xr errno 2 ,
+.Xr getrlimit 2 ,
 .Xr thr_exit 2 ,
 .Xr thr_kill 2 ,
 .Xr thr_kill2 2 ,
 .Xr thr_new 2 ,
 .Xr thr_self 2 ,
 .Xr thr_set_name 2 ,
-.Xr _umtx_op 2 ,
 .Xr dlclose 3 ,
 .Xr dlopen 3 ,
 .Xr getenv 3 ,
diff --git a/lib/libveriexec/veriexec.3 b/lib/libveriexec/veriexec.3
index 8fd5822c806..b367fc5ea40 100644
--- a/lib/libveriexec/veriexec.3
+++ b/lib/libveriexec/veriexec.3
@@ -59,5 +59,5 @@ If the signature does not match,
 .Va errno
 is set to the reason for the mismatch.
 .Sh SEE ALSO
-.Xr mac_veriexec 4
+.Xr mac_veriexec 4 ,
 .Xr veriexec 4
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 46c7f987d77..e050452498b 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -52,7 +52,7 @@ dialin devices, hardwired terminals
 dialout devices
 .El
 .Sh SEE ALSO
-.Xr stty 1 ,
+.Xr stty 1
 .Sh HISTORY
 Originally part of cgd's com package patches, version 0.2.1, to
 .Bx 386 0.1 .
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 0dc93cb8b78..4ac6e56879b 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -352,13 +352,13 @@ than the historical defaults
 This large fragment size may lead to much wasted space
 on file systems that contain many small files.
 .Sh SEE ALSO
-.Xr fdformat 8 ,
 .Xr geom 4 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
 .Xr camcontrol 8 ,
 .Xr dump 8 ,
 .Xr dumpfs 8 ,
+.Xr fdformat 8 ,
 .Xr fsck 8 ,
 .Xr gjournal 8 ,
 .Xr gpart 8 ,
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index 086980151d6..2c26ca868da 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -187,8 +187,8 @@ file system table
 .Xr unmount 2 ,
 .Xr fstab 5 ,
 .Xr autounmountd 8 ,
-.Xr mount 8 ,
-.Xr mdconfig 8
+.Xr mdconfig 8 ,
+.Xr mount 8
 .Sh HISTORY
 A
 .Nm
diff --git a/share/man/man4/atopcase.4 b/share/man/man4/atopcase.4
index fc93b709446..830c67f872a 100644
--- a/share/man/man4/atopcase.4
+++ b/share/man/man4/atopcase.4
@@ -101,9 +101,9 @@ device node.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
+.Xr loader.conf 5 ,
 .Xr backlight 8 ,
-.Xr loader 8 ,
-.Xr loader.conf 5 .
+.Xr loader 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 7c3fa6ed985..0260d5ec5a8 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -336,6 +336,7 @@ devices
 None.
 .Sh SEE ALSO
 .Xr cam 4 ,
+.Xr cd9660 4 ,
 .Xr da 4 ,
 .Xr cd9660 5 ,
 .Xr disklabel 8 ,
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index 9d842e475d8..87a6f5da4b0 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -140,10 +140,10 @@ is running low on mbufs.
 .Xr intro 4 ,
 .Xr ipheth 4 ,
 .Xr netintro 4 ,
+.Xr u3g 4 ,
+.Xr ucom 4 ,
 .Xr urndis 4 ,
 .Xr usb 4 ,
-.Xr ucom 4 ,
-.Xr u3g 4 ,
 .Xr ifconfig 8
 .Rs
 .%T "Universal Serial Bus Class Definitions for Communication Devices"
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 81b1b33efb6..ad82cb80011 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -59,9 +59,9 @@ pipes.
 .Xr setsockopt 2 ,
 .Xr if_bridge 4 ,
 .Xr ip 4 ,
-.Xr ipfw 8 ,
-.Xr dnctl 8 ,
 .Xr pf.conf 5 ,
+.Xr dnctl 8 ,
+.Xr ipfw 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/ftgpio.4 b/share/man/man4/ftgpio.4
index e31457673fa..7a556284173 100644
--- a/share/man/man4/ftgpio.4
+++ b/share/man/man4/ftgpio.4
@@ -40,8 +40,8 @@ is a driver for the GPIO controller found on Fintek Super I/O chips.
 .Xr gpio 3 ,
 .Xr gpio 4 ,
 .Xr gpioled 4 ,
-.Xr gpioctl 8
 .Xr superio 4 ,
+.Xr gpioctl 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index bfc571bcb59..691ed3d331c 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -149,11 +149,11 @@ man page for a complete description of the
 capabilities and how to use it.
 .Sh SEE ALSO
 .Xr setsockopt 2 ,
+.Xr libalias 3 ,
 .Xr divert 4 ,
 .Xr ip 4 ,
 .Xr ip6 4 ,
 .Xr ipfw 8 ,
-.Xr libalias 3 ,
 .Xr natd 8 ,
 .Xr sysctl 8 ,
 .Xr syslogd 8 ,
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 952d7b92538..96a10dfb770 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -333,8 +333,8 @@ routines from looking into the IP payload.
 .Xr ipsec_set_policy 3 ,
 .Xr crypto 4 ,
 .Xr enc 4 ,
-.Xr if_ipsec 4 ,
 .Xr icmp6 4 ,
+.Xr if_ipsec 4 ,
 .Xr intro 4 ,
 .Xr ip6 4 ,
 .Xr setkey 8 ,
diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4
index ce9f8cf25a4..aa84a71b495 100644
--- a/share/man/man4/mac_do.4
+++ b/share/man/man4/mac_do.4
@@ -74,5 +74,5 @@ The following rule:
 means the user with the uid 1001 can execute processes as user with uid 80,
 all the users which belongs to the group gid 0 can execute processes as any user.
 .Sh SEE ALSO
-.Xr mac 4 ,
-.Xr mdo 1
+.Xr mdo 1 ,
+.Xr mac 4
diff --git a/share/man/man4/man4.aarch64/rk_gpio.4 b/share/man/man4/man4.aarch64/rk_gpio.4
index 69bcb1671f8..b5648662cf5 100644
--- a/share/man/man4/man4.aarch64/rk_gpio.4
+++ b/share/man/man4/man4.aarch64/rk_gpio.4
@@ -47,7 +47,7 @@ rockchip,gpio-bank
 .El
 .Sh SEE ALSO
 .Xr gpiobus 4 ,
-.Xr gpioctl 8 ,
+.Xr gpioctl 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.aarch64/rk_i2c.4 b/share/man/man4/man4.aarch64/rk_i2c.4
index f30b510e765..be1a0fab943 100644
--- a/share/man/man4/man4.aarch64/rk_i2c.4
+++ b/share/man/man4/man4.aarch64/rk_i2c.4
@@ -49,7 +49,7 @@ rockchip,rk3328-i2c
 .El
 .Sh SEE ALSO
 .Xr iic 4 ,
-.Xr iicbus 4 ,
+.Xr iicbus 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.aarch64/rk_pinctrl.4 b/share/man/man4/man4.aarch64/rk_pinctrl.4
index c196c00d52b..519b3e793cd 100644
--- a/share/man/man4/man4.aarch64/rk_pinctrl.4
+++ b/share/man/man4/man4.aarch64/rk_pinctrl.4
@@ -46,7 +46,7 @@ compatible strings :
 rockchip,rk3328-pinctrl
 .El
 .Sh SEE ALSO
-.Xr fdt_pinctrl 4 ,
+.Xr fdt_pinctrl 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.arm/imx6_ahci.4 b/share/man/man4/man4.arm/imx6_ahci.4
index cfe8a87deb6..9979cef50d7 100644
--- a/share/man/man4/man4.arm/imx6_ahci.4
+++ b/share/man/man4/man4.arm/imx6_ahci.4
@@ -55,7 +55,7 @@ data and marshall resources for the standard
 driver.
 .Sh SEE ALSO
 .Xr ahci 4 ,
-.Xr fdt 4 ,
+.Xr fdt 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/mpi3mr.4 b/share/man/man4/mpi3mr.4
index 981979e3718..f07ce13d2f2 100644
--- a/share/man/man4/mpi3mr.4
+++ b/share/man/man4/mpi3mr.4
@@ -64,7 +64,7 @@ Broadcom Ltd. 9600-8i8e 24G PCIe 4.0 Tri-Mode RAID Adapters
 .Xr mpr 4 ,
 .Xr pci 4 ,
 .Xr sa 4 ,
-.Xr scsi 4 .
+.Xr scsi 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4
index 5a12f8f3246..6be0c8662d5 100644
--- a/share/man/man4/netmap.4
+++ b/share/man/man4/netmap.4
@@ -1123,10 +1123,10 @@ with the network card or the host.
 .Sh SEE ALSO
 .Xr vale 4 ,
 .Xr bridge 8 ,
-.Xr valectl 8 ,
 .Xr lb 8 ,
 .Xr nmreplay 8 ,
-.Xr pkt-gen 8
+.Xr pkt-gen 8 ,
+.Xr valectl 8
 .Pp
 .Pa http://info.iet.unipi.it/~luigi/netmap/
 .Pp
diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4
index 10615b3b387..53cd841a739 100644
--- a/share/man/man4/ng_nat.4
+++ b/share/man/man4/ng_nat.4
@@ -396,8 +396,8 @@ SEQ
 .Xr libalias 3 ,
 .Xr ng_ipfw 4 ,
 .Xr natd 8 ,
-.Xr ngctl 8 ,
-.Xr ng_ether 8
+.Xr ng_ether 8 ,
+.Xr ngctl 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index 346b2bfbe27..5b5f0dd64de 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -565,9 +565,9 @@ setup(char *ethername, char *service, char *sessname,
 .Xr ng_ether 4 ,
 .Xr ng_ppp 4 ,
 .Xr ng_socket 4 ,
+.Xr vlan 4 ,
 .Xr ngctl 8 ,
-.Xr ppp 8 ,
-.Xr vlan 4
+.Xr ppp 8
 .Rs
 .%A L. Mamakos
 .%A K. Lidl
diff --git a/share/man/man4/procdesc.4 b/share/man/man4/procdesc.4
index d0b99e5cbe0..f1f3757aa83 100644
--- a/share/man/man4/procdesc.4
+++ b/share/man/man4/procdesc.4
@@ -58,10 +58,10 @@ Given a process descriptor, it is possible to query its conventional PID using
 .Sh SEE ALSO
 .Xr fork 2 ,
 .Xr kill 2 ,
+.Xr kqueue 2 ,
 .Xr pdfork 2 ,
 .Xr pdgetpid 2 ,
 .Xr pdkill 2 ,
-.Xr kqueue 2 ,
 .Xr wait4 2 ,
 .Xr capsicum 4
 .Sh HISTORY
diff --git a/share/man/man4/virtio_gpu.4 b/share/man/man4/virtio_gpu.4
index bb34ec419df..f8d48faa05f 100644
--- a/share/man/man4/virtio_gpu.4
+++ b/share/man/man4/virtio_gpu.4
@@ -46,7 +46,7 @@ device driver provides support for VirtIO gpu devices to create a
 .Xr vt 4
 console.
 .Sh SEE ALSO
-.Xr virtio 4
+.Xr virtio 4 ,
 .Xr vt 4
 .Sh HISTORY
 The
diff --git a/share/man/man5/lindebugfs.5 b/share/man/man5/lindebugfs.5
index 8e385be7d74..4e823baff13 100644
--- a/share/man/man5/lindebugfs.5
+++ b/share/man/man5/lindebugfs.5
@@ -81,7 +81,7 @@ file system on
 .Xr linsysfs 5 ,
 .Xr pseudofs 9 ,
 .Xr linux 4 ,
-.Xr mount 1
+.Xr pseudofs 9
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 3193c18760c..7e2db95fd96 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -3407,8 +3407,8 @@ Service name database.
 .Xr ip6 4 ,
 .Xr pf 4 ,
 .Xr pfsync 4 ,
-.Xr tcp 4 ,
 .Xr sctp 4 ,
+.Xr tcp 4 ,
 .Xr udp 4 ,
 .Xr hosts 5 ,
 .Xr pf.os 5 ,
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 2dd46cf50c2..844ba035669 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -945,6 +945,7 @@ file resides in
 .El
 .Sh SEE ALSO
 .Xr rc.conf 5 ,
+.Xr debug.sh 8 ,
 .Xr rc 8
 .Sh HISTORY
 The
diff --git a/share/man/man9/VOP_SETLABEL.9 b/share/man/man9/VOP_SETLABEL.9
index e5cf99bebd8..4ab7dd9beab 100644
--- a/share/man/man9/VOP_SETLABEL.9
+++ b/share/man/man9/VOP_SETLABEL.9
@@ -113,13 +113,13 @@ Depending on the underlying implementation of
 .Fn VOP_SETLABEL ,
 other errors may also be possible.
 .Sh SEE ALSO
+.Xr mac 9 ,
+.Xr mount 9 ,
+.Xr vnode 9 ,
 .Xr VOP_CLOSEEXTATTR 9 ,
 .Xr VOP_OPENEXTATTR 9 ,
 .Xr VOP_READEXTATTR 9 ,
-.Xr VOP_WRITEXTATTR 9 ,
-.Xr mac 9 ,
-.Xr mount 9 ,
-.Xr vnode 9
+.Xr VOP_WRITEXTATTR 9
 .Sh AUTHORS
 This manual page was written by
 .An Robert Watson .
diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9
index f2d42f3835d..d16f4bb6dd8 100644
--- a/share/man/man9/cr_bsd_visible.9
+++ b/share/man/man9/cr_bsd_visible.9
@@ -107,11 +107,11 @@ and
 are not in the same jail.
 .El
 .Sh SEE ALSO
-.Xr cr_canseeotheruids 9 ,
-.Xr cr_canseeothergids 9 ,
+.Xr cr_cansee 9 ,
 .Xr cr_canseejailproc 9 ,
-.Xr priv_check_cred 9 ,
-.Xr cr_cansee 9
+.Xr cr_canseeothergids 9 ,
+.Xr cr_canseeotheruids 9 ,
+.Xr priv_check_cred 9
 .Sh AUTHORS
 This function and its manual page were written by
 .An Olivier Certner Aq Mt olce.freebsd@certner.fr .
diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9
index d5cdfdd6f8e..a93afb8e5c8 100644
--- a/share/man/man9/cr_cansee.9
+++ b/share/man/man9/cr_cansee.9
@@ -77,7 +77,7 @@ The MAC subsystem denied visibility.
 denied visibility according to the BSD security policies in force.
 .El
 .Sh SEE ALSO
-.Xr prison_check 9 ,
-.Xr mac 9 ,
 .Xr cr_bsd_visible 9 ,
-.Xr p_cansee 9
+.Xr mac 9 ,
+.Xr p_cansee 9 ,
+.Xr prison_check 9
diff --git a/share/man/man9/cr_canseeothergids.9 b/share/man/man9/cr_canseeothergids.9
index 109d41a8545..530335d5d5f 100644
--- a/share/man/man9/cr_canseeothergids.9
+++ b/share/man/man9/cr_canseeothergids.9
@@ -79,5 +79,5 @@ Otherwise, it returns
 .Er ESRCH .
 .Sh SEE ALSO
 .Xr cr_bsd_visible 9 ,
-.Xr realgroupmember 9 ,
-.Xr priv_check_cred 9
+.Xr priv_check_cred 9 ,
+.Xr realgroupmember 9
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index b7865a35fdc..db2138ef088 100644
--- a/share/man/man9/groupmember.9
+++ b/share/man/man9/groupmember.9
@@ -69,7 +69,7 @@ or
 .Dv false
 otherwise.
 .Sh SEE ALSO
-.Xr getgroups 2
+.Xr getgroups 2 ,
 .Xr setgroups 2
 .Sh AUTHORS
 This manual page was initially written by
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index c824db97415..be4710f0a15 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -138,8 +138,8 @@ command
 .Pc .
 .El
 .Sh SEE ALSO
-.Xr prison_check 9 ,
-.Xr mac 9 ,
-.Xr cr_bsd_visible 9 ,
 .Xr procctl 2 ,
-.Xr p_cansee 9
+.Xr cr_bsd_visible 9 ,
+.Xr mac 9 ,
+.Xr p_cansee 9 ,
+.Xr prison_check 9
diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9
index 9fdce460dfe..7de0c965499 100644
--- a/share/man/man9/p_cansee.9
+++ b/share/man/man9/p_cansee.9
@@ -74,6 +74,6 @@ and cannot see it as determined by
 .Xr cr_cansee 9 .
 .El
 .Sh SEE ALSO
-.Xr ucred 9 ,
 .Xr cr_cansee 9 ,
-.Xr p_candebug 9
+.Xr p_candebug 9 ,
+.Xr ucred 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index f9d2b1668da..3f2e6c9ef65 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -227,7 +227,7 @@ Empty space available for protocol-specific information.
 .El
 .Sh SEE ALSO
 .Xr route 4 ,
-.Xr route 8 ,
+.Xr route 8
 .Sh HISTORY
 The
 .Vt rtentry
diff --git a/tools/tools/ether_reflect/ether_reflect.1 b/tools/tools/ether_reflect/ether_reflect.1
index 617ee0b7837..9e94661211a 100644
--- a/tools/tools/ether_reflect/ether_reflect.1
+++ b/tools/tools/ether_reflect/ether_reflect.1
@@ -94,8 +94,8 @@ Rewrite the destination address in each packet to 00:00:00:aa:bb:cc
 before reflecting the packet.
 .Sh SEE ALSO
 .Xr tcpdump 1 ,
-.Xr bpf 4 ,
 .Xr pcap 3 ,
+.Xr bpf 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
diff --git a/usr.bin/beep/beep.1 b/usr.bin/beep/beep.1
index 29988c5b271..732f2ae261c 100644
--- a/usr.bin/beep/beep.1
+++ b/usr.bin/beep/beep.1
@@ -73,7 +73,7 @@ Playback default beep sound using /dev/dsp .
 .El
 .Sh SEE ALSO
 .Xr mixer 3 ,
-.Xr sound 4 ,
+.Xr sound 4
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1
index afb1147f3df..6f1a99a15b9 100644
--- a/usr.bin/gzip/gzip.1
+++ b/usr.bin/gzip/gzip.1
@@ -202,8 +202,8 @@ Report progress to standard error.
 .Sh SEE ALSO
 .Xr bzip2 1 ,
 .Xr compress 1 ,
-.Xr zstd 1 ,
 .Xr xz 1 ,
+.Xr zstd 1 ,
 .Xr fts 3 ,
 .Xr zlib 3
 .Sh HISTORY
diff --git a/usr.bin/mdo/mdo.1 b/usr.bin/mdo/mdo.1
index 115ce44f453..ae89481ddb2 100644
--- a/usr.bin/mdo/mdo.1
+++ b/usr.bin/mdo/mdo.1
@@ -40,5 +40,5 @@ option can be used to only call
 .Fn setuid
 and keep the group from the calling user.
 .Sh SEE ALSO
-.Xr su 1
+.Xr su 1 ,
 .Xr mac_do 4
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index a3a25257ffc..9d685e12416 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -220,8 +220,8 @@ database
 number of next message to be presented
 .El
 .Sh SEE ALSO
-.Xr mail 1 ,
 .Xr less 1 ,
+.Xr mail 1 ,
 .Xr aliases 5 ,
 .Xr periodic 8
 .Sh HISTORY
diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.1 b/usr.bin/posixmqcontrol/posixmqcontrol.1
index ec60230aac6..6ed36ceffa0 100644
--- a/usr.bin/posixmqcontrol/posixmqcontrol.1
+++ b/usr.bin/posixmqcontrol/posixmqcontrol.1
@@ -158,8 +158,8 @@ use the command
 .Dl "posixmqcontrol info -q /4"
 .El
 .Sh SEE ALSO
-.Xr mq_open 2 ,
 .Xr mq_getattr 2 ,
+.Xr mq_open 2 ,
 .Xr mq_receive 2 ,
 .Xr mq_send 2 ,
 .Xr mq_setattr 2 ,
diff --git a/usr.sbin/i2c/i2c.8 b/usr.sbin/i2c/i2c.8
index 95aba8e5d10..3415b614f87 100644
--- a/usr.sbin/i2c/i2c.8
+++ b/usr.sbin/i2c/i2c.8
@@ -204,7 +204,7 @@ Reading these can disturb the firmware's operation and writing to them
 can "brick" the hardware.
 .Sh SEE ALSO
 .Xr iic 4 ,
-.Xr iicbus 4
+.Xr iicbus 4 ,
 .Xr smbus 4
 .Sh HISTORY
 The
diff --git a/usr.sbin/lastlogin/lastlogin.8 b/usr.sbin/lastlogin/lastlogin.8
index 0e18724a870..3b2d47fdaf7 100644
--- a/usr.sbin/lastlogin/lastlogin.8
+++ b/usr.sbin/lastlogin/lastlogin.8
@@ -92,9 +92,9 @@ last login database
 .Sh SEE ALSO
 .Xr last 1 ,
 .Xr getutxent 3 ,
-.Xr ac 8 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3
+.Xr xo_parse_args 3 ,
+.Xr ac 8
 .Sh AUTHORS
 .An -nosplit
 .An John M. Vinopal
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 8480c939904..c0f201318f5 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -165,12 +165,12 @@ The
 will print a diagnostic if its configuration file is missing or malformed,
 or does not contain a mapping for the name under which it was invoked.
 .Sh SEE ALSO
-.Xr dma 8 ,
 .Xr mail 1 ,
 .Xr mailq 1 ,
 .Xr newaliases 1 ,
 .Xr mailer.conf 5 ,
 .Xr periodic.conf 5 ,
+.Xr dma 8 ,
 .Xr sendmail 8
 .Sh HISTORY
 The
diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.8 b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.8
index 5e6f93318ec..f4e8acc0c5c 100644
--- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.8
+++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.8
@@ -194,9 +194,9 @@ option has also been specified.
 .Sh SEE ALSO
 .Xr openssl 1 ,
 .Xr ktls 4 ,
+.Xr ssl 7 ,
 .Xr mount_nfs 8 ,
 .Xr rpc.tlsservd 8 ,
-.Xr ssl 7 ,
 .Xr syslogd 8
 .Sh STANDARDS
 The implementation is based on the specification in