Xr cleanup; seb@todesplanet.de

34 files changed, 72 insertions, 86 deletions

diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 9555c27b534..77bb16d9925 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.3,v 1.12 2001/08/22 12:15:46 heko Exp $
+.\"	$OpenBSD: intro.3,v 1.13 2002/06/30 21:46:23 deraadt Exp $
 .\"	$NetBSD: intro.3,v 1.5 1995/05/10 22:46:24 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -62,8 +62,7 @@ it is not necessary to supply the loader flag
 for these functions.
 There are several
 .Dq libraries
-or groups of functions included inside of
-.Xr libc : the standard
+or groups of functions included inside of libc: the standard
 .Tn I/O
 routines,
 database routines,
@@ -79,8 +78,7 @@ and more.
 Reentrant C library.
 Contains POSIX 1003.1c
 .Xr pthreads 3
-API and thread scheduler, as well as all of the functions found in
-.Xr libc .
+API and thread scheduler, as well as all of the functions found in libc.
 .It libcurses Pq Fl l Ns Ar curses
 Terminal independent screen management routines for two-dimensional
 non-bitmap display terminals.
@@ -174,7 +172,7 @@ library provided in 4.3.
 4.3-compatible termcap library.
 For use with
 .Xo
-.Xr libocurses
+.Xr ocurses 3
 .Pf ( i.e., Fl l Ns Ar ocurses
 .Fl l Ns Ar otermcap )
 .Xc
@@ -182,7 +180,7 @@ For use with
 .Xr panel 3
 library for use with
 .Xo
-.Xr libcurses
+.Xr curses 3
 .Pf ( i.e., Fl l Ns Ar panel
 .Fl l Ns Ar curses )
 .Xc
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4
index 78d99700a2b..fc40c9928fc 100644
--- a/share/man/man4/audio.4
+++ b/share/man/man4/audio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: audio.4,v 1.25 2002/05/23 09:30:34 mpech Exp $
+.\"	$OpenBSD: audio.4,v 1.26 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -637,7 +637,6 @@ mixer controls because they use a name from one of the AudioC* string values.
 .Pp
 For ports using the ISA bus:
 .Xr gus 4 ,
-.Xr pas 4 ,
 .Xr pss 4 ,
 .Xr sb 4 ,
 .Xr wss 4 .
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index 80299d806db..fc130192434 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bge.4,v 1.6 2002/06/03 20:37:08 deraadt Exp $
+.\" $OpenBSD: bge.4,v 1.7 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 2001 Wind River Systems
 .\" Copyright (c) 1997, 1998, 1999, 2000, 2001
 .\"	Bill Paul <wpaul@windriver.com>. All rights reserved.
@@ -98,7 +98,7 @@ driver supports the following media types:
 Enable autoselection of the media type and options.
 The user can manually override
 the autoselected mode by adding media options to
-.Xr rc.conf 5 .
+.Xr rc.conf 8 .
 .It Cm 10baseT
 Set 10Mbps operation.
 The
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index ef3411bbef2..1e811f43ddc 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bridge.4,v 1.42 2002/06/15 02:26:44 angelos Exp $
+.\"	$OpenBSD: bridge.4,v 1.43 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -579,7 +579,7 @@ and certificates, to impersonate the protected host(s).
 .Xr brconfig 8 ,
 .Xr ipsecadm 8 ,
 .Xr isakmpd 8 ,
-.Xr photurisd 8,
+.Xr photurisd 8 ,
 .Sh AUTHORS
 The
 .Xr brconfig 8
diff --git a/share/man/man4/emu.4 b/share/man/man4/emu.4
index 2abc5a1c583..2abc9245f55 100644
--- a/share/man/man4/emu.4
+++ b/share/man/man4/emu.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: emu.4,v 1.2 2002/03/20 13:06:07 espie Exp $
+.\"	$OpenBSD: emu.4,v 1.3 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: emuxki.4,v 1.1 2001/10/18 18:40:16 jdolecek Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -84,7 +84,6 @@ Allows multiple audio sources playback on the same speaker system
 .Sh SEE ALSO
 .Xr audio 4 ,
 .Xr joy 4 ,
-.Xr mpu 4 ,
 .Xr pci 4
 .Sh HISTORY
 The
