diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 88686868ebcc..acaac1c96999 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: intro.9,v 1.5 2007/02/18 21:45:30 rmind Exp $
+.\"     $NetBSD: intro.9,v 1.6 2007/02/20 08:22:05 wiz Exp $
 .\"
 .\" Copyright (c) 1997, 2007 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd Feb 17, 2007
+.Dd February 17, 2007
 .Dt INTRO 9
 .Sh NAME
 .Nm intro
@@ -55,7 +55,7 @@ and/or source code of the variables or functions being documented.
 .Sh MEMORY MANAGEMENT
 Machine-dependent swap interface.
 See
-.Xr swapout 9 .
+.Xr cpu_swapout 9 .
 .Pp
 Introduction to kernel memory allocators.
 See
@@ -68,7 +68,6 @@ See
 Virtual memory system external interface.
 See
 .Xr uvm 9 .
-.Pp
 .Sh I/O SUBSYSTEM
 Buffer cache interfaces.
 See
@@ -85,7 +84,6 @@ See
 I/O descriptor allocation interface.
 See
 .Xr getiobuf 9 .
-.Pp
 .Sh PROCESS CONTROL
 Machine-dependent process exit.
 See
@@ -118,7 +116,7 @@ See
 .Pp
 Context switch notification.
 See
-.Xr need_resched 9 .
+.Xr cpu_need_resched 9 .
 .Pp
 Process scheduling subsystem.
 See
@@ -135,7 +133,6 @@ See
 Return path to user-mode execution.
 See
 .Xr userret 9 .
-.Pp
 .Sh FILE SYSTEM
 High-level file operations.
 See
@@ -180,7 +177,6 @@ Kernel representation of a file or directory and vnode attributes.
 See
 .Xr vnode 9 ,
 .Xr vattr 9 .
-.Pp
 .Sh NETWORKING
 Kernel interfaces for manipulating output queues on network interfaces.
 See
@@ -223,7 +219,6 @@ See
 TCP congestion control API.
 See
 .Xr tcp_congctl 9 .
-.Pp
 .Sh LOCKING AND INTERRUPT CONTROL
 Condition variables.
 See
@@ -260,7 +255,6 @@ See
 Functions ro raise the system priority level.
 See
 .Xr splraiseipl 9 .
-.Pp
 .Sh SECURITY
 Kernel authorization framework.
 See
@@ -273,7 +267,6 @@ See
 Security model development guidelines.
 See
 .Xr secmodel 9 .
-.Pp
 .Sh SYSTEM TIME CONTROL
 Execute a function after a specified length of time.
 See
@@ -331,7 +324,6 @@ See
 System time variables.
 See
 .Xr time_second 9 .
-.Pp
 .Sh KERNEL AND USER SPACE DATA COPY FUNCTIONS
 Kernel space to/from user space copy functions.
 See
@@ -348,7 +340,6 @@ See
 Move data described by a struct uio.
 See
 .Xr uiomove 9 .
-.Pp
 .Sh MACHINE DEPENDENT KERNEL FUNCTIONS
 Machine-dependent clock setup interface.
 See
@@ -381,7 +372,6 @@ See
 Disk label management routines.
 See
 .Xr disklabel 9 .
-.Pp
 .Sh DEVICE CONFIGURATION
 Autoconfiguration frame-work.
 See
@@ -398,7 +388,6 @@ See
 Machine-dependent device autoconfiguration.
 See
 .Xr cpu_configure 9 .
-.Pp
 .Sh MI DEVICE DRIVER API
 Bus and Machine Independent DMA Mapping Interface.
 See
@@ -430,7 +419,6 @@ See
 Extensible line discipline framework.
 See
 .Xr linedisc 9 .
-.Pp
 .Sh CONSOLE DEVICES
 Console magic key sequence management.
 See
@@ -451,7 +439,6 @@ See
 Machine-independent console support.
 See
 .Xr wscons 9 .
-.Pp
 .Sh DEVICE SPECIFIC IMPLEMENTATION
 Interface between low and high level audio drivers.
 See
@@ -552,7 +539,6 @@ See
 Machine-independent IDE/ATAPI driver.
 See
 .Xr wdc 9 .
-.Pp
 .Sh KERNEL EVENT
 Continuation-passing framework for deferring execution and
 for notification of asynchronous events.
@@ -574,7 +560,6 @@ See
 Simple do-it-in-thread-context framework.
 See
 .Xr workqueue 9 .
-.Pp
 .Sh KERNEL HELPER FUNCTIONS
 Kernel expression verification macros.
 See
@@ -618,7 +603,6 @@ See
 Bring down system on fatal error.
 See
 .Xr panic 9 .
-.Pp
 .Sh MISC
 Run all power hooks.
 See
@@ -647,7 +631,7 @@ See
 .Pp
 Options string management.
 See
-.Xr opstr 9 .
+.Xr optstr 9 .
 .Pp
 Performs pattern matching on strings.
 See
@@ -672,7 +656,6 @@ See
 System variable control interfaces.
 See
 .Xr sysctl 9 .
-.Pp
 .Sh HISTORY
 The
 .Nx