diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 79ec893be4f6..d00c75fceeff 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -32,6 +32,7 @@ MLINKS+=dialog.3 draw_shadow.3 dialog.3 draw_box.3 \
 	dialog.3 dialog_mesgbox.3 dialog.3 dialog_gauge.3 \
 	dialog.3 init_dialog.3 dialog.3 end_dialog.3 \
 	dialog.3 use_helpfile.3 dialog.3 use_helpline.3 \
-	dialog.3 get_helpline.3 dialog.3 restore_helpline.3
+	dialog.3 get_helpline.3 dialog.3 restore_helpline.3 \
+	dialog.3 dialog_msgbox.3
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index 06b13a9e89cb..7d9b690a5743 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -11,7 +11,7 @@
 .\" nor does the author assume any responsibility for damages incurred with
 .\" its use.
 .\"
-.\" $Id: dialog.3,v 1.1 1995/12/23 01:10:15 jkh Exp $
+.\" $Id: dialog.3,v 1.2 1996/01/01 03:43:51 jkh Exp $
 .\"
 .Dd December 18, 1995
 .Dt dialog 3
@@ -43,7 +43,7 @@
 .Nm use_helpfile ,
 .Nm use_helpline ,
 .Nm get_helpline ,
-.Nm restore_helpline .
+.Nm restore_helpline
 .Nd Provide a simple ncurses-based "GUI" interface.
 .Sh DESCRIPTION
 The dialog library attempts to provide a fairly simplistic set of
diff --git a/gnu/lib/libreadline/readline.3 b/gnu/lib/libreadline/readline.3
index bbe9d9139542..7f8c2c3820c5 100644
--- a/gnu/lib/libreadline/readline.3
+++ b/gnu/lib/libreadline/readline.3
@@ -22,8 +22,8 @@ readline \- get a line from a user with editing
 .LP
 .nf
 .ft B
-#include <readline.h>
-#include <history.h>
+#include <readline/readline.h>
+#include <readline/history.h>
 .ft
 .fi
 .LP
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index ce9e1fe60fca..6ac463f8cbc7 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 1994/11/15 04:51:27 phk Exp $
+# $Id: Makefile,v 1.8 1994/12/26 19:15:19 ats Exp $
 #
 
 PROG =	cc
@@ -8,6 +8,6 @@ BINDIR=	/usr/bin
 .PATH: ${.CURDIR}/../cc_int
 SRCS+=	obstack.c version.c
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
-MLINKS= cc.1 gcc.1
+MLINKS= cc.1 gcc.1 cc.1 c++.1 cc.1 g++.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/cc.1 b/gnu/usr.bin/cc/cc/cc.1
index 1a520397638a..7eca1bb2294b 100644
--- a/gnu/usr.bin/cc/cc/cc.1
+++ b/gnu/usr.bin/cc/cc/cc.1
@@ -20,7 +20,7 @@
 .if n .sp
 .if t .sp 0.4
 ..
-.Id $Id: cc.1,v 1.2 1994/11/15 04:51:29 phk Exp $
+.Id $Id: cc.1,v 1.3 1995/12/26 01:34:18 bde Exp $
 .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools"
 .SH NAME
 gcc, g++ \- GNU project C and C++ Compiler (v2.6)
@@ -4077,7 +4077,7 @@ if available, else
 .B /tmp\c
 \&).
 .SH "SEE ALSO"
