48 files changed, 153 insertions, 113 deletions

diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index f5376cef43f2..5146bc4f64cb 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.25.2.3 1997/06/06 02:18:41 brian Exp $
+#	$Id: Makefile,v 1.25.2.4 1997/10/29 01:23:14 asami Exp $
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer -I${.CURDIR}
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
@@ -30,7 +30,7 @@ gcrt0.o: crt0.o
 # dependencies fudged as for gcrt0.o
 scrt0.o: crt0.o
 	${CC} ${CFLAGS} -c -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-	${LD} -O ${TARGET} -x -r ${.TARGET}
+	${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 # dependencies fudged as for gcrt0.o
 sgcrt0.o: scrt0.o
@@ -39,11 +39,11 @@ sgcrt0.o: scrt0.o
 
 beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dlfcn.h \
-		${DESTDIR}/usr/include
+		${DESTDIR}${INCLUDEDIR}
 
 realinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-		${DESTDIR}/usr/lib
+		${DESTDIR}${LIBDIR}
 
 depend:	.depend
 
diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index 28c0a04eeb69..eeec5f0d4911 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -90,7 +90,7 @@
         SetExpire() function added. (cjm)
 
         DeleteLink() no longer frees memory association with a pointer
-        to a fragment (this bug was first recognized by E. Eiklund in
+        to a fragment (this bug was first recognized by E. Eklund in
         v1.9).
 
     Version 2.1: May, 1997 (cjm)
@@ -102,6 +102,8 @@
         added to the API.  The first function is a more generalized
         version of PacketAliasPermanentLink().  The second function
         implements static network address translation.
+
+    See HISTORY file for additional revisions.
 */
 
 
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
index db05a3413811..32245c1ff97f 100644
--- a/lib/libc/compat-43/setruid.3
+++ b/lib/libc/compat-43/setruid.3
@@ -39,7 +39,7 @@
 .Nm setrgid
 .Nd set user and group ID
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
+.Fd #include <unistd.h>
 .Ft int
 .Fn setruid "uid_t ruid"
 .Ft int
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index de8d452cef1f..ee93e895e7f4 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -42,7 +42,7 @@
 .Bd -literal
 struct sigvec {
         void     (*sv_handler)();
-	sigset_t sv_mask;
+	int      sv_mask;
 	int      sv_flags;
 };
 .Ed
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index 0d9d138d5cee..ce9cbf15a646 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -65,6 +65,7 @@ __bt_free(t, h)
 	h->prevpg = P_INVALID;
 	h->nextpg = t->bt_free;
 	t->bt_free = h->pgno;
+	F_SET(t, B_METADIRTY);
 
 	/* Make sure the page gets written back. */
 	return (mpool_put(t->bt_mp, h, MPOOL_DIRTY));
@@ -92,6 +93,7 @@ __bt_new(t, npg)
 	    (h = mpool_get(t->bt_mp, t->bt_free, 0)) != NULL) {
 		*npg = t->bt_free;
 		t->bt_free = h->nextpg;
+		F_SET(t, B_METADIRTY);
 		return (h);
 	}
 	return (mpool_new(t->bt_mp, npg));
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index 1646d8215950..c7779b897c95 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -673,7 +673,8 @@ bt_psplit(t, h, l, r, pskip, ilen)
 		 * where we decide to try and copy too much onto the left page.
 		 * Make sure that doesn't happen.
 		 */
-		if (skip <= off && used + nbytes >= full) {
+		if (skip <= off &&
+		    used + nbytes + sizeof(indx_t) >= full || nxt == top - 1) {
 			--off;
 			break;
 		}
@@ -686,7 +687,7 @@ bt_psplit(t, h, l, r, pskip, ilen)
 			memmove((char *)l + l->upper, src, nbytes);
 		}
 
-		used += nbytes;
+		used += nbytes + sizeof(indx_t);
 		if (used >= half) {
 			if (!isbigkey || bigkeycnt == 3)
 				break;
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 4d99fa108d9d..5e47a151681b 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -60,10 +60,14 @@ will supersede the prior call.
 The request
 .Fn alarm "0"
 voids the current
-alarm and the signal SIGALRM will not be delivered. The maximum number of
+alarm and the signal SIGALRM will not be delivered.
+.Pp
+Due to
+.Xr setitimer 2
+restriction the maximum number of
 .Ar seconds
-allowed
-is 2147483647.
+allowed is 100000000.
+.Sh RETURN VALUES
 .Pp
 The return value of 
 .Fn alarm
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index 3929f929b95d..39178fec2364 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c	8.1 (Berkeley) 6/4/93";
+static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -64,7 +64,7 @@ devname(dev, type)
 		failure = 1;
 	}
 	if (failure)
-		return ("??");
+		return (NULL);
 
 	/*
 	 * Keys are a mode_t followed by a dev_t.  The former is the type of
@@ -76,5 +76,5 @@ devname(dev, type)
 	bkey.type = type;
 	key.data = &bkey;
 	key.size = sizeof(bkey);
-	return ((db->get)(db, &key, &data, 0) ? "??" : (char *)data.data);
+	return ((db->get)(db, &key, &data, 0) ? NULL : (char *)data.data);
 }
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 6698f7af01ab..a1ca34774020 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -100,8 +100,8 @@ are good only for the lifetime of the
 .Dv DIR
 pointer,
 .Fa dirp ,
-from which they are derived.
-If the directory is closed and then reopened, prior values returned by
+from which they are derived.  If the directory is closed and then 
+reopened, prior values returned by
 .Fn telldir
 will no longer be valid.
 .Pp
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 047ed17725b3..7a346caa27a1 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\"	$Id: err.3,v 1.3 1996/02/11 22:33:27 mpp Exp $
+.\"	$Id: err.3,v 1.4 1996/08/22 23:25:29 mpp Exp $
 .\"
 .Dd April 13, 1995
 .Dt ERR 3
@@ -52,23 +52,24 @@
 .Ft void
 .Fn err "int eval" "const char *fmt" "..."
 .Ft void
-.Fn verr "int eval" "const char *fmt" "va_list args"
-.Ft void
 .Fn errx "int eval" "const char *fmt" "..."
 .Ft void
-.Fn verrx "int eval" "const char *fmt" "va_list args"
-.Ft void
 .Fn warn "const char *fmt" "..."
 .Ft void
-.Fn vwarn "const char *fmt" "va_list args"
-.Ft void
 .Fn warnx "const char *fmt" "..."
 .Ft void
-.Fn vwarnx "const char *fmt" "va_list args"
-.Ft void
 .Fn err_set_file "void *fp"
 .Ft void
 .Fn err_set_exit "void (*exitf)(int)"
+.Fd #include <stdarg.h>
+.Ft void
+.Fn verr "int eval" "const char *fmt" "va_list args"
+.Ft void
+.Fn verrx "int eval" "const char *fmt" "va_list args"
+.Ft void
+.Fn vwarn "const char *fmt" "va_list args"
+.Ft void
+.Fn vwarnx "const char *fmt" "va_list args"
 .Sh DESCRIPTION
 The
 .Fn err
@@ -82,18 +83,19 @@ In all cases, the last component of the program name, a colon character,
 and a space are output.
 If the
 .Va fmt
-argument is not NULL, the formatted error message, a colon character,
-and a space are output.
+argument is not NULL, the formatted error message is output.
 In the case of the
 .Fn err ,
 .Fn verr ,
 .Fn warn ,
 and
 .Fn vwarn
-functions, the error message string affiliated with the current value of
+functions,
+the error message string affiliated with the current value of
 the global variable
 .Va errno 
-is output.
+is also output,
+preceded by another colon and space if necessary.
 In all cases, the output is followed by a newline character.
 .Pp
 The
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index bc007870596d..1da91a88c8cc 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -31,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)fnmatch.3	8.2 (Berkeley) 4/16/94
+.\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
 .\"
-.Dd April 16, 1994
+.Dd April 28, 1995
 .Dt FNMATCH 3
 .Os
 .Sh NAME
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 73832e59ff18..02cad6c00dc4 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -241,14 +241,15 @@ fts_close(sp)
 		(void)close(sp->fts_rfd);
 	}
 
-	/* Free up the stream pointer. */
-	free(sp);
-
 	/* Set errno and return. */
 	if (!ISSET(FTS_NOCHDIR) && saved_errno) {
+		/* Free up the stream pointer. */
+		free(sp);
 		errno = saved_errno;
 		return (-1);
 	}
+	/* Free up the stream pointer. */
+	free(sp);
 	return (0);
 }
 
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index fc7b12342b61..a35ad721c509 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -88,7 +88,7 @@ fmterr:			warnx("%s: unknown blocksize", p);
 			break;
 		}
 		if (n > max) {
-			warnx("maximum blocksize is %dG", MAXB / GB);
+			warnx("maximum blocksize is %ldG", MAXB / GB);
 			n = max;
 		}
 		if ((blocksize = n * mul) < 512) {
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index 48aa8594cc1d..223caef927ae 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -40,6 +40,7 @@
 .Nm endusershell
 .Nd get legal user shells
 .Sh SYNOPSIS
+.Fd #include <unistd.h>
 .Ft char *
 .Fn getusershell void
 .Ft void
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index 8b37c06c2073..104c1a22a61a 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <errno.h>
 #include <unistd.h>
 
 /*
@@ -48,7 +49,6 @@ nice(incr)
 	int incr;
 {
 	int prio;
-	extern int errno;
 
 	errno = 0;
 	prio = getpriority(PRIO_PROCESS, 0);
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 98fb1c460909..e44b5ef9c308 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -38,8 +38,11 @@
 .Nm pwcache
 .Nd cache password and group entries
 .Sh SYNOPSIS
-.Fn user_from_uid "uid_t uid" "int nouser"
-.Fn group_from_gid "gid_t gid" "int nogroup"
+.Fd #include <stdlib.h>
+.Ft char *
+.Fn user_from_uid "unsigned long uid" "int nouser"
+.Ft char *
+.Fn group_from_gid "unsigned long gid" "int nogroup"
 .Sh DESCRIPTION
 .Pp
 The
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index 356f2f30262f..67aef14f94bf 100644
--- a/lib/libc/gen/rand48.3
+++ b/lib/libc/gen/rand48.3
@@ -152,9 +152,9 @@ always also set the multiplicand and addend for any of the six
 generator calls.
 .Pp
 For a more powerful random number generator, see
-.Xr random 3
-.Sh AUTHOR
-Martin Birgmeier
+.Xr random 3 .
+.Sh AUTHORS
+.An Martin Birgmeier
 .Sh SEE ALSO
 .Xr rand 3 ,
-.Xr random 3 .
+.Xr random 3
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 9283fbc70c7f..10c416836444 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -33,10 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*
-static char sccsid[] = "From: @(#)syslog.c	8.4 (Berkeley) 3/18/94";
+static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 */
 static const char rcsid[] =
-  "$Id: syslog.c,v 1.9.2.2 1998/03/05 22:19:54 brian Exp $";
+  "$Id: syslog.c,v 1.9.2.3 1998/03/06 02:12:55 brian Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -303,8 +303,7 @@ connectlog()
 		SyslogAddr.sun_len = sizeof(SyslogAddr);
 		SyslogAddr.sun_family = AF_UNIX;
 		(void)strncpy(SyslogAddr.sun_path, _PATH_LOG,
-		    sizeof SyslogAddr.sun_path - 1);
-		SyslogAddr.sun_path[sizeof SyslogAddr.sun_path - 1] = '\0';
+		    sizeof SyslogAddr.sun_path);
 		connected = connect(LogFile, (struct sockaddr *)&SyslogAddr,
 			sizeof(SyslogAddr)) != -1;
 