diff --git a/share/man/man4/gx.4 b/share/man/man4/gx.4
index 5e7270b6ab0..ea460c44233 100644
--- a/share/man/man4/gx.4
+++ b/share/man/man4/gx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gx.4,v 1.4 2002/04/02 18:08:04 nate Exp $
+.\" $OpenBSD: gx.4,v 1.5 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 2001
 .\"	Jonathan Lemon <jlemon@FreeBSD.org>. All rights reserved.
 .\"
@@ -81,7 +81,7 @@ driver supports the following media types:
 Enable autoselection of the media type and options.
 User can manually override
 the autoselected mode by adding media options to
-.Xr rc.conf 5 .
+.Xr rc.conf 8 .
 .It Cm 10baseT
 Set 10Mbps operation.
 The
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index 00bb82b5ce5..a500669349d 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lge.4,v 1.3 2002/04/02 18:08:04 nate Exp $
+.\" $OpenBSD: lge.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 2001 Wind River Systems
 .\" Copyright (c) 1997, 1998, 1999, 2000, 2001
 .\"	Bill Paul <william.paul@windriver.com>. All rights reserved.
@@ -77,7 +77,7 @@ driver supports the following media types:
 Enable autoselection of the media type and options.
 The user can manually override
 the autoselected mode by adding media options to
-.Xr rc.conf 5 .
+.Xr rc.conf 8 .
 .It Cm 1000baseSX
 Set 1000baseSX operation over fiber optic cable.
 Both
diff --git a/share/man/man4/man4.alpha/wd.4 b/share/man/man4/man4.alpha/wd.4
index 0e7bd3f57b4..227a18854bf 100644
--- a/share/man/man4/man4.alpha/wd.4
+++ b/share/man/man4/man4.alpha/wd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wd.4,v 1.7 2001/10/05 14:45:53 mpech Exp $
+.\"	$OpenBSD: wd.4,v 1.8 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 James A. Jegers
@@ -45,5 +45,4 @@ the motherboard.
 Support for extended EIDE controllers is
 .Ud .
 .Sh SEE ALSO
-.Xr acd 4 ,
 .Xr intro 4
diff --git a/share/man/man4/man4.amiga/console.4 b/share/man/man4/man4.amiga/console.4
index d96fa9a5fee..1085028a913 100644
--- a/share/man/man4/man4.amiga/console.4
+++ b/share/man/man4/man4.amiga/console.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: console.4,v 1.3 1999/05/12 21:58:33 aaron Exp $
+.\"   $OpenBSD: console.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cons.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: console.4,v 1.3 1999/05/12 21:58:33 aaron Exp $
+.\"	$Id: console.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .Dd August 30, 1994
 .Dt CONSOLE 4 amiga
@@ -76,5 +76,5 @@ device is
 .Xr reboot 8
 .Sh BUGS
 You should be able to specify potential console devices at
-.Xr config.new 8
+.Xr config 8
 time.
diff --git a/share/man/man4/man4.hp300/hil.4 b/share/man/man4/man4.hp300/hil.4
index 0669de05163..a05fde8114d 100644
--- a/share/man/man4/man4.hp300/hil.4
+++ b/share/man/man4/man4.hp300/hil.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hil.4,v 1.7 2001/11/13 13:54:26 mpech Exp $
+.\"	$OpenBSD: hil.4,v 1.8 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -152,7 +152,7 @@ The last close (system-wide) of any device removes that device
 from all queues it was mapped to while the last close of the loop
 pseudo-device unmaps all devices and deallocates all queues.
 .Pp
-.Xr Ioctl 2
+.Xr ioctl 2
 is used to control the
 .Tn HIL
 device.
diff --git a/share/man/man4/man4.hppa/ie.4 b/share/man/man4/man4.hppa/ie.4
index 9b4e6d01fc9..b16d134e61d 100644
--- a/share/man/man4/man4.hppa/ie.4
+++ b/share/man/man4/man4.hppa/ie.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ie.4,v 1.3 2002/05/23 09:30:34 mpech Exp $
+.\"	$OpenBSD: ie.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Paul Weissmann
 .\" All rights reserved.
@@ -52,7 +52,7 @@ Local Area Network Coprocessor for Ethernet
 Each of the host's network addresses
 is specified at boot time with an
 .Dv SIOCSIFADDR
-.Xr ioctl .
+.Xr ioctl 2 .
 The
 .Nm
 interface employs the address resolution protocol described in
diff --git a/share/man/man4/man4.sparc/bwtwo.4 b/share/man/man4/man4.sparc/bwtwo.4
index da56f93c135..d3d3b8aa38e 100644
--- a/share/man/man4/man4.sparc/bwtwo.4
+++ b/share/man/man4/man4.sparc/bwtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bwtwo.4,v 1.9 2002/02/20 17:18:33 jason Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -55,7 +55,7 @@ is a memory based black and white frame buffer.
 It supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr cgeight 4 ,
 .Xr cgfour 4 ,
diff --git a/share/man/man4/man4.sparc/cgfourteen.4 b/share/man/man4/man4.sparc/cgfourteen.4
index 6a78e09536e..9eb271fd7a3 100644
--- a/share/man/man4/man4.sparc/cgfourteen.4
+++ b/share/man/man4/man4.sparc/cgfourteen.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgfourteen.4,v 1.9 2001/10/05 14:45:54 mpech Exp $
+.\"	$OpenBSD: cgfourteen.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: cgfourteen.4,v 1.3 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright (c) 1996 The President and Fellows of Harvard College.
@@ -62,7 +62,7 @@ The
 driver supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Pp
 The driver operates by default in
 .Xr cgthree 4
diff --git a/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4
index c5c9a0cd00e..3f3ac66b3b3 100644
--- a/share/man/man4/man4.sparc/cgsix.4
+++ b/share/man/man4/man4.sparc/cgsix.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgsix.4,v 1.11 2002/02/20 17:18:33 jason Exp $
+.\"	$OpenBSD: cgsix.4,v 1.12 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: cgsix.4,v 1.4 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright 1994
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)cgsix.4	8.1 (Berkeley) 2/16/94
-.\"	$Id: cgsix.4,v 1.11 2002/02/20 17:18:33 jason Exp $
+.\"	$Id: cgsix.4,v 1.12 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGSIX 4 sparc
@@ -56,7 +56,7 @@ is a memory based color frame buffer.
 It supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
diff --git a/share/man/man4/man4.sparc/cgthree.4 b/share/man/man4/man4.sparc/cgthree.4
index f60168898f3..54c75493d1d 100644
--- a/share/man/man4/man4.sparc/cgthree.4
+++ b/share/man/man4/man4.sparc/cgthree.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgthree.4,v 1.9 2002/02/20 17:18:33 jason Exp $
+.\"	$OpenBSD: cgthree.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: cgthree.4,v 1.4 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
 .\"
 .\"	from: Header: cgthree.4,v 1.3 94/02/03 20:49:52 leres Exp
 .\"     from: @(#)cgthree.4	8.2 (Berkeley) 2/16/94
-.\"	$Id: cgthree.4,v 1.9 2002/02/20 17:18:33 jason Exp $
+.\"	$Id: cgthree.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGTHREE 4 sparc
@@ -56,7 +56,7 @@ is a memory based color frame buffer.
 It supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
diff --git a/share/man/man4/man4.sparc/cgtwo.4 b/share/man/man4/man4.sparc/cgtwo.4
index cb7ec1c3d9d..1c15ead1d6e 100644
--- a/share/man/man4/man4.sparc/cgtwo.4
+++ b/share/man/man4/man4.sparc/cgtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgtwo.4,v 1.7 1999/09/09 02:40:21 jason Exp $
+.\"	$OpenBSD: cgtwo.4,v 1.8 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: cgtwo.4,v 1.3 1997/10/08 22:00:08 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@ system call.
 The
 .Nm
 driver supports the minimal ioctl's needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
diff --git a/share/man/man4/man4.sparc/pnozz.4 b/share/man/man4/man4.sparc/pnozz.4
index 123826a91ce..0c84137d9ae 100644
--- a/share/man/man4/man4.sparc/pnozz.4
+++ b/share/man/man4/man4.sparc/pnozz.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: pnozz.4,v 1.5 2002/02/20 17:18:33 jason Exp $
+.\"     $OpenBSD: pnozz.4,v 1.6 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -57,7 +57,7 @@ with a resolution of 800x600 with 256 colors.
 It supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Pp
 If the
 .Xr tctrl 4
diff --git a/share/man/man4/man4.sparc/tcx.4 b/share/man/man4/man4.sparc/tcx.4
index 69a6e56ea79..cdc396de1a8 100644
--- a/share/man/man4/man4.sparc/tcx.4
+++ b/share/man/man4/man4.sparc/tcx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcx.4,v 1.10 2002/02/20 17:18:33 jason Exp $
+.\"	$OpenBSD: tcx.4,v 1.11 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: tcx.4,v 1.3 1997/10/08 22:00:14 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ The
 driver supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 ,
+.Xr X 7 ,
 and can be operated in
 .Xr cgthree 4
 emulation mode.
diff --git a/share/man/man4/man4.sparc64/le.4 b/share/man/man4/man4.sparc64/le.4
index a3e89f80d13..017444c3c7a 100644
--- a/share/man/man4/man4.sparc64/le.4
+++ b/share/man/man4/man4.sparc64/le.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: le.4,v 1.3 2002/05/13 15:18:30 jason Exp $
+.\"	$OpenBSD: le.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -64,7 +64,7 @@ chip set.
 Each of the host's network addresses
 is specified at boot time with an
 .Dv SIOCSIFADDR
-.Xr ioctl .
+.Xr ioctl 2 .
 The
 .Nm
 interface employs the address resolution protocol described in
diff --git a/share/man/man4/man4.sparc64/vgafb.4 b/share/man/man4/man4.sparc64/vgafb.4
index ded9855a0d2..6fc2738b6a6 100644
--- a/share/man/man4/man4.sparc64/vgafb.4
+++ b/share/man/man4/man4.sparc64/vgafb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgafb.4,v 1.2 2002/04/04 04:00:53 jason Exp $
+.\"	$OpenBSD: vgafb.4,v 1.3 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -50,7 +50,7 @@ but makes its functions available via the internal
 interface.
 Both unaccelerated access as a dumb framebuffer and
 accelerated access methods are provided to
-.Xr wscons .
+.Xr wscons 4 .
 .Sh SEE ALSO
 .Xr wscons 4 ,
 .Xr wsdisplay 4
diff --git a/share/man/man4/man4.sun3/bwtwo.4 b/share/man/man4/man4.sun3/bwtwo.4
index 3ba7722e25d..9d00b332c82 100644
--- a/share/man/man4/man4.sun3/bwtwo.4
+++ b/share/man/man4/man4.sun3/bwtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bwtwo.4,v 1.6 2001/06/23 07:04:21 pjanzen Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.7 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -53,7 +53,7 @@ is a memory based black and white frame buffer.
 It supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr cgfour 4 ,
 .Xr cgtwo 4
diff --git a/share/man/man4/man4.sun3/cgfour.4 b/share/man/man4/man4.sun3/cgfour.4
index ce6aa7f4d17..0213bd24100 100644
--- a/share/man/man4/man4.sun3/cgfour.4
+++ b/share/man/man4/man4.sun3/cgfour.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgfour.4,v 1.5 2001/06/23 07:04:21 pjanzen Exp $
+.\"	$OpenBSD: cgfour.4,v 1.6 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -59,7 +59,7 @@ The
 driver supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgtwo 4
diff --git a/share/man/man4/man4.sun3/cgtwo.4 b/share/man/man4/man4.sun3/cgtwo.4
index e39bb6d253a..a9b5bf1d27c 100644
--- a/share/man/man4/man4.sun3/cgtwo.4
+++ b/share/man/man4/man4.sun3/cgtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgtwo.4,v 1.5 2001/06/23 07:04:22 pjanzen Exp $
+.\"	$OpenBSD: cgtwo.4,v 1.6 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -59,7 +59,7 @@ The
 driver supports the minimal
 .Xr ioctl 2 Ns s
 needed to run
-.Xr X 1 .
+.Xr X 7 .
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgfour 4
diff --git a/share/man/man4/man4.vax/le.4 b/share/man/man4/man4.vax/le.4
index 3993ef10d96..7e199ed1dac 100644
--- a/share/man/man4/man4.vax/le.4
+++ b/share/man/man4/man4.vax/le.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: le.4,v 1.3 2001/10/05 14:45:54 mpech Exp $
+.\" $OpenBSD: le.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .Dd July 21, 2000
 .Dt LE 4 vax
@@ -31,6 +31,6 @@ RG58 connector (10base2)
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr ifconfig 4 ,
+.Xr ifconfig 8 ,
 .Xr ifmedia 4 ,
 .Xr ze 4
diff --git a/share/man/man4/man4.vax/vp.4 b/share/man/man4/man4.vax/vp.4
index 44c52becc46..6d21f4cc85c 100644
--- a/share/man/man4/man4.vax/vp.4
+++ b/share/man/man4/man4.vax/vp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vp.4,v 1.6 2001/11/13 13:54:26 mpech Exp $
+.\"	$OpenBSD: vp.4,v 1.7 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: vp.4,v 1.3 1996/03/03 17:14:16 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -104,7 +104,7 @@ The device is offline.
 .El
 .Sh SEE ALSO
 .Xr lpr 1 ,
-.Xr vtroff 1 ,
+.Xr troff 1 ,
 .Xr va 4 ,
 .Xr font 5 ,
 .Xr lpd 8
diff --git a/share/man/man4/man4.vax/ze.4 b/share/man/man4/man4.vax/ze.4
index 7371f3ab6cc..8493da3114d 100644
--- a/share/man/man4/man4.vax/ze.4
+++ b/share/man/man4/man4.vax/ze.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ze.4,v 1.3 2001/10/05 14:45:54 mpech Exp $
+.\" $OpenBSD: ze.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .Dd July 21, 2000
 .Dt ZE 4 vax
@@ -27,6 +27,6 @@ RG58 connector (10base2)
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr ifconfig 4 ,
+.Xr ifconfig 8 ,
 .Xr ifmedia 4 ,
 .Xr le 4
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index 1e443f50f96..4cf3468dfa0 100644
--- a/share/man/man4/nge.4
+++ b/share/man/man4/nge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nge.4,v 1.9 2002/06/03 20:37:08 deraadt Exp $
+.\"	$OpenBSD: nge.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\" Copyright (c) 2001 Wind River Systems
 .\" Copyright (c) 1997, 1998, 1999, 2000, 2001
 .\"	Bill Paul <wpaul@bsdi.com>. All rights reserved.
@@ -100,7 +100,7 @@ driver supports the following media types:
 Enable autoselection of the media type and options.
 The user can manually override
 the autoselected mode by adding media options to
-.Xr rc.conf 5 .
+.Xr rc.conf 8 .
 .It Cm 10baseT
 Set 10Mbps operation.
 The
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 1fa0ffe5f70..f71f2212976 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.103 2002/06/17 23:13:02 matthieu Exp $
+.\"	$OpenBSD: options.4,v 1.104 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -233,11 +233,11 @@ to be built in addition to
 .Pa bsd.gdb
 is useful for debugging kernels and their crashdumps with gdb.
 Note that
-.Xr gdb Ns 's
+.Xr gdb 1 Ns 's
 .Fl k
 flag is obsolete and should not be used.
 Instead, a crashdump can be debugged by starting
-.Xr gdb
+.Xr gdb 1
 with the kernel name as an argument (no core file) and then use the
 .Xr gdb 1
 command
@@ -1047,7 +1047,7 @@ and/or
 .\" .Sh FILES
 .\" .Sh EXAMPLES
 .Sh SEE ALSO
-.Xr X 1 ,
+.Xr X 7 ,
 .Xr gdb 1 ,
 .Xr ktrace 1 ,
 .Xr quota 1 ,
diff --git a/share/man/man4/pcppi.4 b/share/man/man4/pcppi.4
index b0ff943e74b..cc855325b8e 100644
--- a/share/man/man4/pcppi.4
+++ b/share/man/man4/pcppi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pcppi.4,v 1.1 2002/04/01 07:56:08 mpech Exp $
+.\" $OpenBSD: pcppi.4,v 1.2 2002/06/30 21:45:25 deraadt Exp $
 .\" $NetBSD: pcppi.4,v 1.5 2001/10/02 20:37:00 augustss Exp $
 .Dd April 1, 2002
 .Dt PCPPI 4
@@ -36,11 +36,7 @@ The
 and
 .Xr midi 4
 devices use this to synthesize sounds.
-The
-.Xr isabeep 4
-and
-.Xr sysbeep 4
-devices are helpers which the
+The isabeep and sysbeep devices are helpers which the
 .Xr pckbd 4
 driver uses as a substitute for a
 .Dq keyboard beep ,
diff --git a/share/man/man4/radio.4 b/share/man/man4/radio.4
index 292cbc99f48..4ba9894719e 100644
--- a/share/man/man4/radio.4
+++ b/share/man/man4/radio.4
@@ -1,5 +1,5 @@
 .\"	$RuOBSD: radio.4,v 1.4 2001/10/26 05:38:43 form Exp $
-.\"	$OpenBSD: radio.4,v 1.10 2002/06/03 18:03:23 mickey Exp $
+.\"	$OpenBSD: radio.4,v 1.11 2002/06/30 21:45:25 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -203,7 +203,6 @@ cards.
 .Xr az 4 ,
 .Xr bktr 4 ,
 .Xr fms 4 ,
-.Xr gtp 4 ,
 .Xr rt 4 ,
 .Xr rtii 4 ,
 .Xr sfr 4 ,
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index 040cc29a841..92cad8489de 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uk.4,v 1.9 2001/10/05 14:45:53 mpech Exp $
+.\"	$OpenBSD: uk.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\"	$NetBSD: uk.4,v 1.3 1996/10/20 23:15:26 explorer Exp $
 .\"
 .\" Copyright (c) 1996
@@ -72,8 +72,7 @@ devices.
 .Xr ch 4 ,
 .Xr scsi 4 ,
 .Xr sd 4 ,
-.Xr st 4 ,
-.Xr su 4
+.Xr st 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 882203410e2..a5f179fa95d 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vga.4,v 1.3 2001/03/27 22:44:54 aaron Exp $
+.\" $OpenBSD: vga.4,v 1.4 2002/06/30 21:45:25 deraadt Exp $
 .\" $NetBSD: vga.4,v 1.2.4.1 2000/08/09 07:48:40 drochner Exp $
 .\"
 .Dd March 20, 1999
@@ -85,9 +85,7 @@ The
 driver can display fonts of the original IBM type and ISO-8859-1 encoded fonts.
 As an experimental feature, the
 .Dq higher half
-fonts of the former OpenBSD/i386
-.Xr pcvt 4
-driver distribution can be used too if
+fonts of the former OpenBSD/i386 pcvt driver distribution can be used too if
 .Em option WSCONS_SUPPORT_PCVTFONTS
 was set at kernel compile time.
 This is only useful with the
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4
index 16ca2898bf4..47092b3fa08 100644
--- a/share/man/man4/wsdisplay.4
+++ b/share/man/man4/wsdisplay.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsdisplay.4,v 1.9 2002/04/03 23:01:06 mickey Exp $
+.\" $OpenBSD: wsdisplay.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
 .\" $NetBSD: wsdisplay.4,v 1.5 2000/05/13 15:22:19 mycroft Exp $
 .\"
 .Dd March 20, 1999
@@ -132,7 +132,6 @@ control device
 .It Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
-.Xr ega 4 ,
 .Xr pcdisplay 4 ,
 .Xr sti 4 ,
 .Xr tga 4 ,
diff --git a/share/man/man4/wsmux.4 b/share/man/man4/wsmux.4
index ef1f8285ac3..0220589b063 100644
--- a/share/man/man4/wsmux.4
+++ b/share/man/man4/wsmux.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsmux.4,v 1.5 2001/08/03 15:21:16 mpech Exp $
+.\" $OpenBSD: wsmux.4,v 1.6 2002/06/30 21:45:25 deraadt Exp $
 .\" $NetBSD: wsmux.4,v 1.2 1999/11/03 22:01:40 castor Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ and detached.
 .Pp
 It is also possible to inject events into a multiplexor from a user program.
 This is used by the
-.Xr moused 8
+.Xr wsmoused 8
 daemon to take data from a mouse connected to a serial port and
 make it appear on the standard mouse mux.
 .Sh FILES
@@ -91,7 +91,7 @@ make it appear on the standard mouse mux.
 .Xr wsdisplay 4 ,
 .Xr wskbd 4 ,
 .Xr wsmouse 4 ,
-.Xr moused 8 ,
+.Xr wsmoused 8 ,
 .Xr wsconscfg 8 ,
 .Xr wsconsctl 8 ,
 .Xr wsfontload 8