-cpp(1), as(1), ld(1), gdb(1), adb(1), dbx(1), sdb(1).
+cpp(1), as(1), ld(1), gdb(1).
 .br
 .RB "`\|" gcc "\|', `\|" cpp \|',
 .RB "`\|" as "\|', `\|" ld \|',
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index bad2e7492b03..60b0758b8b2d 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -43,7 +43,6 @@
 .Nd survey open files
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
-.Fd #include <sys/kinfo.h>
 .Fd #define KERNEL
 .Fd #include <sys/file.h>
 .Fd #undef KERNEL
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index d47259c851aa..7640b5d6d0d1 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -3,18 +3,14 @@
 LIB=	md
 NOPIC=	true
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c
-.if exists(obj)
-MAN3+=	obj/md2.3 obj/md4.3 obj/md5.3
-.else
-MAN3+=	md2.3 md4.3 md5.3
-.endif
+MAN3+=	mdX.3 md2.3 md4.3 md5.3
 MLINKS+=md2.3 MD2Init.3 md2.3 MD2Update.3 md2.3 MD2Final.3
 MLINKS+=md2.3 MD2End.3  md2.3 MD2File.3   md2.3 MD2Data.3
 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3
 MLINKS+=md4.3 MD4End.3  md4.3 MD4File.3   md4.3 MD4Data.3
 MLINKS+=md5.3 MD5Init.3 md5.3 MD5Update.3 md5.3 MD5Final.3
 MLINKS+=md5.3 MD5End.3  md5.3 MD5File.3   md5.3 MD5Data.3
-MLINKS=mdX.3 MDXInit.3 mdX.3 MDXUpdate.3 mdX.3 MDXFinal.3 mdX.3 MDXEnd.3 \
+MLINKS+=mdX.3 MDXInit.3 mdX.3 MDXUpdate.3 mdX.3 MDXFinal.3 mdX.3 MDXEnd.3 \
 	mdX.3 MDXFile.3 mdX.3 MDXData.3
 CLEANFILES+=	md[245]hl.c md[245].ref md[245].3 mddriver
 CFLAGS+= -I${.CURDIR}
diff --git a/share/man/man4/man4.i386/qcam.4 b/share/man/man4/man4.i386/qcam.4
index 2159ca8969ea..d611e5a9831a 100644
--- a/share/man/man4/man4.i386/qcam.4
+++ b/share/man/man4/man4.i386/qcam.4
@@ -1,5 +1,5 @@
 .Dd Feburary 1, 1996
-.Dt SD 4
+.Dt QCAM 4
 .Os FreeBSD
 .Sh NAME
 .Nm qcam
diff --git a/share/man/man4/man4.i386/uha.4 b/share/man/man4/man4.i386/uha.4
index b88bcb0df8eb..8ec379c26064 100644
--- a/share/man/man4/man4.i386/uha.4
+++ b/share/man/man4/man4.i386/uha.4
@@ -64,7 +64,7 @@ automatically.
 .Bl -tag -width Pa -compact
 .It Pa /sys/i386/conf/GENERIC
 sample generic kernel config file for Bustek and Ultrastore based systems
-.It Pa /sys/i386/isa/uha.c
+.It Pa /sys/i386/isa/ultra14f.c
 driver source
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index ffab944bfc8b..ffd71c4cfc7e 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -2,7 +2,7 @@
 .Dt STYLE 9
 .Os FreeBSD 2.2
 .Sh NAME
-.Nm STYLE
+.Nm style
 .Nd "Kernel source file style guide"
 .Sh DESCRIPTION
 This file contains an example of the preferred style for kernel source
@@ -14,7 +14,7 @@ files in the FreeBSD source tree.
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
  *
- *	FreeBSD $Id$
+ *	FreeBSD $Id: style.9,v 1.3 1995/12/21 18:35:19 phk Exp $
  *
  */
 
diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile
index cbcbc7806a5f..45f4d06cab22 100644
--- a/usr.sbin/pcvt/keycap/Makefile
+++ b/usr.sbin/pcvt/keycap/Makefile
@@ -17,6 +17,10 @@ KEYCAPSRC=	keycap.src
 CFLAGS	+=	-DKEYCAP_PATH=\"$(CAPPATH)\"
 SRCS	=	keycap.c
 MAN3	=	keycap.${MAN3EXT}