@@ -314,7 +313,7 @@ connectlog()
 			 * compatibility.
 			 */
 			(void)strncpy(SyslogAddr.sun_path, _PATH_OLDLOG,
-			    sizeof SyslogAddr.sun_path - 1);
+			    sizeof SyslogAddr.sun_path);
 			connected = connect(LogFile,
 				(struct sockaddr *)&SyslogAddr,
 				sizeof(SyslogAddr)) != -1;
diff --git a/lib/libc/gen/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index 503359e1ca1e..045c569fbd90 100644
--- a/lib/libc/gen/tcgetpgrp.3
+++ b/lib/libc/gen/tcgetpgrp.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd "June 4, 1993"
+.Dd June 4, 1993
 .Dt TCGETPGRP 3
 .Os
 .Sh NAME
diff --git a/lib/libc/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index 2df884cbf2db..1e80265c24f6 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd "June 4, 1993"
+.Dd June 4, 1993
 .Dt TCSENDBREAK 3
 .Os
 .Sh NAME
diff --git a/lib/libc/gen/tcsetpgrp.3 b/lib/libc/gen/tcsetpgrp.3
index 684ec4cd9b2d..c7fcc7810de7 100644
--- a/lib/libc/gen/tcsetpgrp.3
+++ b/lib/libc/gen/tcsetpgrp.3
@@ -63,7 +63,7 @@ Upon successful completion,
 returns a value of zero.
 .Sh ERRORS
 If an error occurs,
