diff --git a/gnu/usr.bin/as/as.1 b/gnu/usr.bin/as/as.1
index 57e2dc1f9b9e..66f7ee5004b0 100644
--- a/gnu/usr.bin/as/as.1
+++ b/gnu/usr.bin/as/as.1
@@ -3,7 +3,7 @@
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
-GNU as \- the portable GNU assembler.
+as \- the portable GNU assembler.
 
 .SH SYNOPSIS
 .na
diff --git a/gnu/usr.bin/as/as.1aout b/gnu/usr.bin/as/as.1aout
index 57e2dc1f9b9e..66f7ee5004b0 100644
--- a/gnu/usr.bin/as/as.1aout
+++ b/gnu/usr.bin/as/as.1aout
@@ -3,7 +3,7 @@
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
-GNU as \- the portable GNU assembler.
+as \- the portable GNU assembler.
 
 .SH SYNOPSIS
 .na
diff --git a/gnu/usr.bin/awk/awk.1 b/gnu/usr.bin/awk/awk.1
index a98c99d1608b..1b58bec9acbe 100644
--- a/gnu/usr.bin/awk/awk.1
+++ b/gnu/usr.bin/awk/awk.1
@@ -1,11 +1,11 @@
 .ds PX \s-1POSIX\s+1
 .ds UX \s-1UNIX\s+1
 .ds AN \s-1ANSI\s+1
-.TH GAWK 1 "Apr 18 1994" "Free Software Foundation" "Utility Commands"
+.TH AWK 1 "Apr 18 1994" "Free Software Foundation" "Utility Commands"
 .SH NAME
-gawk \- pattern scanning and processing language
+awk \- GNU awk pattern scanning and processing language
 .SH SYNOPSIS
-.B gawk
+.B awk
 [ POSIX or GNU style options ]
 .B \-f
 .I program-file
@@ -13,7 +13,7 @@ gawk \- pattern scanning and processing language
 .B \-\^\-
 ] file .\^.\^.
 .br