+MLINKS+=	keycap.${MAN3EXT} kgetent.${MAN3EXT} \
+		keycap.${MAN3EXT} keygetnum.${MAN3EXT} \
+		keycap.${MAN3EXT} keygetflag.${MAN3EXT} \
+		keycap.${MAN3EXT} ketgetstr.${MAN3EXT}
 MAN5	=	man5/keycap.${MAN5EXT}
 #CLEANFILES+=	keycap.0 man5/keycap.0
 
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.1 b/usr.sbin/pcvt/userkeys/vt220keys.1
index cff95bf2b221..282adecbce89 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.1
+++ b/usr.sbin/pcvt/userkeys/vt220keys.1
@@ -1,15 +1,15 @@
-.TH VT220 1 
+.TH VT220KEYS 1 
 .UC 4
 .SH NAME
-vt220 \- define SHIFTED function keys on VT220 terminal
+vt220keys \- define SHIFTED function keys on VT220 terminal
 .SH SYNTAX
-.B vt220
+.B vt220keys
 [
 .B \-cil
 ]
 [ keyname keystring ] ...
 .SH DESCRIPTION
-.I Vt220
+.I Vt220keys
 sets up a "vt220 terminal" in vt200 mode to allow user
 definition of the SHIFTED function keys. Each
 \f2keyname\f1 specified on the command line will be loaded with
@@ -19,7 +19,7 @@ F6 F7 F8 F9 F10 F11 ESC F12 BS F13 LF F14 HELP DO F17 F18 F19 F20.
 \f2Keystrings\f1
 must be quoted if spaces, tabs, or shell metacharacters are included. 
 .PP
-.B Vt220
+.B Vt220keys
 expects to receive some combination of option flags and/or 
 argument pair(s), otherwised an usage message
 is printed.
@@ -51,13 +51,13 @@ pairs.
 The only way
 to unlock is by turning the power off.
 .SH EXAMPLES
-vt220 -ci
+vt220keys -ci
 .br
-vt220 F6 'nroff -ms '
+vt220keys F6 'nroff -ms '
 .br
-vt220 -i F20 'cc -O -c '
+vt220keys -i F20 'cc -O -c '
 .br
-vt220 -l HELP man
+vt220keys -l HELP man
 .SH "OTHER FEATURES"
 Pressing the function keys without using the shift key, generates
 a string of characters.  With
@@ -69,15 +69,15 @@ where ^[[17~ is what is generated by pressing the F6 key.  Therefore
 F6 can perform two commands, depending if pressed with/without the SHIFT
 key.
 .PP
-.B Vt220
+.B Vt220keys
 can be called from your .login or .profile file.  Typically an user
 will create a initialization file and include a line like
 .br
-	vt220 -ci
+	vt220keys -ci
 .br
 OR
 .br
-	vt220 -cil
+	vt220keys -cil
 .br
 in the above mentioned files.  This way the SHIFTED function keys
 will be set to your favorite commands when logging in.
@@ -101,11 +101,11 @@ ESC key.  Here are some available alternatives:
 The escape character can be generated by typing ^[ (control-[).
 .sp
 Use 
-.B vt220
+.B vt220keys
 as follows (note ^[ is control-[)
 .br
 .in +.5i
-vt220 ESC '^['  
+vt220keys ESC '^['  
 .in
 .br
 This will require you
diff --git a/usr.sbin/rndcontrol/Makefile b/usr.sbin/rndcontrol/Makefile
index e6418eb1206e..2cda5a857c07 100644
--- a/usr.sbin/rndcontrol/Makefile
+++ b/usr.sbin/rndcontrol/Makefile
@@ -4,5 +4,6 @@ PROG=		rndcontrol
 CFLAGS+=	-Wall
 MAN4=		random.4
 MAN8=		rndcontrol.8
+MLINKS+=	random.4 urandom.4
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/sendmail.8 b/usr.sbin/sendmail/src/sendmail.8
index 5b48ffcda9a7..ff84042ed109 100644
--- a/usr.sbin/sendmail/src/sendmail.8
+++ b/usr.sbin/sendmail/src/sendmail.8
@@ -474,7 +474,7 @@ raw data for alias names
 data base of alias names
 .It Pa /etc/sendmail.cf
 configuration file
-.It Pa /etc/sendmail.hf
+.It Pa /usr/share/misc/sendmail.hf
 help file
 .It Pa /var/log/sendmail.st
 collected statistics