-.Nm tcgetpgrp
+.Nm tcsetpgrp
 returns -1 and the global variable
 .Va errno
 is set to indicate the error, as follows:
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index c428552a964b..ee3243898b58 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -39,8 +39,8 @@
 .Nd aligned memory allocation function
 .Sh SYNOPSIS
 .Fd #include <unistd.h>
-.Ft char *
-.Fn valloc "unsigned size"
+.Ft void *
+.Fn valloc "size_t size"
 .Sh DESCRIPTION
 .Bf -symbolic
 Valloc is obsoleted by the current version of malloc(3),
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index ec6e2e89044c..603532958360 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -42,9 +42,9 @@ void *
 valloc(i)
 	size_t i;
 {
-	int valsiz = getpagesize(), j;
+	long valsiz = getpagesize(), j;
 	void *cp = malloc(i + (valsiz-1));
 
-	j = ((int)cp + (valsiz-1)) &~ (valsiz-1);
+	j = ((long)cp + (valsiz-1)) &~ (valsiz-1);
 	return ((void *)j);
 }
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index ade7e10b139f..cf054d920368 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\"	$Id: i386_get_ldt.2,v 1.2 1993/10/09 00:59:10 cgd Exp $
+.\"	$Id: i386_get_ldt.2,v 1.1 1994/01/31 12:05:30 davidg Exp $
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2
@@ -65,7 +65,7 @@ The argument
 .Fa descs
 can be either segment_descriptor or gate_descriptor and are defined in
 .Fd <i386/segments.h> .
