diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
index 7e471bf5955e..a4247ff59f82 100644
--- a/bin/freebsd-version/freebsd-version.1
+++ b/bin/freebsd-version/freebsd-version.1
@@ -110,8 +110,7 @@ env ROOT=/mnt /mnt/bin/freebsd-version -ku
 .Ed
 .Sh SEE ALSO
 .Xr uname 1 ,
-.Xr loader.conf 5 ,
-.Xr freebsd-version 8
+.Xr loader.conf 5
 .Sh HISTORY
 The
 .Nm
diff --git a/lib/libc/stdio/open_memstream.3 b/lib/libc/stdio/open_memstream.3
index 1a0cb0753aba..8e2c1e9e057f 100644
--- a/lib/libc/stdio/open_memstream.3
+++ b/lib/libc/stdio/open_memstream.3
@@ -144,8 +144,8 @@ Memory for the stream or buffer could not be allocated.
 .Xr fopen 3 ,
 .Xr free 3 ,
 .Xr fseek 3 ,
-.Xr sbuf 3 ,
-.Xr stdio 3
+.Xr stdio 3 ,
+.Xr sbuf 9
 .Sh STANDARDS
 The
 .Fn open_memstream
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 786f4576db9b..10ad660fe9e4 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -103,7 +103,7 @@ be ignored.
 If the child was created by
 .Xr vfork 2
 system call or
-.Xr rfork(2)
+.Xr rfork 2
 call with the
 .Dv RFMEM
 flag specified, the debugging events are reported to the parent
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index bb295f1045c0..e04917ebcb42 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -724,7 +724,6 @@ SSL_CA_CERT_FILE=/path/to/myca.pem
 .Ed
 .Sh SEE ALSO
 .Xr fetch 1 ,
-.Xr ftpio 3 ,
 .Xr ip 4
 .Rs
 .%A J. Postel
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index dc765ca3027a..3a03b0acff40 100644
--- a/sbin/atm/atmconfig/atmconfig.8
+++ b/sbin/atm/atmconfig/atmconfig.8
@@ -313,7 +313,6 @@ List all NATM routes.
 .El
 .Sh SEE ALSO
 .Xr natm 4 ,
-.Xr natmip 4 ,
-.Xr atm 8
+.Xr natmip 4
 .Sh AUTHORS
 .An Hartmut Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/cyapa.4 b/share/man/man4/cyapa.4
index 5ecc9d757a1f..dc312f490637 100644
--- a/share/man/man4/cyapa.4
+++ b/share/man/man4/cyapa.4
@@ -175,9 +175,9 @@ file:
 .Dl debug.cyapa_enable_tapclick=2
 .Sh SEE ALSO
 .Xr ig4 4 ,
-.Xr moused 4 ,
 .Xr smbus 4 ,
-.Xr sysmouse 4
+.Xr sysmouse 4 ,
+.Xr moused 8
 .Sh AUTHORS
 .An -nosplit
 The original
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 04df7248b934..087b9160d146 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -1132,7 +1132,7 @@ abbreviations.
 .Nm
 supports a basic output capture facility, which can be used to retrieve the
 results of debugging commands from userspace using
-.Xr sysctl 2 .
+.Xr sysctl 3 .
 .Ic capture on
 enables output capture;
 .Ic capture off
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 78ab5b246ba0..aca6eddf6764 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -233,7 +233,7 @@ Most bridge device drivers are still missing multichannel matrixing
 support, but in most cases this should be trivial to implement.
 Use the
 .Va dev.pcm.%d.[play|rec].vchanformat
-.Xr sysctl(8)
+.Xr sysctl 8
 to adjust the number of channels used.
 The current multichannel interleaved structure and arrangement was
 implemented by inspecting various popular UNIX applications.
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 00700d8bcb96..0420bb45ab80 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -175,7 +175,6 @@ take place.
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr intro 4 ,
-.Xr ppp 4 ,
 .Xr ifconfig 8 ,
 .Xr spppcontrol 8
 .Rs
diff --git a/share/man/man4/vxlan.4 b/share/man/man4/vxlan.4
index 167d5b0f2ae2..15b40e61febc 100644
--- a/share/man/man4/vxlan.4
+++ b/share/man/man4/vxlan.4
@@ -217,9 +217,9 @@ interface can be configured with
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr inet6 4 ,
+.Xr vlan 4 ,
 .Xr ifconfig 8 ,
-.Xr sysctl 8 ,
-.Xr vlan 8
+.Xr sysctl 8
 .Rs
 .%A "M. Mahalingam"
 .%A "et al"
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index a8dee319f592..cb9a8b06b39c 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -617,7 +617,7 @@ Weekly counterpart of
 Set to
 .Dq Li YES
 if you want to use
-.Xr pkg_version 1
+.Xr pkg-version 8
 to list installed packages which are out of date.
 .It Va pkg_version
 .Pq Vt str
@@ -628,7 +628,7 @@ is set to
 this variable specifies the program that is used to determine the out of
 date packages.
 If unset, the
-.Xr pkg_version 1
+.Xr pkg-version 8
 program is used.
 As an example, this variable might be set to
 .Dq Li portversion
@@ -642,7 +642,7 @@ This variable specifies the
 file from
 .Pa /usr/ports
 that should be used by
-.Xr pkg_version 1 .
+.Xr pkg-version 8 .
 Because the dependency tree may be substantially different between versions of
 .Fx ,
 there may be more than one
@@ -975,7 +975,6 @@ is shared or distributed.
 .Xr msgs 1 ,
 .Xr netstat 1 ,
 .Xr nice 1 ,
-.Xr pkg_version 1 ,
 .Xr login.conf 5 ,
 .Xr rc.conf 5 ,
 .Xr ac 8 ,
@@ -983,6 +982,7 @@ is shared or distributed.
 .Xr dump 8 ,
 .Xr newsyslog 8 ,
 .Xr periodic 8 ,
+.Xr pkg-version 8 ,
 .Xr sendmail 8
 .Sh HISTORY
 The
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index a73914bbe86b..99d566580385 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -214,12 +214,12 @@ portion never recurses
 (this is perhaps a bug).
 .It Cm reinstall
 Use this to restore a port after using
-.Xr pkg_delete 1
+.Xr pkg-delete 8
 when you should have used
 .Cm deinstall .
 .It Cm deinstall
 Remove an installed port from the system, similar to
-.Xr pkg_delete 1 .
+.Xr pkg-delete 8 .
 .It Cm deinstall-all
 Remove all installed ports with the same
 .Va PKGORIGIN
@@ -231,7 +231,7 @@ The package is a
 .Pa .tbz
 file that you can use to
 install the port on other machines with
-.Xr pkg_add 1 .
+.Xr pkg-add 8 .
 If the directory specified by
 .Va PACKAGES
 does not exist, the package will be put into the current directory.
diff --git a/share/man/man9/netisr.9 b/share/man/man9/netisr.9
index 6d79c57a95b2..63112be4c1b1 100644
--- a/share/man/man9/netisr.9
+++ b/share/man/man9/netisr.9
@@ -120,7 +120,7 @@ whose fields are defined as follows:
 .Bl -tag -width "netisr_handler_t nh_handler"
 .It Vt "const char *" Va nh_name
 Unique character string name of the protocol, which may be included in
-.Xr sysctl 2
+.Xr sysctl 3
 MIB names, so should not contain whitespace.
 .It Vt netisr_handler_t Va nh_handler
 Protocol handler function that will be invoked on each packet received for