-.B gawk
+.B awk
 [ POSIX or GNU style options ]
 [
 .B \-\^\-
@@ -35,7 +35,7 @@ of \*(UX
 also provides some GNU-specific extensions.
 .PP
 The command line consists of options to
-.I gawk
+.I awk
 itself, the AWK program text (if not supplied via the
 .B \-f
 or
@@ -57,7 +57,7 @@ for \*(PX mandated features.  Other implementations of the AWK language
 are likely to only accept the traditional one letter options.
 .PP
 Following the \*(PX standard,
-.IR gawk -specific
+.IR awk -specific
 options are supplied via arguments to the
 .B \-W
 option.  Multiple
@@ -135,9 +135,9 @@ flag sets the maximum record size.  These two flags and the
 option are from the AT&T Bell Labs research version of \*(UX
 .IR awk .
 They are ignored by
-.IR gawk ,
+.IR awk ,
 since
-.I gawk
+.I awk
 has no pre-defined limits.
 .TP \w'\fB\-\^\-copyright\fR'u+1n
 .PD 0
@@ -148,7 +148,7 @@ has no pre-defined limits.
 Run in
 .I compatibility
 mode.  In compatibility mode,
-.I gawk
+.I awk
 behaves identically to \*(UX
 .IR awk ;
 none of the GNU-specific extensions are recognized.
@@ -268,10 +268,10 @@ will be recognized in the same argument.
 .PD
 .B \-\^\-version
 Print version information for this particular copy of
-.I gawk
+.I awk
 on the error output.
 This is useful mainly for knowing if the current copy of
-.I gawk
+.I awk
 on your system
 is up to date with respect to whatever the Free Software Foundation
 is distributing.
@@ -341,10 +341,10 @@ all variable assignments specified via the
 .B \-v
 option are performed.
 Next,
-.I gawk
+.I awk
 compiles the program into an internal form.
 Then,
-.I gawk
+.I awk
 executes the code in the
 .B BEGIN
 block(s) (if any),
@@ -353,7 +353,7 @@ each file named in the
 .B ARGV
 array.
 If there are no files named on the command line,
-.I gawk
+.I awk
 reads the standard input.
 .PP
 If a filename on the command line has the form
@@ -374,11 +374,11 @@ a single data file.
 If the value of a particular element of
 .B ARGV
 is empty (\fB""\fR),
-.I gawk
+.I awk
 skips over it.
 .PP
 For each line in the input,
-.I gawk
+.I awk
 tests to see if it matches any
 .I pattern
 in the AWK program.
@@ -388,7 +388,7 @@ is executed.
 The patterns are tested in the order they occur in the program.
 .PP
 Finally, after all the input is exhausted,
-.I gawk
+.I awk
 executes the code in the
 .B END
 block(s) (if any).
@@ -403,7 +403,7 @@ runs; these will be described as needed and summarized below.
 .SS Fields
 .PP
 As each input line is read,
-.I gawk
+.I awk
 splits the line into
 .IR fields ,
 using the value of the
@@ -429,7 +429,7 @@ If the
 .B FIELDWIDTHS
 variable is set to a space separated list of numbers, each field is
 expected to have fixed width, and
-.I gawk
+.I awk
 will split up the record using the specified widths.  The value of
 .B FS
 is ignored.
@@ -480,7 +480,7 @@ AWK's built-in variables are:
 .TP \w'\fBFIELDWIDTHS\fR'u+1n
 .B ARGC
 The number of command line arguments (does not include options to
-.IR gawk ,
+.IR awk ,
 or the program source).
 .TP
 .B ARGIND
@@ -506,12 +506,12 @@ The array is indexed by the environment variables, each element being
 the value of that variable (e.g., \fBENVIRON["HOME"]\fP might be
 .BR /u/arnold ).
 Changing this array does not affect the environment seen by programs which
-.I gawk
+.I awk
 spawns via redirection or the
 .B system()
 function.
 (This may change in a future version of
-.IR gawk .)
+.IR awk .)
 .\" but don't hold your breath...
 .TP
 .B ERRNO
@@ -528,14 +528,14 @@ a string describing the error.
 .TP
 .B FIELDWIDTHS
 A white-space separated list of fieldwidths.  When set,
-.I gawk
+.I awk
 parses the input into fields of fixed width, instead of using the
 value of the
 .B FS
 variable as the field separator.
 The fixed field width facility is still experimental; expect the
 semantics to change as
-.I gawk
+.I awk
 evolves over time.
 .TP
 .B FILENAME
@@ -605,7 +605,7 @@ The input record separator, by default a newline.
 is exceptional in that only the first character of its string
 value is used for separating records.
 (This will probably change in a future release of
-.IR gawk .)
+.IR awk .)
 If
 .B RS
 is set to the null string, then records are separated by
@@ -739,7 +739,7 @@ Two strings are compared, of course, as strings.
 According to the \*(PX standard, even if two strings are
 numeric strings, a numeric comparison is performed.  However, this is
 clearly incorrect, and
-.I gawk
+.I awk
 does not do this.
 .PP
 Uninitialized variables have the numeric value 0 and the string value ""
@@ -1246,13 +1246,13 @@ into a file,
 or via
 .B getline
 from a file,
-.I gawk
+.I awk
 recognizes certain special filenames internally.  These filenames
 allow access to open file descriptors inherited from
-.IR gawk 's
+.IR awk 's
 parent process (usually the shell).
 Other special filenames provide access information about the running
-.B gawk
+.B awk
 process.
 The filenames are:
 .TP \w'\fB/dev/stdout\fR'u+1n
@@ -1468,7 +1468,7 @@ Non-alphabetic characters are left unchanged.
 .PP
 Since one of the primary uses of AWK programs is processing log files
 that contain time stamp information,
-.I gawk
+.I awk
 provides the following two functions for obtaining time stamps and
 formatting them.
 .PP
@@ -1496,11 +1496,11 @@ guaranteed to be available.
 A public-domain version of
 .IR strftime (3)
 and a man page for it are shipped with
-.IR gawk ;
+.IR awk ;
 if that version was used to build
-.IR gawk ,
+.IR awk ,
 then all of the conversions described in that man page are available to
-.IR gawk.
+.IR awk.
 .SS String Constants
 .PP
 String constants in AWK are sequences of characters enclosed
@@ -1643,12 +1643,12 @@ Addison-Wesley, 1988. ISBN 0-201-07981-X.
 Edition 0.15, published by the Free Software Foundation, 1993.
 .SH POSIX COMPATIBILITY
 A primary goal for
-.I gawk
+.I awk
 is compatibility with the \*(PX standard, as well as with the
 latest version of \*(UX
 .IR awk .
 To this end,
-.I gawk
+.I awk
 incorporates the following user visible
 features which are not described in the AWK book,
 but are part of
@@ -1679,7 +1679,7 @@ The
 option for implementation specific features is from the \*(PX standard.
 .PP
 When processing arguments,
-.I gawk
+.I awk
 uses the special option ``\fB\-\^\-\fP'' to signal the end of
 arguments.
 In compatibility mode, it will warn about, but otherwise ignore,
@@ -1696,7 +1696,7 @@ has it return the seed it was using, to allow keeping track
 of random number sequences. Therefore
 .B srand()
 in
-.I gawk
+.I awk
 also returns its current seed.
 .PP
 Other new features are:
@@ -1711,7 +1711,7 @@ array; the
 and
 .BR \ev
 escape sequences (done originally in
-.I gawk
+.I awk
 and fed back into AT&T's); the
 .B tolower()
 and
@@ -1726,13 +1726,13 @@ has some extensions to \*(PX
 They are described in this section.  All the extensions described here
 can be disabled by
 invoking
-.I gawk
+.I awk
 with the
 .B "\-W compat"
 option.
 .PP
 The following features of
-.I gawk
+.I awk
 are not available in
 \*(PX
 .IR awk .
@@ -1800,7 +1800,7 @@ or
 when closing a file or pipe, respectively.
 .PP
 When
-.I gawk
+.I awk
 is invoked with the
 .B "\-W compat"
 option,
@@ -1818,7 +1818,7 @@ has been specified.
 .ig
 .PP
 If
-.I gawk
+.I awk
 was compiled for debugging, it will
 accept the following additional options:
 .TP
@@ -1833,13 +1833,13 @@ or
 .IR bison (1)
 debugging output during program parsing.
 This option should only be of interest to the
-.I gawk
+.I awk
 maintainers, and may not even be compiled into
-.IR gawk .
+.IR awk .
 ..
 .SH HISTORICAL FEATURES
 There are two features of historical AWK implementations that
-.I gawk
+.I awk
 supports.
 First, it is possible to call the
 .B length()
@@ -1863,7 +1863,7 @@ a = length($0)
 .RE
 .PP
 This feature is marked as ``deprecated'' in the \*(PX standard, and
-.I gawk
+.I awk
 will issue a warning about its use if
 .B "\-W lint"
 is specified on the command line.
@@ -1887,14 +1887,14 @@ has not been specified.
 If
 .B POSIXLY_CORRECT
 exists in the environment, then
-.I gawk
+.I awk
 behaves exactly as if
 .B \-\-posix
 had been specified on the command line.
 If
 .B \-\-lint
 has been specified,
-.I gawk
+.I awk
 will issue a warning message to this effect.
 .SH BUGS
 The
@@ -1910,9 +1910,9 @@ and the associated
 and
 .B /dev/stderr
 files, you may get different output from
-.I gawk
+.I awk
 than you would get on a system without those files.  When
-.I gawk
+.I awk
 interprets these files internally, it synchronizes output to the standard
 output with output to
 .BR /dev/stdout ,
@@ -1921,11 +1921,11 @@ open files.
 Caveat Emptor.
 .SH VERSION INFORMATION
 This man page documents
-.IR gawk ,
+.IR awk ,
 version 2.15.
 .PP
 Starting with the 2.15 version of
-.IR gawk ,
+.IR awk ,
 the
 .BR \-c ,
 .BR \-V ,
diff --git a/gnu/usr.bin/cvs/mkmodules/mkmodules.1 b/gnu/usr.bin/cvs/mkmodules/mkmodules.1
index 8196a47f137b..ff446abe2e1c 100644
--- a/gnu/usr.bin/cvs/mkmodules/mkmodules.1
+++ b/gnu/usr.bin/cvs/mkmodules/mkmodules.1
@@ -57,9 +57,9 @@ and
 If not set, the default is
 .BR /usr/local/bin .
 .SH "SEE ALSO"
-.BR checkin (1),
+.BR ci (1),
 .BR co (1),
 .BR cvs (1),
-.BR ndbm (3),
+.\" .BR ndbm (3),
 .BR rcs (1),
 .SH "BUGS"
diff --git a/gnu/usr.bin/groff/addftinfo/addftinfo.man b/gnu/usr.bin/groff/addftinfo/addftinfo.man
index 4c92477c7b8b..0b6b796a7497 100644
--- a/gnu/usr.bin/groff/addftinfo/addftinfo.man
+++ b/gnu/usr.bin/groff/addftinfo/addftinfo.man
@@ -79,7 +79,6 @@ If a parameter is not specified the default will be used.
 The defaults are chosen to have the reasonable values for
 a Times font.
 .SH "SEE ALSO"
-.BR font (5)
 .BR groff_font (@MAN5EXT@),
 .BR groff (@MAN1EXT@),
 .BR groff_char (@MAN7EXT@)
diff --git a/gnu/usr.bin/groff/groff/groff.man b/gnu/usr.bin/groff/groff/groff.man
index 340966c341c8..40961ccc256f 100644
--- a/gnu/usr.bin/groff/groff/groff.man
+++ b/gnu/usr.bin/groff/groff/groff.man
@@ -347,7 +347,7 @@ The most recent released version of groff is always available for
 anonymous ftp from prep.ai.mit.edu (18.71.0.38) in the directory
 pub/gnu.
 .SH "SEE ALSO"
-.BR grog (@MAN1EXT@),
+.\" .BR grog (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
 .BR @g@tbl (@MAN1EXT@),
 .BR @g@pic (@MAN1EXT@),
@@ -357,7 +357,7 @@ pub/gnu.
 .BR grops (@MAN1EXT@),
 .BR grodvi (@MAN1EXT@),
 .BR grotty (@MAN1EXT@),
-.BR gxditview (@MAN1EXT@),
+.\" .BR gxditview (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR groff_out (@MAN5EXT@),
 .BR groff_ms (@MAN7EXT@),
diff --git a/gnu/usr.bin/groff/grops/grops.man b/gnu/usr.bin/groff/grops/grops.man
index 218f1ce7b20c..1f4947ebf863 100644
--- a/gnu/usr.bin/groff/grops/grops.man
+++ b/gnu/usr.bin/groff/grops/grops.man
@@ -808,7 +808,7 @@ Macros to undo the effect of
 .BI /tmp/grops XXXXXX
 Temporary file.
 .SH "SEE ALSO"
-.BR afmtodit (@MAN1EXT@),
+.\" .BR afmtodit (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
 .BR psbb (@MAN1EXT@),
diff --git a/gnu/usr.bin/groff/grotty/grotty.man b/gnu/usr.bin/groff/grotty/grotty.man
index b965691d45f6..9e7d31c90544 100644
--- a/gnu/usr.bin/groff/grotty/grotty.man
+++ b/gnu/usr.bin/groff/grotty/grotty.man
@@ -192,5 +192,4 @@ cannot be printed.
 .BR groff_font (@MAN5EXT@),
 .BR groff_char (@MAN7EXT@),
 .BR ul (1),
-.BR more (1),
-.BR less (1)
+.BR more (1)
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index c9ca259a1e0f..c4b310ea3f0e 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -6,8 +6,8 @@ TMACMODE?=	444
 TMACDIR?=	/usr/share/tmac
 MDOCDIR?=	${TMACDIR}/mdoc
 
-MAN7=		groff_ms.7 me.7
-MLINKS=		groff_ms.7 ms.7
+MAN7=		groff_ms.7 me.7 
+MLINKS=		groff_ms.7 ms.7 me.7 groff_me.7
 LINKS=          ${TMACDIR}/tmac.andoc ${TMACDIR}/tmac.an
 
 MANDEPEND=	${MAN7}
diff --git a/gnu/usr.bin/gzip/gzip.1 b/gnu/usr.bin/gzip/gzip.1
index ac151ec0d79a..5304d30b44ea 100644
--- a/gnu/usr.bin/gzip/gzip.1
+++ b/gnu/usr.bin/gzip/gzip.1
@@ -367,7 +367,7 @@ explicit command line parameters. For example:
 On Vax/VMS, the name of the environment variable is GZIP_OPT, to
 avoid a conflict with the symbol set for invocation of the program.
 .SH "SEE ALSO"
-znew(1), zcmp(1), zmore(1), zforce(1), gzexe(1), zip(1), unzip(1), compress(1)
+znew(1), zcmp(1), zmore(1), zforce(1), gzexe(1), compress(1)
 .SH "DIAGNOSTICS"
 Exit status is normally 0;
 if an error occurs, exit status is 1. If a warning occurs, exit status is 2.
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
index d096096b621a..b11cf8d68b4e 100644
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ b/gnu/usr.bin/rcs/ci/ci.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id: ci.1,v 5.17 1995/06/16 06:19:24 eggert Exp $
+.Id $Id: ci.1,v 1.2 1995/10/28 21:49:06 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
@@ -887,7 +887,6 @@ Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
 Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
 .SH "SEE ALSO"
 co(1),
-emacs(1),
 ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
 rcsintro(1), rcsmerge(1), rlog(1), setuid(2), rcsfile(5)
 .br
diff --git a/gnu/usr.bin/texinfo/info/info.1 b/gnu/usr.bin/texinfo/info/info.1
index 674bcefb8dde..aabfcf12962d 100644
--- a/gnu/usr.bin/texinfo/info/info.1
+++ b/gnu/usr.bin/texinfo/info/info.1
@@ -216,7 +216,8 @@ is not given.
 .B INFO_PRINT_COMMAND
 The command used for printing.
 .SH SEE ALSO
-.BR emacs (1)
+.BR man (1)
+.\" .BR emacs (1)
 .SH AUTHOR
 .RS
 Brian Fox, Free Software Foundation
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 4ce40f04ade6..542028c54ac7 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -88,7 +88,7 @@ MLINKS+=getvfsent.3 getvfsbyname.3 getvfsent.3 getvfsbytype.3 \
 MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
 MLINKS+=glob.3 globfree.3
 MLINKS+=popen.3 pclose.3
-MLINKS+=psignal.3 sys_siglist.3
+MLINKS+=psignal.3 sys_siglist.3 psignal.3 sys_signame.3
 MLINKS+=pwcache.3 user_from_uid.3 pwcache.3 group_from_gid.3
 MLINKS+=rand48.3 _rand48.3 rand48.3 drand48.3 rand48.3 erand48.3 \
 	rand48.3 jrand48.3 rand48.3 lcong48.3 rand48.3 lrand48.3 \
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 5d5dfd58fbf5..8d0919c3e872 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -107,8 +107,7 @@ otherwise, it returns the value
 .Sh SEE ALSO
 .Xr sh 1 ,
 .Xr glob 3 ,
-.Xr regex 3 ,
-.Xr wordexp 3
+.Xr regex 3
 .Sh STANDARDS
 The
 .Fn fnmatch
diff --git a/lib/libc/rpc/rstat_svc.8 b/lib/libc/rpc/rstat_svc.8
index 0289153fd53d..b7b438681ba9 100644
--- a/lib/libc/rpc/rstat_svc.8
+++ b/lib/libc/rpc/rstat_svc.8
@@ -17,5 +17,5 @@ daemon is normally invoked at boot time through /etc/rc.local.
 .PP
 .B rstat_svc
 uses an RPC protocol defined in /usr/include/rpcsvc/rstat.x.
-.SH "SEE ALSO"
-.BR rstat (1),
+.\" .SH "SEE ALSO"
+.\" .BR rstat (1),
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 336476aa7938..dddea781a70a 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -94,4 +94,4 @@ MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
 MLINKS+=strcpy.3 strncpy.3
-MLINKS+=strerror.3 perror.3
+MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index b76cc39e83eb..207fe7b35ba9 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -36,9 +36,7 @@
 .Sh NAME
 .Nm ipx_addr ,
 .Nm ipx_ntoa
-.\" .Nd Novell
-.Tn IPX
-address conversion routines
+.Nd IPX address conversion routines
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <netipx/ipx.h>
diff --git a/lib/libncurses/curs_inopts.3 b/lib/libncurses/curs_inopts.3
index cfa4085d29be..f8cd8148a94d 100644
--- a/lib/libncurses/curs_inopts.3
+++ b/lib/libncurses/curs_inopts.3
@@ -92,7 +92,7 @@ causes the terminal keypad to be turned on when \fBwgetch\fR is
 called.  The default value for keypad is false.
 
 Initially, whether the terminal returns 7 or 8 significant bits on
-input depends on the control mode of the tty driver [see termio(7)].
+input depends on the control mode of the tty driver [see termios(4)].
 To force 8 bits to be returned, invoke \fBmeta\fR(\fIwin\fR,
 \fBTRUE\fR).  To force 7 bits to be returned, invoke
 \fBmeta\fR(\fIwin\fR, \fBFALSE\fR).  The window argument, \fIwin\fR,
@@ -123,7 +123,7 @@ BREAK key depends on other bits in the tty driver that are not set by
 
 When the \fBnoqiflush\fR routine is used, normal flush of input and
 output queues associated with the \fBINTR\fR, \fBQUIT\fR and
-\fBSUSP\fR characters will not be done [see termio(7)].  When
+\fBSUSP\fR characters will not be done [see termios(4)].  When
 \fBqiflush\fR is called, the queues will be flushed when these control
 characters are read.
 
@@ -161,7 +161,7 @@ The entry points \fBintrflush\fR, \fBqiflush\fR, \fBnoqiflush\fR, and
 \fBtypeahead\fR are not yet implemented in ncurses 1.8.6.  The ncurses
 code does not do typeahead checking during input as SVr4 curses does.
 .SH SEE ALSO
-\fBncurses\fR(3), \fBcurs_getch\fR(3), \fBcurs_initscr\fR(3), \fBtermio\fR(7)
+\fBncurses\fR(3), \fBcurs_getch\fR(3), \fBcurs_initscr\fR(3), \fBtermios\fR(4)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index 5445de04f25d..a4b65f5a658f 100644
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@@ -9,7 +9,7 @@ SRCS=   termcap.c tgoto.c tputs.c tparm.c tospeed.c
 MAN3=	termcap.3
 MLINKS=	termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
 	termcap.3 tgetstr.3 termcap.3 tgoto.3 termcap.3 tputs.3 \
-	termcap.3 tparm.3
+	termcap.3 tparm.3 termcap.3 _set_ospeed.3
 LINKS=	${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a
 .if !defined(NOPIC)
 LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 906f8c21babe..fbb971cb3308 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -311,8 +311,9 @@ to create the new entry.
 .Xr netintro 4 ,
 .Xr route 4 ,
 .Xr esis 4 ,
-.Xr routed 8 ,
-.Xr XNSrouted 8
+.Xr IPXrouted
+.Xr routed 8
+.\" .Xr XNSrouted 8
 .Sh HISTORY
 The
 .Nm
diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile
index a6289a4ac0d9..c9b861c8158b 100644
--- a/secure/lib/libcipher/Makefile
+++ b/secure/lib/libcipher/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1994/09/07 21:48:45 csgr Exp $
+# $Id: Makefile,v 1.3 1994/09/09 09:43:18 csgr Exp $
 #
 
 
@@ -9,8 +9,8 @@ PRECIOUSLIB=	yes
 NOPROFILE=	yes
 
 #MAN3=   crypt.0
-#MLINKS= crypt.3 encrypt.3 crypt.3 setkey.3
-#MLINKS+=crypt.3 des_cipher.3 crypt.3 des_setkey.3
+MLINKS= crypt.3 encrypt.3 crypt.3 setkey.3
+MLINKS+=crypt.3 des_cipher.3 crypt.3 des_setkey.3
 
 #SUBDIR=		test
 
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 10b4e634c5c6..0ebf19df9bf7 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -2748,7 +2748,7 @@ to restore the old style behavior.
 .Bl -tag -width /usr/share/man0/template.doc -compact
 .It Pa /usr/share/tmac/tmac.doc
 manual macro package
-.It Pa /usr/share/man0/template.doc
+.It Pa /usr/share/misc/mdoc.template
 template for writing a man page
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/devfs_add_devsw.9 b/share/man/man9/devfs_add_devsw.9
index 45880d4d3c99..895de67300c3 100644
--- a/share/man/man9/devfs_add_devsw.9
+++ b/share/man/man9/devfs_add_devsw.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: devfs_add_devsw.9,v 1.1 1995/12/31 00:08:17 joerg Exp $
+.\" $Id: devfs_add_devsw.9,v 1.2 1996/01/30 13:51:51 mpp Exp $
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
@@ -34,7 +34,7 @@
 .Nm devfs_add_devsw
 .Nd wire device into devswitch table
 .Sh SYNOPSIS
-.Fd #include <devfsext.h>
+.Fd #include <sys/devfsext.h>
 .Ft void *
 .Fn devfs_add_devsw "char *path" "char *name" "void *devsw" "int minor" "int chrblk" "uid_t uid" "gid_t gid" "int perms"
 .Sh DESCRIPTION
diff --git a/share/man/man9/devfs_link.9 b/share/man/man9/devfs_link.9
index e5251c71fc0f..3480dfd4981f 100644
--- a/share/man/man9/devfs_link.9
+++ b/share/man/man9/devfs_link.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $Id: devfs_link.9,v 1.1 1995/12/31 00:08:18 joerg Exp $
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
@@ -34,7 +34,7 @@
 .Nm devfs_link
 .Nd make a hard link for a devfs entry
 .Sh SYNOPSIS
-.Fd #include <devfsext.h>
+.Fd #include <sys/devfsext.h>
 .Ft void *
 .Fn devfs_link "char *path" "char *name" "void *original"
 .Sh DESCRIPTION
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 1a49c5f32208..28e3980869d6 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -137,7 +137,7 @@ macro packages.
 .Sh SEE ALSO
 .Xr nroff 1 ,
 .Xr troff 1 ,
-.Xr checkeq 1 ,
+.\" .Xr checkeq 1 ,
 .Xr ms 7 ,
 .Xr me 7
 .Sh DIAGNOSTICS
diff --git a/usr.bin/dnsquery/dnsquery.1 b/usr.bin/dnsquery/dnsquery.1
index ff147f0e84f9..053d38cb526e 100644
--- a/usr.bin/dnsquery/dnsquery.1
+++ b/usr.bin/dnsquery/dnsquery.1
@@ -140,8 +140,7 @@ The name of the host (or domain) of interest.
 .br
 <resolv.h>		list of resolver flags
 .SH "SEE ALSO"
-nslookup(8), nstest(1), nsquery(1), 
-named(8), resolver(5)
+nslookup(8), named(8), resolver(5)
 .SH DIAGNOSTICS
 If the resolver fails to answer the query and debugging has not been
 turned on,
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index c2126564d2e6..7366d7e587cd 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -233,10 +233,10 @@ Dynamic call graph and profile.
 Summarized dynamic call graph and profile.
 .El
 .Sh SEE ALSO
-.Xr monitor 3 ,
+.\" .Xr monitor 3 ,
 .Xr profil 2 ,
-.Xr cc 1 ,
-.Xr prof 1
+.Xr cc 1
+.\" .Xr prof 1
 .Rs
 .%T "An Execution Profiler for Modular Programs"
 .%A S. Graham
diff --git a/usr.bin/lex/lexdoc.1 b/usr.bin/lex/lexdoc.1
index 7241c225f29d..b1d46098d256 100644
--- a/usr.bin/lex/lexdoc.1
+++ b/usr.bin/lex/lexdoc.1
@@ -1,6 +1,6 @@
-.TH FLEXDOC 1 "November 1993" "Version 2.4"
+.TH LEXDOC 1 "November 1993" "Version 2.4"
 .SH NAME
-flexdoc \- documentation for flex, fast lexical analyzer generator
+lexdoc \- documentation for flex, fast lexical analyzer generator
 .SH SYNOPSIS
 .B flex
 .B [\-bcdfhilnpstvwBFILTV78+ \-C[aefFmr] \-Pprefix \-Sskeleton]
diff --git a/usr.bin/ncftp/ncftp.1 b/usr.bin/ncftp/ncftp.1
index 290a2eaf3a19..eb1240e458cb 100644
--- a/usr.bin/ncftp/ncftp.1
+++ b/usr.bin/ncftp/ncftp.1
@@ -64,7 +64,7 @@
 .\"-------
 .SH "NAME"
 .\"-------
-NcFTP \(em Internet file transfer program
+ncftp \(em Internet file transfer program
 .\"-------
 .SH "SYNOPSIS"
 .\"-------
@@ -1397,6 +1397,6 @@ or
 .IR compress (1),
 .IR gzip (1),
 .IR zcat (1),
-.IR fsp (1),
-.IR archie (1),
+.\" .IR fsp (1),
+.\" .IR archie (1),
 .IR tftp (1).
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index df1ebf225f11..338cbf02a9f7 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -93,8 +93,7 @@ uuencode src_tree.tar.Z \&| mail sys1!sys2!user
 .Xr compress 1 ,
 .Xr mail 1 ,
 .Xr uucp 1 ,
-.Xr uuencode 5 ,
-.Xr format 5
+.Xr uuencode 5
 .Sh BUGS
 The encoded form of the file is expanded by 35% (3 bytes become 4 plus
 control information).
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 81591b8593c7..ac9e1cba984e 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -91,7 +91,6 @@ on a line by itself.
 .Sh SEE ALSO
 .Xr uuencode 1 ,
 .Xr uudecode 1 ,
-.Xr uusend 1 ,
 .Xr uucp 1 ,
 .Xr mail 1
 .Sh HISTORY
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index e136279ec041..0358048132dc 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -14,10 +14,10 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.\"     @(#)pkg_add.8
+.\"     @(#)pkg_add.1
 .\"
 .Dd November 25, 1994
-.Dt pkg_add 8
+.Dt pkg_add 1
 .Os FreeBSD 2.0
 .Sh NAME
 .Nm pkg_add
@@ -33,7 +33,7 @@ The
 .Nm
 command is used to extract packages that have been previously created
 with the
-.Xr pkg_create 8
+.Xr pkg_create 1
 command.
 
 .Sh WARNING
@@ -198,7 +198,7 @@ terminate installation.
 Scan all the package dependencies (from
 .Cm @pkgdep
 directives, see
-.Xr pkg_create 8 )
+.Xr pkg_create 1 )
 and make sure each one is met. If not, print the missing dependencies and
 terminate the installation.
 .It
@@ -218,7 +218,7 @@ final location, otherwise it is extracted into the staging area.
 If the package contains a
 .Ar require
 file (see 
-.Xr pkg_create 8 ),
+.Xr pkg_create 1 ),
 then execute it with the following arguments:
 .Bd -filled -offset indent -compact
 .Ar <pkg-name>
@@ -255,7 +255,7 @@ If the package contains an
 file (see the
 .Fl m
 option to
-.Xr pkg_create 8 ),
+.Xr pkg_create 1 ),
 then mtree is invoked as
 .Bd -filled -offset indent -compact
 .Cm mtree
@@ -294,7 +294,7 @@ After installation is complete, a copy of the packing list,
 script, description, and display files are copied into
 .Pa /var/db/pkg/<pkg-name>
 for subsequent possible use by
-.Xr pkg_delete 8 .
+.Xr pkg_delete 1 .
 Any package dependencies are recorded in the other packages' 
 .Pa /var/db/pkg/<other-pkg>/+REQUIRED_BY
 file
@@ -320,8 +320,8 @@ flag to
 .Xr mktemp 3 ,
 .Xr sysconf 3 ,
 .Xr mtree 8 ,
-.Xr pkg_create 8 ,
-.Xr pkg_delete 8 .
+.Xr pkg_create 1 ,
+.Xr pkg_delete 1 .
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index cd98bf0101b9..5ac26ddc3986 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -14,8 +14,8 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.\"     @(#)pkg_create.8
-.\"	$Id: pkg_create.1,v 1.13 1995/04/09 15:05:01 jkh Exp $	
+.\"     @(#)pkg_create.1
+.\"	$Id: pkg_create.1,v 1.14 1995/04/22 00:03:12 jkh Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -24,7 +24,7 @@
 .\" better integration with FreeBSD's new ports collection.
 .\"
 .Dd April 21, 1995
-.Dt pkg_create 8
+.Dt pkg_create 1
 .Os FreeBSD 2.0
 .Sh NAME
 .Nm pkg_create
@@ -353,10 +353,10 @@ package is deinstalled.  Multiple
 directives may be used if hte package depends on multiple other packages.
 .El
 .Sh SEE ALSO
-.Xr pkg_add 8 ,
+.Xr pkg_add 1 ,
+.Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
-.Xr sysconf 3 ,
-.Xr pkg_delete 8 .
+.Xr sysconf 3 .
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index ea6e7c81b971..cb8c0265b593 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -14,10 +14,10 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.\"     @(#)pkg_delete.8
+.\"     @(#)pkg_delete.1
 .\"
 .Dd November 25, 1994
-.Dt pkg_delete 8
+.Dt pkg_delete 1
 .Os FreeBSD 2.0
 .Sh NAME
 .Nm pkg_delete
@@ -32,7 +32,7 @@ The
 .Nm
 command is used to delete packages that have been previously installed
 with the
-.Xr pkg_add 8
+.Xr pkg_add 1
 command.
 
 .Sh WARNING
@@ -83,7 +83,7 @@ Sets
 as the directory in which to delete files from any installed packages
 which do not explicitly set theirs.  For most packages, the prefix will
 be set automatically to the installed location by
-.Xr pkg_add 8 .
+.Xr pkg_add 1 .
 .Em "Optional."
 .It Fl d
 Remove empty directories created by file cleanup.  By default, only
@@ -118,7 +118,7 @@ option is given).
 If the package contains a
 .Ar require
 file (see 
-.Xr pkg_create 8 ),
+.Xr pkg_create 1 ),
 then this is executed first as
 .Bd -filled -offset indent -compact
 .Cm require
@@ -168,11 +168,11 @@ option when running
 or
 .Cm pkg_add .
 .Sh SEE ALSO
+.Xr pkg_add 1 ,
+.Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
 .Xr mktemp 3 ,
-.Xr mtree 8 ,
-.Xr pkg_add 8 ,
-.Xr pkg_create 8 .
+.Xr mtree 8 .
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index acfce3862605..6d2cc1257f1c 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -37,7 +37,7 @@ The
 command is used to dump out information for packages, either packed up in
 files or already installed on the system
 with the
-.Xr pkg_create 8
+.Xr pkg_create 1
 command.
 .Sh OPTIONS
 The following command line options are supported.
@@ -119,11 +119,11 @@ command line, or from already installed package information
 in
 .Pa /var/db/pkg/<pkg-name> .
 .Sh SEE ALSO
+.Xr pkg_add 1 ,
+.Xr pkg_create 1 ,
+.Xr pkg_delete 1 ,
 .Xr mktemp 3 ,
-.Xr mtree 8 ,
-.Xr pkg_add 8 ,
-.Xr pkg_create 8 ,
-.Xr pkg_delete 8 .
+.Xr mtree 8 .
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/usr.sbin/routed/routed.8 b/usr.sbin/routed/routed.8
index cb71d53220ca..fe4538dd4454 100644
--- a/usr.sbin/routed/routed.8
+++ b/usr.sbin/routed/routed.8
@@ -307,8 +307,9 @@ for distant gateways
 .Sh SEE ALSO
 .Xr udp 4 ,
 .Xr icmp 4 ,
-.Xr XNSrouted 8 ,
-.Xr htable 8
+.Xr IPXrouted 8
+.\" .Xr XNSrouted 8 ,
+.\" .Xr htable 8
 .Rs
 .%T Internet Transport Protocols
 .%R XSIS 028112