-These structures are defined by the architecure
+These structures are defined by the architecture
 as disjoint bit-fields, so care must be taken in constructing them.
 .Sh RETURN VALUES
 Upon successful completion,
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index f9da379f1d0f..4d51813dbe2c 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -172,3 +172,11 @@ toupper(c)
 {
         return (__toupper(c));
 }
+
+#undef digittoint
+int
+digittoint(c)
+	int c;
+{
+	return (__maskrune((c), 0xFF));
+}
diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c
index 0f01f0b6f76f..de5f30588710 100644
--- a/lib/libc/net/ns_ntoa.c
+++ b/lib/libc/net/ns_ntoa.c
@@ -53,7 +53,7 @@ ns_ntoa(addr)
 	static char *spectHex();
 
 	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", ntohl(net.long_e));
+	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
 	cp = spectHex(obuf);
 	cp2 = cp + 1;
 	while (*up==0 && up < uplim) up++;
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index 469149824060..58ef724ee92a 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -161,8 +161,8 @@ generator is greater than
 .if t 2\u\s769\s10\d,
 .if n 2**69
 which should be sufficient for most purposes.
-.Sh AUTHOR
-Earl T. Cohen
+.Sh AUTHORS
+.An Earl T. Cohen
 .Sh DIAGNOSTICS
 If
 .Fn initstate
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index e1d4c394d932..742157c222f5 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -112,7 +112,8 @@ function
 conforms to
 .St -ansiC .
 .Sh AUTHORS
