diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 6444a1bc9061..7288d00f2930 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -140,7 +140,7 @@ with names as in the include file
 .It Dv SIGQUIT No "	create core image" "	quit program"
 .It Dv SIGILL No "	create core image" "	illegal instruction"
 .It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Xr 	abort 2
+.It Dv SIGABRT No "	create core image" Xr 	abort 3
 call (formerly
 .Dv SIGIOT )
 .It Dv SIGEMT No "	create core image" "	emulate instruction executed"
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index f0e83ea374a8..9a28b2e38df4 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -104,5 +104,5 @@ will modify the same object.
 The memory allocated by
 .Fn getmntinfo
 cannot be
-.Xr free 2 Ns 'd
+.Xr free 3 Ns 'd
 by the application.
diff --git a/lib/libc/gen/getvfsent.3 b/lib/libc/gen/getvfsent.3
index a8151b0ae317..bb9c6cd8a3c9 100644
--- a/lib/libc/gen/getvfsent.3
+++ b/lib/libc/gen/getvfsent.3
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: getvfsent.3,v 1.1 1994/09/25 01:38:30 wollman Exp $
 .\"	Written by Garrett A. Wollman, September 1994.
 .\"	This manual page is in the public domain.
 .\"
@@ -179,7 +179,7 @@ fails,
 .Va errno
 may be set to one of the values documented for
 .Xr fork 2 ,
-.Xr waitpid 3 ,
+.Xr waitpid 2 ,
 .Xr chdir 2 ,
 or
 .Xr execlp 3 ,
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index b306c9cac4c2..3b5d89e11c58 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -126,7 +126,7 @@ pairs save and restore the signal mask while
 .Fn _setjmp Ns / Ns Fn _longjmp
 pairs save and restore only the register set and the stack.
 (See
-.Fn sigmask 2 . )
+.Fn sigprocmask 2 . )
 .Pp
 The
 .Fn sigsetjmp Ns / Ns Fn siglongjmp
@@ -145,7 +145,7 @@ routine calls the routine
 If
 .Fn longjmperror
 returns the program is aborted (see
-.Xr abort 2 ) .
+.Xr abort 3 ) .
 The default version of
 .Fn longjmperror
 prints the message
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 53622f6c7616..a67208fe1259 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -64,7 +64,7 @@ The available values are as follows:
 .Pp
 .It Li _SC_ARG_MAX
 The maximum bytes of argument to
-.Xr exec 2 .
+.Xr execve 2 .
 .It Li _SC_CHILD_MAX
 The maximum number of simultaneous processes per user id.
 .It Li _SC_CLK_TCK
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index a7cffcfc73bf..6eb30ebb1a99 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -51,7 +51,7 @@ The information available from
 consists of integers, strings, and tables.
 Information may be retrieved and set from the command interface
 using the 
-.Xr sysctl 1
+.Xr sysctl 8
 utility.
 .Pp
 Unless explicitly noted below,
@@ -260,7 +260,7 @@ information.
 .Bl -tag -width "123456"
 .It Li KERN_ARGMAX
 The maximum bytes of argument to
-.Xr exec 2 .
+.Xr execve 2 .
 .It Li KERN_BOOTTIME
 A
 .Va struct timeval
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 54e320602954..52e33242220f 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -75,7 +75,7 @@ may contain
 an optional network interface identifier of the form
 .Dq "name unit-number" ,
 suitable for the first argument to
-.Xr ifconfig 4 ,
+.Xr ifconfig 8 ,
 followed in all cases by a colon and
 an interface address in the form of
 groups of hexadecimal digits
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index ba0f9cc58206..6849dac0a4ca 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -163,7 +163,7 @@ and
 .Fn ruserok
 return \-1.
 If the local domain (as obtained from
-.Xr gethostname 2 )
+.Xr gethostname 3 )
 is the same as the remote domain, only the machine name need be specified.
 .Pp
 The
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
index d89c79e25c15..44aaf0c863b8 100644
--- a/lib/libc/stdlib/system.3
+++ b/lib/libc/stdlib/system.3
@@ -76,7 +76,7 @@ The
 .Fn system
 function
 returns the exit status of the shell, or \-1 if the
