diff --git a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3 b/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3
index 81cdd74de010..11e8b48cedf2 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3
+++ b/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3
@@ -430,7 +430,7 @@ The description of the MIB tree implemented by
 .It Pa /usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 This is the MIB that is implemented by this module.
 .Sh SEE ALSO
-.Xr snmpmod 3 ,
-.Xr gensnmptree 1
+.Xr gensnmptree 1 ,
+.Xr snmpmod 3
 .Sh AUTHORS
 .An Hartmut Brandt Aq harti@freebsd.org
diff --git a/lib/libc/locale/isideogram.3 b/lib/libc/locale/isideogram.3
index 457046642daf..cbaa625e91df 100644
--- a/lib/libc/locale/isideogram.3
+++ b/lib/libc/locale/isideogram.3
@@ -49,7 +49,7 @@ returns non-zero if the character tests true.
 .Sh SEE ALSO
 .Xr ctype 3 ,
 .Xr isphonogram 3 ,
-.Xr iswideogram 3 ,
+.Xr iswideogram 3
 .Sh HISTORY
 The
 .Fn isideogram
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index f0e3a9f5c986..d412b4dc14a7 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -78,8 +78,8 @@ An invalid multibyte sequence was detected.
 The conversion state is invalid.
 .El
 .Sh SEE ALSO
-.Xr mbtowc 3 ,
 .Xr mbsrtowcs 3 ,
+.Xr mbtowc 3 ,
 .Xr multibyte 3
 .Sh STANDARDS
 The
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index 0d4a0a26b32d..8a5231bc49f6 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -119,8 +119,8 @@ and
 functions
 never return.
 .Sh SEE ALSO
-.Xr wait 2 ,
 .Xr _exit 2 ,
+.Xr wait 2 ,
 .Xr atexit 3 ,
 .Xr intro 3 ,
 .Xr sysexits 3 ,
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 561f36a4db78..45d4baea76fc 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -283,8 +283,8 @@ is ``root'', then the program has some of the powers
 of a super-user as well.
 .Sh SEE ALSO
 .Xr ktrace 1 ,
-.Xr fork 2 ,
 .Xr _exit 2 ,
+.Xr fork 2 ,
 .Xr execl 3 ,
 .Xr exit 3 ,
 .Xr sysctl 3 ,
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index dfc2ac0c6ebd..315fd826cc7d 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -159,9 +159,9 @@ is outside the range defined for the scheduling policy of the specified
 .Fa pid .
 .El
 .Sh SEE ALSO
-.Xr sched_getscheduler 2 ,
 .Xr sched_get_priority_max 2 ,
 .Xr sched_get_priority_min 2 ,
+.Xr sched_getscheduler 2 ,
 .Xr sched_rr_get_interval 2 ,
 .Xr sched_setscheduler 2 ,
 .Xr sched_yield 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index b299923ca576..a1f74cb29d52 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -102,11 +102,11 @@ it is wrong to call
 since buffered data would then be flushed twice.)
 .Sh SEE ALSO
 .Xr execve 2 ,
+.Xr _exit 2 ,
 .Xr fork 2 ,
 .Xr rfork 2 ,
 .Xr sigvec 2 ,
 .Xr wait 2 ,
-.Xr _exit 2 ,
 .Xr exit 3
 .Sh RETURN VALUES
 Same as for
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 35a2818bc550..ab734fc192b7 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -314,9 +314,9 @@ and the ability to restart a pending
 .Fn wait
 call are extensions to the POSIX interface.
 .Sh SEE ALSO
+.Xr _exit 2 ,
 .Xr ptrace 2 ,
 .Xr sigaction 2 ,
-.Xr _exit 2 ,
 .Xr exit 3
 .Sh HISTORY
 The
diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8
index 90fe3bd137c7..cc9c061200ad 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.8
+++ b/lib/libpam/modules/pam_guest/pam_guest.8
@@ -82,8 +82,8 @@ password.
 Requires the guest user to type in the guest account name as password.
 .El
 .Sh SEE ALSO
-.Xr pam_get_item 3 ,
 .Xr pam_getenv 3 ,
+.Xr pam_get_item 3 ,
 .Xr pam.conf 5 ,
 .Xr pam 8
 .Sh AUTHORS
diff --git a/lib/libufs/libufs.3 b/lib/libufs/libufs.3
index 4fd0ce5d224c..72d5c45e3957 100644
--- a/lib/libufs/libufs.3
+++ b/lib/libufs/libufs.3
@@ -63,7 +63,7 @@ to a string describing the error.
 .Xr ufs_disk_fillout 3 ,
 .Xr ufs_disk_fillout_blank 3 ,
 .Xr ufs_disk_write 3 ,
-.Xr ffs 7 .
+.Xr ffs 7
 .Sh HISTORY
 The
 .Xr libufs 3
