From owner-man-jp-reviewer@jp.freebsd.org  Wed Jul  5 12:23:17 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA49263;
	Wed, 5 Jul 2000 12:23:17 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from smtp1.interramp.com (smtp1.interramp.com [38.8.45.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id MAA49257
	for <man-jp-reviewer@jp.freebsd.org>; Wed, 5 Jul 2000 12:23:14 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.210] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 139flv-0007Vq-00; Tue, 4 Jul 2000 23:22:48 -0400
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Tue_Jul__4_21:41:59_2000_41)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000704232006I.horikawa@psinet.com>
Date: Tue, 04 Jul 2000 23:20:06 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 2041
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: man-jp-reviewer 2671
Subject: [man-jp-reviewer 2671] 4.0-20000703-STABLE (man567)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: horikawa@psinet.com

----Next_Part(Tue_Jul__4_21:41:59_2000_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 $BKY@n$G$9!#(B

 man567 $B$N(B 4.0-20000703-STABLE $B$X$N(B 4.0-RELEASE $B$+$i$N:9J,$G$9!#(B
 $BLu$7$?$H$3$m$O(B crontab.5, pccard.conf.5, rc.conf.5 $B$/$i$$$N$O$:$G$9!#(B


----Next_Part(Tue_Jul__4_21:41:59_2000_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: jdiff_4.0-20000703-STABLE_567
Content-Disposition: attachment; filename=jdiff_4.0-20000703-STABLE_567

diff -ur man/man5/Makefile man/man5/Makefile
--- man/man5/Makefile	Wed Jun 14 22:42:09 2000
+++ man/man5/Makefile	Wed Jul  5 07:24:22 2000
@@ -84,6 +84,7 @@
 	shells.5\
 	skey.access.5\
 	stab.5\
+	sysctl.conf.5\
 	syslog.conf.5\
 	tacplus.conf.5\
 	term.5\
diff -ur man/man5/amd.conf.5 man/man5/amd.conf.5
--- man/man5/amd.conf.5	Tue Feb 15 23:34:47 2000
+++ man/man5/amd.conf.5	Wed Jul  5 09:36:57 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.9 1999/09/15 05:45:17 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.9.2.1 2000/05/09 14:12:51 sheldonh Exp %
 .\"
 .\" jpman %Id: amd.conf.5,v 1.3 1998/11/28 13:23:35 horikawa Stab %
 .\"
@@ -721,7 +721,7 @@
 .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
 .Pp
-.An am-utils $B$NB>$N:n<TJB$S$K9W8%<T$N%j%9%H$,!"(Bam-utils $B$H6&$KG[I[$5$l$F$$$k(B
+am-utils $B$NB>$N:n<TJB$S$K9W8%<T$N%j%9%H$,!"(Bam-utils $B$H6&$KG[I[$5$l$F$$$k(B
 .Nm AUTHORS
 $B%U%!%$%k$K$"$j$^$9!#(B
 .Sh $BNr;K(B
diff -ur man/man5/crontab.5 man/man5/crontab.5
--- man/man5/crontab.5	Wed Jun 14 22:42:09 2000
+++ man/man5/crontab.5	Wed Jul  5 09:37:00 2000
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" %FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.12.2.1 2000/03/13 19:32:12 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.12.2.2 2000/06/22 12:50:15 sheldonh Exp %
 .\"
 .\" jpman %Id: crontab.5,v 1.3 1998/07/02 14:12:25 horikawa Stab %
 .\" 
@@ -61,6 +61,10 @@
 ($B%7%s%0%k%/%)!<%H$^$?$O%@%V%k%/%)!<%H$G$9$,$I$A$i$+$KE}0l$7$^$9(B)
 $B$G0O$&$3$H$b$G$-!"$=$N$H$-$K$O(B = $B$KB3$/%V%i%s%/$dKvHx$N%V%i%s%/(B
 $B$r4^$`$3$H$,$G$-$^$9!#(B
+.Em name
+$BJ8;zNs$b%/%)!<%H(B
+($B%7%s%0%k%/%)!<%H$^$?$O%@%V%k%/%)!<%H$G$9$,$I$A$i$+$KE}0l$7$^$9(B)
+$B$G0O$&$3$H$b$G$-!"A0CV!"8eCV$*$h$SFbIt$N6uGr$rJ]$A$^$9!#(B
 .Pp
 $B$$$/$D$+$N4D6-JQ?t$O<+F0E*$K(B
 .Xr cron 8
@@ -178,6 +182,21 @@
 ``30 4 1,15 * 5''
 $B$O3F7n$N(B 1 $BF|$*$h$S(B 15 $BF|$K2C$($FA4$F$N6bMKF|$K$*$$$F!"(B
 $B8aA0(B 4:30 $B$K%3%^%s%I$r<B9T$5$;$^$9!#(B
+.Pp
+$B:G=i$N(B 5 $B8D$NMs$NBe$j$K!"(B
+8 $B<oN`$NFC<lJ8;zNs$N$&$A$N$$$:$l$+$,EP>l$7$F$bNI$$$G$9(B:
+.Bd -literal -offset indent
+$BJ8;zNs(B		$B0UL#(B
+------		-------
+@reboot		$B5/F0;~$K(B 1 $B2s<B9T!#(B
+@yearly		$BG/$K(B 1 $B2s<B9T!"$9$J$o$A(B "0 0 1 1 *"$B!#(B
+@annually	(@yearly $B$HF1$8(B)
+@monthly	$B7n$K(B 1 $B2s<B9T!"$9$J$o$A(B "0 0 1 * *"$B!#(B
+@weekly		$B=5$K(B 1 $B2s<B9T!"$9$J$o$A(B "0 0 * * 0"$B!#(B
+@daily		$BF|$K(B 1 $B2s<B9T!"$9$J$o$A(B "0 0 * * *"$B!#(B
+@midnight	(@daily $B$HF1$8(B)
+@hourly		$B;~4V$K(B 1 $B2s<B9T!"$9$J$o$A(B "0 * * * *"$B!#(B
+.Ed
 .Sh cron $B%U%!%$%k$NNc(B
 .Bd -literal
 
@@ -219,6 +238,10 @@
 crontab $B=jM-<T0J30$N?M$X%a!<%k$7$?$j(B (SysV $B$O$G$-$^$;$s(B)$B!"(B
 $B$3$N5!G=$rDd;_$7$FC/$K$b%a!<%k$rAw$i$J$/$G$-$^$9(B
 (SysV $B$O$3$l$b$G$-$^$;$s(B) $B!#(B
+.Pp
+$B:G=i$N(B 5 $B8D$NMs$N>l=j$K5-=R2DG=$J(B
+.Sq @
+$B%3%^%s%I$9$Y$F$O!"3HD%$G$9!#(B
 .Sh $B:n<T(B
 .An Paul Vixie Aq paul@vix.com
 .Sh $B%P%0(B
diff -ur man/man5/login.conf.5 man/man5/login.conf.5
--- man/man5/login.conf.5	Wed Jun 14 22:42:10 2000
+++ man/man5/login.conf.5	Wed Jul  5 09:37:03 2000
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.22 2000/03/02 09:13:29 sheldonh Exp %
+.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.22.2.1 2000/06/02 20:53:55 alfred Exp %
 .\"
 .\" jpman %Id: login.conf.5,v 1.3 1998/07/21 23:10:00 jsakai Stab %
 .Dd November 22, 1996
@@ -162,6 +162,7 @@
 .It memorylocked	size		$B%3%"%a%b%j%m%C%/2DG=NL$N:GBgCM@)8B(B
 .It maxproc	number		$B%W%m%;%9?t$N:GBgCM@)8B(B
 .It openfiles	number		$B%W%m%;%9$4$H$K%*!<%W%s$G$-$k%U%!%$%k?t$N:GBgCM@)8B(B
+.It sbsize	number		$B:GBg$N%=%1%C%H%P%C%U%!%5%$%:(B
 .El
 .Pp
 $B$3$l$i$N%j%=!<%9@)8B%(%s%H%j$O!"<B:]$K$O:GBgCM$H8=:_$N(B
diff -ur man/man5/opiekeys.5 man/man5/opiekeys.5
--- man/man5/opiekeys.5	Tue Feb 15 23:34:48 2000
+++ man/man5/opiekeys.5	Wed Jul  5 09:37:04 2000
@@ -1,4 +1,4 @@
-.\" opieaccess.5: Manual page describing the /etc/opiekeys file.
+.\" opiekeys.5: Manual page describing the /etc/opiekeys file.
 .\"
 .\" Portions of this software are Copyright 1995 by Randall Atkinson and Dan
 .\" McDonald, All Rights Reserved. All Rights under this copyright are assigned
@@ -7,12 +7,15 @@
 .\"
 .\"	History:
 .\"
+.\"	Modified by cmetz for OPIE 2.32. This is opiekeys.5, not opiekeys.1 or
+.\"         opieaccess.5.
 .\"	Written at NRL for OPIE 2.0.
 .\"
 .ll 6i
 .\" jpman %Id: opiekeys.5,v 1.3 1998/07/03 09:08:53 mutoh Stab %
 .pl 10.5i
 .\"	@(#)opiekeys.5	2.0 (NRL) 1/10/95
+.\"	%FreeBSD: src/contrib/opie/opiekeys.5,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .\"
 .lt 6.0i
 .TH OPIEKEYS 5 "January 10, 1995"
diff -ur man/man5/passwd.5 man/man5/passwd.5
--- man/man5/passwd.5	Wed Jun 14 22:42:10 2000
+++ man/man5/passwd.5	Wed Jul  5 09:37:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.26 2000/03/02 14:53:51 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.26.2.1 2000/06/30 16:14:07 wollman Exp %
 .\"
 .\" jpman %Id: passwd.5,v 1.3 1998/07/30 15:26:15 horikawa Stab %
 .\"
@@ -47,7 +47,9 @@
 .Nm passwd
 $B%U%!%$%k$O2~9T$G6h@Z$i$l$?%l%3!<%I$+$i@.$j$^$9!#(B
 $B%f!<%6$4$H$K(B 1 $B%l%3!<%I$,BP1~$7!"(B
-$B%3%m%s(B (``:'') $B$G6h@Z$i$l$?(B 10 $B8D$NMs$,4^$^$l$^$9!#(B
+$B%3%m%s(B
+.Pq Ql \&:
+$B$G6h@Z$i$l$?(B 10 $B8D$NMs$,4^$^$l$^$9!#(B
 $B$3$l$i$NMs$O0J2<$NDL$j$G$9(B:
 .Pp
 .Bl -tag -width password -offset indent
@@ -85,15 +87,16 @@
 $BN>J}6&$=$N%7%9%F%`(B ($B$^$?$7$P$7$PJ#?t$N%7%9%F%`$K$o$?$k(B 1 $B$D$N%0%k!<%W(B) $B$NCf(B
 $B$G0l0U$G$"$k$Y$-$G$9!#(B
 .Pp
-$BF1$8%m%0%$%sL>$dF1$8%f!<%6(B id $B$N%(%s%H%j$rJ#?t;}$D$3$H$O2DG=$G(B
+$BF1$8%m%0%$%sL>$dF1$8(B UID $B$N%(%s%H%j$rJ#?t;}$D$3$H$O2DG=$G(B
 $B$9$,!"IaDL$=$l$O8m$j$G$9!#$3$l$i$N%U%!%$%k$r<h$j07$&%k!<%A%s$O$7$P$7$P$=(B
 $B$NJ#?t%(%s%H%j$N(B 1 $B$D$@$1$rJV$7$^$9$7!"(B
 $B$=$7$F$=$l$O%i%s%@%`$JA*Br$K$h$k$b$N$G$9!#(B
 .Pp
-$B%m%0%$%sL>$O7h$7$F%O%$%U%s(B (``-'') $B$G;O$a$F$O$$$1$^$;$s!#$^$?!"%a!<%i$r(B
-$B:.Mp$5$;$k798~$K$"$k$N$G!"BgJ8;z$d%I%C%H(B (``.'') $B$b@dBP$KL>A0$N0lIt$K$7$J(B
-$B$$$3$H$r6/$/?d>)$7$^$9!#%3%m%s(B (``:'') $B$ONr;KE*$K%f!<%6%G!<%?%Y!<%9Cf$NMs(B
-$B$rJ,$1$k$?$a$KMQ$$$i$l$F$-$?$N$G!"$$$+$J$kMs$K$b4^$^$l$^$;$s!#(B
+$B%m%0%$%sL>$O7h$7$F%O%$%U%s(B
+.Pq Ql \&-
+$B$G;O$a$F$O$$$1$^$;$s!#$^$?!"%a!<%i$r:.Mp$5$;$k798~$K$"$k$N$G!"BgJ8;z$d%I%C%H(B
+.Pq Ql \&.
+$B$b@dBP$KL>A0$N0lIt$K$7$J$$$3$H$r6/$/?d>)$7$^$9!#(B
 .Pp
 password $BMs$O%Q%9%o!<%I$N(B
 .Em $B0E9f2=$5$l$?(B
@@ -142,21 +145,27 @@
 $B$3$NMs$r6u$K%;%C%H$7$F$*$/$+(B 0 $B$r%;%C%H$7$F$*$1$PNI$$$G$9!#(B
 .Pp
 .Ar gecos
-$BMs$O%3%s%^(B (``,'') $B$G6h@Z$i$l$?0J2<$N$h$&$JI{Ms$rDL>o4^$s$G$$$^$9(B:
+$BMs$O%3%s%^(B
+.Pq Ql \&,
+$B$G6h@Z$i$l$?0J2<$N$h$&$JI{Ms$rDL>o4^$s$G$$$^$9(B:
 .Pp
-.Bd -unfilled -offset indent
-fullname		$B%f!<%6$N%U%k%M!<%`(B
-office		$B%f!<%6$N?&>l$N0LCV(B
-wphone		$B%f!<%6$N?&>l$NEEOCHV9f(B
-hphone		$B%f!<%6$N<+Bp$NEEOCHV9f(B
-.Ed
+.Bl -bullet -compact -offset indent
+.It
+$B%f!<%6$N%U%k%M!<%`(B
+.It
+$B%f!<%6$N?&>l$N0LCV(B
+.It
+$B%f!<%6$N?&>l$NEEOCHV9f(B
+.It
+$B%f!<%6$N<+Bp$NEEOCHV9f(B
+.El
 .Pp
 $B$3$N>pJs$O(B
 $B%U%#%s%,!<%W%m%0%i%`(B
 .Xr finger 1
 $B$K$h$C$FMxMQ$5$l!":G=i$NMs$O%7%9%F%`$N%a!<%i(B
 $B$K$h$C$F;H$o$l$^$9!#(Bfullname $BMsFb$K%"%s%Q%5%s%IJ8;z(B
-.Ql \&&
+.Pq Ql \&&
 $B$,8=$o$l$k$H!"$3$NMs$r;H$&%W%m%0%i%`$O$=$l$r$=$N%"%+%&%s%H$N%m%0%$%sL>$N(B
 $BBgJ8;zHG$KCV$-49$($^$9!#(B
 .Pp
@@ -198,15 +207,18 @@
 .Xr pwd_mkdb 8
 $B$rMQ$$$F%Q%9%o!<%I%G!<%?%Y!<%9$r<jF0$G99?7$9$k$3$H$,$G$-$^$9!#(B
 .Pp
-NIS $B$r3h@-2=$9$k$?$a$N:G$b4JC1$JJ}K!$O!"L>A0Ms$K%W%i%9Id9f(B (`+') $B$@$1$r;}$D!"(B
+NIS $B$r3h@-2=$9$k$?$a$N:G$b4JC1$JJ}K!$O!"L>A0Ms$K%W%i%9Id9f(B
+.Pq Ql \&+
+$B$@$1$r;}$D!"(B
 $B0J2<$N$h$&$J6u$N%l%3!<%I$rIU$12C$($k$3$H$G$9!#(B
 .Bd -literal -offset indent
 +:::::::::
 
 .Ed
-`+' $B$O!"(B
+.Ql \&+
+$B$O!"(B
 .Tn FreeBSD
-$B$NI8=`(BC$B%i%$%V%i%j$N(B
+$B$NI8=`(B C $B%i%$%V%i%j$N(B
 .Xr getpwent 3
 $B%k!<%A%s$KBP$7!"(B
 $B8!:w$K$*$$$F(B NIS $B%Q%9%o!<%I%^%C%W$r;HMQ3+;O$9$k$h$&;X<($7$^$9!#(B
@@ -214,10 +226,14 @@
 $B>e5-$N%(%s%H%j$O(B
 .Em $B%o%$%k%I%+!<%I(B
 $B%(%s%H%j$H$7$FCN$i$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#$J$<$J$i!"$=$l$O$9$Y$F$N(B
-$B%f!<%6$H0lCW$7(B ($BB>$K>pJs$r;}$?$J$$(B `+' $B$O!"A40w$K0lCW$7$^$9(B)$B!"(B
+$B%f!<%6$H0lCW$7(B ($BB>$K>pJs$r;}$?$J$$(B
+.Ql \&+
+$B$O!"A40w$K0lCW$7$^$9(B)$B!"(B
 $BA4(B NIS $B%Q%9%o!<%I%G!<%?$rL5JQ99$K$F0z$-=P$9$3$H$r5v$7$^$9!#(B
 $B0lJ}!"(B
-NIS $B%(%s%H%j$G(B `+' $B$N<!$K%f!<%6L>$d%M%C%H%0%k!<%WL>$r;XDj$9$k$3$H$K$h$C$F!"(B
+NIS $B%(%s%H%j$G(B
+.Ql \&+
+$B$N<!$K%f!<%6L>$d%M%C%H%0%k!<%WL>$r;XDj$9$k$3$H$K$h$C$F!"(B
 $B$I$N$h$&$J%G!<%?$,(B NIS $B%Q%9%o!<%I%^%C%W$+$iE83+$5$l$k$N$+!"(B
 $B$*$h$S$=$l$,$I$N$h$&$K2r<a$5$l$k$N$+$K$D$$$F!"(B
 $B4IM}<T$,1F6A$rM?$($k$3$H$,$G$-$^$9!#(B
@@ -233,29 +249,51 @@
 +@rejected-users::32767:32767::::::/bin/false
 
 .Ed
-$BFCDj$N%f!<%6L>$OL@<(E*$K%j%9%H$5$l$^$9$,!"%M%C%H%0%k!<%W$O(B `@' $B$rA0$KIU$1(B
-$B$FI=$5$l$^$9!#(B
-$B>e$NNc$G$O!"(B``staff'' $B$*$h$S(B ``permitted-users'' $B%M%C%H%0%k!<%W(B
+$BFCDj$N%f!<%6L>$OL@<(E*$K%j%9%H$5$l$^$9$,!"%M%C%H%0%k!<%W$O(B
+.Ql \&@
+$B$rA0$KIU$1$FI=$5$l$^$9!#(B
+$B>e$NNc$G$O!"(B
+.Dq staff
+$B$*$h$S(B
+.Dq permitted-users
+$B%M%C%H%0%k!<%W(B
 $B$N%f!<%6$O!"(BNIS $B$+$iFI$^$lL5JQ99$G;HMQ$5$l$k%Q%9%o!<%I>pJs$r;}$A$^$9!#(B
 $B8@$$49$($l$P!"$=$l$i$N%f!<%6$O$=$N%^%7%s$KDL>o$N%"%/%;%9$r5v$5$l$k(B
-$B$H$$$&$3$H$G$9!#%f!<%6(B ``ken'' $B$*$h$S(B ``dennis'' $B$O!"(B
+$B$H$$$&$3$H$G$9!#%f!<%6(B
+.Dq ken
+$B$*$h$S(B
+.Dq dennis
+$B$O!"(B
 $B%M%C%H%0%k!<%W$rDL$8$F$G$O$J$/L@<(E*$KL>A0$,;XDj$5$l$F$*$j!"(B
 NIS $B$+$iFI$^$l$k%Q%9%o!<%I>pJs$r;}$A$^$9!#(B
-$BNc30$O!"%f!<%6(B ``ken'' $B$N%7%'%k$,(B
+.Em $BNc30(B
+$B$O!"%f!<%6(B
+.Dq ken
+$B$N%7%'%k$,(B
 .Pa /bin/csh
 $B$K:F%^%C%W$5$l$k$3$H$G$9!#(B
 $B$3$l$O!"(BNIS $B%Q%9%o!<%I%^%C%W$G;XDj$5$l$?%7%'%k$NCM$,!"%m!<%+%k(B
 .Pa master.passwd
 $B%U%!%$%k$NFCJL$J(B
 NIS $B%(%s%H%j$G;XDj$5$l$?CM$K$h$C$F>e=q$-$5$l$k$3$H$r0UL#$7$^$9!#(B
-$B%f!<%6(B ``ken'' $B$O(B csh $B%7%'%k$r3d$jEv$F$F$*$$$F$bNI$$$+$bCN$l$^$;$s!#(B
+$B%f!<%6(B
+.Dq ken
+$B$O(B csh $B%7%'%k$r3d$jEv$F$F$*$$$F$bNI$$$+$bCN$l$^$;$s!#(B
 $B$J$<$J$i!"(B
 $B@/<#E*$"$k$$$O5;=QE*$JM}M3$G%/%i%$%"%s%H%^%7%s$K%$%s%9%H!<%k$5$l$F$$$J$$(B
 $BJL$N%7%'%k$r!"H`$N(B NIS $B%Q%9%o!<%I%(%s%H%j$K;XDj$5$l$F$$$k$+$b$7$l$J$$$?$a$G$9!#(B
-$BB>J}!"(B``rejected-users''$B%M%C%H%0%k!<%W$N%f!<%6$O!"$=$N(B UID$B!"(B
+$BB>J}!"(B
+.Dq rejected-users
+$B%M%C%H%0%k!<%W$N%f!<%6$O!"$=$N(B UID$B!"(B
 GID$B!"%7%'%k$,IT@5$JCM$G>e=q$-$5$l$F$$$k$N$G%m%0%$%s$G$-$J$/$J$j$^$9!#(B
 .Pp
-$B%f!<%6(B ``mitnick'' $B$O!"$=$N%(%s%H%j$,(B `+' $B$G$O$J$/(B `-' $B$G;XDj$5$l$F$$$k$N$G!"(B
+$B%f!<%6(B
+.Dq mitnick
+$B$O!"$=$N%(%s%H%j$,(B
+.Ql \&+
+$B$G$O$J$/(B
+.Ql \&-
+$B$G;XDj$5$l$F$$$k$N$G!"(B
 $B40A4$KL5;k$5$l$k$3$H$K$J$j$^$9!#(B
 $B%^%$%J%9%(%s%H%j$O!"(B
 $B$"$k(B NIS $B%(%s%H%j$r40A4$K<WCG$9$k$?$a$KMQ$$$k$3$H$,$G$-$^$9!#(B
@@ -267,7 +305,11 @@
 $B0lHL$K%^%$%J%9%(%s%H%j$O!"(B
 $B$"$k8"8B$N$"$k%M%C%H%0%k!<%W$N%a%s%P$H$J$C$F%"%/%;%9$r5v$5$l$k$+$b$7$l$J$$(B
 $B%f!<%6$rFCJL$K=|30$9$k$?$a$K;HMQ$7$^$9!#(B
-$BNc$($P(B ``mitnick'' $B$,(B ``permitted-users'' $B%M%C%H%0%k!<%W$N%a%s%P$G$"$j!"(B
+$BNc$($P(B
+.Dq mitnick
+$B$,(B
+.Dq permitted-users
+$B%M%C%H%0%k!<%W$N%a%s%P$G$"$j!"(B
 $B$$$+$J$kM}M3$,$"$C$F$b$=$N%M%C%H%0%k!<%WFb$KN1$^$k$3$H$r5v$9I,MW$,$"$k>l9g(B
 ($B$*$=$i$/$=$N%I%a%$%sFb$NB>$N%^%7%s$K%"%/%;%9$9$k$3$H$rJ]>Z$9$k$?$a(B)$B!"(B
 $B4IM}<T$O%^%$%J%9%(%s%H%j$r;HMQ$9$k$3$H$K$h$j!"(B
@@ -277,13 +319,25 @@
 $B5v$5$l$J$$%f!<%6$rL@<(E*$K%j%9%H$9$kJ}$,MF0W$J$3$H$,B?$$$G$9!#(B
 .Pp
 $B%W%i%9$*$h$S%^%$%J%9%(%s%H%j$O!"@h9T0lCWM%@h$G:G=i$+$i:G8e$N=g$GI>2A$5$l$^(B
-$B$9!#$3$l$O%7%9%F%`$,FCDj$N%f!<%6$K0lCW$9$k:G=i$N%(%s%H%j$@$1$r;HMQ$9$k$3(B
-$B$H$r0UL#$7$^$9!#Nc$($P!"(B``staff'' $B%M%C%H%0%k!<%W$H(B ``rejected-users''
-$B%M%C%H%0%k!<%W$NN>J}$N%a%s%P$H$J$C$F$$$k$h$&$J%f!<%6(B ``foo'' $B$O!"(B
+$B$9!#$3$l$O%7%9%F%`$,FCDj$N%f!<%6$K0lCW$9$k:G=i$N%(%s%H%j$@$1$r;HMQ$9$k(B
+$B$3$H$r0UL#$7$^$9!#(B
+$BF1$8Nc$r;HMQ$9$k$H!"(B
+.Dq staff
+$B%M%C%H%0%k!<%W$H(B
+.Dq rejected-users
+$B%M%C%H%0%k!<%W$NN>J}$N%a%s%P$H$J$C$F$$$k$h$&$J%f!<%6(B
+.Dq foo
+$B$O!"(B
 $B>e$NNc$G$O(B
-``rejected-users'' $B$N%(%s%H%j$NA0$K(B ``staff'' $B$N%(%s%H%j$,$"$j$^$9$N$G!"(B
-$B%7%9%F%`$K5v2D$5$l$^$9!#$b$7=g=x$,5U$J$i!":#EY$O%f!<%6(B ``foo'' $B$O(B
-``rejected-users'' $B$H$7$FG'<1$5$l!"%"%/%;%9$O5qH]$5$l$^$9!#(B
+.Dq rejected-users
+$B$N%(%s%H%j$NA0$K(B
+.Dq staff
+$B$N%(%s%H%j$,$"$j$^$9$N$G!"(B
+$B%7%9%F%`$K5v2D$5$l$^$9!#$b$7=g=x$,5U$J$i!":#EY$O%f!<%6(B
+.Dq foo
+$B$O(B
+.Dq rejected-users
+$B$H$7$FG'<1$5$l!"%"%/%;%9$O5qH]$5$l$^$9!#(B
 .Pp
 $B:G8e$K!"(B
 .Pa /etc/master.passwd
@@ -291,29 +345,33 @@
 $B$N$I$l$H$b0lCW$7$J$$(B NIS $B%Q%9%o!<%I%G!<%?%Y!<%9%l%3!<%I$O!"(B($B%^%$%J%9%(%s%H%j(B
 $B$r;H$C$F;XDj$7$?$9$Y$F$N%f!<%6$H6&$K(B) $B$9$Y$FL5;k$5$l$^$9!#@h$K<($7$?Nc(B
 $B$G$O%j%9%H$N:G8e$K%o%$%k%I%+!<%I%(%s%H%j$,L5$$$N$G!"(B
-``ken'' $B$H(B ``dennis'' $B$H(B ``staff'' $B%M%C%H%0%k!<%W$H(B
-``permitted-users'' $B%M%C%H%0%k!<%W$H$r=|$/$9$Y$F$N%f!<%6$r(B
+.Dq ken
+$B$H(B
+.Dq dennis
+$B$H(B
+.Dq staff
+$B%M%C%H%0%k!<%W$H(B
+.Dq permitted-users
+$B%M%C%H%0%k!<%W$H$r=|$/$9$Y$F$N%f!<%6$r!"(B
 $B%7%9%F%`$O8"8B$,$"$k%f!<%6$H$7$FG'<1$7$J$$$G$7$g$&!#(B
-``rejected-users'' $B%M%C%H%0%k!<%W$OG'<1$5$l$^$9$,!"(B
+.Dq rejected-users
+$B%M%C%H%0%k!<%W$OG'<1$5$l$^$9$,!"(B
 $BA4%a%s%P$N%7%'%k$O:F%^%C%W$5$l$^$9$N$G!"(B
 $B%"%/%;%9$O5qH]$5$l$k$G$7$g$&!#B>$N$9$Y$F$N(B NIS $B%Q%9%o!<%I%l%3!<%I$OL5;k$5$l(B
 $B$k$G$7$g$&!#(B $B4IM}<T$O0J2<$N$h$&$J%o%$%k%I%+!<%I%(%s%H%j$r%j%9%H$N:G8e$K(B
 $BIU$1$F$bNI$$$G$7$g$&!#(B
 .Bd -literal -offset indent
-+:::::::::/usr/local/bin/go_away
++:::::::::/sbin/nologin
 
 .Ed
 $B$3$N%(%s%H%j$OB>$N$9$Y$F$N%(%s%H%j$H0lCW$7$J$$$9$Y$F$N%f!<%6$r0l5s$K$H$i$($k(B
 $BF/$-$r$7$^$9!#(B
-.Pa /usr/local/bin/go_away
-$B$O!"%7%9%F%`$K%"%/%;%9$r5v2D$5$l$J$$%f!<%6$KEA$($k%a%C%;!<%8$r=PNO$9$kC;$+(B
-$B$$%9%/%j%W%H$^$?$O%W%m%0%i%`$G$7$g$&!#(B
 $BI,$:$7$b%m%0%$%s%"%/%;%9$r5v2D$;$:$K!"(B
 $BFCDj$N(B
 NIS $B%I%a%$%sFb$NA4%f!<%6$r%7%9%F%`$,G'<12DG=$G$"$k$3$H$,K>$^$7$$$H$-$K$O!"(B
 $B$3$N%F%/%K%C%/$,M-8z$J$3$H$,$"$j$^$9!#(B
 $B%m%0%$%s%7%'%k$H%7%'%k%9%/%j%W%H$r;HMQ$9$k$H$-$N%;%-%e%j%F%#$K4X$9$k;vJA(B
-$B$K$D$$$F!">e5-$N%7%'%kMs$N5-=R$r;2>H$7$F$/$@$5$$!#(B
+$B$K$D$$$F!"%7%'%kMs$N5-=R$r;2>H$7$F$/$@$5$$!#(B
 .Pp
 $B$3$N(B
 .Pa $B>e=q$-(B
@@ -432,14 +490,16 @@
 .Sy Pa master.passwd
 .Sy $B%U%!%$%k$K$O!V@dBP$K!W$3$N$h$&$J%(%s%H%j$OF~$l$J$$$G$/$@$5$$(B!!
 $B:G=i$N$b$N$O!"(B
-$B$9$Y$F$N%Q%9%o!<%I$r(B `*' $B$K:F%^%C%W$7(B ($B$3$l$OC/$b%m%0%$%s$G$-$J$/$7$^$9(B)$B!"(B
+$B$9$Y$F$N%Q%9%o!<%I$r(B
+.Ql \&*
+$B$K:F%^%C%W$7(B ($B$3$l$OC/$b%m%0%$%s$G$-$J$/$7$^$9(B)$B!"(B
 $B$9$Y$F$N(B UID $B$*$h$S(B GID $B$r(B 0 $B$K:F%^%C%W$9$k(B ($B$3$l$O3'$r%9!<%Q%f!<%6$K$7$^$9(B)
 $B$3$H$r(B
 .Tn FreeBSD
 $B$K;X<($7$^$9!#(B
 2 $BHVL\$N$b$N$OA4(B UID $B$*$h$S(B GID $B$r$A$g$&$I(B 0 $B$K%^%C%W$7$^$9(B
 $B$,!"$3$l$O(B
-.Pa $B$9$Y$F$N%f!<%6$,(B root $B$K$J$C$F$7$^$&(B
+$B$9$Y$F$N%f!<%6$,(B root $B$K$J$C$F$7$^$&(B
 $B$3$H$r0UL#$7$^$9(B!
 .Pp
 .Ss NIS $B>e=q$-I>2A$N8_49@-(B
@@ -453,15 +513,25 @@
 .Tn ASCII
 $B%U%)!<%^%C%H$G$"$k$H$$$&$3$H$,9MN8$5$l$F$$$^$7$?!#(B
 .Tn SunOS
-$B$N%I%-%e%a%s%H$K$h$l$P!"%Q%9%o!<%I%U%!%$%k$K(B '+' $B%(%s%H%j$rIU$12C$($k$H!"(B
-$B%Q%9%o!<%I%U%!%$%kCf$N(B '+' $B%(%s%H%j$,$"$k0LCV$K(B
-NIS $B%Q%9%o!<%I%G!<%?%Y!<%9$NFbMF$,!VA^F~!W$5$l$^$9!#Nc$($P(B
+$B$N%I%-%e%a%s%H$K$h$l$P!"%Q%9%o!<%I%U%!%$%k$K(B
+.Ql \&+
+$B%(%s%H%j$rIU$12C$($k$H!"(B
+$B%Q%9%o!<%I%U%!%$%kCf$N(B
+.Ql \&+
+$B%(%s%H%j$,$"$k0LCV$K(B
+NIS $B%Q%9%o!<%I%G!<%?%Y!<%9$NFbMF$,(B
+.Dq $BA^F~(B
+$B$5$l$^$9!#Nc$($P(B
 $B4IM}<T$,(B
 .Pa /etc/passwd
-$B$NCf1{$K(B +:::::: $B%(%s%H%j$rCV$$$?>l9g!"(B
+$B$NCf1{$K(B
+.Ql \&+::::::
+$B%(%s%H%j$rCV$$$?>l9g!"(B
 NIS $B%Q%9%o!<%I%^%C%W$NA4BN$NFbMF$,(B
 $B%Q%9%o!<%I%U%!%$%k$NCf1{$K%3%T!<$5$l$?$+$N$h$&$K8=$o$l$k$G$7$g$&!#(B
-$B4IM}<T$,(B +:::::: $B%(%s%H%j$r(B
+$B4IM}<T$,(B
+.Ql \&+::::::
+$B%(%s%H%j$r(B
 .Pa /etc/passwd
 $B$NCf1{$H:G8e$NN>J}$KCV$1$P(B NIS $B%Q%9%o!<%I%^%C%W$O(B
 2 $BEY8=$o$l$k$3$H$K$J$k$G$7$g$&!#(B
@@ -470,7 +540,7 @@
 $BB>$NAH$_9g$o$;$,2DG=$G$9(B)$B!#(B
 .Pp
 $B$3$l$KBP$7(B
-.Tn FreeBSD
+.Fx
 $B$G$OC10l$N(B
 .Tn ASCII
 $B%Q%9%o!<%I%U%!%$%k$r;}$D$H$$$&$o$1$G$O$"$j$^$;$s!#(B
@@ -499,10 +569,16 @@
 $B$KBP$7$FHf3S$5$l!"$=$l$K1~$8$F<h$j07$o$l$^$9!#%U%#%k%?$,%(%s%H%j$rJQ99$;(B
 $B$:$KDL$9$3$H$r5v$9$J$i%(%s%H%j$OJQ99$5$l$J$$$b$N$H$7$F<h$j07$o$l!"%U%#%k%?(B
 $B$,Ms$N:F%^%C%W$rMW5a$9$k$J$iMs$O:F%^%C%W$5$l!"%U%#%k%?$,L@Gr$J=|30$rMW5a(B
-$B$9$k$J$i(B($B$9$J$o$A%(%s%H%j$,(B '-' $B>e=q$-$H0lCW$9$k$J$i(B) $B%(%s%H%j$OL5;k$5$l!"(B
+$B$9$k$J$i(B($B$9$J$o$A%(%s%H%j$,(B
+.Ql \&-
+$B>e=q$-$H0lCW$9$k$J$i(B) $B%(%s%H%j$OL5;k$5$l!"(B
 $B%(%s%H%j$,%U%#%k%?;XDj$N$I$l$H$b0lCW$7$J$$$J$i%(%s%H%j$O<N$F$i$l$^$9!#(B
 .Pp
-$B$^$?!"(BNIS $B$N(B '+' $B$*$h$S(B '-' $B%(%s%H%j<+?H$O!"(B
+$B$^$?!"(BNIS $B$N(B
+.Ql \&+
+$B$*$h$S(B
+.Ql \&-
+$B%(%s%H%j<+?H$O!"(B
 .Pa /etc/master.passwd
 $B$NCf$G;XDj$5$l$?=g=x$G<h$j07$o$l$k$3$H$K:FEYCm0U$7$F$/$@$5$$!#(B
 $B$=$l0J30$NJ}K!$G<h$j07$&$H!"M=B,IT2DG=$J?6Iq$$$H$J$C$F$7$^$&$+$i$G$9!#(B
@@ -521,7 +597,11 @@
 NIS $B%Q%9%o!<%I%^%C%W$N3F!9$N%l%3!<%I$O!"%m!<%+%k%Q%9%o!<%I6u4V$N%Q%9%o!<%I$K(B
 1 $BEY$@$1%^%C%W$9$k$3$H$,$G$-$^$9!#(B
 .It
-NIS $B$N(B '+' $B$*$h$S(B '-' $B$N%(%s%H%j$N0LCV$O!"(B
+NIS $B$N(B
+.Ql \&+
+$B$*$h$S(B
+.Ql \&-
+$B$N%(%s%H%j$N0LCV$O!"(B
 NIS $B%Q%9%o!<%I%l%3!<%I$,%Q%9%o!<%I6u4V$K%^%C%W$5$l$k>l=j$K(B
 $BI,$:$7$b1F6A$rM?$($^$;$s!#(B
 .El
@@ -541,10 +621,15 @@
 +@operator:::::::::
 
 .Ed
-$B%7%9%F%`$O$^$:(B `operator' $B$H8F$P$l$k%M%C%H%0%k!<%W$KBP$7$F%f!<%6$r(B
+$B%7%9%F%`$O$^$:(B
+.Ql operator
+$B$H8F$P$l$k%M%C%H%0%k!<%W$KBP$7$F%f!<%6$r(B
 $B>H9g$7$h$&$H$7$^$9!#(B
-`operator' $B%M%C%H%0%k!<%W$,B8:_$7$J$$$H$-!"(B
-$B%7%9%F%`$OBe$j$KDL>o$N(B `operator' $B%0%k!<%W$KBP$7$F>H9g$7$h$&$H$7$^$9!#(B
+.Ql operator
+$B%M%C%H%0%k!<%W$,B8:_$7$J$$$H$-!"(B
+$B%7%9%F%`$OBe$j$KDL>o$N(B
+.Ql operator
+$B%0%k!<%W$KBP$7$F>H9g$7$h$&$H$7$^$9!#(B
 .Ss FreeBSD $B$N8E$$%P!<%8%g%s$+$i$NF0:n$NJQA+(B
 .Tn FreeBSD
 $B$N(B NIS/YP $B$N<h$j07$$$K$D$$$F$O$$$/$D$+$N%P%0%U%#%C%/%9$H2~A1$,$"$j$^$7$?!#(B
diff -ur man/man5/pccard.conf.5 man/man5/pccard.conf.5
--- man/man5/pccard.conf.5	Wed Jun 14 22:42:10 2000
+++ man/man5/pccard.conf.5	Wed Jul  5 09:37:10 2000
@@ -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.
 .\"
-.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.12 2000/03/01 14:09:20 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.12.2.2 2000/06/05 14:59:03 iwasaki Exp %
 .\"
 .\" WORD: resource	$B%j%=!<%9(B[pccard.conf.5]
 .\"
@@ -55,6 +55,14 @@
 $B:G8e$N(B 2 $B$D$O$I$s$J=g=x$G8=$l$F$b$h$/!"(B
 $BET9g$K1~$8$F$"$A$3$A$X;6:_$7$F$b9=$$$^$;$s!#(B
 .Pp
+.Pa /etc/pccard.conf
+$B%U%!%$%k$O!"%G%U%)%k%H$N%j%=!<%9%W!<%k@_Dj$H(B pccard $B<1JL;R%G!<%?%Y!<%9$r;}$D(B
+.Pa /etc/defaults/pccard.conf
+$B$+$i%$%s%/%k!<%I$5$l$^$9!#(B
+$B%f!<%68GM-$N@_Dj$r(B
+.Pa /etc/rc.conf
+$B$G;XDj$7$F!"$3$l$i$N%G%U%)%k%H$r>e=q$-$7$?$jDI2C%(%s%H%j$rDI2C2DG=$G$9!#(B
+.Pp
 $B$=$l$>$l$N(B PC-CARD $B%+!<%I$O!"@=B$<T$d%+!<%I$N%P!<%8%g%s$r5,Dj$9$k(B
 $B@_Dj%?%W%k$r4^$s$G$$$^$9!#$3$l$i$O!"@_Dj%U%!%$%kCf$G%+!<%I$N;EMM$r(B
 $BFCDj$9$k$N$K;H$o$l!"$=$l$K$h$C$F!"$=$N%+!<%I$H%$%s%?%U%'!<%9$r$H$l$k(B
@@ -119,7 +127,7 @@
 .Ss "$B%+!<%I<1JL;R(B"
 $B%+!<%I<1JL;R$N9=J8$O0J2<$NDL$j$G$9!#(B
 .Pp
-.Dl card Ar manufacturer version
+.Dl card Ar manufacturer version [ add_info1 [ add_info2 ]]
 .Dl config Ar index driver interrupt [ flags ]
 .Dl ether Ar offset
 .Dl insert Ar command
@@ -130,8 +138,15 @@
 .Em config
 $B9T$OJ#?tB8:_$9$k$3$H$b$"$j$^$9!#(B
 .Em card
-$B$N%Q%i%a!<%?$K$O!"@=B$<TL>$H%+!<%I$N%P!<%8%g%s$,$"$j!"(B
+$B$N%Q%i%a!<%?$K$O!"@=B$<TL>!"%+!<%I$N%P!<%8%g%s!"(B
+$B$=$7$FDI2C>pJs(B add_info1 $B$H(B add_info2 $B$,$"$j!"(B
 $B%+!<%I$N(B CIS $B%a%b%j$+$iF@$?CM$H$N0lCW$r$_$k$N$K;H$o$l$^$9!#(B
+\&"/.*/" $B$N$h$&$K(B '/' $B$GJ8;zNs$r3g$l$P!"(B
+$B$3$l$i$N%Q%i%a!<%?$O!"3HD%@55,I=8=(B
+.Xr regex 3
+$B$G5-=R2DG=$G$9!#(B
+$B3F<0$O!"@hF,$K$*$$$FJ8;z(B '^' $B$GI>2A$5$l$^$9!#(B
+.Pp
 .Em config
 $B%Q%i%a!<%?$O!"(B
 $B%+!<%I$N(B CIS $B$GF@$i$l$kHO0O$+$i$=$N%+!<%I$N@_Dj%$%s%G%C%/%9$rA*Br$7!"(B
@@ -162,6 +177,29 @@
 $B$d(B
 .Em remove
 $B%3%^%s%I$b=q$/$3$H$,$G$-!"$=$N>l9gNs5s$5$l$?=g$K<B9T$5$l$^$9!#(B
+.Ss $B%o%$%k%I%+!<%I%(%s%H%j(B
+$B<!$N!"%+!<%I<1JL;R$N(B 2 $B8D$N%o%$%k%I%+!<%I%(%s%H%j$O!"(B
+$BHFMQ%+!<%I$K;HMQ2DG=$G$9(B:
+.Pp    
+.Dl generic serial
+.Dl generic fixed_disk
+.Pp 
+$B%-!<%o!<%I(B
+.Em serial
+$B$O(B ``Functional ID: Serial port/modem'' $B$K%^%C%A$7!"(B
+.Em fixed_disk
+$B$O(B ``Fixed disk card' $B$K%^%C%A$7$^$9!#(B
+$B9=J8$O(B
+.Em "card identifiers"
+$B$HF1$8$G$9$,!":G=i$N9T$G(B ``card'' $B$NBe$j$K(B ``generic'' $B$,;HMQ$5$l$^$9!#(B
+$B$3$l$i$O!"(B
+.Nm  
+$B$N:G8e$KCV$+$l!"B>$N(B
+.Em card
+$B%(%s%H%j$K%^%C%A$7$J$+$C$?%+!<%I$,<!$K$3$l$i$K%^%C%A$G$-$k$h$&$K$7$^$9!#(B
+$BNr;KE*$J;v>p$G!"(B
+$B%(%$%j%"%9(B ``function'' $B$r(B ``generic'' $B$NBe$j$K;HMQ2DG=$G$9!#(B
+.Pp  
 .Sh $B;HMQNc(B
 $BE57?E*$J@_Dj%U%!%$%k$O0J2<$N$h$&$JBN:[$G$7$g$&!#(B
 .Bd -literal
@@ -191,10 +229,12 @@
 
 .Ed
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /etc/pccard.conf -compact
-.It Pa /etc/pccard.conf
+.Bl -tag -width /etc/defaults/pccard.conf -compact
+.It Pa /etc/defaults/pccard.conf
 .Xr pccardd 8
 $B$N@_Dj%U%!%$%k!#(B
+.It Pa /etc/pccard.conf
+$B%f!<%6$N@_Dj%U%!%$%k!#(B
 .El
 .Sh $B4XO"9`L\(B
 .Xr pccardd 8
diff -ur man/man5/rc.conf.5 man/man5/rc.conf.5
--- man/man5/rc.conf.5	Wed Jun 14 22:42:10 2000
+++ man/man5/rc.conf.5	Wed Jul  5 09:37:13 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.64 2000/03/03 14:04:56 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.64.2.4 2000/04/27 10:43:18 des Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -163,6 +163,11 @@
 .Ar YES
 $B$K%;%C%H$7!"$+$D%+!<%M%k$,(B IPFIREWALL $BIU$-$G:n$i$l$J$+$C$?>l9g!"(B
 ipfw $B%+!<%M%k%b%8%e!<%k$,%m!<%I$5$l$^$9!#(B
+.It Ar firewall_script
+($BJ8;zNs(B)
+.Pa /etc/rc.firewall
+$B0J30$N%U%!%$%"%&%)!<%k%9%/%j%W%H$r<B9T$7$?$$>l9g!"(B
+$B$=$N%9%/%j%W%H$N40A4$J%Q%9L>$r$3$NJQ?t$K@_Dj$7$F$/$@$5$$!#(B
 .It Ar firewall_type
 ($BJ8;zNs(B)
 .Pa /etc/rc.firewall
@@ -517,10 +522,17 @@
 .Ar YES
 $B$K%;%C%H$9$k$H!"8"8BIU$1$i$l$F$$$J$$%^%&%s%HMW5a$r9T$J$&$?$a$K(B
 PCNFSD $B$N$h$&$J%5!<%S%9$r5v2D$7$^$9!#(B
-.It Ar nfs_reserved_port_only
+.It Ar nfs_privport
 ($B%V!<%kCM(B)
 .Ar YES
 $B$K%;%C%H$9$k$H!"0BA4$J%]!<%H>e$G$N$_(B NFS $B%5!<%S%9$rDs6!$7$^$9!#(B
+.It Ar nfs_bufpackets
+($B@0?t(B) $B?tCM$r@_Dj$9$k$H!"$=$N%Q%1%C%H?tJ,$N%=%1%C%H%P%C%U%!6u4V$,!"(B
+NFS $B%/%i%$%"%s%H>e$KM=Ls$5$l$^$9!#(B
+.Ar DEFAULT
+$B$K@_Dj$9$k$H!"%+!<%M%k$N%G%U%)%k%H(B ($BE57?E*$K$O(B 4) $B$,;HMQ$5$l$^$9!#(B
+$B%.%,%S%C%H%M%C%H%o!<%/$G$OBg$-$JCM$r@_Dj$9$k$H9b@-G=$K$J$k$G$7$g$&!"(B
+$B:G>.CM$O(B 2 $B$G$"$j!":GBgCM$O(B 64 $B$G$9!#(B
 .It Ar rcp_lockd_enable
 ($B%V!<%kCM(B) $B$3$NJQ?t$,(B
 .Ar YES
diff -ur man/man5/utmp.5 man/man5/utmp.5
--- man/man5/utmp.5	Tue Feb 15 23:34:48 2000
+++ man/man5/utmp.5	Wed Jul  5 09:37:14 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9 1999/08/28 00:20:51 peter Exp %
+.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9.2.1 2000/05/24 13:29:24 mpp Exp %
 .\"
 .\" jpman %Id: utmp.5,v 1.3 1998/06/17 07:53:04 kumano Stab %
 .Dd March 17, 1994
@@ -83,7 +83,7 @@
         char    ut_line[UT_LINESIZE];
         char    ut_name[UT_NAMESIZE];
         char    ut_host[UT_HOSTSIZE];
-        long    ut_time;
+        time_t  ut_time;
 };
 .Ed
 .Pp
diff -ur man/man6/Makefile man/man6/Makefile
--- man/man6/Makefile	Tue Feb 15 23:34:48 2000
+++ man/man6/Makefile	Wed Jul  5 07:24:57 2000
@@ -31,6 +31,7 @@
 	sail.6\
 	snake.6\
 	trek.6\
+	wargames.6\
 	worm.6\
 	worms.6\
 	wump.6
diff -ur man/man6/banner.6 man/man6/banner.6
--- man/man6/banner.6	Tue Feb 15 23:34:48 2000
+++ man/man6/banner.6	Wed Jul  5 09:37:27 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\" %FreeBSD: src/usr.bin/banner/banner.6,v 1.4 1999/08/28 00:59:10 peter Exp %
+.\" %FreeBSD: src/usr.bin/banner/banner.6,v 1.4.2.1 2000/07/01 12:32:34 ps Exp %
 .\" jpman %Id: banner.6,v 1.4 1999/01/16 17:06:39 kuma Stab %
 .\"
 .\" $B0J2<$O;29M$K$7$?(B Linux JM $B$N%/%l%8%C%H(B
@@ -47,21 +47,33 @@
 .Nd $B%W%j%s%?MQ$KBg$-$J8+=P$7$r=PNO$9$k(B
 .Sh $B=q<0(B
 .Nm banner
-.Op Fl w Ar n
+.Op Fl d
+.Op Fl t
+.Op Fl w Ar width
 .Ar message ...
 .Sh $B2r@b(B
 .Nm banner
 $B$OBg$-$/$F%/%*%j%F%#$N9b$$8+=P$7J8;z$rI8=`=PNO$K=PNO$7$^$9!#(B
 message $B$,>JN,$5$l$?>l9g$O!"(B
 $B%W%m%s%W%H$r=P$7$FI8=`F~NO$+$i0l9TF~NO$rFI$_$H$j$^$9!#(B
-.Fl w
-$B$,;X<($5$l$?>l9g$O!">.$5$JC<KvMQ$K!"J8;z$N2#I}$r(B 132 $B7e$G$O$J$/(B
-.Ar n 
-$B7e$^$G2!$7$D$V$7$^$9!#(B
 .Pp
 $B=PNO$O!"E,@Z$JI}$N;f$K@Z$lL\L5$/0u:~$5$l$k$G$7$g$&!#(B
+.Pp
+$B<!$N%*%W%7%g%s$,;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
+.It Fl d
+$B%G%P%C%0$rM-8z2=$7$^$9!#(B
+.It Fl t
+$B%H%l!<%9$rM-8z2=$7$^$9!#(B
+.It Fl w Ar width
+$B=PNOI}$r(B 132 $B$+$i(B
+.Ar width
+$B$XJQ99$7$^$9!#(B
+$B69$$C<Kv8~$-$G$9!#(B
+.El
 .Sh $B%P%0(B
- <$B!"(B >$B!"(B [$B!"(B ]$B!"(B \\$B!"(B^$B!"(B _$B!"(B{$B!"(B }$B!"(B |$B!"(B ~$B!"$H$$$C$?$$$/$D$+$N(B ASCII
+ <$B!"(B >$B!"(B [$B!"(B ]$B!"(B \\$B!"(B^$B!"(B _$B!"(B{$B!"(B }$B!"(B |$B!"(B ~$B!"$H$$$C$?$$$/$D$+$N(B
+.Tn ASCII
 $B%-%c%i%/%?$OMxMQ$G$-$^$;$s!#(B
 $B$^$?!"(B"$B!"(B'$B!"(B& $B$O$*$+$7$JIw$K8+$($^$9(B ($B$,LrN)$D$G$7$g$&(B)$B!#(B
 .Pp
Only in man/man6: wargames.6
diff -ur man/man7/hier.7 man/man7/hier.7
--- man/man7/hier.7	Wed Jun 14 22:42:11 2000
+++ man/man7/hier.7	Wed Jul  5 09:37:42 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man7/hier.7,v 1.29 2000/01/30 04:22:11 kris Exp %
+.\" %FreeBSD: src/share/man/man7/hier.7,v 1.29.2.2 2000/06/13 08:30:58 ru Exp %
 .\"
 .\" jpman %Id: hier.7,v 1.3 1999/01/04 08:08:08 kuma Stab %
 .Dd June 5, 1993
@@ -282,6 +282,8 @@
 .It Li lib/
 $B%"!<%+%$%V%i%$%V%i%j!#(B
 .Bl -tag -width Fl -compact
+.It Li aout/
+a.out $B%"!<%+%$%V%i%$%V%i%j!#(B
 .It Li compat/
 $B8_49@-0];}MQ$N6&M-%i%$%V%i%j!#(B
 .Bl -tag -width Fl -compact
@@ -349,10 +351,6 @@
 $B5-=R$5$l$?0lHLE*$JG[CV$,;HMQ$5$l$^$9!#Nc30$H$7$F!"(Bman $B%G%#%l%/%H%j$O(B
 local/share/ $B$N2<$G$O$J$/!"(Blocal/ $B$ND>2<$KB8:_$7$^$9!#(Bports $B$N%I%-%e%a%s%H$O(B
 share/doc/<port>/ $B$KCV$+$l$^$9!#(B
-.It Li mdec/
-$B%V!<%H%W%m%0%i%`!#(B
-.Xr disklabel 8
-$B;2>H!#(B
 .It Li obj/
 $B%"!<%-%F%/%A%c0MB8$N%?!<%2%C%H%D%j!<!#(B
 /usr/src $B%D%j!<$r9=C[$9$k$3$H$G:n@.$5$l$k!#(B
diff -ur man/man7/mdoc.7 man/man7/mdoc.7
--- man/man7/mdoc.7	Wed Jun 14 22:42:11 2000
+++ man/man7/mdoc.7	Wed Jul  5 09:37:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.17 2000/03/03 14:05:00 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.17.2.2 2000/05/04 16:27:37 phantom Exp %
 .\"
 .\" jpman %Id: mdoc.7,v 1.5 1999/01/21 18:02:11 kuma Stab %
 .\"
@@ -102,6 +102,10 @@
 $B$H!"(B
 .Ql \&.Nd
 $B%^%/%m$r4^$`I,MW$,$"$j$^$9!#(B
+.It Ar LIBRARY
+$B4X?t$,AH$_9~$^$l$k%i%$%V%i%j!#(B
+.Ql \&.Lb
+$B%^%/%m$N$_$r%$%s%/%k!<%I$9$Y$-$G$9!#(B
 .It Ar SYNOPSIS
 $B;HMQJ}K!!#(B
 .It Ar DESCRIPTION
@@ -305,6 +309,11 @@
 .It Li \&Fd Ta Yes Ta Yes Ta "$B4X?t$NDj5A!#(B"
 .It Li \&Fn Ta Yes Ta Yes Ta "$B4X?t8F$S=P$7(B (.Fo $B$d(B .Fc $B$bF1MM(B)$B!#(B"
 .It Li \&Ic Ta Yes Ta Yes Ta "$BBPOCE*$J%3%^%s%I!#(B"
+.It Li \&Lb Ta \&No Ta \&No Ta "$B%i%$%V%i%jL>!#4{CN$N%i%$%V%i%j0lMw$O(B"
+.Xr mdoc.samples 7
+$B$N(B
+.Sx $B5,3J(B
+$B$N@a$r;2>H!#(B
 .It Li \&Li Ta Yes Ta Yes Ta "$B%j%F%i%k%F%-%9%H!#(B"
 .It Li \&Nm Ta Yes Ta Yes Ta "$B%3%^%s%IL>!#(B"
 .It Li \&Op Ta Yes Ta Yes Ta "$B%*%W%7%g%s(B (.Oo $B$d(B .Oc $B$bF1MM(B)$B!#(B"
@@ -353,10 +362,10 @@
 .It Li \&Ef Ta \&No Ta \&No Ta "$B%U%)%s%H%b!<%I=*N;!#(B"
 .It Li \&Em Ta Yes Ta Yes Ta "$B6/D4(B ($B8EIw$J1Q8l(B)$B!#(B"
 .It Li \&Eo Ta Yes Ta Yes Ta "$BJ8;zNs$G0O$`3+$-%/%)!<%H!#(B"
-.It Li \&Fx Ta \&No Ta \&No Ta Tn "FreeBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
+.It Li \&Fx Ta Yes Ta Yes Ta Tn "FreeBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
 .It Li \&No Ta Yes Ta Yes Ta "$BDL>o$N%F%-%9%H(B (no-op)$B!#(B"
 .It Li \&Ns Ta Yes Ta Yes Ta "$B6uGr$J$7!#(B"
-.It Li \&Nx Ta \&No Ta \&No Ta Tn "NetBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
+.It Li \&Nx Ta Yes Ta Yes Ta Tn "NetBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
 .It Li \&Pc Ta Yes Ta Yes Ta "$B4]3g8L(B(parenthesis)$BJD$8%/%)!<%H!#(B"
 .It Li \&Pf Ta Yes Ta \&No Ta "$B@\F,J8;zNs!#(B"
 .It Li \&Po Ta Yes Ta Yes Ta "$B4]3g8L(B(parenthesis)$B3+$-%/%)!<%H!#(B"
@@ -364,7 +373,7 @@
 .It Li \&Qc Ta Yes Ta Yes Ta "$B$^$C$9$0$J%@%V%k(B(double)$BJD$8%/%)!<%H!#(B"
 .It Li \&Ql Ta Yes Ta Yes Ta "$B%/%)!<%H$5$l$?%j%F%i%k!#(B"
 .It Li \&Qo Ta Yes Ta Yes Ta "$B$^$C$9$0$J%@%V%k(B(double)$B3+$-%/%)!<%H!#(B"
-.It Li \&Ox Ta \&No Ta \&No Ta Tn "OpenBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
+.It Li \&Ox Ta Yes Ta Yes Ta Tn "OpenBSD $B%*%Z%l!<%F%#%s%0%7%9%F%`!#(B"
 .It Li \&Qq Ta Yes Ta Yes Ta "$B$^$C$9$0$J%@%V%k(B(double)$B%/%)!<%H!#(B"
 .It Li \&Re Ta \&No Ta \&No Ta "$B;2>H=*N;!#(B"
 .It Li \&Rs Ta \&No Ta \&No Ta "$B;2>H3+;O!#(B"
diff -ur man/man7/mdoc.samples.7 man/man7/mdoc.samples.7
--- man/man7/mdoc.samples.7	Wed Jun 14 22:42:11 2000
+++ man/man7/mdoc.samples.7	Wed Jul  5 09:37:51 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.28 2000/03/03 14:05:00 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.28.2.4 2000/06/24 23:03:42 mpp Exp %
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
@@ -148,6 +148,7 @@
 .It "$B4X?t(B ($B%i%$%V%i%j%k!<%A%s(B)"
 .It "$B4X?t$N7?(B"
 .\" .It "$B%X%C%@%U%!%$%k(B ($B%=!<%9%3!<%I$r4^$`(B)"
+.It "$B%i%$%V%i%jL>(B"
 .It "$BBPOCE*$J%3%^%s%I(B"
 .It "$BL>>N(B"
 .It "$B%*%W%7%g%s(B"
@@ -1128,6 +1129,55 @@
 $B$r0z?t$J$7$G8F$S=P$9$N$O%(%i!<$G$9!#(B
 .Ql \&.Ic
 $B%^%/%m$O2r@O$5$l!"8F$S=P$72DG=$G$9!#(B
+.Ss $B%i%$%V%i%jL>(B
+.Ql \&.Lb
+$B%^%/%m$O!"4X?t$,$I$N%i%$%V%i%j$KAH$_9~$^$l$k$+$r;XDj$7$^$9!#(B
+.Pp
+.Dl $B;H$$J}(B: .Lb argument ... \*(Pu
+.Pp
+.Ql \&.Lb 
+$B%^%/%m$KBP$7$F;HMQ2DG=$J0z?t$H7k2L$O<!$NDL$j$G$9(B:
+.Pp
+.Bl -tag -width "libnetgraph" -compact -offset indent
+.It Li "libc"
+.Lb libc
+.It Li "libc_r"
+.Lb libc_r
+.It Li "libcalendar"
+.Lb libcalendar
+.It Li "libcam"
+.Lb libcam
+.It Li "libcrypt"
+.Lb libcrypt
+.It Li "libdevstat"
+.Lb libdevstat
+.It Li "libdisk"
+.Lb libdisk
+.It Li "libedit"
+.Lb libedit
+.It Li "libfetch"
+.Lb libfetch
+.It Li "libipsec"
+.Lb libipsec
+.It Li "libipx"
+.Lb libipx
+.It Li "libkvm"
+.Lb libkvm
+.It Li "libm"
+.Lb libm
+.It Li "libmd"
+.Lb libmd
+.It Li "libnetgraph"
+.Lb libnetgraph
+.It Li "libposix1e"
+.Lb libposix1e
+.It Li "libskey"
+.Lb libskey
+.It Li "libutil"
+.Lb libutil
+.It Li "libvgl"
+.Lb libvgl
+.El
 .Ss $BL>>N%^%/%m(B
 .Ql \&.Nm
 $B%^%/%m$OJ8=q$N%?%$%H%k$d%5%V%8%'%/%HL>$r;XDj$9$k$?$a$K;H$o$l$^$9!#(B
@@ -1389,11 +1439,7 @@
 .Ql \&.Fx ,
 .Ql \&.Nx ,
 .Ql \&.Ox
-$B%^%/%m$O2r@O(B
-.Em $B$5$l$:(B
-$B!"8F$S=P$7(B
-.Em $BIT2DG=(B
-$B$G$9!#(B
+$B%^%/%m$O2r@O$5$l!"8F$S=P$72DG=$G$9!#(B
 $B:GBg(B 2 $B$D$^$G$N0z?t$r<h$k$3$H$,$G$-$^$9!#(B
 .Ss UNIX $B%^%/%m(B
 .Dl $B;H$$J}(B: .Ux ... \*(Pu
diff -ur man/man7/security.7 man/man7/security.7
--- man/man7/security.7	Wed Jun 14 22:42:11 2000
+++ man/man7/security.7	Wed Jul  5 09:37:57 2000
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\" %FreeBSD: src/share/man/man7/security.7,v 1.13 2000/03/07 13:59:26 nik Exp %
+.\" %FreeBSD: src/share/man/man7/security.7,v 1.13.2.1 2000/05/09 14:12:52 sheldonh Exp %
 p %
 .\"
 .\" jpman %Id: security.7,v 1.3 1999/02/11 11:18:48 vanitas Stab %
@@ -121,7 +121,7 @@
 root $B$N8"8B$rGK$k$3$H$,2DG=$G$"$k$H$$$&%P%0$r;}$D(B suid-root $B%W%m%0%i%`$N(B
 $BB8:_$r!"967b<T$OCN$C$F$$$k$+$b$7$l$^$;$s!#(B
 $B$"$k%^%7%s>e$G!"967b<T$,(B root $B$N8"8B$rGK$kJ}K!$rCN$C$?$H$9$k$H!"(B
-.Pa $B967b<T$O!"N"8}$r:n$kI,MW$J$I$J$$$+$b$7$l$^$;$s!#(B
+$B967b<T$O!"N"8}$r:n$kI,MW$J$I$J$$$+$b$7$l$^$;$s!#(B
 $BH/8+$5$l!"$U$5$,$l$?(B root $B$N7j$NB?$/$K$O!"%/%i%C%+!<$,?/F~$7$?@W$r>C$=$&$H$7$F(B
 $B$?$/$5$s;E;v$7$?7k2L$,4^$^$l$F$$$^$9!#(B
 $B$=$N$?$a$K$3$=!"B?$/$N%/%i%C%+!<$ON"8}$r:n$k$N$G$9!#$3$NN"8}$O!"%/%i%C%+!<$N(B

----Next_Part(Tue_Jul__4_21:41:59_2000_41)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_4.0-20000703-STABLE_567
Content-Disposition: attachment; filename=diff_4.0-20000703-STABLE_567

diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/amd.conf.5 man5/amd.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/amd.conf.5	Tue Mar 21 06:31:54 2000
+++ man5/amd.conf.5	Mon Jul  3 19:52:55 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp $
-.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.9 1999/09/15 05:45:17 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.9.2.1 2000/05/09 14:12:51 sheldonh Exp %
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
@@ -678,8 +678,8 @@
 .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
 .Pp
-.An Other Authors and contributers to am-utils are listed in the 
-.Nm AUTHORS
+Other authors and contributers to am-utils are listed in the 
+.Pa AUTHORS
 file distributed with am-utils.
 .Sh HISTORY
 The
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/crontab.5 man5/crontab.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/crontab.5	Tue Mar 21 06:32:00 2000
+++ man5/crontab.5	Mon Jul  3 19:53:02 2000
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" %FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.12.2.1 2000/03/13 19:32:12 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.12.2.2 2000/06/22 12:50:15 sheldonh Exp %
 .\" 
 .Dd January 24, 1994
 .Dt CRONTAB 5
@@ -55,6 +55,10 @@
 .Em value
 string may be placed in quotes (single or double, but matching) to preserve
 leading or trailing blanks.
+The
+.Em name
+string may also be placed in quote (single or double, but matching)
+to preserve leading, traling or inner blanks.
 .Pp
 Several environment variables are set up
 automatically by the
@@ -182,6 +186,21 @@
 ``30 4 1,15 * 5''
 would cause a command to be run at 4:30 am on the 1st and 15th of each
 month, plus every Friday.
+.Pp
+Instead of the first five fields,
+one of eight special strings may appear:
+.Bd -literal -offset indent
+string		meaning
+------		-------
+@reboot		Run once, at startup.
+@yearly		Run once a year, "0 0 1 1 *".
+@annually	(sames as @yearly)
+@monthly	Run once a month, "0 0 1 * *".
+@weekly		Run once a week, "0 0 * * 0".
+@daily		Run once a day, "0 0 * * *".
+@midnight	(same as @daily)
+@hourly		Run once an hour, "0 * * * *".
+.Ed
 .Sh EXAMPLE CRON FILE
 .Bd -literal
 
@@ -221,6 +240,11 @@
 mailed to a person other than the crontab owner (SysV can't do this), or the
 feature can be turned off and no mail will be sent at all (SysV can't do this
 either).
+.Pp
+All of the
+.Sq @
+commands that can appear in place of the first five fields
+are extensions.
 .Sh AUTHORS
 .An Paul Vixie Aq paul@vix.com
 .Sh BUGS
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/lastlog.5 man5/lastlog.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/lastlog.5	Tue Mar 21 06:30:41 2000
+++ man5/lastlog.5	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9 1999/08/28 00:20:51 peter Exp %
+.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9.2.1 2000/05/24 13:29:24 mpp Exp %
 .\"
 .Dd March 17, 1994
 .Dt UTMP 5
@@ -82,7 +82,7 @@
         char    ut_line[UT_LINESIZE];
         char    ut_name[UT_NAMESIZE];
         char    ut_host[UT_HOSTSIZE];
-        long    ut_time;
+        time_t  ut_time;
 };
 .Ed
 .Pp
Only in man5: linprocfs.5
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/login.conf.5 man5/login.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/login.conf.5	Tue Mar 21 06:27:35 2000
+++ man5/login.conf.5	Mon Jul  3 19:47:59 2000
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.22 2000/03/02 09:13:29 sheldonh Exp %
+.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.22.2.1 2000/06/02 20:53:55 alfred Exp %
 .\"
 .Dd November 22, 1996
 .Dt LOGIN.CONF 5
@@ -159,6 +159,7 @@
 .It memorylocked	size		Maximum locked in core memory size limit.
 .It maxproc	number		Maximum number of processes.
 .It openfiles	number		Maximum number of open files per process.
+.It sbsize	number		Maximum permitted socketbuffer size.
 .El
 .Pp
 These resource limit entries actually specify both the maximum
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/opiekeys.5 man5/opiekeys.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/opiekeys.5	Tue Mar 21 06:28:09 2000
+++ man5/opiekeys.5	Mon Jul  3 19:48:25 2000
@@ -1,4 +1,4 @@
-.\" opieaccess.5: Manual page describing the /etc/opiekeys file.
+.\" opiekeys.5: Manual page describing the /etc/opiekeys file.
 .\"
 .\" Portions of this software are Copyright 1995 by Randall Atkinson and Dan
 .\" McDonald, All Rights Reserved. All Rights under this copyright are assigned
@@ -7,11 +7,14 @@
 .\"
 .\"	History:
 .\"
+.\"	Modified by cmetz for OPIE 2.32. This is opiekeys.5, not opiekeys.1 or
+.\"         opieaccess.5.
 .\"	Written at NRL for OPIE 2.0.
 .\"
 .ll 6i
 .pl 10.5i
 .\"	@(#)opiekeys.5	2.0 (NRL) 1/10/95
+.\"	%FreeBSD: src/contrib/opie/opiekeys.5,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .\"
 .lt 6.0i
 .TH OPIEKEYS 5 "January 10, 1995"
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/passwd.5 man5/passwd.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/passwd.5	Tue Mar 21 06:30:41 2000
+++ man5/passwd.5	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.26 2000/03/02 14:53:51 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.26.2.1 2000/06/30 16:14:07 wollman Exp %
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
@@ -42,7 +42,9 @@
 The
 .Nm passwd
 files are files consisting of newline separated records, one per user,
-containing ten colon (``:'') separated fields.  These fields are as
+containing ten colon
+.Pq Ql \&:
+separated fields.  These fields are as
 follows:
 .Pp
 .Bl -tag -width password -offset indent
@@ -83,15 +85,17 @@
 control file access.
 .Pp
 While it is possible to have multiple entries with identical login names
-and/or identical user id's, it is usually a mistake to do so.  Routines
+and/or identical uids, it is usually a mistake to do so.  Routines
 that manipulate these files will often return only one of the multiple
 entries, and that one by random selection.
 .Pp
-The login name must never begin with a hyphen (``-''); also, it is strongly
-suggested that neither upper-case characters nor dots (``.'') be part
-of the name, as this tends to confuse mailers.  No field may contain a
-colon (``:'') as this has been used historically to separate the fields
-in the user database.
+The login name must never begin with a hyphen
+.Pq Ql \&- ;
+also, it is strongly
+suggested that neither upper-case characters nor dots
+.Pq Ql \&.
+be part
+of the name, as this tends to confuse mailers.
 .Pp
 The password field is the
 .Em encrypted
@@ -143,20 +147,26 @@
 .Pp
 The
 .Ar gecos
-field normally contains comma (``,'') separated subfields as follows:
+field normally contains comma
+.Pq Ql \&,
+separated subfields as follows:
 .Pp
-.Bd -unfilled -offset indent
-fullname		user's full name
-office		user's office location
-wphone		user's work phone number
-hphone		user's home phone number
-.Ed
+.Bl -bullet -compact -offset indent
+.It
+user's full name
+.It
+user's office location
+.It
+user's work phone number
+.It
+user's home phone number
+.El
 .Pp
 This information is used by the
 .Xr finger 1
 program, and the first field used by the system mailer.
 If an ampersand
-.Ql \&&
+.Pq Ql \&&
 character appears within the fullname field, programs that
 use this field will substitute it with a capitalized version
 of the account's login name.
@@ -205,12 +215,16 @@
 .Xr pwd_mkdb 8 .
 .Pp
 The simplest way to activate NIS is to add an empty record
-with only a plus sign (`+') in the name field, such as this:
+with only a plus sign
+.Pq Ql \&+
+in the name field, such as this:
 .Bd -literal -offset indent
 +:::::::::
 
 .Ed
-The `+' will tell the
+The
+.Ql \&+
+will tell the
 .Xr getpwent 3
 routines in
 .Tn FreeBSD Ns 's
@@ -219,11 +233,15 @@
 .Pp
 Note that the entry shown above is known as a
 .Em wildcard
-entry, because it matches all users (the `+' without any other information
+entry, because it matches all users (the
+.Ql \&+
+without any other information
 matches everybody) and allows all NIS password data to be retrieved
 unaltered.
 However, by
-specifying a username or netgroup next to the `+' in the NIS
+specifying a username or netgroup next to the
+.Ql \&+
+in the NIS
 entry, the administrator can affect what data are extracted from the
 NIS passwd maps and how it is interpreted.
 Here are a few example
@@ -241,31 +259,53 @@
 
 .Ed
 Specific usernames are listed explicitly while netgroups are signified
-by a preceding `@'. In the above example, users in the ``staff'' and
-``permitted-users'' netgroups will have their password information
+by a preceding
+.Ql \&@ .
+In the above example, users in the
+.Dq staff
+and
+.Dq permitted-users
+netgroups will have their password information
 read from NIS and used unaltered.
 In other words, they will be allowed
 normal access to the machine.
-Users ``ken'' and ``dennis,'' who have
+Users
+.Dq ken
+and
+.Dq dennis ,
+who have
 been named explicitly rather than through a netgroup, will also have
-their password data read from NIS, _except_ that user ``ken'' will
-have his shell remapped to
+their password data read from NIS,
+.Em except
+that user
+.Dq ken
+will have his shell remapped to
 .Pa /bin/csh .
 This means that value for his shell specified in the NIS password map
 will be overridden by the value specified in the special NIS entry in
 the local
 .Pa master.passwd
 file.
-User ``ken'' may have been assigned the csh shell because his
+User
+.Dq ken
+may have been assigned the csh shell because his
 NIS password entry specified a different shell that may not be
 installed on the client machine for political or technical reasons.
-Meanwhile, users in the ``rejected-users'' netgroup are prevented
+Meanwhile, users in the
+.Dq rejected-users
+netgroup are prevented
 from logging in because their UIDs, GIDs and shells have been overridden
 with invalid values.
 .Pp
-User ``mitnick'' will be be ignored entirely because his entry is
-specified with a `-' instead of a `+'. A minus entry can be used
-to block out certain NIS password entries completely; users who's
+User
+.Dq mitnick
+will be be ignored entirely because his entry is
+specified with a
+.Ql \&-
+instead of a
+.Ql \&+ .
+A minus entry can be used
+to block out certain NIS password entries completely; users whose
 password data has been excluded in this way are not recognized by
 the system at all.
 (Any overrides specified with minus entries are
@@ -274,12 +314,16 @@
 In general, a minus entry is used to specifically exclude a user
 who might otherwise be granted access because he happens to be a
 member of an authorized netgroup.
-For example, if ``mitnick'' is
-a member of the ``permitted-users'' netgroup and must, for whatever
+For example, if
+.Dq mitnick
+is
+a member of the
+.Dq permitted-users
+netgroup and must, for whatever
 the reason, be permitted to remain in that netgroup (possibly to
 retain access to other machines within the domain), the administrator
 can still deny him access to a particular system with a minus entry.
-Also, it is sometimes easier to explicitly list those users who aren't
+Also, it is sometimes easier to explicitly list those users who are not
 allowed access rather than generate a possibly complicated list of
 users who are allowed access and omit the rest.
 .Pp
@@ -287,13 +331,23 @@
 first to last with the first match taking precedence.
 This means
 the system will only use the first entry that matches a particular user.
-If, for instance, we have a user ``foo'' who is a member of both the ``staff''
-netgroup and the ``rejected-users'' netgroup, he will be admitted to
-the system because the above example lists the entry for ``staff'' 
-before the entry for ``rejected-users.''
-If we reversed the order,
-user ``foo'' would be flagged as a ``rejected-user'' instead and
-denied access.
+If, using the same example, there is a user
+.Dq foo
+who is a member of both the
+.Dq staff
+netgroup and the
+.Dq rejected-users
+netgroup, he will be admitted to
+the system because the above example lists the entry for
+.Dq staff
+before the entry for
+.Dq rejected-users .
+If the order were reversed,
+user
+.Dq foo
+would be flagged as a
+.Dq rejected-user
+instead and denied access.
 .Pp
 Lastly, any NIS password database records that do not match against
 at least one of the users or netgroups specified by the NIS access
@@ -303,9 +357,16 @@
 entries). In our example shown above, we do not have a wildcard
 entry at the end of the list; therefore, the system will not recognize
 anyone except
-``ken,'' ``dennis,'' the ``staff'' netgroup and the ``permitted-users''
+.Dq ken ,
+.Dq dennis ,
+the
+.Dq staff
+netgroup, and the
+.Dq permitted-users
 netgroup as authorized users.
-The ``rejected-users'' netgroup will
+The
+.Dq rejected-users
+netgroup will
 be recognized but all members will have their shells remapped and
 therefore be denied access.
 All other NIS password records
@@ -313,19 +374,15 @@
 The administrator may add a wildcard entry to the
 end of the list such as:
 .Bd -literal -offset indent
-+:::::::::/usr/local/bin/go_away
++:::::::::/sbin/nologin
 
 .Ed
 This entry acts as a catch-all for all users that don't match against
 any of the other entries.
-.Pa /usr/local/bin/go_away
-can be a short shell script or program
-that prints a message telling the user that he is not allowed access
-to the system.
 This technique is sometimes useful when it is
 desirable to have the system be able to recognize all users in a
 particular NIS domain without necessarily granting them login access.
-See the above text on the shell field regarding security concerns when using
+See the description of the shell field regarding security concerns when using
 a shell script as the login shell.
 .Pp
 The primary use of this
@@ -459,11 +516,13 @@
 .Sy FILE!!
 The first tells
 .Tn FreeBSD
-to remap all passwords to `*' (which
+to remap all passwords to
+.Ql \&*
+(which
 will prevent anybody from logging in) and to remap all UIDs and GIDs
 to 0 (which will make everybody appear to be the superuser). The
 second case just maps all UIDs and GIDs to 0, which means that
-.Pa all users will appear to be root!
+all users will appear to be root!
 .Pp
 .Ss Compatibility of NIS override evaluation
 When Sun originally added NIS support to their
@@ -478,17 +537,25 @@
 The
 .Tn SunOS
 documentation claims that
-adding a '+' entry to the password file causes the contents of
-the NIS password database to be 'inserted' at the position in
-the file where the '+' entry appears.
+adding a 
+.Ql \&+
+entry to the password file causes the contents of
+the NIS password database to be
+.Dq inserted
+at the position in the file where the
+.Ql \&+
+entry appears.
 If, for example, the
-administrator places the +:::::: entry in the middle of
-.Pa /etc/passwd,
+administrator places a
+.Ql \&+::::::
+entry in the middle of
+.Pa /etc/passwd ,
 then the entire contents of the NIS password map would appear
 as though it had been copied into the middle of the password
 file.
-If the administrator places the +:::::: entry at both the
-middle and the end of
+If the administrator places
+.Ql \&+::::::
+entries at both the middle and the end of
 .Pa /etc/passwd ,
 then the NIS password map would appear twice: once in the middle
 of the file and once at the end.
@@ -496,7 +563,7 @@
 instead of simple wildcards, other combinations could be achieved.)
 .Pp
 By contrast,
-.Tn FreeBSD
+.Fx
 does not have a single
 .Tn ASCII
 password file: it
@@ -531,15 +598,19 @@
 treated accordingly: if the filter allows the entry through
 unaltered, it's treated unaltered; if the filter calls for remapping
 of fields, then fields are remapped; if the filter calls for
-explicit exclusion (i.e. the entry matches a '-' override),
-the entry is ignored; if the entry doesn't match against any
+explicit exclusion (i.e., the entry matches a
+.Ql \&-
+override), the entry is ignored; if the entry doesn't match against any
 of the filter specifications, it's discarded.
 .Pp
-Again, note that the NIS '+' and '-' entries
-themselves are handled in the order in which they were specified
+Again, note that the NIS
+.Ql \&+
+and
+.Ql \&-
+entries themselves are handled in the order in which they were specified
 in the
 .Pa /etc/master.passwd
-file since doing otherwise would lead to unpredictable behavior.
+file, since doing otherwise would lead to unpredictable behavior.
 .Pp
 The end result is that
 .Tn FreeBSD Ns 's
@@ -557,12 +628,16 @@
 Each NIS password map record can be mapped into the password
 local password space only once.
 .It
-The placement of the NIS '+' and '-' entries does not necessarily
+The placement of the NIS
+.Ql \&+
+and
+.Ql \&-
+entries does not necessarily
 affect where NIS password records will be mapped into
 the password space.
 .El
 .Pp
-In %99 of all
+In 99% of all
 .Tn FreeBSD
 configurations, NIS client behavior will be
 indistinguishable from that of
@@ -582,9 +657,13 @@
 
 .Ed
 the system will first try to match users against a netgroup called
-`operator'. If an `operator' netgroup doesn't exist, the system
-will try to match users against the normal `operator' group
-instead. 
+.Ql operator .
+If an
+.Ql operator
+netgroup doesn't exist, the system
+will try to match users against the normal
+.Ql operator
+group instead. 
 .Ss Changes in behavior from older versions of FreeBSD
 There have been several bug fixes and improvements in
 .Tn FreeBSD Ns 's
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/pccard.conf.5 man5/pccard.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/pccard.conf.5	Tue Mar 21 06:32:11 2000
+++ man5/pccard.conf.5	Mon Jul  3 19:53:13 2000
@@ -23,7 +23,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.
 .\"
-.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.12 2000/03/01 14:09:20 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.12.2.2 2000/06/05 14:59:03 iwasaki Exp %
 .\"
 .Dd November 2, 1994
 .Dt PCCARD.CONF 5
@@ -54,6 +54,17 @@
 The latter two may appear in any order, and may be
 interspersed as desired.
 .Pp
+The
+.Pa /etc/pccard.conf
+file is included from the file
+.Pa /etc/defaults/pccard.conf ,
+which contains the default resource pool settings and
+pccard identifiers database.
+The user specific configuration can be specified in 
+.Pa /etc/rc.conf
+when the user wishes to override these defaults and/or
+add additional entries.
+.Pp
 Each PC-CARD card contains configuration tuples that provide
 the manufacturer and card version; these are used
 to identify the card specification in the configuration
@@ -130,7 +141,7 @@
 .Ss "Card Identifiers"
 The syntax for card identifiers is:
 .Pp
-.Dl card Ar manufacturer version
+.Dl card Ar manufacturer version [ add_info1 [ add_info2 ]]
 .Dl config Ar index driver interrupt [ flags ]
 .Dl ether Ar offset
 .Dl insert Ar command
@@ -144,8 +155,14 @@
 lines.
 The
 .Em card
-parameters are the Manufacturer name and card version that
+parameters are the Manufacturer name, card version and
+additional information add_info1, add_info2 that
 is used to match the values from the card's CIS memory.
+These parameter can be described in extended regular expression
+.Xr regex 3
+if the string is enclosed by '/' like "/.*/".
+Each of the expressions is evaluated with a character '^' at top.
+.Pp
 The
 .Em config
 parameters select the particular card's configuration index
@@ -184,6 +201,29 @@
 .Em remove
 commands are allowed, and they are executed in the order they
 are listed.
+.Ss "Wildcard entries"
+Following two wildcard entries of card identifiers are available
+for generic type of the cards:
+.Pp    
+.Dl generic serial
+.Dl generic fixed_disk
+.Pp 
+The keyword
+.Em serial
+matches ``Functional ID: Serial port/modem'' and
+.Em fixed_disk
+matches ``Fixed disk card''.
+The syntax is the same of
+.Em "card identifiers"
+but used ``generic'' instead of ``card'' in the first line.
+These are in the last of
+.Nm  
+because unmatched cards with the other
+.Em card
+entries can match these entries secondly.
+The alias ``function'' can be used instead of ``generic'' because of
+the historical reason.
+.Pp  
 .Sh EXAMPLE
 A typical configuration file may appear thus:
 .Bd -literal
@@ -213,11 +253,14 @@
 
 .Ed
 .Sh FILES
-.Bl -tag -width /etc/pccard.conf -compact
-.It Pa /etc/pccard.conf
+.Bl -tag -width /etc/defaults/pccard.conf -compact
+.It Pa /etc/defaults/pccard.conf
 The
 .Xr pccardd 8
-configuration file.
+default configuration file.
+.It Pa /etc/pccard.conf
+The
+user configuration file.
 .El
 .Sh SEE ALSO
 .Xr pccardd 8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/pim6dd.conf.5 man5/pim6dd.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/pim6dd.conf.5	Tue Mar 21 06:32:12 2000
+++ man5/pim6dd.conf.5	Mon Jul  3 19:53:13 2000
@@ -26,15 +26,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6dd.conf.5,v 1.2 1999/12/10 06:08:49 itojun Exp $
-.\"	%FreeBSD: src/usr.sbin/pim6dd/pim6dd.conf.5,v 1.2 2000/03/01 14:08:13 sheldonh Exp %
+.\"	%FreeBSD: src/usr.sbin/pim6dd/pim6dd.conf.5,v 1.2.2.3 2000/05/09 14:12:52 sheldonh Exp %
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD.CONF 5
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6dd.conf
 .Nd "config file for pim6dd, PIM for IPv6 dense mode daemon"
-.\"
 .Sh DESCRIPTION
 The file describes how the
 .Nm pim6dd
@@ -91,7 +90,7 @@
 Specifies an output filter.
 If an incoming multicast packet's destination
 matches the specified
-.Ar groupaddrs,
+.Ar groupaddrs ,
 the packet is not sent on the
 .Ar interfaces.
 Moreover, if there is no other interface than the specified
@@ -130,8 +129,8 @@
 .\"
 .Sh EXAMPLE
 .Bd -literal -offset
-#phyint gif0 disable
-#phyint ep0 preference 101
+# phyint gif0 disable
+# phyint ep0 preference 101
 phyint de0 disable
 filter ff15::4000/120 gif1 gif2
 filter ff18::1000-ff18::1050 gif3
@@ -144,7 +143,7 @@
 command and the configuration file
 .Nm
 are based on
-.Nm pimdd,
+.Nm pimdd ,
 which is an IPv4 multicast routing daemon
 developed at the University of Oregon.
 .Nm Pimdd
@@ -156,5 +155,7 @@
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/pim6sd.conf.5 man5/pim6sd.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/pim6sd.conf.5	Tue Mar 21 06:32:12 2000
+++ man5/pim6sd.conf.5	Mon Jul  3 19:53:14 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6sd.conf.5,v 1.7 1999/12/03 07:31:45 jinmei Exp $
-.\"	%FreeBSD: src/usr.sbin/pim6sd/pim6sd.conf.5,v 1.2 2000/03/01 14:08:15 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pim6sd/pim6sd.conf.5,v 1.2.2.2 2000/05/06 14:22:21 phantom Exp %
 .\"
 .Dd Oct 6, 1999
 .Dt PIM6SD.CONF 5
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6sd.conf
 .Nd config file for pim6sd, PIM-SM daemon for IPv6
@@ -308,8 +308,8 @@
 .\"
 .Sh EXAMPLE
 .Bd -literal -offset
-#phyint gif0 disable;
-#phyint ep0 preference 101;
+# phyint gif0 disable;
+# phyint ep0 preference 101;
 phyint de0 disable;
 #
 #followings are for a candidate Rendezvous Point, which should usually
@@ -331,5 +331,7 @@
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/rc.conf.5 man5/rc.conf.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/rc.conf.5	Tue Mar 21 06:30:41 2000
+++ man5/rc.conf.5	Mon Jul  3 19:51:36 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.64 2000/03/03 14:04:56 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.64.2.4 2000/04/27 10:43:18 des Exp %
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -154,6 +154,10 @@
 .Ar YES ,
 and the kernel was not built with IPFIREWALL, the ipfw
 kernel module will be loaded.
+.It Ar firewall_script
+(str) If you want to run a firewall script other than
+.Pa /etc/rc.firewall ,
+set this variable to the full path to that script.
 .It Ar firewall_type
 (str) Names the firewall type from the selection in 
 .Pa /etc/rc.firewall ,
@@ -491,10 +495,17 @@
 .Ar YES ,
 allow services like PCNFSD to make non-privileged mount
 requests.
-.It Ar nfs_reserved_port_only
+.It Ar nfs_privport
 (bool) If set to
 .Ar YES ,
 provide NFS services only on a secure port.
+.It Ar nfs_bufpackets
+(integer) If set to a number, indicates the number of packets worth of
+socket buffer space to reserve on an NFS client.  If set to
+.Ar DEFAULT ,
+the kernel default is used (typically 4).  Using a higher number may be
+useful on gigabit networks to improve performance.  The minimum value is
+2 and the maximum is 64.
 .It Ar rcp_lockd_enable
 (bool) If set to
 .Ar YES
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/utmp.5 man5/utmp.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/utmp.5	Tue Mar 21 06:30:41 2000
+++ man5/utmp.5	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9 1999/08/28 00:20:51 peter Exp %
+.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9.2.1 2000/05/24 13:29:24 mpp Exp %
 .\"
 .Dd March 17, 1994
 .Dt UTMP 5
@@ -82,7 +82,7 @@
         char    ut_line[UT_LINESIZE];
         char    ut_name[UT_NAMESIZE];
         char    ut_host[UT_HOSTSIZE];
-        long    ut_time;
+        time_t  ut_time;
 };
 .Ed
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man5/wtmp.5 man5/wtmp.5
--- /home/horikawa/man-jp/work/fbsd-400r/man/man5/wtmp.5	Tue Mar 21 06:30:41 2000
+++ man5/wtmp.5	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9 1999/08/28 00:20:51 peter Exp %
+.\" %FreeBSD: src/share/man/man5/utmp.5,v 1.9.2.1 2000/05/24 13:29:24 mpp Exp %
 .\"
 .Dd March 17, 1994
 .Dt UTMP 5
@@ -82,7 +82,7 @@
         char    ut_line[UT_LINESIZE];
         char    ut_name[UT_NAMESIZE];
         char    ut_host[UT_HOSTSIZE];
-        long    ut_time;
+        time_t  ut_time;
 };
 .Ed
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man6/banner.6 man6/banner.6
--- /home/horikawa/man-jp/work/fbsd-400r/man/man6/banner.6	Tue Mar 21 06:31:10 2000
+++ man6/banner.6	Mon Jul  3 19:52:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\" %FreeBSD: src/usr.bin/banner/banner.6,v 1.4 1999/08/28 00:59:10 peter Exp %
+.\" %FreeBSD: src/usr.bin/banner/banner.6,v 1.4.2.1 2000/07/01 12:32:34 ps Exp %
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
@@ -40,23 +40,34 @@
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm banner
-.Op Fl w Ar n
+.Op Fl d
+.Op Fl t
+.Op Fl w Ar width
 .Ar message ...
 .Sh DESCRIPTION
 .Nm Banner
 prints a large, high quality banner on the standard output.
 If the message is omitted, it prompts for and reads one line of its
 standard input.
-If
-.Fl w
-is given, the output is changed from a width of 132 to
-.Ar n ,
-suitable for a narrow terminal.
 .Pp
 The output should be printed on paper of the appropriate width,
 with no breaks between the pages.
+.Pp
+The following options are available:
+.Bl -tag -width indent
+.It Fl d
+Enable debug.
+.It Fl t
+Enable trace.
+.It Fl w Ar width
+Change the output from a width of 132 to
+.Ar width ,
+suitable for a narrow terminal.
+.El
 .Sh BUGS
-Several ASCII characters are not defined, notably <, >, [, ], \\,
+Several
+.Tn ASCII
+characters are not defined, notably <, >, [, ], \\,
 ^, _, {, }, |, and ~.
 Also, the characters ", ', and & are funny looking (but in a useful way.)
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man7/hier.7 man7/hier.7
--- /home/horikawa/man-jp/work/fbsd-400r/man/man7/hier.7	Tue Mar 21 06:30:42 2000
+++ man7/hier.7	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man7/hier.7,v 1.29 2000/01/30 04:22:11 kris Exp %
+.\" %FreeBSD: src/share/man/man7/hier.7,v 1.29.2.2 2000/06/13 08:30:58 ru Exp %
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -275,6 +275,8 @@
 .It Li lib/
 archive libraries
 .Bl -tag -width Fl -compact
+.It Li aout/
+a.out archive libraries
 .It Li compat/
 shared libraries for compatibility
 .Bl -tag -width Fl -compact
@@ -341,10 +343,6 @@
 for /usr
 should be used.  Exceptions are the man directory is directly under local/
 rather than under local/share/.  Ports documentation is in share/doc/<port>/
-.It Li mdec/
-boot programs;
-see
-.Xr disklabel 8
 .It Li obj/
 architecture-specific target tree produced by building the /usr/src tree
 .It Li ports
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man7/mdoc.7 man7/mdoc.7
--- /home/horikawa/man-jp/work/fbsd-400r/man/man7/mdoc.7	Tue Mar 21 06:30:42 2000
+++ man7/mdoc.7	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.17 2000/03/03 14:05:00 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.17.2.2 2000/05/04 16:27:37 phantom Exp %
 .\"
 .Dd December 30, 1993
 .Os
@@ -93,6 +93,11 @@
 and the
 .Ql \&.Nd
 macros.
+.It Ar LIBRARY
+Library where that function is compiled in.
+Should include
+.Ql \&.Lb
+macro only.
 .It Ar SYNOPSIS
 Usage.
 .It Ar DESCRIPTION
@@ -300,6 +305,10 @@
 .It Li \&Fd Ta Yes Ta Yes Ta "Function declaration."
 .It Li \&Fn Ta Yes Ta Yes Ta "Function call (also .Fo and .Fc)."
 .It Li \&Ic Ta Yes Ta Yes Ta "Interactive command."
+.It Li \&Lb Ta \&No Ta \&No Ta "Library name; see"
+.Xr mdoc.samples 7 ,
+.Sx Standards
+section for complete list of known libraries.
 .It Li \&Li Ta Yes Ta Yes Ta "Literal text."
 .It Li \&Nm Ta Yes Ta Yes Ta "Command name."
 .It Li \&Op Ta Yes Ta Yes Ta "Option (also .Oo and .Oc)."
@@ -346,10 +355,10 @@
 .It Li \&Ef Ta \&No Ta \&No Ta "End font mode."
 .It Li \&Em Ta Yes Ta Yes Ta "Emphasis (traditional English)."
 .It Li \&Eo Ta Yes Ta Yes Ta "Enclose string open quote."
-.It Li \&Fx Ta \&No Ta \&No Ta Tn "FreeBSD operating system."
+.It Li \&Fx Ta Yes Ta Yes Ta Tn "FreeBSD operating system."
 .It Li \&No Ta Yes Ta Yes Ta "Normal text (no-op)."
 .It Li \&Ns Ta Yes Ta Yes Ta "No space."
-.It Li \&Nx Ta \&No Ta \&No Ta Tn "NetBSD operating system."
+.It Li \&Nx Ta Yes Ta Yes Ta Tn "NetBSD operating system."
 .It Li \&Pc Ta Yes Ta Yes Ta "Parenthesis close quote."
 .It Li \&Pf Ta Yes Ta \&No Ta "Prefix string."
 .It Li \&Po Ta Yes Ta Yes Ta "Parenthesis open quote."
@@ -358,7 +367,7 @@
 .It Li \&Ql Ta Yes Ta Yes Ta "Quoted literal."
 .It Li \&Qo Ta Yes Ta Yes Ta "Straight Double open quote."
 .It Li \&Qq Ta Yes Ta Yes Ta "Straight Double quote."
-.It Li \&Ox Ta \&No Ta \&No Ta Tn "OpenBSD operating system."
+.It Li \&Ox Ta Yes Ta Yes Ta Tn "OpenBSD operating system."
 .It Li \&Re Ta \&No Ta \&No Ta "Reference end."
 .It Li \&Rs Ta \&No Ta \&No Ta "Reference start."
 .It Li \&Rv Ta \&No Ta \&No Ta "Return values (sections two and three only)."
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man7/mdoc.samples.7 man7/mdoc.samples.7
--- /home/horikawa/man-jp/work/fbsd-400r/man/man7/mdoc.samples.7	Tue Mar 21 06:30:42 2000
+++ man7/mdoc.samples.7	Mon Jul  3 19:51:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.28 2000/03/03 14:05:00 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.28.2.4 2000/06/24 23:03:42 mpp Exp %
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
@@ -144,6 +144,7 @@
 .It "Functions (library routines)" .
 .It "Function Types" .
 .\" .It "Header File (including source code)" .
+.It "Library name" .
 .It "Interactive Commands" .
 .It "Names" .
 .It "Options" .
@@ -1226,6 +1227,57 @@
 The
 .Ql \&.Ic
 macro is parsed and is callable.
+.Ss Library Name
+The
+.Ql \&.Lb
+macro is used to specify library where that function is compiled in.
+.Pp
+.Dl Usage: .Lb argument ... \*(Pu
+.Pp
+Available arguments to
+.Ql \&.Lb 
+macro and its results are:
+.Pp
+.Bl -tag -width "libnetgraph" -compact -offset indent
+.It Li "libc"
+.Lb libc
+.It Li "libc_r"
+.Lb libc_r
+.It Li "libcalendar"
+.Lb libcalendar
+.It Li "libcam"
+.Lb libcam
+.It Li "libcrypt"
+.Lb libcrypt
+.It Li "libdevstat"
+.Lb libdevstat
+.It Li "libdisk"
+.Lb libdisk
+.It Li "libedit"
+.Lb libedit
+.It Li "libfetch"
+.Lb libfetch
+.It Li "libipsec"
+.Lb libipsec
+.It Li "libipx"
+.Lb libipx
+.It Li "libkvm"
+.Lb libkvm
+.It Li "libm"
+.Lb libm
+.It Li "libmd"
+.Lb libmd
+.It Li "libnetgraph"
+.Lb libnetgraph
+.It Li "libposix1e"
+.Lb libposix1e
+.It Li "libskey"
+.Lb libskey
+.It Li "libutil"
+.Lb libutil
+.It Li "libvgl"
+.Lb libvgl
+.El
 .Ss Name Macro
 The
 .Ql \&.Nm
@@ -1512,11 +1564,8 @@
 .Ql \&.Fx ,
 .Ql \&.Nx ,
 .Ql \&.Ox
-macros are
-.Em not
-parsed and
-.Em not
-callable.  They accept at most two arguments.
+macros are parsed and are callable.
+They accept at most two arguments.
 .Ss UNIX Macro
 .Dl Usage: .Ux ... \*(Pu
 .Bl -tag -width ".Ux 4.3 ) ," -compact -offset 14n
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man7/security.7 man7/security.7
--- /home/horikawa/man-jp/work/fbsd-400r/man/man7/security.7	Tue Mar 21 06:30:42 2000
+++ man7/security.7	Mon Jul  3 19:51:36 2000
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\" %FreeBSD: src/share/man/man7/security.7,v 1.13 2000/03/07 13:59:26 nik Exp %
+.\" %FreeBSD: src/share/man/man7/security.7,v 1.13.2.1 2000/05/09 14:12:52 sheldonh Exp %
 .\"
 .Dd September 18, 1999
 .Dt SECURITY 7
@@ -106,7 +106,7 @@
 connection to that server, or the attacker may know of a bug in an suid-root
 program that allows the attacker to break root once he has broken into a 
 user's account.  If an attacker has found a way to break root on a machine,
-.Pa the attacker may not have a need to install a backdoor.
+the attacker may not have a need to install a backdoor.
 Many of the root holes found and closed to date involve a considerable amount
 of work by the hacker to cleanup after himself, so most hackers do install
 backdoors.  This gives you a convienient way to detect the hacker.  Making

----Next_Part(Tue_Jul__4_21:41:59_2000_41)----