-The author of this software is David M. Gay.
+The author of this software is
+.An David M. Gay .
 .Pp
 Copyright (c) 1991 by AT&T.
 .Pp
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 5cdea8c4bc01..26662758055b 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\"     $Id: getrusage.2,v 1.6.2.2 1998/02/17 19:36:15 jkh Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
@@ -144,7 +144,7 @@ account only for real
 I/O; data supplied by the caching mechanism is charged only
 to the first process to read or write the data.
 .Sh RETURN VALUES
-Uponsuccessful completion,
+Upon successful completion,
 .Fn getrusage
 returns 0.  Otherwise, a value of -1 is returned and
 .Va errno
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 17d8fbf42716..5e6c33577c5d 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\"	$Id: mincore.2,v 1.4.2.2 1997/01/11 23:34:44 mpp Exp $
+.\"	$Id: mincore.2,v 1.4.2.3 1998/06/06 05:03:43 jkoshy Exp $
 .\"
 .Dd June 9, 1993
 .Dt MINCORE 2
@@ -55,11 +55,11 @@ in the character array
 with a value of 1 meaning
 that the page is in-core.
 .Sh RETURN VALUES
-Upson successful completion,
+Upon successful completion,
 .Fn mincore
 returns 0 and
 .Fa vec
-is updated to relect the page status.  Otherwise a value of -1
+is updated to reflect the page status.  Otherwise a value of -1
 is returned and
 .Va error
 is set to indicate the error.
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index 4728a23ac86f..9d59e6afe4af 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $Id: rtprio.2,v 1.9 1997/03/21 20:57:20 mpp Exp $
+.\" $Id: rtprio.2,v 1.5.2.2 1997/03/25 02:45:33 mpp Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 2
@@ -94,11 +94,13 @@ root is allowed to change the realtime priority of any process, and non-root
 may only change the idle priority of the current process.
 .It Bq Er ESRCH
 The specified process was not found.
-.Sh AUTHOR
-The original author was Henrik Vestergaard Draboel - hvd@terry.ping.dk. This
-implementation in
-.Tn FreeBSD
-was substantially rewritten by David Greenman.
+.Sh AUTHORS
+The original author was
+.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk .
+This implementation in
+.Bx Free
+was substantially rewritten by
+.An David Greenman .
 .Sh SEE ALSO
 .Xr nice 1 ,
 .Xr ps 1 ,
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 920aa6541ff1..45d19b78e8f0 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: setuid.2,v 1.4.2.6 1997/09/03 06:58:50 peter Exp $
+.\"	$Id: setuid.2,v 1.4.2.7 1998/02/17 19:46:17 jkh Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETUID 2
@@ -96,7 +96,7 @@ The
 .Fn setgid
 function is permitted if the specified ID is equal to the real group ID
 .\" Comment out next line for !_POSIX_SAVED_IDS
-.\" or the saved set-groupd-ID
+.\" or the saved set-group-ID
 .\" Next line is for Appendix B.4.2.2 case.
 or the effective group ID
 of the process, or if the effective user ID is that of the super user.
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 2046b477ffc9..2b0c22022f3e 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: calendar.3,v 1.3.2.1 1998/01/12 05:11:15 obrien Exp $
+.\"	$Id: calendar.3,v 1.3.2.2 1998/01/12 06:20:59 obrien Exp $
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
@@ -190,8 +190,8 @@ The
 .Nm calendar
 library first appeared in
 .Fx 3.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page and the library was written by