diff --git a/share/man/man4/man4.i386/ndis.4 b/share/man/man4/man4.i386/ndis.4
index 18e55beec332..93d16015433e 100644
--- a/share/man/man4/man4.i386/ndis.4
+++ b/share/man/man4/man4.i386/ndis.4
@@ -119,8 +119,8 @@ before a timeout expired.
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr ifconfig 8 ,
-.Xr ndisapi 9 ,
-.Xr ndiscvt 8
+.Xr ndiscvt 8 ,
+.Xr ndisapi 9
 .Rs
 .%T "NDIS 5.1 specification"
 .%O http://www.microsoft.com
diff --git a/share/man/man4/matcd.4 b/share/man/man4/matcd.4
index cd4d2c0688eb..880f8b8ae155 100644
--- a/share/man/man4/matcd.4
+++ b/share/man/man4/matcd.4
@@ -462,7 +462,8 @@ present on the first host interface.
 Host interfaces are numbered as specified in the \fI/boot/devices.hints\fR
 file.
 .Sh SEE ALSO
-.Xr /usr/include/sys/cdio.h ,
+.In sys/cdio.h
+.Pp
 .Xr kldload 8 ,
 .Xr kldunload 8
 .Sh AUTHORS
diff --git a/share/man/man4/natmip.4 b/share/man/man4/natmip.4
index 82b2e7401e61..7d5f3d96262c 100644
--- a/share/man/man4/natmip.4
+++ b/share/man/man4/natmip.4
@@ -207,10 +207,10 @@ route_host2="-iface 128.252.200.2 -link en0:3.0.0.cb.1.1.86.a0"
 .Ed
 .Sh SEE ALSO
 .Xr en 4 ,
-.Xr hatm 4 ,
 .Xr fatm 4 ,
-.Xr patm 4 ,
-.Xr natm 4
+.Xr hatm 4 ,
+.Xr natm 4 ,
+.Xr patm 4
 .Sh AUTHORS
 .An Chuck Cranor
 of Washington University implemented the NATM protocol layer
diff --git a/share/man/man4/ng_atm.4 b/share/man/man4/ng_atm.4
index 8dbb90e448b8..85f16dfb8c6c 100644
--- a/share/man/man4/ng_atm.4
+++ b/share/man/man4/ng_atm.4
@@ -370,9 +370,9 @@ which when set to a non-zero values allows the nodes to shut down.
 Note, that this is intended for development only and may lead to kernel
 panics if set.
 .Sh SEE ALSO
+.Xr natm 4 ,
 .Xr netgraph 4 ,
 .Xr ng_ether 4 ,
-.Xr natm 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
 .An Harti Brandt Aq harti@freebsd.org