-.Xr wait 3
+.Xr wait 2
 for the shell failed.
 A return value of 127 means the execution of the shell
 failed.
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 304295862069..37fbb34e233d 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -295,10 +295,10 @@ This semantic means that applications must be aware of any files that
 a subroutine library may access.
 For example if an application for updating the password file locks the
 password file database while making the update, and then calls
-.Xr getpwname 3
+.Xr getpwnam 3
 to retrieve a record,
 the lock will be lost because 
-.Xr getpwname 3
+.Xr getpwnam 3
 opens, reads, and closes the password database.
 The database close will release all locks that the process has
 associated with the database, even if the library routine never
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index a6e735155544..070e4974f32c 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -159,9 +159,9 @@ or a read (write) request was made to a file that was only open for
 writing (reading).
 .It Er 10 ECHILD Em "\&No child processes" .
 A
-.Xr wait
+.Xr wait 2
 or
-.Xr waitpid
+.Xr waitpid 2
 function was executed by a process that had no existing or unwaited-for
 child processes.
 .It Er 11 EDEADLK Em "Resource deadlock avoided" .
@@ -187,7 +187,7 @@ in a manner which would have conflicted with the request.
 .It Er 17 EEXIST Em "File exists" .
 An existing file was mentioned in an inappropriate context,
 for instance, as the new link name in a
-.Xr link
+.Xr link 2
 function.
 .It Er 18 EXDEV Em "Improper link" .
 A hard link to a file on another file system
@@ -205,9 +205,9 @@ An attempt was made to open a directory with write mode specified.
 .It Er 22 EINVAL Em "Invalid argument" .
 Some invalid argument was supplied. (For example,
 specifying an undefined signal to a
-.Xr signal
+.Xr signal 3
 or
-.Xr kill
+.Xr kill 2
 function).
 .It Er 23 ENFILE Em "Too many open files in system" .
 Maximum number of file descriptors allowable on the system
@@ -227,7 +227,7 @@ special device for which the operation was inappropriate.
 The new process was a pure procedure (shared text) file
 which was open for writing by another process, or
 while the pure procedure file was being executed an