-.An Wolfgang Helbig Aq helbig@FreeBSD.ORG .
+.An Wolfgang Helbig Aq helbig@FreeBSD.org .
 .Sh BUGS
 The library was coded with great care so there are no bugs left.
diff --git a/lib/libcurses/curses.3 b/lib/libcurses/curses.3
index a0815400aa1f..17893b50cf19 100644
--- a/lib/libcurses/curses.3
+++ b/lib/libcurses/curses.3
@@ -64,7 +64,7 @@ should be called before exiting.
 .%T Screen Updating and Cursor Movement Optimization: A Library Package
 .%A Ken Arnold
 .Re
-.Sh AUTHOR
+.Sh AUTHORS
 .An Ken Arnold
 .Sh FUNCTIONS
 .Bl -column "subwin(win,lines,cols,begin_y,begin_x)   "
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 6974d08de92b..6222de88229a 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: create_chunk.c,v 1.24.2.3 1998/03/20 23:27:17 jkh Exp $
+ * $Id: create_chunk.c,v 1.24.2.4 1998/03/21 00:32:20 jkh Exp $
  *
  */
 
@@ -254,17 +254,20 @@ MakeDev(struct chunk *c1, const char *path)
 	return 0;
     
     if (!strncmp(p, "wd", 2))
-	bmaj = 0, cmaj = 3, p += 2;
+	bmaj = 0, cmaj = 3;
     else if (!strncmp(p, "sd", 2))
-	bmaj = 4, cmaj = 13, p += 2;
+	bmaj = 4, cmaj = 13;
     else if (!strncmp(p, "od", 2))
-	bmaj = 20, cmaj = 70, p += 2;
+	bmaj = 20, cmaj = 70;
     else if (!strncmp(p, "wfd", 3))
-	bmaj = 1, cmaj = 87, p += 3;
+	bmaj = 1, cmaj = 87;
+    else if (!strncmp(p, "da", 2))	/* CAM support */
+	bmaj = 4, cmaj = 13;
     else {
 	msgDebug("MakeDev: Unknown major/minor for devtype %s\n", p);
 	return 0;
     }
+    p += 2;
     if (!isdigit(*p)) {
 	msgDebug("MakeDev: Invalid disk unit passed: %s\n", p);
 	return 0;
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index b8f43068c569..b53948c34765 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: disk.c,v 1.22.2.10 1998/05/15 21:18:59 obrien Exp $
+ * $Id: disk.c,v 1.22.2.11 1998/05/19 11:16:41 obrien Exp $
  *
  */
 
@@ -289,7 +289,7 @@ Collapse_Disk(struct disk *d)
 }
 #endif
 
-static char * device_list[] = {"wd","sd","wfd","od",0};
+static char * device_list[] = {"wd","sd","da","od","wfd",0};
 
 char **
 Disk_Names()
@@ -372,11 +372,11 @@ slice_type_name( int type, int subtype )
 					case 12:        return "fat (32-bit,LBA)";
 					case 14:        return "fat (16-bit,>32Mb,LBA)";
 					case 15:        return "extended DOS, LBA";
-					case 18:        return "Compaq Diags";
+					case 18:        return "Compaq Diagnostic";
 					case 84:	return "OnTrack diskmgr";
 					case 100:	return "Netware 2.x";
 					case 101:	return "Netware 3.x";
-					case 115:	return "UnixWare";
+					case 115:	return "SCO UnixWare";
 					case 128:	return "Minix 1.1";
 					case 129:	return "Minix 1.5";
 					case 130:	return "linux_swap";
@@ -391,7 +391,6 @@ slice_type_name( int type, int subtype )
 		case 2:		return "fat";
 		case 3:		switch (subtype) {
 					case 165:	return "freebsd";
-					case 181:	return "freebsd"; /* tweaked by boot mgr */
 					default:	return "unknown";
 				}
 		case 4:		return "extended";
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 046174853c22..a09ac1593970 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -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: libdisk.3,v 1.2.2.1 1997/01/24 21:08:29 jkh Exp $
+.\" $Id: libdisk.3,v 1.2.2.2 1998/06/06 06:09:22 jkoshy Exp $
 .\" "
 .Dd March 15, 1996
 .Dt LIBDISK 3
@@ -330,9 +330,10 @@ If
 .Fn slice_type_name
 returns "unknown" for slices it isn't familiar with.
 .Ql / .
-.Sh AUTHOR
+.Sh AUTHORS
 .Nm Libdisk
-has been written by Poul-Henning Kamp.
+has been written by
+.An Poul-Henning Kamp .
 .Pp
 This man page by
 .ie t J\(:org Wunsch.
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index e0c328646465..132b280093e0 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: write_disk.c,v 1.17 1996/04/29 05:03:02 jkh Exp $
+ * $Id: write_disk.c,v 1.17.2.1 1996/11/28 21:51:15 phk Exp $
  *
  */
 
@@ -87,7 +87,8 @@ Write_FreeBSD(int fd, struct disk *new, struct disk *old, struct chunk *c1)
 
 	dl->d_npartitions = MAXPARTITIONS;
 
-	dl->d_type = new->name[0] == 's' ? DTYPE_SCSI : DTYPE_ESDI;
+	dl->d_type = new->name[0] == 's' || new->name[0] == 'd' ||
+	    new->name[0] == 'o' ? DTYPE_SCSI : DTYPE_ESDI;
 	dl->d_partitions[RAW_PART].p_size = c1->size;
 	dl->d_partitions[RAW_PART].p_offset = c1->offset;
 
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 0b326cd52d40..d7eb3a197841 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -519,8 +519,10 @@ library first appeared in
 .Sh AUTHORS
 The
 .Nm
-library was written by Christos Zoulas,
-and this manual was written by Luke Mewburn.
+library was written by
+.An Christos Zoulas ,
+and this manual was written by
+.An Luke Mewburn .
 .Sh BUGS
 This documentation is probably incomplete.
 .Pp
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index e9b2992aaf06..4237100defc2 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -213,7 +213,7 @@ or
 indicating that the terminal does or does not have that capability.
 .Pp
 .Fl s
-returns an emptry string for non-existant capabilities, rather than
+returns an empty string for non-existent capabilities, rather than
 causing an error.
 .Fl v
 causes messages to be verbose.
@@ -286,7 +286,9 @@ in the chosen set.
 .Sh AUTHORS
 The
 .Nm editline
-library was written by Christos Zoulas,
-and this manual was written by Luke Mewburn,
+library was written by
+.An Christos Zoulas ,
+and this manual was written by
+.An Luke Mewburn ,
 with some sections inspired by
 .Xr tcsh 1 .
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 8de3027592d5..442583b09462 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1248,7 +1248,7 @@ term_echotc(el, argc, argv)
     }
 #endif
     else if (strcmp(*argv, "baud") == 0) {
-	(void) fprintf(el->el_outfile, "%ld\n", el->el_tty.t_speed);
+	(void) fprintf(el->el_outfile, "%lu\n", (u_long)el->el_tty.t_speed);
 	return 0;
     }
     else if (strcmp(*argv, "rows") == 0 || strcmp(*argv, "lines") == 0) {
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index f1988d93f1b1..772625aa630b 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ftpio.3,v 1.11.2.2 1997/08/03 18:42:41 peter Exp $
+.\"	$Id: ftpio.3,v 1.11.2.3 1998/02/10 07:02:11 jkh Exp $
 .\"
 .Dd June 17, 1996
 .Dt ftpio 3
@@ -206,4 +206,7 @@ utility, later significantly mutated into a more general form as an
 extension of stdio by Jordan Hubbard.  Also incorporates some ideas and
 extensions from Jean-Marc Zucconi.
 .Sh AUTHORS
-Jordan Hubbard, Poul-Henning Kamp and Jean-Marc Zucconi
+.An Jordan Hubbard ,
+.An Poul-Henning Kamp
+and
+.An Jean-Marc Zucconi
diff --git a/lib/libipx/ipx_ntoa.c b/lib/libipx/ipx_ntoa.c
index 21e60a15009e..1bf1c577c3b3 100644
--- a/lib/libipx/ipx_ntoa.c
+++ b/lib/libipx/ipx_ntoa.c
@@ -53,7 +53,7 @@ ipx_ntoa(addr)
 	static char *spectHex();
 
 	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", ntohl(net.long_e));
+	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
 	cp = spectHex(obuf);
 	cp2 = cp + 1;
 	while (*up==0 && up < uplim) up++;
diff --git a/lib/libncurses/lib_kernel.c b/lib/libncurses/lib_kernel.c
index 86d63a30e5c7..2cc71dad11e2 100644
--- a/lib/libncurses/lib_kernel.c
+++ b/lib/libncurses/lib_kernel.c
@@ -119,7 +119,7 @@ int cursor = SP->_cursor;
 
 int delay_output(int ms)
 {
-int speed;
+int speed = 0;
 
 	T(("delay_output(%d) called", ms));
 
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index 04cee4430029..a31825728db3 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: skey.3,v 1.6 1997/03/19 01:33:23 bde Exp $
+.\"	$Id: skey.3,v 1.2.2.2 1997/09/03 08:32:05 pst Exp $
 .\"
 .Dd December 22, 1996
 .Dt SKEY 3
@@ -152,6 +152,8 @@ No advisory locking is done on the s/key database to guard against
 simultaneous access from multiple processes.
 This is not normally a problem when keys are added to or updated
 in the file, but may be problematic when keys are removed.
-.Sh AUTHOR
-Phil Karn, Neil M. Haller, John S. Walden, Scott Chasin
-
+.Sh AUTHORS
+.An Phil Karn ,
+.An Neil M. Haller ,
+.An John S. Walden ,
+.An Scott Chasin
diff --git a/lib/libskey/skey.access.5 b/lib/libskey/skey.access.5
index ecc518b43a8a..9fff8f99a131 100644
--- a/lib/libskey/skey.access.5
+++ b/lib/libskey/skey.access.5
@@ -82,8 +82,8 @@ where its rules allow the use of UNIX passwords.  In particular, this
 means that an invocation of \fIlogin(1)\fR in a pseudo-tty (e.g. from
 within \fIxterm(1)\fR or \fIscreen(1)\fR) will be treated as a login
 that is neither from the console nor from the network, mandating the use
-of an S/Key password.  Such an invocation of \fIlogin(1)\fR will 
-necessarily fail for those users who do not have an S/Key password.
+of an S/Key password.  Such an invocation of \fIlogin(1)\fR will necessarily 
+fail for those users who do not have an S/Key password.
 .PP
 Several rule types depend on host name or address information obtained
 through the network.  What follows is a list of conceivable attacks to
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 5cbcacdb8eba..afb81bcef37c 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -24,7 +24,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: vgl.3,v 1.1.2.1 1997/10/16 09:13:49 sos Exp $
+.\" $Id: vgl.3,v 1.1.2.2 1998/01/04 23:53:11 jraynard Exp $
 
 .Dd August 13, 1997
 .Dt VGL 3
@@ -51,8 +51,8 @@ on different virtual consoles.
 
 Below is a short description of the various functions:
 
-.Sh AUTHOR
-.An Søren Schmidt (sos@FreeBSD.org)
+.Sh AUTHORS
+.An Søren Schmidt Aq sos@FreeBSD.org
 
 .Sh FUNCTIONS
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 1aacd389c93c..8d076f37e74a 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,10 +1,11 @@
 #
-# $Id: Makefile,v 1.3.2.1 1998/02/28 06:18:48 steve Exp $
+# $Id: Makefile,v 1.3.2.2 1998/02/28 06:32:14 steve Exp $
 #
 
 MAINTAINER=peter@FreeBSD.org
 
 LIB=		z
+MAN3=           zlib.3
 
 #CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS+=	-g -DDEBUG