diff --git a/share/man/man4/ng_atmpif.4 b/share/man/man4/ng_atmpif.4
index 4e7cf4230b98..4193c28b2108 100644
--- a/share/man/man4/ng_atmpif.4
+++ b/share/man/man4/ng_atmpif.4
@@ -144,9 +144,9 @@ struct hva_stats_aal5 {
 .Ed
 .El
 .Sh SEE ALSO
+.Xr natm 4 ,
 .Xr netgraph 4 ,
 .Xr ng_ksocket 4 ,
-.Xr natm 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
 .An Harti Brandt Aq harti@freebsd.org
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 48f1cead175a..c70a142fea79 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -226,11 +226,11 @@ achieved.
 More transmit and link failure algorithms should be supported.
 A good candidate is Cisco's Etherchannel.
 .Sh SEE ALSO
-.Xr ifconfig 8 ,
 .Xr netgraph 4 ,
 .Xr ng_bridge 4 ,
 .Xr ng_ether 4 ,
 .Xr ng_hub 4 ,
+.Xr ifconfig 8 ,
 .Xr ngctl 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/ng_sppp.4 b/share/man/man4/ng_sppp.4
index 12512ff83d32..0257d283493d 100644
--- a/share/man/man4/ng_sppp.4
+++ b/share/man/man4/ng_sppp.4
@@ -130,19 +130,20 @@ managed via
 or via
 .Xr spppcontrol 8 as a sppp interface.
 .Sh SEE ALSO
-.Xr cx 4 ,
 .Xr bpf 4 ,
-.Xr sppp 4 ,
+.Xr cx 4 ,
 .Xr netgraph 4 ,
 .Xr ng_cisco 4 ,
 .Xr ng_iface 4 ,
 .Xr ng_ppp 4 ,
+.Xr sppp 4 ,
 .Xr ifconfig 8 ,
-.Xr ngctl 8,
+.Xr ngctl 8 ,
 .Xr spppcontrol 8
 .Pp
 For complex networking topologies you may want to look at
-.Xr mpd ports .
+.Pa net/mpd
+port.
 .Sh HISTORY
 The
 .Nm ng_sppp
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index 22940f95f516..7b54c732b68a 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -303,9 +303,9 @@ so its use is discouraged.
 .Xr arc4random 3 ,
 .Xr drand48 3 ,
 .Xr rand 3 ,
-.Xr random 3 ,
 .Xr RAND_add 3 ,
 .Xr RAND_bytes 3 ,
+.Xr random 3 ,
 .Xr sysctl 8
 .Sh HISTORY
 A
diff --git a/share/man/man4/sbp_targ.4 b/share/man/man4/sbp_targ.4
index e68b8f61cf7c..64012e253df3 100644
--- a/share/man/man4/sbp_targ.4
+++ b/share/man/man4/sbp_targ.4
@@ -69,7 +69,7 @@ md0
 .Xr camcontrol 8 ,
 .Xr fwcontrol 8 ,
 .Xr kldload 8 ,
-.Xr scsi_target 8 ,
+.Xr scsi_target 8
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 34dddcc285bd..a70404bba85e 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -572,8 +572,8 @@ Useful when dmesg buffer in the kernel no longer has this information.
 .Xr kill 1 ,
 .Xr rc.conf 5 ,
 .Xr init 8 ,
-.Xr rc.subr 8 ,
 .Xr rcorder 8 ,
+.Xr rc.subr 8 ,
 .Xr reboot 8 ,
 .Xr savecore 8
 .Sh HISTORY
diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9
index 3a040231353a..a7f81fbcce2b 100644
--- a/share/man/man9/VOP_LINK.9
+++ b/share/man/man9/VOP_LINK.9
@@ -107,8 +107,8 @@ The file is immutable.
 A hard link is not possible between different file systems.
 .El
 .Sh SEE ALSO
-.Xr vnode 9 ,
-.Xr vn_lock 9
+.Xr vn_lock 9 ,
+.Xr vnode 9
 .Sh AUTHORS
 This man page was originally written by
 .An Doug Rabson .
diff --git a/share/man/man9/VOP_LISTEXTATTR.9 b/share/man/man9/VOP_LISTEXTATTR.9
index 336e397e5858..b1fba71ef64f 100644
--- a/share/man/man9/VOP_LISTEXTATTR.9
+++ b/share/man/man9/VOP_LISTEXTATTR.9
@@ -123,5 +123,5 @@ The file system does not support
 .Sh SEE ALSO
 .Xr extattr 9 ,
 .Xr vnode 9 ,
-.Xr VOP_GETEXTATTR 9
+.Xr VOP_GETEXTATTR 9 ,
 .Xr VOP_SETEXTATTR 9
diff --git a/share/man/man9/g_access.9 b/share/man/man9/g_access.9
index 40d175ca87c2..a7f501800b7e 100644
--- a/share/man/man9/g_access.9
+++ b/share/man/man9/g_access.9
@@ -147,8 +147,8 @@ some_function(struct g_geom *mygeom, struct g_provider *pp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
 .Xr g_consumer 9 ,
diff --git a/share/man/man9/g_attach.9 b/share/man/man9/g_attach.9
index 94424f5807c0..0cf8661095d0 100644
--- a/share/man/man9/g_attach.9
+++ b/share/man/man9/g_attach.9
@@ -124,8 +124,8 @@ some_function(struct g_geom *mygeom, struct g_provider *pp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_bio 9 ,
 .Xr g_consumer 9 ,
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index 2145997fd020..ce01f306a03c 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -229,8 +229,8 @@ example_start(struct bio *bp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_consumer 9 ,
diff --git a/share/man/man9/g_consumer.9 b/share/man/man9/g_consumer.9
index 7e94191aedca..90de11fb01b7 100644
--- a/share/man/man9/g_consumer.9
+++ b/share/man/man9/g_consumer.9
@@ -121,8 +121,8 @@ some_function(struct g_geom *mygeom, struct g_provider *pp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_data.9 b/share/man/man9/g_data.9
index 36fbd5d09548..37292720eab8 100644
--- a/share/man/man9/g_data.9
+++ b/share/man/man9/g_data.9
@@ -98,8 +98,8 @@ Possible errors:
 Can not read data.
 .El
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_event.9 b/share/man/man9/g_event.9
index 5f2b6367464f..42a2e2fa614b 100644
--- a/share/man/man9/g_event.9
+++ b/share/man/man9/g_event.9
@@ -166,8 +166,8 @@ example_event(void *arg, int flag)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9
index 64a8a5601ead..ff21c16b31d6 100644
--- a/share/man/man9/g_geom.9
+++ b/share/man/man9/g_geom.9
@@ -183,8 +183,8 @@ destroy_example_geom(struct g_geom *gp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index 87d943306597..914338b7e716 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -124,8 +124,8 @@ create_example_provider(struct g_geom *gp)
 }
 .Ed
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_provider_by_name.9 b/share/man/man9/g_provider_by_name.9
index bb59f298327e..7a5bb0c63b1b 100644
--- a/share/man/man9/g_provider_by_name.9
+++ b/share/man/man9/g_provider_by_name.9
@@ -58,8 +58,8 @@ or
 .Dv NULL
 if there is no such provider.
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/g_wither_geom.9 b/share/man/man9/g_wither_geom.9
index b4ceff07927a..9f22a79208e1 100644
--- a/share/man/man9/g_wither_geom.9
+++ b/share/man/man9/g_wither_geom.9
@@ -69,8 +69,8 @@ must be nonzero.
 .Pp
 The topology lock has to be held.
 .Sh SEE ALSO
-.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr geom 4 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
 .Xr g_access 9 ,
 .Xr g_attach 9 ,
 .Xr g_bio 9 ,
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index 079f345ec6d2..4b452bd72904 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -224,14 +224,14 @@ sub-type.
 .Pp
 .\"
 .Sh SEE ALSO
-.Xr ifnet 9
 .Xr ieee80211_crypto 9 ,
 .Xr ieee80211_input 9 ,
 .Xr ieee80211_ioctl 9 ,
 .Xr ieee80211_node 9 ,
 .Xr ieee80211_output 9 ,
 .Xr ieee80211_proto 9 ,
-.Xr ieee80211_radiotap 9
+.Xr ieee80211_radiotap 9 ,
+.Xr ifnet 9
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index c6111257c823..7cdc2c882de4 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -126,7 +126,7 @@ The MAC subsystem denied debuggability.
 .Xr intro 2 ,
 .Xr jail 2 ,
 .Xr sysctl 8 ,
-.Xr cr_seeotheruids 9 ,
 .Xr cr_seeothergids 9 ,
+.Xr cr_seeotheruids 9 ,
 .Xr mac 9 ,
 .Xr prison_check 9
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index 31be2e43d236..e022eb87ed96 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -91,7 +91,7 @@ operation.
 .Xr pmap_addr_hint 9 ,
 .Xr pmap_change_wiring 9 ,
 .Xr pmap_clear_modify 9 ,
-.Xr pmap_clear_reference ,
+.Xr pmap_clear_reference 9 ,
 .Xr pmap_copy 9 ,
 .Xr pmap_copy_page 9 ,
 .Xr pmap_enter 9 ,
@@ -121,8 +121,8 @@ operation.
 .Xr pmap_ts_modified 9 ,
 .Xr pmap_wired_count 9 ,
 .Xr pmap_zero_area 9 ,
-.Xr pmap_zero_page 9 ,
 .Xr pmap_zero_idle 9 ,
+.Xr pmap_zero_page 9 ,
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 359676b96eb3..76be6fcea5b6 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -87,8 +87,8 @@ and cannot accommodate any RPC-based services.
 The host may be down.
 .El
 .Sh SEE ALSO
-.Xr rpc.rstatd 8 ,
-.Xr rpcbind 8
+.Xr rpcbind 8 ,
+.Xr rpc.rstatd 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index e68c85082266..f528bb87e4e4 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -96,8 +96,8 @@ The host may be down.
 .Xr rwho 1 ,
 .Xr users 1 ,
 .Xr who 1 ,
-.Xr rpc.rusersd 8 ,
-.Xr rpcbind 8
+.Xr rpcbind 8 ,
+.Xr rpc.rusersd 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index ee1836101c3c..2de83d4c2711 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -71,8 +71,8 @@ The host may be down.
 .El
 .Sh SEE ALSO
 .Xr who 1 ,
-.Xr rpc.rwalld 8 ,
-.Xr rpcbind 8
+.Xr rpcbind 8 ,
+.Xr rpc.rwalld 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 81cdd74de010..11e8b48cedf2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
@@ -430,7 +430,7 @@ The description of the MIB tree implemented by
 .It Pa /usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 This is the MIB that is implemented by this module.
 .Sh SEE ALSO
-.Xr snmpmod 3 ,
-.Xr gensnmptree 1
+.Xr gensnmptree 1 ,
+.Xr snmpmod 3
 .Sh AUTHORS
 .An Hartmut Brandt Aq harti@freebsd.org
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index a3a7a8d4ab65..2533fdae7d75 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -173,10 +173,10 @@ Ypservers source file (generated by
 .Xr mknetid 8 ,
 .Xr revnetgroup 8 ,
 .Xr yp 8 ,
+.Xr yp_mkdb 8 ,
 .Xr yppush 8 ,
 .Xr ypserv 8 ,
-.Xr ypxfr 8 ,
-.Xr yp_mkdb 8
+.Xr ypxfr 8
 .Sh HISTORY
 This version of
 .Nm