diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index eb94904dc34e..841d37ab8a68 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -53,7 +53,8 @@ struct sigvec {
 .Fn sigvec "int sig" "struct sigvec *vec" "struct sigvec *ovec"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is made obsolete by sigaction(2).
+This interface is made obsolete by
+.Xr sigaction 2 .
 .Ef
 .Pp
 The system defines a set of signals that may be delivered to a process.
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 4157f2615ac5..94f05901912c 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -46,7 +46,8 @@
 .Fn alarm "unsigned int seconds"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is made obsolete by setitimer(2).
+This interface is made obsolete by
+.Xr setitimer 2 .
 .Ef
 .Pp
 The
diff --git a/lib/libc/gen/fmtcheck.3 b/lib/libc/gen/fmtcheck.3
index f8a7eb966612..972f0a8d1df5 100644
--- a/lib/libc/gen/fmtcheck.3
+++ b/lib/libc/gen/fmtcheck.3
@@ -37,7 +37,9 @@
 .Dt FMTCHECK 3
 .Sh NAME
 .Nm fmtcheck
-.Nd sanitizes user-supplied printf(3)-style format string
+.Nd sanitizes user-supplied
+.Xr printf 3 Ns -style
+format string
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 1fb7eb2e5c53..38bd0534db36 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -46,7 +46,8 @@
 .Fn nice "int incr"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is obsoleted by setpriority(2).
+This interface is obsoleted by
+.Xr setpriority 2 .
 .Ef
 .Pp
 The
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index 137212e7f576..f2b269c0aafa 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -46,7 +46,8 @@
 .Fn ualarm "u_int microseconds" "u_int interval"
 .Sh DESCRIPTION
 .Bf -symbolic
-This is a simplified interface to setitimer(2).
+This is a simplified interface to
+.Xr setitimer 2 .
 .Ef
 .Pp
 The
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 87fa93cdb343..a14eea3081c1 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -47,7 +47,8 @@
 .Fn utime "const char *file" "const struct utimbuf *timep"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is obsoleted by utimes(2) .
+This interface is obsoleted by
+.Xr utimes 2 .
 .Ef
 .Pp
 The
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index 00e4beb34626..b15847fa13ab 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -46,7 +46,10 @@
 .Fn valloc "size_t size"
 .Sh DESCRIPTION
 .Bf -symbolic
-Valloc is obsoleted by the current version of malloc(3),
+The
+.Fn valloc
+function is obsoleted by the current version of
+.Xr malloc 3 ,
 which aligns page-sized and larger allocations.
 .Ef
 .Pp
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 67e84e930001..43ce4e397678 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -395,7 +395,10 @@ The allocation functions were compiled with
 .Dq EXTRA_SANITY
 defined, and an error was found during the additional error checking.
 Consult the source code for further information.
-.It "mmap(2) failed, check limits
+.It Xo
+.Xr mmap 2
+failed, check limits
+.Xc
 This most likely means that the system is dangerously overloaded or that
 the process' limits are incorrectly specified.
 .It "freelist is destroyed
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index d9c7b5401196..bc3bff03e247 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -59,7 +59,8 @@
 .Fn rand_r "unsigned *ctx"
 .Sh DESCRIPTION
 .Bf -symbolic
-These interfaces are obsoleted by random(3).
+These interfaces are obsoleted by
+.Xr random 3 .
 .Ef
 .Pp
 The
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 6ad05cc9de2d..814cee57388c 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -66,7 +66,8 @@
 .Fn strtok_r "char *str" "const char *sep" "char **last"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is obsoleted by strsep(3).
+This interface is obsoleted by
+.Xr strsep 3 .
 .Ef
 .Pp
 The
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 63da0ce8e4e3..26423876dab0 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -47,7 +47,8 @@
 .Fn ftime "struct timeb *tp"
 .Sh DESCRIPTION
 .Bf -symbolic
-This interface is obsoleted by gettimeofday(2).
+This interface is obsoleted by
+.Xr gettimeofday 2 .
 .Ef
 .Pp
 The
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index 618da44a928c..f1a57c5e1784 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -46,7 +46,10 @@
 .Fn getpw "uid_t uid" "char *buf"
 .Sh DESCRIPTION
 .Bf -symbolic
-The getpw function is made obsolete by getpwuid(3).
+The
+.Fn getpw
+function is made obsolete by
+.Xr getpwuid 3 .
 .Ef
 .Pp
 The
diff --git a/lib/libcompat/4.1/stty.3 b/lib/libcompat/4.1/stty.3
index dddb93c2956b..a1f89d1a2528 100644
--- a/lib/libcompat/4.1/stty.3
+++ b/lib/libcompat/4.1/stty.3
@@ -49,7 +49,8 @@
 .Fn gtty "int fd" "struct sgttyb *buf"
 .Sh DESCRIPTION
 .Bf -symbolic
-These interfaces are obsoleted by ioctl(2).
+These interfaces are obsoleted by
+.Xr ioctl 2 .
 .Ef
 .Pp
 The
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 5701deb88520..957d6ffbf8f6 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -165,7 +165,7 @@ Consult the appropriate manual page for
 details on the operation of any given builtin command under those shells.
 Users of other shells will need to consult the documentation supplied
 with the other shells.
-.Bl -column "continueXX" "ExternalXX" "csh(1)" "sh(1)" -offset indent
+.Bl -column ".Ic uncomplete" ".Em External" ".Xr csh 1" ".Xr sh 1" -offset indent
 .It Xo
 .Em "Command	External" Ta Xr csh 1 Ta Xr sh 1
 .Xc
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 05b8b9e4a4c1..ea988efaf5d5 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -113,7 +113,9 @@ Set to PCCARD controller memory address or
 for the default value.
 .It Va pccard_ifconfig
 .Pq Vt str
-List of arguments to be passed to ifconfig(8) at boot time or on
+List of arguments to be passed to
+.Xr ifconfig 8
+at boot time or on
 insertion of the card (e.g. "inet 192.168.1.1 netmask 255.255.255.0"
 for a fixed address or "DHCP" for a DHCP client).
 .It Va pccard_beep
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 191bf2e65888..ab47de16ba44 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -66,7 +66,9 @@ contain additional custom startup code for your system.
 contains the global system configuration information referenced
 by the rc files, while
 .Nm rc.conf.local
-contains the local system configuration.  See rc.conf(5)
+contains the local system configuration.
+See
+.Xr rc.conf 5 .
 .Pp
 The
 .Nm rc.d
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 985b452c4398..d7b040a4e2dd 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -507,4 +507,6 @@ Besides for being used for network packets, they were used
 to store various dynamic structures, such as routing table
 entries, interface addresses, protocol control blocks, etc.
 .Sh AUTHORS
-The original mbuf(9) man page was written by Yar Tikhiy.
+The original
+.Nm
+man page was written by Yar Tikhiy.
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 0e2842350b87..f658db2145a7 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -36,7 +36,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-program is intended to be called by cron(8) to execute shell scripts
+program is intended to be called by
+.Xr cron 8
+to execute shell scripts
 located in the specified directory.
 .Pp
 One or more of the following arguments must be specified: