diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index 0c023caca751..7151b486bea9 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: hlfsd.8,v 1.2 1998/09/05 06:56:36 obrien Exp $
+.\" $Id: hlfsd.8,v 1.3 1998/09/12 04:04:58 obrien Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
@@ -265,7 +265,7 @@ are read and checked.  All other fields are ignored.  The file
 must be compliant with 
 .Ux 
 System 7 colon-delimited format
-.Xr passwd 4 .
+.Xr passwd 5 .
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /hlfs
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index 8add8287c2a5..b83500969970 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -38,7 +38,7 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: amd.conf.5,v 1.6 1998/11/30 22:25:24 billf Exp $
+.\" $Id: amd.conf.5,v 1.7 1999/08/14 21:37:28 chris Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
@@ -342,7 +342,7 @@ will send its events to the standard error file descriptor.  IF the string
 is given,
 .Nm amd
 will record its events with the system logger
-.Xr syslog 8 .
+.Xr syslogd 8 .
 The default syslog facility used is
 .Ev LOG_DAEMON .
 If you wish to change it, append its name to the log file name, delimited by a
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 0e399e77ba50..2a35e7d93c32 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $Id: login_cap.3,v 1.11 1999/07/14 22:36:07 nik Exp $
+.\" $Id: login_cap.3,v 1.12 1999/07/20 20:46:26 nik Exp $
 .\"
 .Dd December 27, 1996
 .Os FreeBSD
@@ -87,7 +87,7 @@ Remaining fields in the record consist of keyword/data pairs.
 Long lines may be continued with a backslash within empty entries,
 with the second and subsequent lines optionally indented for readability.
 This is similar to the format used in
-.Xr termcap 5,
+.Xr termcap 5 ,
 except that keywords are not limited to two significant characters,
 and are usually longer for improved readability.
 As with termcap entries, multiple records can be linked together
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index ac891f4c17ae..896a825fa370 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.19 1999/07/23 03:42:23 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.20 1999/08/17 10:57:18 mpp Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -75,7 +75,7 @@ directly.
 .Pp
 .Nm
 currently uses the
-.Xr libdialog 3
+.Xr dialog 3
 library to do user interaction with simple ANSI line graphics, color
 support for which is enabled by either running on a syscons VTY or some
 other color-capable terminal emulator (newer versions of xterm will support
diff --git a/share/man/man4/man4.i386/umass.4 b/share/man/man4/man4.i386/umass.4
index 0c1fa809b422..6168de05849b 100644
--- a/share/man/man4/man4.i386/umass.4
+++ b/share/man/man4/man4.i386/umass.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: umass.4,v 1.2 1999/07/12 21:01:57 nik Exp $
+.\"     $Id: umass.4,v 1.3 1999/08/15 10:48:15 mpp Exp $
 .\"
 .Dd May 3, 1999
 .Dt UMASS 4 i386
@@ -87,10 +87,10 @@ Create a new FAT type filesystem.
 .Xr ohci 4 ,
 .Xr uhci 4 ,
 .Xr usb 4 ,
+.Xr vpo 4 ,
 .Xr disktab 5 ,
 .Xr camcontrol 8 ,
-.Xr disklabel 8 ,
-.Xr vpo 8
+.Xr disklabel 8
 .\".Sh HISTORY
 .Sh AUTHORS
 The
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 0c1fa809b422..6168de05849b 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: umass.4,v 1.2 1999/07/12 21:01:57 nik Exp $
+.\"     $Id: umass.4,v 1.3 1999/08/15 10:48:15 mpp Exp $
 .\"
 .Dd May 3, 1999
 .Dt UMASS 4 i386
@@ -87,10 +87,10 @@ Create a new FAT type filesystem.
 .Xr ohci 4 ,
 .Xr uhci 4 ,
 .Xr usb 4 ,
+.Xr vpo 4 ,
 .Xr disktab 5 ,
 .Xr camcontrol 8 ,
-.Xr disklabel 8 ,
-.Xr vpo 8
+.Xr disklabel 8
 .\".Sh HISTORY
 .Sh AUTHORS
 The
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index c01a7d73e1b0..f6d039fca362 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: rc.conf.5,v 1.38 1999/08/13 06:39:12 imp Exp $
+.\"     $Id: rc.conf.5,v 1.39 1999/08/15 10:48:22 mpp Exp $
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -635,7 +635,7 @@ then enable the routing of IPX traffic.
 (bool) If set to
 .Ar YES
 then run the
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 daemon at system boot time.
 .It Ar ipxrouted_flags
 (str) If
@@ -643,7 +643,7 @@ daemon at system boot time.
 is set to
 .Ar YES ,
 these are the flags to pass to the
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 daemon.
 .It Ar arpproxy_all
 If set to
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 10bfa7da6315..3a828f151ac3 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\"	$Id: security.7,v 1.6 1999/03/02 03:55:34 ghelmer Exp $
+.\"	$Id: security.7,v 1.7 1999/03/15 15:43:10 ghelmer Exp $
 .\"
 .Dd December 20, 1998
 .Dt SECURITY 7
@@ -392,7 +392,7 @@ a break-in.
 Process accounting
 .Po
 see
-.Xr accton 1
+.Xr accton 8
 .Pc
 is a relatively low-overhead feature of
 the operating system which I recommend using as a post-break-in evaluation
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 1b067be59d41..c4114ff7f395 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.conf.5,v 1.2 1999/04/24 17:49:41 dcs Exp $
+.\"	$Id: loader.conf.5,v 1.3 1999/05/13 14:53:13 brian Exp $
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
@@ -57,7 +57,7 @@ exists at installworld time, one with the above lines will be installed.
 Though
 .Nm loader.conf Ns No 's
 format was defined explicitly to resemble
-.Xr rc.conf 8 ,
+.Xr rc.conf 5 ,
 and can be sourced by
 .Xr sh 1 ,
 some settings are treated in a special fashion. Also, the
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 6ce3bfa86afb..098bca2a7e34 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14 1998/12/13 15:32:26 bde Exp $
+.\"     $Id: chpass.1,v 1.15 1999/02/23 02:41:26 ghelmer Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@ The list of approved shells
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index c669fdd15e17..b212e090492e 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\"     $Id: config.8,v 1.14 1999/07/12 20:12:05 nik Exp $
 .\"
 .Dd April 19, 1994
 .Dt CONFIG 8
@@ -165,7 +165,7 @@ kernel.  A debug kernel contains complete symbols for all the source files, and
 enables an experienced kernel programmer to analyse the cause of a problem.  The
 debuggers available prior to 4.4BSD-Lite were able to find some information
 from a normal kernel; 
-.Xr gdb 8 
+.Xr gdb 1
 provides very little support for normal kernels, and a debug kernel is needed
 for any meaningful analysis.
 .Pp
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index b89ab50b7edd..eea966a3c8ff 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.14 1998/03/12 01:29:12 jkh Exp $
+.\"	$Id: rtprio.1,v 1.15 1998/03/23 08:28:58 charnier Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -144,7 +144,7 @@ to
 .Ed
 .Pp
 To run
-.Xr tcpdump 8
+.Xr tcpdump 1
 without realtime priority:
 .Bd -literal -offset indent -compact
 .Sy "rtprio -t tcpdump"
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index ac891f4c17ae..896a825fa370 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.19 1999/07/23 03:42:23 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.20 1999/08/17 10:57:18 mpp Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -75,7 +75,7 @@ directly.
 .Pp
 .Nm
 currently uses the
-.Xr libdialog 3
+.Xr dialog 3
 library to do user interaction with simple ANSI line graphics, color
 support for which is enabled by either running on a syscons VTY or some
 other color-capable terminal emulator (newer versions of xterm will support
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index ac891f4c17ae..896a825fa370 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.19 1999/07/23 03:42:23 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.20 1999/08/17 10:57:18 mpp Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -75,7 +75,7 @@ directly.
 .Pp
 .Nm
 currently uses the
-.Xr libdialog 3
+.Xr dialog 3
 library to do user interaction with simple ANSI line graphics, color
 support for which is enabled by either running on a syscons VTY or some
 other color-capable terminal emulator (newer versions of xterm will support
diff --git a/usr.sbin/xntpd/doc/xntpd.8 b/usr.sbin/xntpd/doc/xntpd.8
index f1096bc52562..c37e666a3c74 100644
--- a/usr.sbin/xntpd/doc/xntpd.8
+++ b/usr.sbin/xntpd/doc/xntpd.8
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id$
+.\"	$Id: xntpd.8,v 1.5 1998/02/19 08:05:43 charnier Exp $
 .\"
 .Dd December 21, 1993
 .Dt XNTPD 8
@@ -235,7 +235,7 @@ frequency to stabilize and the residual timing errors to subside. The
 file contains a single floating point value equal to the offset in
 parts-per-million (ppm). Note that the file is updated by first writing
 the current drift value into a temporary file and then using
-.Xr rename 3
+.Xr rename 2
 to replace the old version. This implies that
 .Nm
 must have write permission for the directory the drift file is located
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index 32a37e3e115b..ca7b82c090d6 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -1,4 +1,4 @@
-.\"	$Id: zic.8,v 1.8 1999/01/21 17:12:49 wollman Exp $
+.\"	$Id: zic.8,v 1.8 1999/01/21 17:46:19 wollman Exp $
 .Dd
 .Dt ZIC 8
 .Os
@@ -87,7 +87,7 @@ After creating each output file, change its owner to
 .It Fl v
 Complain if a year that appears in a data file is outside the range
 of years representable by
-.Xr time 2
+.Xr time 3
 values.
 .It Fl s
 Limit time values stored in output files to values that are the same