-.Xr open
+.Xr open 2
 call requested write access.
 .It Er 27 EFBIG Em "File too large" .
 The size of a file exceeded the maximum (about
@@ -236,7 +236,7 @@ The size of a file exceeded the maximum (about
 bytes).
 .It Er 28 ENOSPC Em "Device out of space" .
 A
-.Xr write
+.Xr write 2
 to an ordinary file, the creation of a
 directory or symbolic link, or the creation of a directory
 entry failed because no more disk blocks were available
@@ -245,7 +245,7 @@ created file failed because no more inodes were available
 on the file system.
 .It Er 29 ESPIPE Em "Illegal seek" .
 An
-.Xr lseek
+.Xr lseek 2
 function was issued on a socket, pipe or
 .Tn FIFO .
 .It Er 30 EROFS Em "Read-only file system" .
@@ -344,12 +344,12 @@ An operation on a socket or pipe was not performed because
 the system lacked sufficient buffer space or because a queue was full.
 .It Er 56 EISCONN Em "Socket is already connected" .
 A
-.Xr connect
+.Xr connect 2
 request was made on an already connected socket; or,
 a
-.Xr sendto
+.Xr sendto 2
 or
-.Xr sendmsg
+.Xr sendmsg 2
 request on a connected socket specified a destination
 when already connected.
 .It Er 57 ENOTCONN Em "Socket is not connected" .
@@ -363,9 +363,9 @@ had already been shut down with a previous
 call.
 .It Er 60 ETIMEDOUT Em "Operation timed out" .
 A
-.Xr connect
+.Xr connect 2
 or
-.Xr send
+.Xr send 2
 request failed because the connected party did not
 properly respond after a period of time.  (The timeout
 period is dependent on the communication protocol.)
@@ -397,7 +397,7 @@ was supplied to a remove directory or rename call.
 The quota system ran out of table entries.
 .It Er 69 EDQUOT Em "Disc quota exceeded" .
 A 
-.Xr write
+.Xr write 2
 to an ordinary file, the creation of a
 directory or symbolic link, or the creation of a directory
 entry failed because the user's quota of disk blocks was
@@ -450,7 +450,7 @@ A new process is created by a currently active process; (see
 The parent process ID of a process is initially the process ID of its creator.
 If the creating process exits,
 the parent process ID of each child is set to the ID of a system process,
-.Xr init .
+.Xr init 8 .
 .It  Process Group
 Each active process is a member of a process group that is identified by
 a non-negative integer called the process group ID.  This is the process
@@ -701,4 +701,5 @@ of a certain format.  An Address Family is the set of addresses
 for a specific group of protocols.  Each socket has an address
 chosen from the address family in which the socket was created.
 .Sh SEE ALSO
-intro(3), perror(3)
+.Xr intro 3 ,
+.Xr perror 3
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 88684de1c671..2b87189dc723 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -124,7 +124,7 @@ Notify the kernel that the region may contain semaphores and that special
 handling may be necessary.
 .It Dv MAP_INHERIT
 Permit regions to be inherited across
-.Xr exec 2
+.Xr execve 2
 system calls.
 .It Dv MAP_PRIVATE
 Modifications are private.
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 9412dd14396d..64f534d8f48a 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -234,7 +234,7 @@ with names as in the include file
 .It Dv SIGQUIT No "	create core image" "	quit program"
 .It Dv SIGILL No "	create core image" "	illegal instruction"
 .It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Xr 	abort 2
+.It Dv SIGABRT No "	create core image" Xr 	abort 3
 call (formerly
 .Dv SIGIOT )
 .It Dv SIGEMT No "	create core image" "	emulate instruction executed"
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 8b6e077a90ee..b708bde6ea16 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -48,15 +48,15 @@ space of the old process, which is horrendously inefficient in a paged
 environment.  It is useful when the purpose of
 .Xr fork 2
 would have been to create a new system context for an
-.Xr execve .
+.Xr execve 2 .
 .Fn Vfork
 differs from
-.Xr fork
+.Xr fork 2
 in that the child borrows the parent's memory and thread of
 control until a call to
 .Xr execve 2
 or an exit (either by a call to
-.Xr exit 2
+.Xr exit 3
 or abnormally.)
 The parent process is suspended while the child is using its resources.
 .Pp
@@ -74,19 +74,19 @@ since the eventual return from
 .Fn vfork
 would then return to a no longer existent stack frame.
 Be careful, also, to call
-.Xr _exit
+.Xr _exit 2
 rather than
-.Xr exit
+.Xr exit 3
 if you can't
-.Xr execve ,
+.Xr execve 2 ,
 since
-.Xr exit
+.Xr exit 3
 will flush and close standard I/O channels, and thereby mess up the
 parent processes standard I/O data structures.
 (Even with
-.Xr fork
+.Xr fork 2
 it is wrong to call
-.Xr exit
+.Xr exit 3
 since buffered data would then be flushed twice.)
 .Sh SEE ALSO
 .Xr fork 2 ,
@@ -95,15 +95,15 @@ since buffered data would then be flushed twice.)
 .Xr wait 2 ,
 .Sh DIAGNOSTICS
 Same as for
-.Xr fork .
+.Xr fork 2 .
 .Sh BUGS
 This system call will be eliminated when proper system sharing
 mechanisms are implemented. 
 Users should not depend on the memory
 sharing semantics of
-.Xr vfork
+.Xr vfork 2
 as it will, in that case, be made synonymous to
-.Xr fork .
+.Xr fork 2 .
 .Pp
 To avoid a possible deadlock situation,
 processes that are children in the middle