From owner-man-jp-reviewer@jp.freebsd.org  Mon Apr 26 00:54:12 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA47243;
	Mon, 26 Apr 1999 00:54:12 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id AAA47238
	for <man-jp-reviewer@jp.freebsd.org>; Mon, 26 Apr 1999 00:54:11 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp868.yk.rim.or.jp [202.247.185.119])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id AAA25645
	for <man-jp-reviewer@jp.freebsd.org>; Mon, 26 Apr 1999 00:53:51 +0900 (JST)
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: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19990426005257B.k-horik@yk.rim.or.jp>
Date: Mon, 26 Apr 1999 00:52:57 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 2532
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990405
X-Sequence: man-jp-reviewer 1322
Subject: [man-jp-reviewer 1322] diff 3.1-19990311-STABLE to 3.1-19990417-STABLE
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

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

 diff 3.1-19990311-STABLE $B$+$i(B 3.1-19990417-STABLE $B$X$N:9J,$N$&$A!"(B
ppp.8 $B$H(B vinum.8 $B$r=|$$$?$b$N$G$9!#(B
($B?75,%^%K%e%"%k$N(B kget.8 $B$H(B loader.8 $B$b=|$/(B)

 $B:9J,NL$OB?$$$G$9$,!"8+$?L\$H(B typo $B$NJQ99$,<g$G$9!#(B

 natd.8 $B$N?75,FbMF$N(B transparent proxy $B$N$"$?$j$,$h$/$o$+$C$F$J$$$N$G!"(B
$B=EE@E*$K8+$F$$$?$@$-$?$/!#(B

diff -ur man/man1/addftinfo.1 man/man1/addftinfo.1
--- man/man1/addftinfo.1	Wed Feb 25 13:53:52 1998
+++ man/man1/addftinfo.1	Sun Apr 25 21:43:45 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: addftinfo.1,v 1.2 1997/05/13 16:07:12 horikawa Stab %
-.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.10"
+.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 addftinfo \- troff $BMQ$N%U%)%s%H%U%!%$%k$K(B groff $B$GMQ$$$k$?$a$N>pJs$rIU2C$9$k(B
 .SH $B=q<0(B
@@ -31,8 +31,8 @@
 .SH $B2r@b(B
 .B addftinfo
 $B$O(B troff $B%U%)%s%H%U%!%$%k$rFI$_!"(Bgroff 
-$B%7%9%F%`$GMQ$$$i$l$k%U%)%s%H%a%H%j%C%/>pJs$rIU2C$7$^$9!#>pJs$,IU2C$5$l$?%U%)%s%H%U%!%$%k(B
-$B$OI8=`=PNO$K=q$-=P$5$l$^$9!#(B
+$B%7%9%F%`$GMQ$$$i$l$k%U%)%s%H%a%H%j%C%/>pJs$rIU2C$7$^$9!#(B
+$B>pJs$,IU2C$5$l$?%U%)%s%H%U%!%$%k$OI8=`=PNO$K=q$-=P$5$l$^$9!#(B
 $BDI2C$5$l$k>pJs$O!"%U%)%s%H<+BN$N%Q%i%a%H%j%C%/$J>pJs$H!"EAE}E*$J(B troff 
 $B$NJ8;zL>$N$D$1$+$?$K4X$9$k2>Dj$+$i?dDj$5$l$^$9!#(B
 $B$3$N>pJs$O!"<g$KJ8;z$N9b$5$d?<$5$G$9!#0z?t$N(B 
@@ -62,7 +62,7 @@
 x $B$J$I$N$h$&$J!"GX$NDc$$>.J8;z$N9b$5!#(B
 .TP
 .B fig-height
-$B?^$N9b$5(B ( $B==?J$N?tCM(B )
+$B?^$N9b$5(B (10 $B?J$N?tCM(B)
 .TP
 .B asc-height
 b, d, l $B$J$I$N$h$&$J!"GX$N9b$$J8;z$N9b$5!#(B
Only in man/man1: doscmd.1
diff -ur man/man1/eqn.1 man/man1/eqn.1
--- man/man1/eqn.1	Fri Feb 12 00:44:38 1999
+++ man/man1/eqn.1	Sun Apr 25 21:43:47 1999
@@ -11,7 +11,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH EQN 1 "15 January 1995" "Groff Version 1.09"
+.TH EQN 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 eqn \- troff $BMQ$N?t<0%U%)!<%^%C%?(B
 .SH $B=q<0(B
@@ -51,8 +51,7 @@
 .B eqn
 $B$O!"(B
 .B troff
-$B$X$NF~NO%U%!%$%k$KKd$a9~$^$l$F$$$k?t<0$K4X$9$k5-=R$r%3%s(B
-$B%Q%$%k$7!"(B
+$B$X$NF~NO%U%!%$%k$KKd$a9~$^$l$F$$$k?t<0$K4X$9$k5-=R$r%3%s%Q%$%k$7!"(B
 .B troff
 $B$,2r<a$G$-$kL?NaNs$KJQ49$7$^$9!#DL>o!"(B
 .B groff
@@ -60,29 +59,27 @@
 .B \-e
 $B%*%W(B
 $B%7%g%s$r;XDj$9$k$3$H$G!"K\%W%m%0%i%`$O<B9T$5$l$^$9!#J8K!$O(B UNIX $B$N(B eqn 
-$B$H$H$F$b;w$+$h$C$F$$$^$9!#(BGNU eqn $B$N=PNO$O(B UNIX $B$N(B troff $B$G=hM}$9$k$3(B
-$B$H$,$G$-$J$$$N$G!"(BGNU troff $B$rMQ$$$kI,MW$,$"$j$^$9!#%3%^%s%I%i%$%s$K%U%!(B
-$B%$%kL>$,;XDj$5$l$J$+$C$?>l9g$O!"I8=`F~NO$+$iFI$_9~$_$^$9!#%U%!%$%k%M!<(B
-$B%`$H$7$F(B
+$B$H$H$F$b;w$+$h$C$F$$$^$9!#(BGNU eqn $B$N=PNO$O(B UNIX $B$N(B troff $B$G=hM}$G$-$J$$$N$G!"(B
+GNU troff $B$rMQ$$$kI,MW$,$"$j$^$9!#%3%^%s%I%i%$%s$K(B
+$B%U%!%$%kL>$,;XDj$5$l$J$+$C$?>l9g$O!"I8=`F~NO$+$iFI$_9~$_$^$9!#(B
+$B%U%!%$%kL>$H$7$F(B
 .B \-
 $B$r;XDj$7$?>l9g$bI8=`F~NO$+$iFI$_9~$_$^$9!#(B
 .LP
 .B eqn
 $B$O(B
 .B /usr/share/tmac/eqnrc
-$B$r8!:w$7!"$b$7B8:_$9$l$PF~NO%U%!%$%k$N=h(B
-$BM}$K@h$,$1$FFI$_9~$_$r9T$$$^$9!#(B
+$B$r8!:w$7!"$b$7B8:_$9$l$PF~NO%U%!%$%k$N=hM}$K@h$,$1$FFI$_9~$_$r9T$$$^$9!#(B
 .B \-R
-$B%*%W%7%g%s$r;H$&$3$H$K$h$j!"$3$NF0:n(B
-$B$r6X;_$9$k$3$H$,$G$-$^$9!#(B
+$B%*%W%7%g%s$r;H$&$3$H$K$h$j!"$3$NF0:n$r6X;_$G$-$^$9!#(B
 .LP
 GNU eqn $B$O(B neqn $B$N5!G=$N$9$Y$F$rDs6!$9$k$b$N$G$O$"$j$^$;$s!#Dc2rA|EY$N(B
-$B%?%$%W%i%$%?$N$h$&$J5!4o$r(B($BC1=c$JF~NO$KBP$7$F$O==J,$G$"$k$N$G$9$,(B)$B%5%]!<(B
-$B%H$7$^$;$s!#(B
+$B%?%$%W%i%$%?$N$h$&$J5!4o$r(B ($BC1=c$JF~NO$KBP$7$F$O==J,$G$"$k$N$G$9$,(B)
+$B%5%]!<%H$7$^$;$s!#(B
 .SH $B%*%W%7%g%s(B
 .TP
 .B \-C
-$BD>8e$K%9%Z!<%9$d2~9T$G$O$J$$J8;z$,B3$/(B
+$BD>8e$K6uGrJ8;z$d2~9T$G$O$J$$J8;z$,B3$/(B
 .B .EQ
 $B$H(B
 .B .EN
@@ -98,7 +95,7 @@
 $B%P!<%8%g%sHV9f$rI=<($7$^$9!#(B
 .TP
 .B \-r
-$B%5%$%:$r0l$D$@$1=L>.$7$^$9!#(B
+$B%5%$%:$r(B 1 $B$D$@$1=L>.$7$^$9!#(B
 .TP
 .BI \-m n
 $B:GDc$N%]%$%s%H%5%$%:$r(B
@@ -117,16 +114,14 @@
 $B$$$&CM(B 1 $B$N%^%/%m$,Dj5A$5$l$k$@$1$G$9!#IaDL$O(B
 .B eqnrc
 $B$G$3$NDj5A$5$l$?%^(B
-$B%/%m$K$h$C$F=PNO5!4o$K$U$5$o$7$$@_Dj$,$J$5$l$^$9!#%G%U%)%k%H$N=PNO5!4o(B
-$B$O(B
+$B%/%m$K$h$C$F=PNO5!4o$K$U$5$o$7$$@_Dj$,$J$5$l$^$9!#%G%U%)%k%H$N=PNO5!4o$O(B
 .B ps
 $B$G$9!#(B
 .TP
 .BI \-M dir
 $B%G%U%)%k%H$N%G%#%l%/%H%j(B
 .B /usr/share/tmac
-$B$h$j$b@h$K;XDj$7$?%G%#(B
-$B%l%/%H%j(B
+$B$h$j$b@h$K;XDj$7$?%G%#%l%/%H%j(B
 .I dir
 $B$N(B eqnrc $B$rC5$7$^$9!#(B
 .TP
@@ -140,11 +135,8 @@
 .TP
 .BI \-s n
 .BI gsize\  n
-$B%3%^%s%I$HEy2A$G$9!#$3$N%*%W%7%g%s$O;H$&$Y$-$G$O$"$j$^(B
-$B$;$s!#(B
-eqn
-$B$O!"DL>o!"?t<0$,EP>l$7$?0LCV$N%]%$%s%H%5%$%:$K?t<0$N%5%$%:$r$"(B
-$B$o$;$^$9!#(B
+$B%3%^%s%I$HEy2A$G$9!#$3$N%*%W%7%g%s$O;H$&$Y$-$G$O$"$j$^$;$s!#(B
+eqn $B$O!"DL>o!"?t<0$,EP>l$7$?0LCV$N%]%$%s%H%5%$%:$K?t<0$N%5%$%:$r$"$o$;$^$9!#(B
 .TP
 .BI \-p n
 $B>eIU$-!"2<IU$-J8;z$,NY@\$9$k%F%-%9%H$h$j(B
@@ -152,16 +144,13 @@
 $B%]%$%s%H>.$5$/$J$k$h$&$K$7(B
 $B$^$9!#$3$N%*%W%7%g%s$O;H$&$Y$-$G$O$"$j$^$;$s!#DL>o(B
 eqn
-$B$ONY@\$9$k%F%-(B
-$B%9%H$N(B 70% $B$N%5%$%:$K$J$k$h$&$KD4@a$7$^$9!#(B
+$B$ONY@\$9$k%F%-%9%H$N(B 70% $B$N%5%$%:$K$J$k$h$&$KD4@a$7$^$9!#(B
 .SH $B;HMQK!(B
-$B$3$3$G$O!"(BGNU eqn$B$H(BUnix eqn$B$N0c$$$N$_$r2r@b$7$^$9!#(B
+$B$3$3$G$O!"(BGNU eqn $B$H(B Unix eqn $B$N0c$$$N$_$r2r@b$7$^$9!#(B
 .LP
-GNU eqn$B$N?7$7$$FCD'$N$[$H$s$I$O!"(B\*(tx
-$B$K4p$E$$$F$$$^$9!#(B
-$B0J2<$K$O!"$$$/$D$+$N(B\*(tx $B$H(B GNU eqn $B$N0c$$$r5-=R$7$F$"$j$^$9!#(B
-$B$b$7!"$"$J$?$,(B\*(tx
-$B$rCN$i$J$$$J$i$P!"L5;k$7$?J}$,0BA4$G$7$g$&!#(B
+GNU eqn $B$N?7$7$$FCD'$N$[$H$s$I$O!"(B\*(tx $B$K4p$E$$$F$$$^$9!#(B
+$B0J2<$K$O!"$$$/$D$+$N(B \*(tx $B$H(B GNU eqn $B$N0c$$$r5-=R$7$F$"$j$^$9!#(B
+$B$b$7!"$"$J$?$,(B \*(tx $B$rCN$i$J$$$J$i$P!"L5;k$7$?J}$,0BA4$G$7$g$&!#(B
 .SS $B<+F0%9%Z!<%7%s%0(B
 .LP
 .B eqn
@@ -181,7 +170,7 @@
 $B$N$h$&$JBg$-$J1i;;5-9f(B
 .TP
 binary
-+ $B$N$h$&$J!"(B2$B9`1i;;;R(B
++ $B$N$h$&$J!"(B2 $B9`1i;;;R(B
 .TP
 relation
 = $B$N$h$&$J4X785-9f(B
@@ -201,7 +190,7 @@
 suppress
 $B%*!<%H%^%A%C%/%9%Z!<%7%s%0$K$h$k0LCVJd@5$rM^@)$9$k(B
 .LP
-$B<0$NCf$N9`$N7?$O!"0J2<$K<($9Fs$D$NJ}K!$N$I$A$i$+$G;XDj$5$l$^$9!#(B
+$B<0$NCf$N9`$N7?$O!"0J2<$K<($9(B 2 $B$D$NJ}K!$N$I$A$i$+$G;XDj$5$l$^$9!#(B
 .TP
 .BI type\  t\ e
 $B<0$NCf$N9`$G(B
@@ -221,8 +210,8 @@
 .RE
 .IP
 $B$HDj5A$5$l$^$9!#(B
-$B%^%/%mE83+$rKI$0$?$a$K%/%)!<%F%#%s%0$9$k0J30$O!"7?$NL>A0$O%/%)!<(B
-$B%H$9$kI,MW$O$"$j$^$;$s!#(B
+$B%^%/%mE83+$rKI$0$?$a$K%/%)!<%F%#%s%0$9$k0J30$O!"(B
+$B7?$NL>A0$O%/%)!<%H$9$kI,MW$O$"$j$^$;$s!#(B
 .TP
 .BI chartype\  t\ text
 $B%/%)!<%H$5$l$F$$$J$$J8;z$N%0%k!<%W$O!"8D!9$NJ8;z$KJ,3d$5$l!"(B
@@ -243,8 +232,7 @@
 .B .,;:
 $B$H$$$&J8;z$,!"$=$l$>$l$K6gFIE@5-9f7?$r;}$D$3$H$r;XDj(B
 $B$7$^$9!#(B
-$B0J8e!"<0$NCf$K$3$l$i$NJ8;z$,=P8=$7$?>l9g$O!"6gFIE@5-9f$H$7$F=hM}(B
-$B$5$l$^$9!#(B
+$B0J8e!"<0$NCf$K$3$l$i$NJ8;z$,=P8=$7$?>l9g$O!"6gFIE@5-9f$H$7$F=hM}$5$l$^$9!#(B
 $B7?(B
 .I t
 $B$O!"(B
@@ -284,7 +272,7 @@
 .TP
 .BI vcenter\  e
 .I e
-$B$r?t<0<4(B(math axis)$B$K$"$o$;$F?bD>J}8~$K%;%s%?%j%s%0$7$^$9!#(B
+$B$r?t<0<4(B (math axis) $B$K$"$o$;$F?bD>J}8~$K%;%s%?%j%s%0$7$^$9!#(B
 $B?t<0<4$O?bD>0LCV$G$"$j!"(B
 $B$3$l$K$"$o$;$F(B + $B$d(B - $B$H$$$C$?J8;z$O%;%s%?%j%s%0$5$l$^$9(B;
 $B$^$?J,?t$N@~$N?bD>0LCV$K$b$J$j$^$9!#(B
@@ -353,7 +341,7 @@
 .IP
 $B$HF1$88z2L$G$9$,!"(B
 .I text
-$B$O%/%*!<%H$5$l$F$$$k$?$a%^%/%mE83+$NBP>]$H$J$j$^$;$s(B;
+$B$O%/%)!<%H$5$l$F$$$k$?$a%^%/%mE83+$NBP>]$H$J$j$^$;$s(B;
 .I text
 $B$O8D!9$NJ8;z$KJ,3d$5$l!"$=$l$>$l$NJ8;z$N4V$K6uGr$,D4@0$5$l$^$9!#(B
 .TP
@@ -365,7 +353,7 @@
 .IP
 $B$HF1$8$G$9$,!"(B
 .I text
-$B$O%/%*!<%H$5$l$F$$$J$$$?$a%^%/%mE83+$NBP>]$H$J$j$^$9(B;
+$B$O%/%)!<%H$5$l$F$$$J$$$?$a%^%/%mE83+$NBP>]$H$J$j$^$9(B;
 .I text
 $B$O8D!9$NJ8;z$KJ,3d$5$l$:!"$=$l$>$l$NJ8;z$N4V$N6uGr$bD4@0$5$l$^$;$s!#(B
 .TP
@@ -401,8 +389,7 @@
 .BR accent ,
 .BR uaccent
 $B0J30$NB>$NA4$F$NJ8;z$h$j$b9b$/$J$j$^$9!#(B
-$B%/%*!<%H$5$l$F$$$J$$%F%-%9%HCf$G$O!"(B
-$B:G=i$NJ8;z$G$O$J$$(B
+$B%/%)!<%H$5$l$F$$$J$$%F%-%9%HCf$G$O!":G=i$NJ8;z$G$O$J$$(B
 .B '
 $B$O(B
 .BR opprime
@@ -415,8 +402,7 @@
 $B$r;HMQ$7$F!"(B
 .I e
 $B$+$i?7$7$$%*%V%8%'%/%H$r@8@.$7$^$9!#(B
-$B%^%/%m$,8F$S=P$5$l$k$H!"(B
-$BJ8;zNs(B
+$B%^%/%m$,8F$S=P$5$l$k$H!"J8;zNs(B
 .B 0s
 $B$O(B
 .IR e
@@ -512,7 +498,7 @@
 .RS
 .LP
 $B%Q%i%a!<%?$r0J2<$K<($7$^$9!#(B
-$BFC$K5-=R$,L5$$>l9g$O!"CM$O(B em $B$N(B100$BJ,$N(B1$B$r0UL#$7$^$9!#(B
+$BFC$K5-=R$,L5$$>l9g$O!"CM$O(B em $B$N(B 100 $BJ,$N(B 1 $B$r0UL#$7$^$9!#(B
 $B0J2<$N5-=R$ODj5AE*$G$O$J$/@bL@E*$K$J$k$h$&$K0U?^$7$F$$$^$9!#(B
 .TP \w'\fBdefault_rule_thickness'u+2n
 .B minimum_size
@@ -528,8 +514,8 @@
 .TP
 .B over_hang
 $BJ,?t$N@~$ND9$5$O!"(B
-$BJ,;R$b$7$/$OJ,Jl$N9-$$J}$NI}$K$3$NCM$r(B2$BG\$7$?D9$5$r2C$($?D9$5$H$J$j$^$9(B;
-$B8@$$BX$($k$H!"J,;R$HJ,Jl$O>/$J$/$H$b$3$NCM$@$1%*!<%P!<%O%s%0$7$^$9!#(B
+$BJ,;R$b$7$/$OJ,Jl$N9-$$J}$NI}$K$3$NCM$r(B 2 $BG\$7$?D9$5$r2C$($?D9$5$H$J$j$^$9(B;
+$B8@$$BX$($k$H!"J,;R$HJ,Jl$O>/$J$/$H$b$3$NCM$@$1%*!<%P%O%s%0$7$^$9!#(B
 .TP
 .B accent_width
 .B bar
@@ -551,7 +537,7 @@
 .B right
 $B%W%j%_%F%#%V$K$h$j@8@.$5$l$k?-D9@-$N$"$k%G%j%_%?$O9b$5$H?<$5$r;}$A$^$9!#(B
 $B%G%j%_%?$,3g$C$F$$$kItJ,<0$,<4$KBP$7$F:GBg8B?-D9$9$kD9$5$N(B
-2000$BJ,$N(B1$B$rC10L$H$9$k$3$N%Q%i%a!<%?$GI=$7$?CM$O!"(B
+2000 $BJ,$N(B 1 $B$rC10L$H$9$k$3$N%Q%i%a!<%?$GI=$7$?CM$O!"(B
 $B%G%j%_%?$N9b$5$H?<$5$N:GDcCM$rM?$($^$9!#(B
 .TP
 .B delimiter_shortfall
@@ -560,7 +546,7 @@
 .B right
 $B%W%j%_%F%#%V$K$h$j@8@.$5$l$k?-D9@-$N$"$k%G%j%_%?$O9b$5$H?<$5$r;}$A$^$9!#(B
 $B%G%j%_%?$,3g$C$F$$$kItJ,<0$,<4$KBP$7$F:GBg8B?-D9$9$kD9$5$N(B
-2000$BJ,$N(B1$B$rC10L$H$9$k$3$N%Q%i%a!<%?$GI=$7$?CM$O!"(B
+2000 $BJ,$N(B 1 $B$rC10L$H$9$k$3$N%Q%i%a!<%?$GI=$7$?CM$O!"(B
 $B%G%j%_%?$N9b$5$H?<$5$N:9$N:GDcCM$H$J$j$^$9!#(B
 .TP
 .B null_delimiter_space
@@ -573,7 +559,7 @@
 $B6gFIE@5-9f$N8e$K$3$l$@$1$N6uGr$,<+F0E*$KA^F~$5$l$^$9!#(B
 .TP
 .B medium_space
-2$B9`1i;;;R$NA08e$K$3$l$@$1$N6uGr$,<+F0E*$KA^F~$5$l$^$9!#(B
+2 $B9`1i;;;R$NA08e$K$3$l$@$1$N6uGr$,<+F0E*$KA^F~$5$l$^$9!#(B
 .TP
 .B thick_space
 $B4X781i;;;R$NA08e$K$3$l$@$1$N6uGr$,<+F0E*$KA^F~$5$l$^$9!#(B
@@ -732,8 +718,7 @@
 .RE
 .SS $B%^%/%m(B
 $B%^%/%m$O0z?t$r<h$k$3$H$,$G$-$^$9!#(B
-$B%^%/%m$,0z?tIU$-$G8F$P$l$?>l9g!"(B
-$B%^%/%m%\%G%#$G$O!"(B
+$B%^%/%m$,0z?tIU$-$G8F$P$l$?>l9g!"%^%/%m%\%G%#$G$O!"(B
 .BI $ n
 $B$?$@$7(B
 .I n
@@ -831,7 +816,7 @@
 .B gbfont
 $B%3%^%s%I$r;HMQ$9$k$@$1$G:Q$_$^$9!#(B
 .LP
-$B$I$NJ8;z$r%l%?!<(B($B%$%?%j%C%/$G%;%C%H$5$l$k$b$N(B)$B$H$7$F07$&$N$+$r!"(B
+$B$I$NJ8;z$r%l%?!<(B ($B%$%?%j%C%/$G%;%C%H$5$l$k$b$N(B) $B$H$7$F07$&$N$+$r!"(B
 $B4{$K<($7$?(B
 .B chartype
 $B%3%^%s%I$G;XDj$G$-$^$9!#(B
diff -ur man/man1/getopt.1 man/man1/getopt.1
--- man/man1/getopt.1	Sat Oct 10 22:09:07 1998
+++ man/man1/getopt.1	Sun Apr 25 22:25:29 1999
@@ -1,12 +1,13 @@
-.Dd June 21, 1993
 .\" jpman %Id: getopt.1,v 1.3 1997/06/19 14:12:53 take Stab %
+.Dd April 3, 1999
 .Dt GETOPT 1
 .Os
 .Sh $BL>>N(B
 .Nm getopt
 .Nd $B%3%^%s%I%i%$%s%*%W%7%g%s$N2r<a$r9T$&(B
 .Sh $B=q<0(B
-.Nm set \-\- \`getopt Ar optstring $*\`
+.Nm args=\`getopt Ar optstring $*\`
+; errcode=$?; set \-\- $args
 .Sh $B2r@b(B
 .Nm getopt
 $B$O!"%7%'%k%W%m%7%8%c$K$h$C$F4JC1$K2r<a$G$-$k$h$&$K%3%^%s%I%i%$%s>e$N(B
@@ -14,9 +15,9 @@
 .Ar optstring
 $B$O!"G'<1$5$l$k%*%W%7%g%sJ8;z$NJ8;zNs$G$9(B (
 .Xr getopt 3
-$B$r;2>H(B )$B!#(B
+$B$r;2>H(B)$B!#(B
 $B%*%W%7%g%sJ8;z$N$"$H$K%3%m%s(B (``:'') $B$,$"$k>l9g!"$=$N%*%W%7%g%s$O!"(B
-( $B6uGrJ8;z$G6h@Z$i$l$F$$$k$+$b$7$l$J$$(B ) $B0z?t$r;}$D$3$H$K$J$j$^$9!#(B
+($B6uGrJ8;z$G6h@Z$i$l$F$$$k$+$b$7$l$J$$(B) $B0z?t$r;}$D$3$H$K$J$j$^$9!#(B
 $BFCJL$J%*%W%7%g%s(B
 .Ql \-\-
 $B$O!"%*%W%7%g%s$N=*$j$r6hJL$9$k$?$a$K;H$o$l$^$9!#(B
@@ -41,27 +42,37 @@
 $B0z?t$r=hM}$9$k$N$+$r<($7$F$$$^$9!#(B
 .Pp
 .Bd -literal -offset indent
-set \-\- \`getopt abo: $*\`
-if test $? != 0
+args=\`getopt abo: $*\`
+# \`getopt abo: "$@"\` $B$r;H$C$F$O$J$j$^$;$s!#(B
+# $B0J2<$N(B set $B%3%^%s%I$H$O0[$C$?$h$&$K!"0z$-?t$r2r<a$7$F$7$^$&$?$a$G$9!#(B
+if [ $? != 0 ]
 then
 	echo 'Usage: ...'
 	exit 2
 fi
+set \-\- $args
+# set $B%3%^%s%I$r!"%P%C%/%/%)!<%H$7$?(B getopt $B$H6&$K!"D>@\;HMQ$G$-$^$;$s!#(B
+# getopt $B$N=*N;%3!<%I$,(B set $B$N$b$N$G1#$5$l$F$7$^$&$+$i$G$9!#(B
+# set $B$N=*N;%3!<%I$O(B 0 $B$HDj5A$5$l$F$$$^$9!#(B
 for i
 do
 	case "$i"
 	in
 		\-a|\-b)
-			flag=$i; shift;;
+			echo flag $i set; sflags="${i#-}$sflags"; 
+			shift;;
 		\-o)
-			oarg=$2; shift; shift;;
+			echo oarg is "'"$2"'"; oarg="$2"; shift;
+			shift;;
 		\-\-)
 			shift; break;;
 	esac
 done
+echo single-char flags: "'"$sflags"'"
+echo oarg is "'"$oarg"'"
 .Ed
 .Pp
-$B$3$N%3!<%I$O!"0J2<$N(B ( $B%3%^%s%I;XDj$N(B ) $BNc$N$I$l$G$bF1$8$h$&$K(B
+$B$3$N%3!<%I$O!"0J2<$N(B ($B%3%^%s%I;XDj$N(B) $BNc$N$I$l$G$bF1$8$h$&$K(B
 $B<u$1F~$l$^$9!#(B
 .\"($BLuCm(B)$B!V%3%^%s%I;XDj$N!W$O!"Lu<T$,>!<j$KA^F~$7$F$$$k!#(B
 .\" 2.2.1R $BBP>](B(1997/04/27) Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
@@ -71,6 +82,7 @@
 cmd \-a \-o arg file file
 cmd \-oarg -a file file
 cmd \-a \-oarg \-\- file file
+.Pp
 .Ed
 .Sh $B4XO"9`L\(B
 .Xr sh 1 ,
@@ -80,10 +92,13 @@
 $B$O!"(B
 .Ar optstring 
 $BCf$K4^$^$l$F$$$J$$%*%W%7%g%sJ8;z$K=P2q$C$?;~$K!"(B
-$BI8=`%(%i!<=PNO$K%(%i!<%a%C%;!<%8$rI=<($7$^$9!#(B
+$BI8=`%(%i!<=PNO$K%(%i!<%a%C%;!<%8$rI=<($7!"(B0 $B$h$jBg$-$J>uBV$G=*N;$7$^$9!#(B
 .Sh $BNr;K(B
-Bell Labs $B$N%^%K%e%"%k$K$h$k$H!"(B Henry Spencer $B$K$h$C$F=q$+$l$^$7$?!#(B
+Bell Labs $B$N%^%K%e%"%k$K$h$k$H!"(BHenry Spencer $B$K$h$C$F=q$+$l$^$7$?!#(B
 $B?6Iq$$$O!"(BBell Labs $BHG$HF1$8$G$"$k$H?.$8$F$$$^$9!#(B
+$B;HMQNc$O(B
+.Fx
+$B%P!<%8%g%s(B 3.2 $B$H(B 4.0 $B$GJQ99$7$^$7$?!#(B
 .Sh $B%P%0(B
 .Xr getopt 3
 $B$,;}$C$F$$$k%P%0$O!"$=$N$^$^;}$C$F$$$^$9!#(B
@@ -91,6 +106,10 @@
 $B6uGrJ8;z$d%7%'%k$N%a%?%-%c%i%/%?$r4^$s$@0z?t$O!"0lHL$K85$N$^$^(B
 $B;D$j$^$;$s!#(B
 $B$3$l$OD>$9$N$O4JC1$K;W$o$l$^$9$,!"$=$&$G$O$"$j$^$;$s!#(B
+.Nm getopt
+$B$dK\%^%K%e%"%k$N;HMQNc$rD>$=$&$H$9$k?M$O!"(B
+.Fx
+$BCf$N$3$N%U%!%$%k$NMzNr$r3NG'$9$Y$-$G$9!#(B
 .Pp
 $BIT@5$J%*%W%7%g%s$KBP$9$k%(%i!<%a%C%;!<%8$O!"(B
 .Nm getopt 
@@ -103,3 +122,9 @@
 .Nm set
 $B%3%^%s%I$r;H$&$?$a$N$H$C$F$bNI$$J}K!$O!"%7%'%k$N%P!<%8%g%s$r(B
 $BJQ$($k$3$H$G$9!#(B
+.Pp
+$B0z$-?t$rItJ,E*$K@5$7$/2r<a$9$k$?$a$K!"(B
+$B3F%7%'%k%9%/%j%W%H$O(B
+($BA05-;HMQNc$N$h$&$J(B) $BJ#;($J%3!<%I$r;}$DI,MW$,$"$j$^$9!#(B
+$B$h$jNI$$(B getopt $BE*%D!<%k$O!"J#;($JItJ,$NBgH>$r%D!<%k$NCf$K0\F0$7!"(B
+$B%/%i%$%"%s%H$N%7%'%k%9%/%j%W%H$rC1=c$K$9$k$b$N$G$7$g$&!#(B
diff -ur man/man1/grodvi.1 man/man1/grodvi.1
--- man/man1/grodvi.1	Wed Feb 25 13:54:01 1998
+++ man/man1/grodvi.1	Sun Apr 25 21:43:48 1999
@@ -25,7 +25,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GRODVI 1 "7 September 1996" "Groff Version 1.10"
+.TH GRODVI 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 grodvi \- groff $B$N=PNO$r(B TeX $B$N(B dvi $B7A<0$KJQ49$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/groff.1 man/man1/groff.1
--- man/man1/groff.1	Tue Dec 22 07:00:14 1998
+++ man/man1/groff.1	Sun Apr 25 21:43:49 1999
@@ -28,7 +28,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROFF 1 "8 September 1996" "Groff Version 1.10"
+.TH GROFF 1 "18 March 1999" "Groff Version 1.11"
 .SH $BL>>N(B
 groff \- groff $B%I%-%e%a%s%H%U%)!<%^%C%H%7%9%F%`$N%U%m%s%H%(%s%I(B
 .SH $B=q<0(B
@@ -101,6 +101,9 @@
 .TP
 .B latin1
 ISO Latin-1 $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9(B
+.TP 
+.B lj4
+HP LaserJet4 $B8_49(B ($B$^$?$OB>$N(B PCL5 $B8_49(B) $B%W%j%s%?(B
 .TP
 .B koi8-r
 $B%m%7%"8l(B KOI8-R $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9(B
diff -ur man/man1/grolj4.1 man/man1/grolj4.1
--- man/man1/grolj4.1	Wed Feb 25 13:54:01 1998
+++ man/man1/grolj4.1	Sun Apr 25 21:43:49 1999
@@ -23,7 +23,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROLJ4 1 "7 September 1996" "Groff Version 1.10"
+.TH GROLJ4 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 grolj4 \- HP Laserjet 4 $B%U%!%_%jMQ(B groff $B%I%i%$%P(B
 .SH $B=q<0(B
diff -ur man/man1/grops.1 man/man1/grops.1
--- man/man1/grops.1	Fri Feb 12 00:44:38 1999
+++ man/man1/grops.1	Sun Apr 25 21:43:51 1999
@@ -23,7 +23,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROPS 1 "8 September 1996" "Groff Version 1.10"
+.TH GROPS 1 "8 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 grops \- groff $BMQ(B PostScript $B%I%i%$%P(B
 .SH $B=q<0(B
diff -ur man/man1/grotty.1 man/man1/grotty.1
--- man/man1/grotty.1	Wed Feb 25 13:54:01 1998
+++ man/man1/grotty.1	Sun Apr 25 21:43:51 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: grotty.1,v 1.2 1997/05/13 16:15:38 horikawa Stab %
-.TH GROTTY 1 "8 September 1996" "Groff Version 1.10"
+.TH GROTTY 1 "8 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 grotty \- $B%?%$%W%i%$%?7?%G%P%$%9$N$?$a$N(B groff $B%I%i%$%P(B
 .SH $B=q<0(B
diff -ur man/man1/indxbib.1 man/man1/indxbib.1
--- man/man1/indxbib.1	Wed Feb 25 13:54:02 1998
+++ man/man1/indxbib.1	Sun Apr 25 21:43:52 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: indxbib.1,v 1.2 1997/03/29 04:27:19 horikawa Stab %
-.TH INDXBIB 1 "7 September 1996" "Groff Version 1.10"
+.TH INDXBIB 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 indxbib \- $BJ88%L\O?%G!<%?%Y!<%9MQ$N5U0z$-%$%s%G%C%/%9$N:n@.(B
 .SH $B=q<0(B
diff -ur man/man1/intro.1 man/man1/intro.1
--- man/man1/intro.1	Sun Jan 31 00:44:14 1999
+++ man/man1/intro.1	Sun Apr 25 21:43:52 1999
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.1	8.2 (Berkeley) 12/30/93
-.\"	%Id: intro.1,v 1.12 1998/12/20 06:30:05 bde Exp %
-.\" jpman %Id: intro.1,v 1.2 1997/05/17 15:58:13 horikawa Stab %
+.\"	%Id: intro.1,v 1.12.2.1 1999/03/20 04:06:47 billf Exp %
 .\"
+.\" jpman %Id: intro.1,v 1.2 1997/05/17 15:58:13 horikawa Stab %
 .Dd December 30, 1993
 .Dt INTRO 1
 .Os
@@ -79,7 +79,7 @@
 .Sh $B4XO"9`L\(B
 .Xr apropos 1 ,
 .Xr man 1 ,
-.Xr security 1 ,
+.Xr security 7 ,
 .Xr intro 2 ,
 .Xr intro 3 ,
 .Xr intro 4 ,
diff -ur man/man1/limits.1 man/man1/limits.1
--- man/man1/limits.1	Sat Sep 26 15:19:57 1998
+++ man/man1/limits.1	Sun Apr 25 21:43:53 1999
@@ -17,9 +17,9 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\"	%Id: limits.1,v 1.8 1998/06/04 21:05:58 steve Exp %
-.\" jpman %Id: limits.1,v 1.3 1997/06/23 15:04:52 horikawa Stab %
+.\"	%Id: limits.1,v 1.8.2.1 1999/04/13 02:33:59 ghelmer Exp %
 .\"
+.\" jpman %Id: limits.1,v 1.3 1997/06/23 15:04:52 horikawa Stab %
 .Dd January 15, 1996
 .Dt LIMITS 1
 .Os FreeBSD
@@ -183,6 +183,10 @@
 .It Fl n Op Ar limit
 .Em openfiles
 $B$N%j%=!<%9$N@)8B$rA*Br$b$7$/$O@_Dj$7$^$9!#(B
+$B%W%m%;%9$4$H$N:GBg%*!<%W%s%U%!%$%k?t$N%7%9%F%`%o%$%I$N@)8B$O!"(B
+\&'sysctl kern.maxfilesperproc' $B%3%^%s%I$GI=<($G$-$^$9!#(B
+$B%7%9%F%`A4BN$GF1;~$K%*!<%W%s$G$-$k%U%!%$%k$NAm?t$O!"(B
+\&'sysctl kern.maxfilesperproc' $B%3%^%s%I$GI=<($G$-$kCM$K@)8B$5$l$^$9!#(B
 .It Fl s Op Ar limit
 .Em stacksize
 $B$N%j%=!<%9$N@)8B$rA*Br$b$7$/$O@_Dj$7$^$9!#(B
@@ -192,6 +196,10 @@
 .It Fl u Op Ar limit
 .Em maxproc
 $B$N%j%=!<%9$N@)8B$rA*Br$b$7$/$O@_Dj$7$^$9!#(B
+UID $B$4$H$N:GBg%W%m%;%9?t$N%7%9%F%`%o%$%I$N@)8B$O!"(B
+\&'sysctl kern.maxprocperuid' $B%3%^%s%I$GI=<($G$-$^$9!#(B
+$B%7%9%F%`A4BN$GF1;~$KAv9T$G$-$k%W%m%;%9$NAm?t$O!"(B
+\&'sysctl kern.maxproc' $B%3%^%s%I$GI=<($G$-$kCM$K@)8B$5$l$^$9!#(B
 .Pp
 $B>e5-$N%U%i%0$N%;%C%H$K$*$1$kM-8z$J(B 'limit' $B$NCM$O!"L58BCM(B ($B$b$7$/$O(B
 $B%+!<%M%k$K$*$$$FDj5A$5$l$F$$$k:GBgCM(B) $B$r@_Dj$9$k>l9g$OJ8;zNs(B 'infinity' 
@@ -275,7 +283,8 @@
 .Xr getrlimit 2 ,
 .Xr setrlimit 2 ,
 .Xr login_cap 3 ,
-.Xr login.conf 5
+.Xr login.conf 5 ,
+.Xr sysctl 8
 .Sh $B%P%0(B
 $BL@$i$+$JM}M3$K$h$j!"(B
 .Nm limits
diff -ur man/man1/lkbib.1 man/man1/lkbib.1
--- man/man1/lkbib.1	Wed Feb 25 13:54:10 1998
+++ man/man1/lkbib.1	Sun Apr 25 21:43:54 1999
@@ -25,7 +25,7 @@
 .el .TP "\\$1"
 ..
 .\" jpman %Id: lkbib.1,v 1.2 1997/05/13 16:17:15 horikawa Stab %
-.TH LKBIB 1 "7 September 1996" "Groff Version 1.10"
+.TH LKBIB 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 lkbib \- $BJ88%L\O?%G!<%?%Y!<%9$r8!:w$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/lookbib.1 man/man1/lookbib.1
--- man/man1/lookbib.1	Wed Feb 25 13:54:10 1998
+++ man/man1/lookbib.1	Sun Apr 25 21:43:54 1999
@@ -17,7 +17,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.10"
+.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.11"
 .\" jpman %Id: lookbib.1,v 1.2 1997/04/24 00:31:25 mutoh Stab %
 .SH $BL>>N(B
 lookbib \- $BJ88%L\O?%G!<%?%Y!<%9$r8!:w$9$k(B
diff -ur man/man1/neqn.1 man/man1/neqn.1
--- man/man1/neqn.1	Sun Mar 15 01:24:22 1998
+++ man/man1/neqn.1	Sun Apr 25 21:43:54 1999
@@ -1,4 +1,4 @@
-.TH NEQN 1 "14 September 1997" "Groff Version 1.10"
+.TH NEQN 1 "14 September 1997" "Groff Version 1.11"
 .SH $BL>>N(B
 neqn \- $B?t<0$r(B ASCII $B7A<0$G=PNO$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/nroff.1 man/man1/nroff.1
--- man/man1/nroff.1	Wed Feb 25 13:54:12 1998
+++ man/man1/nroff.1	Sun Apr 25 21:43:55 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: nroff.1,v 1.2 1997/05/13 16:18:02 horikawa Stab %
-.TH NROFF 1 "8 September 1996" "Groff Version 1.10"
+.TH NROFF 1 "8 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 nroff \- groff $B$K$h$k(B nroff $B%3%^%s%I$N%(%_%e%l!<%H(B
 .SH $B=q<0(B
diff -ur man/man1/pfbtops.1 man/man1/pfbtops.1
--- man/man1/pfbtops.1	Wed Feb 25 13:54:12 1998
+++ man/man1/pfbtops.1	Sun Apr 25 21:43:55 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: pfbtops.1,v 1.2 1997/05/13 16:18:42 horikawa Stab %
-.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.10"
+.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 pfbtops \- .pfb $B%U%)!<%^%C%H$N(B PostScript $B%U%)%s%H$r(B
 ASCII $B%U%)!<%^%C%H$KJQ49$9$k(B
diff -ur man/man1/pic.1 man/man1/pic.1
--- man/man1/pic.1	Sun Apr 25 21:37:38 1999
+++ man/man1/pic.1	Sun Apr 25 22:25:31 1999
@@ -30,7 +30,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH PIC 1 "7 September 1996" "Groff Version 1.10"
+.TH PIC 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 pic \- troff $B$H(B TeX $B$GMQ$$$k%T%/%A%c%3%s%Q%$%i(B
 .SH $B=q<0(B
diff -ur man/man1/psbb.1 man/man1/psbb.1
--- man/man1/psbb.1	Wed Feb 25 13:54:13 1998
+++ man/man1/psbb.1	Sun Apr 25 21:43:57 1999
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH PSBB 1 "7 September 1996" "Groff Version 1.10"
+.TH PSBB 1 "7 September 1996" "Groff Version 1.11"
 .\" jpman %Id: psbb.1,v 1.2 1997/05/20 01:24:45 mutoh Stab %
 .SH $BL>>N(B
 psbb \- PostScript $BJ8=q$N%P%&%s%G%#%s%0%\%C%/%9$rI=<($9$k(B
diff -ur man/man1/psroff.1 man/man1/psroff.1
--- man/man1/psroff.1	Sun Mar 15 01:24:26 1998
+++ man/man1/psroff.1	Sun Apr 25 21:43:57 1999
@@ -1,4 +1,4 @@
-.TH PSROFF 1 "15 September 1997" "Groff Version 1.10"
+.TH PSROFF 1 "15 September 1997" "Groff Version 1.11"
 .SH $BL>>N(B
 psroff \- troff $B=PNO$r(B PostScript $B%W%j%s%?$KAw$k(B
 .SH $B=q<0(B
diff -ur man/man1/refer.1 man/man1/refer.1
--- man/man1/refer.1	Fri Feb 12 00:44:38 1999
+++ man/man1/refer.1	Sun Apr 25 21:43:59 1999
@@ -31,7 +31,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH REFER 1 "7 September 1996" "Groff Version 1.10"
+.TH REFER 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 refer \- groff $B$N$?$a$N;29MJ88%L\O?%W%j%W%m%;%C%5(B
 .SH $B=q<0(B
@@ -78,15 +78,15 @@
 $B$NFbMF$rI8=`=PNO$K%3%T!<$7$^$9!#(B
 .LP
 $B3F!9$N0zMQ$G$O;29MJ88%$r;XDj$7$^$9!#(B
-$B0zMQ$G$O!"$"$k;29MJ88%$K$N$_4^$^$l$k%-!<%o!<%I$N=89g$rM?$($k$3$H$K$h$C(B
-$B$F!"$=$N;29MJ88%$r?^=qL\O?%G!<%?%Y!<%9$+$i;XDj$9$k$3$H$,$G$-$^$9!#(B
+$B0zMQ$G$O!"$"$k;29MJ88%$K$N$_4^$^$l$k%-!<%o!<%I$N=89g$rM?$($k$3$H$K$h$C$F!"(B
+$B$=$N;29MJ88%$r?^=qL\O?%G!<%?%Y!<%9$+$i;XDj$G$-$^$9!#(B
 $B$^$?!"0zMQ$NCf$G%G!<%?%Y!<%9%l%3!<%I$r;XDj$9$k$3$H$K$h$C$F$b;29MJ88%$r(B
-$B;XDj$9$k$3$H$,$G$-$^$9!#(B
+$B;XDj$G$-$^$9!#(B
 $B$3$l$i$NJ}K!$rAH$_9g$o$;$k$3$H$b2DG=$G$9!#(B
 .LP
 $B3F!9$N0zMQ$K$*$$$F(B
 .B refer
-$B$O%F%-%9%H$NCf$K%^!<%/$r:n@.$9$k$3$H$,$G$-$^$9!#(B
+$B$O%F%-%9%H$NCf$K%^!<%/$r:n@.$G$-$^$9!#(B
 $B$3$N%^!<%/$O?'!9$JJ}K!$G%F%-%9%H$dB>$N%i%Y%k$+$i6hJL$5$l$k$$$/$D$+$N%i(B
 $B%Y%k$+$i9=@.$5$l$^$9!#(B
 $B3F0zMQ$K$*$1$k;29MJ88%$r%^%/%m%Q%C%1!<%8$r;H$C$F%U%)!<%^%C%H$7$F=PNO$9(B
@@ -102,8 +102,8 @@
 $B$O$$$:$l$bE,@Z$J%^%/%m$G$9!#(B
 $B0zMQ$N;29MJ88%$r%U%)!<%^%C%H$9$k%3%^%s%I$r0zMQ$ND>8e$K=PNO$9$k$3$H$b!"(B
 $B;29MJ88%$rC_@Q$7$F8e$G%3%^%s%I$r=PNO$9$k$3$H$b$G$-$^$9!#(B
-$B;29MJ88%$rC_@Q$7$?;~!"F1$8;29MJ88%$,J#?t$+$i0zMQ$5$l$F$$$k>l9g$K$O!";2(B
-$B9MJ88%$O(B 1 $B$D$K$^$H$a$F%U%)!<%^%C%H$5$l$^$9!#(B
+$B;29MJ88%$rC_@Q$7$?;~!"F1$8;29MJ88%$,J#?t$+$i0zMQ$5$l$F$$$k>l9g$K$O!"(B
+$B;29MJ88%$O(B 1 $B$D$K$^$H$a$F%U%)!<%^%C%H$5$l$^$9!#(B
 .LP
 GNU refer $B$N?7$7$$5!G=$H$7$F(B
 .B .R1
@@ -121,7 +121,7 @@
 .ft
 .fi
 .RE
-$B$N9T$rDI2C$9$k$3$H$K$h$j(B UNIX refer $B$G$b=hM}$9$k$3$H$,$G$-$^$9!#(B
+$B$N9T$rDI2C$9$k$3$H$K$h$j(B UNIX refer $B$G$b=hM}$G$-$^$9!#(B
 $B$3$N;XDj$K$h$C$F(B
 .B troff
 $B$O(B
@@ -572,7 +572,7 @@
 $B$OG'<1$5$l$^$;$s!#(B
 $B9T$OKvHx$K(B
 .B \e
-$B$r$D$1$k$3$H$K$h$C$F7QB3$9$k$3$H$,$G$-$^$9!#(B
+$B$r$D$1$k$3$H$K$h$C$F7QB3$G$-$^$9!#(B
 $B$?$@$7(B
 .B #
 $B$N8e$N>l9g$O7QB3$5$l$^$;$s!#(B
@@ -733,7 +733,7 @@
 $B$K$h$C$F@8@.$5$l$?%$%s%G%C%/%9(B
 .IB filename .i
 $B$,B8:_$9$l$P!"$=$l$,Be$o$j$K8!:w$5$l$^$9!#3F%$%s%G%C%/%9$OJ#?t$N%G!<%?(B
-$B%Y!<%9$r%+%P!<$9$k$3$H$,$G$-$^$9!#(B
+$B%Y!<%9$r%+%P!<$G$-$^$9!#(B
 .TP
 .BI date-as-label\*n\  string
 .I string
@@ -947,7 +947,7 @@
 $B$3$l$O;29MJ88%$,N_@Q$5$l$F$$$J$$$H1F6A$,$"$j$^$;$s!#(B
 .SS $B%i%Y%k<0(B
 .LP
-$B%i%Y%k<0$ODL>o$b$7$/$O0l;~E*$KI>2A$9$k$3$H$,$G$-$^$9!#(B
+$B%i%Y%k<0$ODL>o$b$7$/$O0l;~E*$KI>2A$G$-$^$9!#(B
 $BDL>oI>2A$N7k2L$O=PNO$K;H$o$l$^$9!#(B
 $B0l;~E*I>2A$N7k2L$O(B
 .I
@@ -1010,7 +1010,7 @@
 .B et-al
 $B%3%^%s%I$G;XDj$5$l$?J8;zNs$GCV$-49$($i$l$^$9!#(B
 $B$3$N%3%^%s%I$OF,J8;z$N%7!<%1%s%9$r;H$&$3$H$,$G$-$k0JA0$KK~$?$5$l$kDI2C(B
-$B$NMW5a$b;XDj$9$k$3$H$,$G$-$^$9!#(B
+$B$NMW5a$b;XDj$G$-$^$9!#(B
 .B @
 $B$O0l;~E*$K:n<T$N@5<0$NI=8=$KI>2A$5$l!"%=!<%H$N$?$a$KF1Ey$+$I$&$+$rHf3S(B
 $B$9$k:n<T$OF1$8I=8=$H$J$j$^$9!#(B
diff -ur man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Sun Mar  7 18:27:10 1999
+++ man/man1/sh.1	Sun Apr 25 21:44:01 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\"	%Id: sh.1,v 1.23 1998/12/18 03:51:18 jkoshy Exp %
+.\"	%Id: sh.1,v 1.23.2.1 1999/04/12 15:46:02 cracauer Exp %
 .\"
 .\" jpman %Id: sh.1,v 1.2 1997/05/31 16:40:31 jsakai Stab %
 .\"	Japanese Translation amended by Norihiro Kumagai, 3/29/96,
@@ -46,10 +46,10 @@
 .Os BSD 4
 .Sh $BL>>N(B
 .Nm sh
-.Nd $B%3%^%s%I%$%s%?%W%j%?(B($B%7%'%k(B)
+.Nd $B%3%^%s%I%$%s%?%W%j%?(B ($B%7%'%k(B)
 .Sh $B=q<0(B
 .Nm
-.Op Fl /+abCEefIimnpsuVvx
+.Op Fl /+abCEefIimnpsTuVvx
 .Op Fl /+o Ar longname
 .Op Fl c Ar string
 .Op Ar arg ...
@@ -63,7 +63,7 @@
 $B$N%7%'%k5,Ls$KBP1~$9$kES>e$K$"$j$^$9!#(B
 $BK\%P!<%8%g%s$N%7%'%k$O!"8+J}$K$h$C$F$O(B Korn shell $B$HF1MM$K(B
 $B8+$($k5!G=$rB??t;}$C$F$$$^$9$,!"(B
-Korn shell $B$N%/%m!<%s$G$O$"$j$^$;$s(B($B$b$7(B Korn shell $B%/%m!<%s$rK>$`$J$i!"(B
+Korn shell $B$N%/%m!<%s$G$O$"$j$^$;$s(B ($B$b$7(B Korn shell $B%/%m!<%s$rK>$`$J$i!"(B
 Gnu $B$N(B bash $B$r;H$$$^$7$g$&(B)$B!#(B
 $B$3$N%7%'%k$K$O!"(BPOSIX $B$G5,Dj$5$l$?;EMM$H$$$/$D$+$N(B Berkeley $B3HD%$N$_$,(B
 $B<h$jF~$l$i$l$F$$$^$9!#(B
@@ -72,7 +72,7 @@
 .Ss $B35MW(B
 $B%7%'%k$O!"%U%!%$%k$^$?$OC<Kv$+$i(B 1 $B9T$:$DFI$_9~$_!"$=$l$r2r<a$7!"(B
 $B%3%^%s%I$r<B9T$7$^$9!#%7%'%k$O%f!<%6$,%7%9%F%`$K%m%0%$%s$7$?$H$-$K5/F0(B
-$B$5$l$k%W%m%0%i%`$G$9(B($B$?$@$7!"%f!<%6$O(B chsh(1)
+$B$5$l$k%W%m%0%i%`$G$9(B ($B$?$@$7!"%f!<%6$O(B chsh(1)
 $B%3%^%s%I$K$h$C$FB>$N%7%'%k$rA*Br$9$k$3$H$b$G$-$^$9(B)$B!#(B
 $B%7%'%k$O!"@)8f9=J8$r;}$D8@8l$G$"$j!"(B
 $B%G!<%?5-21$r$O$8$a$H$7$FB?MM$J5!G=$rDs6!$9$k%^%/%m5!G=!"(B
@@ -152,10 +152,10 @@
 $B%3%^%s%I%i%$%s$N;D$j$N8l$r0z?t$H$7$F2r<a$9$k$3$H$r6/@)$7$^$9!#(B
 .Bl -tag -width Ds
 .It Fl a Li allexport
-$BCM$,BeF~$5$l$?JQ?t$NA4$F$r%(%/%9%]!<%H$7$^$9(B($BL$<BAu$G$9(B)$B!#(B
+$BCM$,BeF~$5$l$?JQ?t$NA4$F$r%(%/%9%]!<%H$7$^$9!#(B
 .It Fl b Li notify
 $B%P%C%/%0%i%&%s%I%8%g%V<B9T$N40N;$r!"%3%^%s%I$,<B9TCf$G$bB(:B$KJs9p$7$^(B
-$B$9(B($BL$<BAu$G$9(B)$B!#(B
+$B$9(B ($BL$<BAu$G$9(B)$B!#(B
 .It Fl C Li noclobber
 $B$9$G$KB8:_$9$k%U%!%$%k$KBP$7$F(B
 .Dq >
@@ -202,12 +202,26 @@
 $B$rFI$_9~$_$^$9!#0lJ}!"4D6-JQ?t(B
 .Ev ENV
 $B$NFbMF$OL5;k$5$l$^$9!#(B
+
 .It Fl s Li stdin
 $B%3%^%s%I$rI8=`F~NO$+$iFI$_9~$_$^$9(B ($B0z?t$G%U%!%$%kL>$,;XDj$5$l$F$$$J$$(B
 $B>l9g$K$O!"$3$N%*%W%7%g%s$,<+F0E*$K@_Dj$5$l$^$9(B)$B!#(B
 $B%7%'%k$,<B9T$5$l$F$+$iK\%*%W%7%g%s$r(B(
 .Xr set 1
 $B$J$I$K$h$C$F(B)$B@_Dj$7$F$b8z2L$O$"$j$^$;$s!#(B
+.It Fl T Li asynctraps
+$B;R$rBT$D$H$-!"B(:B$K%H%i%C%W$r<B9T$7$^$9!#(B
+$BK\%*%W%7%g%s$,@_Dj$5$l$F$$$J$$$H!"(B
+.St -p1003.2
+$B$G;XDj$5$l$F$$$k$h$&$K!";R$,=*N;$7$?8e$K%H%i%C%W$,<B9T$5$l$^$9!#(B
+$B$3$NHsI8=`%*%W%7%g%s$O!"(B
+$B%7%0%J%k$r%V%m%C%/$9$k;R$N<~0O$KJ]8n%7%'%k$rCV$/$?$a$KM-MQ$G$9!#(B
+$B<~0O$N%7%'%k$O;R$r;&$7$?$j!"(B
+$B<!$N$h$&$K!"@)8f$r(B tty $B$KLa$7$F;R$@$1$r;D$7$?$j$G$-$^$9(B:
+.Bd -literal -offset indent
+sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
+.Ed
+.Pp
 .It Fl u Li nounset
 $BCM$,@_Dj$5$l$F$$$J$$JQ?t$rE83+$7$h$&$H$7$?>l9g!"(B
 $BI8=`%(%i!<=PNO$K%(%i!<%a%C%;!<%8$r=PNO$7!"(B
@@ -233,8 +247,8 @@
 $B%7%'%k$O!"%U%!%$%k$r9TC10L$GFI$_9~$_!"6uGrJ8;z(B ($B%V%i%s%/$*$h$S%?%V(B) $B$d(B
 $B%7%'%k$K$H$C$FFCJL$J0UL#$r;}$DFCDj$NJ8;zNs(B (
 .Dq $B1i;;;R(B
-$B$H8F$P$l$k$b$N$G(B
-$B$9(B) $B$r6h@Z$j$H$7$F!"J#?t$NC18l$KJ,3d$7$^$9!#1i;;;R$K$O!"@)8f1i;;;R$H%j(B
+$B$H8F$P$l$k$b$N$G$9(B)
+$B$r6h@Z$j$H$7$F!"J#?t$NC18l$KJ,3d$7$^$9!#1i;;;R$K$O!"@)8f1i;;;R$H%j(B
 $B%@%$%l%/%H1i;;;R$N(B 2 $B<oN`$,$"$j$^$9(B ($B$3$l$i$N0UL#$K$D$$$F$O8e=R$7$^$9(B)$B!#(B
 $B0J2<$K!"$=$l$i$N0lMw$r<($7$^$9!#(B
 .Bl -tag -width Ds
@@ -242,22 +256,22 @@
 &  &&  (  )  ;  ;; | ||
 .No \en
 .It No $B%j%@%$%l%/%H1i;;;R(B:
-<  >  >|  <<  >>  <&  >&  <<-  <>
+<  >  >|  <<  >>  <&  >&  <<-
 .El
-.Ss $B0zMQ(B($B%/%)!<%H(B)
+.Ss $B0zMQ(B ($B%/%)!<%H(B)
 $B0zMQ$O!"FC<l$J0UL#$r;}$DJ8;z$dC18l(B ($B1i;;;R!"6uGr!"%-!<%o!<%I$J$I(B) $B$N0UL#(B
 $B$rBG$A>C$9$?$a$KMQ$$$^$9!#0zMQ$K$O!"%7%s%0%k%/%)!<%HJ8;z$N%Z%"$r;H$&J}K!!"(B
 $B%@%V%k%/%)!<%HJ8;z$N%Z%"$r;H$&J}K!!"%P%C%/%9%i%C%7%eJ8;z$r;H$&J}K!(B
 $B$N(B 3 $B<oN`$,$"$j$^$9!#(B
 .Bl -tag -width Ds
 .It $B%7%s%0%k%/%)!<%HJ8;z(B
-$B%7%s%0%k%/%)!<%H$N%Z%"$G0O$^$l$?J8;z$O!"$9$Y$F$=$NJ8;z$=$N$^$^(B($B%j%F%i(B
-$B%k(B)$B$H$7$F07$o$l$^$9(B ($B$?$@$7%7%s%0%k%/%)!<%H$OJL$G$9!#%7%s%0%k%/%)!<%H(B
+$B%7%s%0%k%/%)!<%H$N%Z%"$G0O$^$l$?J8;z$O!"$9$Y$F$=$NJ8;z$=$N$^$^(B ($B%j%F%i%k(B)
+$B$H$7$F07$o$l$^$9(B ($B$?$@$7%7%s%0%k%/%)!<%H$OJL$G$9!#%7%s%0%k%/%)!<%H(B
 $B$G0O$C$?J8;zNs$NCf$K%7%s%0%k%/%)!<%H$r4^$a$k$3$H$O$G$-$^$;$s(B)$B!#(B
 .It $B%@%V%k%/%)!<%HJ8;z(B
-$B%@%V%k%/%)!<%H$N%Z%"$G0O$^$l$?J8;z$O!"%I%k5-9fJ8;z(B($)$B!"%P%C%/%/%)!<%H(B
-$BJ8;z(B(`)$B!"%P%C%/%9%i%C%7%eJ8;z(B(\\) $B$r=|$-!"$9$Y$F%j%F%i%k$H$7$F07$o$l$^(B
-$B$9!#%@%V%k%/%)!<%HJ8;z$K$h$k0zMQ$NCf$K$"$k%P%C%/%9%i%C%7%eJ8;z$O!"Nr;K(B
+$B%@%V%k%/%)!<%H$N%Z%"$G0O$^$l$?J8;z$O!"%I%k5-9fJ8;z(B ($)$B!"%P%C%/%/%)!<%H(B
+$BJ8;z(B (`)$B!"%P%C%/%9%i%C%7%eJ8;z(B (\\) $B$r=|$-!"$9$Y$F%j%F%i%k$H$7$F07$o$l$^$9!#(B
+$B%@%V%k%/%)!<%HJ8;z$K$h$k0zMQ$NCf$K$"$k%P%C%/%9%i%C%7%eJ8;z$O!"Nr;K(B
 $BE*7P0^$K$h$j$9$3$7JQ$o$C$?07$$$r<u$1$^$9!#$D$^$j!"D>8e$K(B $, `, ", \\, 
 $B2~9TJ8;z(B $B$,Mh$k$H$-$K$N$_!"$=$l$i$NJ8;z$,%j%F%i%k$H$7$F07$o$l$^$9!#$=(B
 $B$l0J30$NJ8;z$,Mh$k>l9g!"%P%C%/%9%i%C%7%eJ8;z<+BN$,%j%F%i%k$H$7$F07$o$l(B
@@ -280,7 +294,7 @@
 $BAH$_9~$_%3%^%s%I(B
 .Xr alias 1
 $B$K$h$C$FDj5A$5$l$^$9!#(B
-$B%7%'%k$O!"M=Ls8l$,8=$l$k2DG=@-$,$"$k>l=j(B($B>e5-$r;2>H(B)$B$G!"(B
+$B%7%'%k$O!"M=Ls8l$,8=$l$k2DG=@-$,$"$k>l=j(B ($B>e5-$r;2>H(B) $B$G!"(B
 $B$"$kC18l$KBP$7$F!"$=$l$,M=Ls8l$+$I$&$+$N8!::$r:Q$^$;$?$N$A!"(B
 $B$=$l$,%(%$%j%"%9$K0lCW$9$k$+$I$&$+$r8!::$7$^$9!#(B
 $B$b$70lCW$7$?$J$i$P!"F~NO9T$NCf$G!"$=$NC18l$r%(%$%j%"%9$NCM$KCV$-49$($^$9!#(B
@@ -304,7 +318,7 @@
 $BK\%^%K%e%"%k$G$OJ8K!$K$D$$$F$O2r@b$7$^$;$s!#(B
 .St -p1003.2
 $B$N(B BNF $BI=5-$r;2>H$7$F$/$@$5$$!#MW$9$k$K!"9T$r(B1$B9T$rFI$_9~$_!"FI$_9~$s$@(B
-$B9T$N:G=i$NC18l(B ($B@)8f1i;;;R$,$"$k>l9g$O!"$=$N$"$H$N:G=i$NC18l(B) $B$,M=Ls8l(B
+$B9T$N:G=i$NC18l(B  ($B@)8f1i;;;R$,$"$k>l9g$O!"$=$N$"$H$N:G=i$NC18l(B) $B$,M=Ls8l(B
 $B$G$J$$>l9g!"%7%'%k$O$=$N9T$rC1=c%3%^%s%I$H$7$F2r<a$7$^$9!#$=$l0J30$N>l(B
 $B9g!"J#9g%3%^%s%I$"$k$$$OFC<l9=B$$G$"$k$H2r<a$7$^$9!#(B
 .Ss $BC1=c%3%^%s%I(B
@@ -352,9 +366,6 @@
 $B%U%!%$%k5-=R;R(B n2 $B$rI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$KJ#<L$7$^$9!#(B
 .It [n]>&-
 $BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n) $B$r%/%m!<%:$7$^$9!#(B
-.It [n]<> file
-$BI8=`F~NO(B ($B$"$k$$$O%U%!%$%k5-=R;R(B n) $B$K$h$j!"%U%!%$%k(B file $B$r(B
-$BFI$_=q$-$9$k$h$&$K$7$^$9!#(B
 .El
 .Pp
 $B0J2<$N%j%@%$%l%/%H$O!"$7$P$7$P(B``$B%R%"!&%I%-%e%a%s%H(B(here-document)''$B$H(B
@@ -366,10 +377,10 @@
 .Ed
 .Pp
 $B%7%'%k$O!"(Bdelimiter $B$^$G$N9T$rJ]B8$7!"%3%^%s%I$X$NI8=`F~NO$^$?$O%U%!%$(B
-$B%k5-=R;R(B n $B$K%j%@%$%l%/%H$7$^$9!#:G=i$N9T$N(B delimiter $B$,0zMQ(B ($B%/%)!<(B
-$B%H(B) $B$5$l$F$$$?>l9g!"(Bhere-doc-text $B$NFbMF$r%j%F%i%k$H$7$F07$$$^$9!#$=(B
-$B$&$G$J$$>l9g!"%Q%i%a!<%?E83+!"%3%^%s%ICV49!"?tCM1i;;(B ($B!VE83+!W$N@a$G@b(B
-$BL@$7$^$9(B) $B$rE,MQ$7$^$9!#1i;;;R$,(B (``<<'' $B$G$J$/(B) ``<<-'' $B$N>l9g$O!"(B
+$B%k5-=R;R(B n $B$K%j%@%$%l%/%H$7$^$9!#:G=i$N9T$N(B delimiter $B$,0zMQ(B ($B%/%)!<%H(B)
+$B$5$l$F$$$?>l9g!"(Bhere-doc-text $B$NFbMF$r%j%F%i%k$H$7$F07$$$^$9!#(B
+$B$=$&$G$J$$>l9g!"%Q%i%a!<%?E83+!"%3%^%s%ICV49!"?tCM1i;;(B ($B!VE83+!W$N@a$G(B
+$B@bL@$7$^$9(B) $B$rE,MQ$7$^$9!#1i;;;R$,(B (``<<'' $B$G$J$/(B) ``<<-'' $B$N>l9g$O!"(B
 here-doc-text $B$N3F9T$N9TF,$N%?%V$r<h$j=|$-$^$9!#(B
 .Ss $B%3%^%s%I8!:w$H<B9T(B
 $B%3%^%s%I$K$O!"%7%'%k4X?t!"AH$_9~$_%3%^%s%I!"DL>o%W%m%0%i%`$N(B 3 $B<oN`$,$"$j!"(B
@@ -419,7 +430,7 @@
 $B$K4^$^$l$k3F%(%s%H%j$KBP$7$F!"=g$K$=$N%3%^%s%I$r8!:w$7$^$9!#(B
 $BJQ?t(B
 .Ev PATH
-$B$NCM$O%3%m%s(B(``:'')$B$G6h@Z$i$l$?%(%s%H%j$NNs$G$J$1$l$P$J$j$^$;$s!#(B
+$B$NCM$O%3%m%s(B (``:'') $B$G6h@Z$i$l$?%(%s%H%j$NNs$G$J$1$l$P$J$j$^$;$s!#(B
 $B3F%(%s%H%j$O!"$=$l$>$l%G%#%l%/%H%jL>0l$D$KBP1~$7$^$9!#(B
 $B%+%l%s%H%G%#%l%/%H%j$O!"(B
 $B6u$N%G%#%l%/%H%jL>$r;XDj$9$k$3$H$G0EL[E*$K!"(B
@@ -431,15 +442,15 @@
 $B1F6A$rM?$($k$3$H$,$G$-$^$9!#4pK\E*$J9M$(J}$H$7$F!"=*N;%9%F!<%?%9(B 0 $B$O(B
 $BDL>o$N=*N;$^$?$O@.8y$r<($7$^$9!#(B0 $B0J30$N=*N;%9%F!<%?%9$O<:GT!"%(%i!<$r(B
 $B0UL#$7$^$9!#3F%3%^%s%I$N%^%K%e%"%k$K$=$l$>$l$N=*N;%9%F!<%?%9$,$I$N$h$&(B
-$B$J0UL#$r;}$D$+$,5-=R$5$l$F$$$k$O$:$G$9!#AH$_9~$_%3%^%s%I$H(B($B<B9T$5$l$?(B)
+$B$J0UL#$r;}$D$+$,5-=R$5$l$F$$$k$O$:$G$9!#AH$_9~$_%3%^%s%I$H(B ($B<B9T$5$l$?(B)
 $B4X?t$b=*N;%9%F!<%?%9$rJV$7$^$9!#(B
 .Pp
-$B%3%^%s%I$,%7%0%J%k$K$h$j=*N;(B(terminate)$B$5$;$i$l$?>l9g!"(B
+$B%3%^%s%I$,%7%0%J%k$K$h$j=*N;(B (terminate) $B$5$;$i$l$?>l9g!"(B
 $B=*N;%9%F!<%?%9$O(B 128 $B$K%7%0%J%kHV9f$r2C$($?$b$N$K$J$j$^$9!#(B
 $B%7%0%J%kHV9f$O%X%C%@%U%!%$%k(B
 .Aq Pa sys/signal.h
 $B$KDj5A$5$l$F$$$^$9!#(B
-.Ss $BJ#9g%3%^%s%I(B(Complex Commands)
+.Ss $BJ#9g%3%^%s%I(B (Complex Commands)
 $BJ#9g%3%^%s%I$O!"C1=c%3%^%s%I$NAH$_9g$o$;$G:n$j$^$9!#(B
 $B@)8f1i;;;R$^$?$OM=Ls8l$HAH$_9g$o$;$k$3$H$G!"$h$jBg$-$JJ#9g%3%^%s%I$r@8(B
 $B@.$7$^$9!#0lHL$K!"%3%^%s%I$O0J2<$N$&$A$N$$$:$l$+$G$9!#(B
@@ -449,9 +460,9 @@
 .It
 $B%Q%$%W%i%$%s(B
 .It
-$B%j%9%H$^$?$O9g@.%j%9%H(B(compound-list)
+$B%j%9%H$^$?$O9g@.%j%9%H(B (compound-list)
 .It
-$B9g@.%3%^%s%I(B(compound command)
+$B9g@.%3%^%s%I(B (compound command)
 .It
 $B4X?tDj5A(B
 .El
@@ -520,7 +531,7 @@
 $B$5$l$^$9!#$b$7!"%3%^%s%I$KB3$1$F%"%s%Q!<%5%s%HJ8;z$,CV$+$l$F$$$k>l9g!"(B
 $B%7%'%k$O$=$N%3%^%s%I$r5/F0$7$?$"$H!"$9$0$K<!$N%3%^%s%I$N=hM}$r3+;O$7$^$9!#(B
 $B$=$NB>$N>l9g!"$=$N%3%^%s%I$N=*N;$rBT$C$F$+$i<!$N%3%^%s%I$N=hM}$r3+;O$7$^$9!#(B
-.Ss $BC;Mm%j%9%H1i;;;R(B(Short-Circuit List Operators)
+.Ss $BC;Mm%j%9%H1i;;;R(B (Short-Circuit List Operators)
 ``&&'' $B$H(B ``||'' $B$O(B AND-OR $B%j%9%H1i;;;R$G$9!#(B ``&&'' $B$O:G=i$N%3%^%s%I(B
 $B$r<B9T$7!"$b$7:G=i$N%3%^%s%I$N=*N;%9%F!<%?%9$,(B 0 $B$J$i$P<!$N%3%^%s%I$r(B
 $B<B9T$7$^$9!#(B ``||'' $B$bF1MM$G$9$,!":G=i$N%3%^%s%I$N=*N;%9%F!<%?%9$,(B 0 
@@ -681,7 +692,7 @@
 .It ?
 $B:G8e$K<B9T$7$?%Q%$%W%i%$%s$N=*N;%9%F!<%?%9$KE83+$5$l$^$9!#(B
 .It -
-($B%O%$%U%s(B) $B8=:_$N%*%W%7%g%s%U%i%0(B (1$BJ8;z%*%W%7%g%sL>$r$D$J$$$@J8;zNs(B) 
+($B%O%$%U%s(B) $B8=:_$N%*%W%7%g%s%U%i%0(B (1 $BJ8;z%*%W%7%g%sL>$r$D$J$$$@J8;zNs(B) 
 $B$KE83+$5$l$^$9!#5/F0;~$K;XDj$5$l$?$b$N!"AH$_9~$_%3%^%s%I(B set $B$G;XDj$7$?(B
 $B$b$N!"%7%'%k$,0EL[$K@_Dj$7$?$b$N$N$9$Y$F$r4^$_$^$9!#(B
 .It $
@@ -723,8 +734,8 @@
 $B0zMQ$5$l$F$$$J$$%A%k%@J8;z(B (~) $B$G;O$^$kC18l$O!"%A%k%@E83+$NBP>]$K$J$j$^$9!#(B
 $B%A%k%@J8;z$+$i%9%i%C%7%eJ8;z$^$?$OC18l$N=*C<$^$G$N$9$Y$F$NJ8;z$,%f!<%6L>(B
 $B$H$_$J$5$l!"$=$N%f!<%6$N%[!<%`%G%#%l%/%H%j$KCV49$5$l$^$9!#$b$7%f!<%6L>$,(B
-$B>JN,$5$l$?>l9g(B($B$?$H$($P(B ~/foobar)$B!"%A%k%@J8;z$OJQ?t(B HOME $B$NCM(B($B8=:_$N%f!<%6(B
-$B$N%[!<%`%G%#%l%/%H%j(B)$B$KCV49$5$l$^$9!#(B
+$B>JN,$5$l$?>l9g(B ($B$?$H$($P(B ~/foobar)$B!"%A%k%@J8;z$OJQ?t(B HOME $B$NCM(B
+($B8=:_$N%f!<%6$N%[!<%`%G%#%l%/%H%j(B) $B$KCV49$5$l$^$9!#(B
 .Ss $B%Q%i%a!<%?E83+(B
 $B%Q%i%a!<%?E83+$N7A<0$O0J2<$N$H$*$j$G$9!#(B
 .Bd -literal -offset indent
@@ -743,7 +754,7 @@
 .Pp
 $B$=$N%Q%i%a!<%?$KCM$,B8:_$9$k>l9g!"$=$NCM$KCV$-49$($i$l$^$9!#(B
 .Pp
-$B%Q%i%a!<%?L>$d%7%s%\%k$rCf3g8L(B({})$B$G0O$s$G$b9=$$$^$;$s!#$3$NCf3g8L$O!"(B
+$B%Q%i%a!<%?L>$d%7%s%\%k$rCf3g8L(B ({}) $B$G0O$s$G$b9=$$$^$;$s!#$3$NCf3g8L$O!"(B
 $B?t;z(B 2 $BJ8;z0J>e$+$i$J$k0LCV%Q%i%a!<%?$N>l9g$d!"%Q%i%a!<%?L>$ND>8e$K(B
 $B%Q%i%a!<%?L>$N0lIt$G$"$k$H$_$J$7F@$kJ8;z$,B3$/>l9g$r=|$-!"(B
 $B>JN,2DG=$G$9!#%@%V%k%/%)!<%H0zMQCf$N%Q%i%a!<%?E83+$O0J2<(B
@@ -785,11 +796,11 @@
 $B$+$^$?$O6u$NCM$G$"$k$3$H$,8!::$5$l!"(B`:' $B$r>JN,$9$k$H%Q%i%a!<%?$,(B
 $B@_Dj$5$l$F$$$J$$$3$H$N$_$r8!::$7$^$9!#(B
 .It Li ${#parameter}
-$BJ8;zNs$ND9$5(B: $B%Q%i%a!<%?$NCM$N(B($BJ8;zNs$H$7$F$N(B)$BD9$5$KCV49$5$l$^$9!#(B
+$BJ8;zNs$ND9$5(B: $B%Q%i%a!<%?$NCM$N(B ($BJ8;zNs$H$7$F$N(B) $BD9$5$KCV49$5$l$^$9!#(B
 .Pp
 $B0J2<$N(B 4 $BDL$j$N%Q%i%a!<%?E83+$OItJ,J8;zNs@Z$j=P$7=hM}$r9T$$$^$9!#3F>l9g(B
 $B$K$*$$$F!"%Q%?!<%s$O@55,I=8=$G$O$J$/!"%Q%?!<%s%^%C%A5-K!(B ($B%7%'%k%Q%?!<%s(B
-$B$N9`$r;2>H(B) $B$,MQ$$$i$l$^$9!#%Q%i%a!<%?$,(B` * '$B$^$?$O(B` @ '$B$N>l9g!"E83+$N7k2L(B
+$B$N9`$r;2>H(B) $B$,MQ$$$i$l$^$9!#%Q%i%a!<%?$,(B ` * ' $B$^$?$O(B ` @ ' $B$N>l9g!"E83+$N7k2L(B
 $B$,$I$&$J$k$+$O5,Dj$7$^$;$s(B (unspecified)$B!#(B
 $B%Q%i%a!<%?E83+A4BN$r%@%V%k%/%)!<%H$G0O$s$G$b(B
 $B%Q%?!<%s$O0zMQ$5$l$^$;$s!#Cf3g8L$N$J$+$G0zMQ$9$k$3$H$K$h$j(B 
@@ -975,7 +986,7 @@
 ($B>.J8;z$N%(%k(B)
 $B%(%G%#%?$r5/F0$;$:$K!"%3%^%s%IMzNr$NFbMF$r0lMw=PNO$7$^$9!#(B
 $B%Q%i%a!<%?(B first $B$H(B last $B$G;XDj$7$?HO0O$N%3%^%s%I$,=g$K(B
-($B=PNO$N=gHV$O(B -r $B%*%W%7%g%s$N1F6A$r<u$1$^$9(B)$B=PNO$5$l$^$9!#(B
+($B=PNO$N=gHV$O(B -r $B%*%W%7%g%s$N1F6A$r<u$1$^$9(B) $B=PNO$5$l$^$9!#(B
 $B3F%3%^%s%I$N=PNO$N:]$K$O%3%^%s%IHV9f$,IU2C$5$l$^$9!#(B
 .It -n
 -l $B$G0lMw=PNO$9$k:]$K%3%^%s%IHV9f$rIU2C$7$^$;$s!#(B
@@ -999,7 +1010,7 @@
 $BJ8;zNs(B string $B$O!"2a5n$K<B9T$5$l$?%3%^%s%I$N$&$A!"(B
 $B$=$NJ8;zNs$+$i;O$^$k:G?7$N$b$N$r;XDj$7$^$9!#(B
 $B$b$7(B -s $B%*%W%7%g%s$,;XDj$5$l$F(B ``old=new'' $B$,;XDj$5$l$F$$$J$1$l$P!"(B
-$B:G=i$N%*%Z%i%s%I$K%$%3!<%k5-9f(B(``='')$B$r4^$a$k$3$H$O$G$-$^$;$s!#(B
+$B:G=i$N%*%Z%i%s%I$K%$%3!<%k5-9f(B (``='') $B$r4^$a$k$3$H$O$G$-$^$;$s!#(B
 .El
 .\" $B<!$N9T$N(B .Pp $B$O$b$H$b$H%3%a%s%H%"%&%H$5$l$F$$$?(B
 .Pp 
@@ -1114,8 +1125,8 @@
 .It type [name] ...
 $B3F(B name $B$r%3%^%s%I$H$7$F2r<a$7!"%3%^%s%I8!:w$N7k2L$r=PNO$7$^$9!#=PNO$5(B
 $B$l$k7k2L$O0J2<$N$b$N$,$"$j$^$9!#%7%'%k$N%-!<%o!<%I!"%(%$%j%"%9!"%7%'%k(B
-$B$NAH$_9~$_%3%^%s%I!"%3%^%s%I!":/@W$D$-%(%$%j%"%9(B(tracked alias)$B!":G8e$K(B 
-not found ($B8+$D$+$i$:(B)$B$,$"$j$^$9!#%(%$%j%"%9$K$D$$$F$O!"%(%$%j%"%9E83+(B
+$B$NAH$_9~$_%3%^%s%I!"%3%^%s%I!":/@W$D$-%(%$%j%"%9(B (tracked alias)$B!":G8e$K(B 
+not found ($B8+$D$+$i$:(B) $B$,$"$j$^$9!#%(%$%j%"%9$K$D$$$F$O!"%(%$%j%"%9E83+(B
 $B$N7k2L$,=PNO$5$l$^$9!#%3%^%s%I$H:/@W$D$-%(%$%j%"%9$K$D$$$F$O!"$=$N%3%^%s%I$N(B
 $B40A4$J%Q%9L>$,0u:~$5$l$^$9!#(B
 .It ulimit [ -HSacdflmnust ] [ limit ]
Only in man/man1: spppcontrol.1
diff -ur man/man1/tar.1 man/man1/tar.1
--- man/man1/tar.1	Tue Oct 27 23:33:12 1998
+++ man/man1/tar.1	Sun Apr 25 21:44:03 1999
@@ -4,9 +4,9 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\"	%Id: tar.1,v 1.18 1998/09/22 09:55:09 roberto Exp %
-.\" jpman %Id: tar.1,v 1.2 1997/06/24 07:09:44 bobson Stab %
+.\"	%Id: tar.1,v 1.18.2.1 1999/03/29 11:26:35 obrien Exp %
 .\"
+.\" jpman %Id: tar.1,v 1.2 1997/06/24 07:09:44 bobson Stab %
 .Dd 25 August 1997
 .Os FreeBSD
 .Dt TAR 1
@@ -41,8 +41,8 @@
 $BDL>o!"(B
 .Nm
 $B%3%^%s%I%i%$%s$N:G=i$N0z?t$O!"5!G=J8;z$*$h$S5!G=JQ99J8;z$+$i$J$kC18l$G$"$j!"(B
-$B$=$NA0$K(B $B%@%C%7%e(B(-)$B$r$D$1$F$b$D$1$J$/$F$b$$$$$h$&$K$J$C$F$$$^$9!#(B
-$BC18l$K$O!"<!$N5!G=J8;z$N$&$A$A$g$&$I(B 1 $B$D$r4^$s$G$$$J$1$l$P$J$j$^$;$s(B:
+$B$=$NA0$K(B $B%@%C%7%e(B (-) $B$rIU$1$F$bIU$1$J$/$F$b$$$$$h$&$K$J$C$F$$$^$9!#(B
+$BC18l$K$O!"<!$N5!G=J8;z$N$&$ACzEY(B 1 $B$D$r4^$s$G$$$kI,MW$,$"$j$^$9(B:
 .Cm A ,
 .Cm c ,
 .Cm d ,
@@ -50,29 +50,30 @@
 .Cm t ,
 .Cm u ,
 .Cm x ,
-$B$3$l$i$O$=$l$>$l(B $BDI2C(B (append) $B!":n@.(B (create) $B!":9J,(B (difference) $B!"(B
-$BCV49(B (replace) $B!"%j%9%HI=<((B (table of contents) $B!"99?7(B (update) $B!"(B
-$B$=$7$FCj=P(B (extract) $B$r0UL#$7$F$$$^$9(B ($B2<5-$K>\:Y$,$"$j$^$9(B) $B!#(B
+$B$3$l$i$O$=$l$>$l!"(B
+$BDI2C(B (append)$B!":n@.(B (create)$B!":9J,(B (difference)$B!"CV49(B (replace)$B!"(B
+$B%j%9%HI=<((B (table of contents)$B!"99?7(B (update)$B!"Cj=P(B (extract)
+$B$r0UL#$7$F$$$^$9(B ($B2<5-$K>\:Y$,$"$j$^$9(B)$B!#(B
 $B$3$l$i$NB>$K!"0J2<$K>\:Y$r=R$Y$k5!G=JQ99J8;z$r!"%3%^%s%IC18l$K(B
 $B4^$a$k$3$H$,$G$-$^$9!#$=$l$i$N$$$/$D$+$O!"%3%^%s%IC18lFb$HF1$8=g$G(B
 $B%3%^%s%I%i%$%s0z?t$rMW5a$7$^$9(B ($B;HMQNc$N@a$r;2>H(B) $B!#(B
 $B5!G=J8;z$H5!G=JQ99J8;z$O!"(BGNU $B7A<0$N0z?t$G;XDj$9$k$3$H$b$G$-$^$9(B
-(2 $B$D$N%@%C%7%e$r:G=i$K$D$1!"(B1 $B$D$N%3%^%s%IC18l$4$H$K5!G=J8;z$+(B
-$B5!G=JQ99J8;z$r(B 1 $B$D$@$1;XDj$9$k(B) $B!#(B
+(2 $B$D$N%@%C%7%e$r:G=i$KIU$1!"(B1 $B$D$N%3%^%s%IC18l$4$H$K5!G=J8;z$+(B
+$B5!G=JQ99J8;z$r(B 1 $B$D$@$1;XDj$9$k(B)$B!#(B
 $B%"!<%+%$%V$X$NDI2C!"%"!<%+%$%V$+$i$NCj=P!"$=$7$F%j%9%HI=<($N$?$a$K(B
 $B%3%^%s%I%i%$%s;XDj$9$k%U%!%$%kL>$K$O!"(B
 $B%7%'%k$N%Q%?!<%s%^%C%AJ8;zNs$r;HMQ$9$k$3$H$,$G$-$^$9!#(B
 .Sh $B5!G=(B
-$B0J2<$N5!G=$N$$$:$l$+(B1$B$D$@$1$rI,$:;XDj$7$J$1$l$P$J$j$^$;$s!#(B
+$B0J2<$N5!G=$N$$$:$l$+(B 1 $B$D$@$1$rI,$:;XDj$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 .Bl -tag -width "--concatenate" -compact
 .It Fl A
 .It Fl -catenate
 .It Fl "-concatenate"
-$B;XDj$5$l$?(B(tar $B%"!<%+%$%V7A<0$N(B)$B%U%!%$%k$r(B tar $B%"!<%+%$%V$NKvHx(B
+$B;XDj$5$l$?(B (tar $B%"!<%+%$%V7A<0$N(B) $B%U%!%$%k$r(B tar $B%"!<%+%$%V$NKvHx(B
 $B$KDI2C$7$^$9!#(B($BDI2C$9$kA0$N8E$$(B end-of-archive $B%V%m%C%/$O:o=|$5(B
 $B$l$^$9!#(B)
-$B$3$l$O!";XDj$5$l$?%U%!%$%k$,%"!<%+%$%V$NCf$N(B1$B%U%!%$%k$H$J$k$N$G(B
+$B$3$l$O!";XDj$5$l$?%U%!%$%k$,%"!<%+%$%V$NCf$N(B 1 $B%U%!%$%k$H$J$k$N$G(B
 $B$O$J$/!";XDj$7$?%U%!%$%k$NCf$K4^$^$l$F$$$k%U%!%$%k$r!":G=i$K;XDj(B
 $B$7$?%"!<%+%$%V$KDI2C$9$k$H$$$&8z2L$r;}$A$^$9!#(B
 .Em $BCm(B:
@@ -114,18 +115,18 @@
 $B$b$7(B
 .Ar filename
 $B0z?t$,%F!<%W>e$N%G%#%l%/%H%jL>$K%^%C%A$7$F$$$l$P!"$=$N%G%#%l%/%H%j$H(B
-$B%G%#%l%/%H%jFb$N%U%!%$%k$,Cj=P$5$l$^$9!#(B($B%G%#%l%/%H%jFb$N$9(B
-$B$Y$F$N%G%#%l%/%H%j$K$D$$$F$bF1MM$KCj=P$5$l$^$9!#(B)
-$B$b$7%"!<%+%$%VFb$K!"AjEv$9$kF1$8%U%!%$%k$,J#?t4^$^$l$F$$$l$P(B($B>e5-$N(B
+$B%G%#%l%/%H%jFb$N%U%!%$%k$,Cj=P$5$l$^$9!#(B($B%G%#%l%/%H%jFb$N(B
+$B$9$Y$F$N%G%#%l%/%H%j$K$D$$$F$bF1MM$KCj=P$5$l$^$9!#(B)
+$B$b$7%"!<%+%$%VFb$K!"AjEv$9$kF1$8%U%!%$%k$,J#?t4^$^$l$F$$$l$P(B ($B>e5-$N(B
 .Fl -append
 $B%3%^%s%I$r;2>H(B)$B!":G8e$K4^$^$l$F$$$k$b$N$,B>$N$9$Y$F$N%U%!%$%k$r(B
 $B>e=q$-$9$k7A$GCj=P$5$l$^$9!#(B
 .Sh $B%*%W%7%g%s(B
 .Nm
 $B$NB>$N%*%W%7%g%s$O!"AH$_9g$o$;$F;HMQ$9$k$3$H$,$G$-$^$9!#(B
-1$BJ8;z%*%W%7%g%s$O!"%3%^%s%IC18l$NCf$G;XDj$9$k$3$H$,$G$-$^$9!#(B
+1 $BJ8;z%*%W%7%g%s$O!"%3%^%s%IC18l$NCf$G;XDj$9$k$3$H$,$G$-$^$9!#(B
 $B0z?t$rM?$($k$Y$-%*%W%7%g%s$N>l9g!"%*%W%7%g%s$KB3$1$F0z?t$r;XDj$7(B
-$B$^$9!#(B1$BJ8;z%*%W%7%g%s$G$"$l$P!"$3$l$KB3$/%3%^%s%I%i%$%s0z?t$r(B
+$B$^$9!#(B1 $BJ8;z%*%W%7%g%s$G$"$l$P!"$3$l$KB3$/%3%^%s%I%i%$%s0z?t$r(B
 $B;HMQ$7$^$9(B ($B0J2<$N(B
 .Sx $B;HMQNc(B
 $B$r;2>H$7$F$/$@$5$$!#(B)
@@ -136,7 +137,7 @@
 $B$N$9$Y$F$N%3%^%s%I%*%W%7%g%s$K$D$$$F0lMw$H2r@b$rI=<($7$^$9!#(B
 .It Fl -atime-preserve
 $B%F!<%W$K=q$+$l$F$$$k!"%U%!%$%k$N%"%/%;%9;~9o$r%j%9%H%"$7$^$9!#(B
-(inode$B$NJQ99;~9o$,JQ99$5$l$k$3$H$KCm0U$7$F$/$@$5$$(B!)
+(inode $B$NJQ99;~9o$,JQ99$5$l$k$3$H$KCm0U$7$F$/$@$5$$(B!)
 .It Fl b
 .It Fl -block-size Ar number
 $BFI$_=q$-$9$k%V%m%C%/%5%$%:$r(B
@@ -193,7 +194,7 @@
 $B;X$7$F$$$k%G!<%?$r=q$-9~$_$^$9!#(B
 .It Fl i
 .It Fl -ignore-zeros
-$B%"!<%+%$%V$NCf$N%<%m%V%m%C%/(B($BDL>o!"(BEnd-Of-File $B$r0UL#$9$k(B)$B$rL5;k$7$^$9!#(B
+$B%"!<%+%$%V$NCf$N%<%m%V%m%C%/(B ($BDL>o!"(BEnd-Of-File $B$r0UL#$9$k(B) $B$rL5;k$7$^$9!#(B
 .It Fl -ignore-failed-read
 $B%U%!%$%k$,FI$a$J$/$F$b!"Hs(B 0 $B$N%9%F!<%?%9$G(B exit $B$7$^$;$s!#(B
 .It Fl k
@@ -204,7 +205,7 @@
 .It Fl -starting-file Ar file
 $B%"!<%+%$%V$NCf$N(B
 .Ar file
-$B$+$i(B($BCj=P!"%j%9%H$J$I$r(B)$B;O$a$^$9!#(B
+$B$+$i(B ($BCj=P!"%j%9%H$J$I$r(B) $B;O$a$^$9!#(B
 .It Fl l
 .It Fl -one-file-system
 $B$"$k%U%!%$%k%7%9%F%`Fb$K$"$k%U%!%$%k$@$1$G%"!<%+%$%V$r:n@.$7$^$9!#(B
@@ -268,9 +269,9 @@
 .It Fl T Ar file
 .It Fl -files-from Ar file
 .Ar file
-$B$+$iCj=P$b$7$/$O:n@.$9$k%U%!%$%kL>$rF@$^$9!#(B(1$B9T(B1$B%U%!%$%kL>!#(B)
+$B$+$iCj=P$b$7$/$O:n@.$9$k%U%!%$%kL>$rF@$^$9!#(B(1 $B9T(B 1 $B%U%!%$%kL>!#(B)
 .It Fl -null
-null$B$G=*$o$C$F$$$kL>A0$r9MN8$7!"(B
+null $B$G=*$o$C$F$$$kL>A0$r9MN8$7!"(B
 .Fl T
 $B$N?6Iq$rJQ99$7$^$9!#(B
 $B$3$l$O(B
@@ -278,7 +279,7 @@
 $B;XDj$rL58z$K$7$^$9!#(B
 .It Fl -totals
 .Fl -create 
-$B$K$h$C$F=q$+$l$?%H!<%?%k%P%$%H?t$rI=<($7$^$9!#(B
+$B$K$h$C$F=q$+$l$?Am%P%$%H?t$rI=<($7$^$9!#(B
 .It Fl v
 .It Fl -verbose
 .Fl -create
@@ -312,6 +313,12 @@
 .It Fl -exclude-from Ar file
 .Ar file
 $B$K0lMw$5$l$F$$$k%U%!%$%k$r=|30$7$^$9!#(B
+.It Fl y
+.It Fl -bzip2
+.It Fl -bunzip2
+$B%"!<%+%$%V$r(B
+.Xr bzip2 1
+$B$G%U%#%k%?%j%s%0$7$^$9!#(B
 .It Fl Z
 .It Fl -compress
 .It Fl -uncompress
@@ -369,8 +376,8 @@
 .Pp
 .Dl tar xf backup.tar '*.[ch]'
 .Pp
-$B%7%'%k$,%+%l%s%H%G%#%l%/%H%jFb$N%U%!%$%kL>$KE83+$7$J$$$h$&!"%Q%?(B
-$B!<%s$r%/%)!<%H$7$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B($BEvA3!"(B
+$B%7%'%k$,%+%l%s%H%G%#%l%/%H%jFb$N%U%!%$%kL>$KE83+$7$J$$$h$&!"%Q%?!<%s$r(B
+$B%/%)!<%H$7$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B($BEvA3!"(B
 $B%7%'%k$O%"!<%+%$%VFb$N%U%!%$%k0lMw$K%"%/%;%9$9$k$3$H$O$G$-$^$;$s!#(B)
 .Pp
 $B%U%!%$%k$r3,AX9=B$$4$H%3%T!<$9$k$K$O!"$3$N$h$&$K%3%^%s%I$r;HMQ$7$F$/$@$5$$(B:
@@ -383,9 +390,9 @@
 .Pp
 .Dl tar --block-compress -z -c -v -f /dev/rfd1a -b 36 tar/
 .Pp
-$B$^$H$a;XDj%U%i%0$H(B --$B%9%?%$%k$N%U%i%0$r:.:_$5$;$k$3$H$,$G$-$J$$(B
+$B$^$H$a;XDj%U%i%0$H(B -- $B%9%?%$%k$N%U%i%0$r:.:_$5$;$k$3$H$,$G$-$J$$(B
 $B$3$H$KCm0U$7$F$/$@$5$$!#<!$N$h$&$K%?%$%W$7$J$1$l$P$J$i$J$$$o$1$G(B
-$B$O$J$/!">e5-$N$h$&$J=q$-J}$G(B1$BJ8;z%U%i%0$r;H$&$3$H$,$G$-$^$9!#(B
+$B$O$J$/!">e5-$N$h$&$J=q$-J}$G(B 1 $BJ8;z%U%i%0$r;H$&$3$H$,$G$-$^$9!#(B
 .Pp
 .Dl tar --block-compress --gzip --verbose --file /dev/rfd1a --block-size 20 tar
 /
@@ -449,6 +456,7 @@
 .\"     (command return values (to shell) and fprintf/stderr type diagnostics)
 .\" .Sh $B?GCG(B
 .Sh $B4XO"9`L\(B
+.Xr bzip2 1 ,
 .Xr compress 1 ,
 .Xr gzip 1 ,
 .Xr pax 1 ,
diff -ur man/man1/tbl.1 man/man1/tbl.1
--- man/man1/tbl.1	Wed Feb 25 13:54:16 1998
+++ man/man1/tbl.1	Sun Apr 25 21:44:03 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: tbl.1,v 1.2 1997/05/15 15:23:39 horikawa Stab %
-.TH TBL 1 "7 September 1996" "Groff Version 1.10"
+.TH TBL 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 tbl \- troff $B$N$?$a$NI=%U%)!<%^%C%?(B
 .SH $B=q<0(B
diff -ur man/man1/tfmtodit.1 man/man1/tfmtodit.1
--- man/man1/tfmtodit.1	Wed Feb 25 13:54:16 1998
+++ man/man1/tfmtodit.1	Sun Apr 25 21:44:04 1999
@@ -25,7 +25,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.10"
+.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 tfmtodit \- groff \-Tdvi $B$GMQ$$$k%U%)%s%H%U%!%$%k$r:n@.$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/time.1 man/man1/time.1
--- man/man1/time.1	Sat Sep 26 15:19:59 1998
+++ man/man1/time.1	Sun Apr 25 21:44:04 1999
@@ -40,7 +40,7 @@
 .Nd $B%3%^%s%I$N<B9T;~4V$N7WB,(B
 .Sh $B=q<0(B
 .Nm
-.Op Fl al
+.Op Fl alp
 .Op Fl o Ar file
 .Ar command
 .Sh $B2r@b(B
@@ -51,12 +51,10 @@
 $B$r<B9T$5$;!"=hM}$KMW$7$?;~4V$r7WB,$7$^$9!#(B
 .Ar command
 $B$N<B9T$r=*$($k$H!"(B
-$BI8=`%(%i!<=PNO$K(B
 $B<B9T3+;O$+$i<B:]$K7P2a$7$?;~4V!"(B
-$B%7%9%F%`$N%*!<%P%X%C%I$KHq$5$l$?;~4V!"(B
 .Ar command
-$B$N<B9T$KMW$7$?;~4V$rICC10L$G(B
-$B=PNO$7$^$9!#(B
+$B$N<B9T$KMW$7$?;~4V!"(B
+$B%7%9%F%`$N%*!<%P%X%C%I$KHq$5$l$?;~4V$r!"(B($BICC10L$G(B) $BI8=`%(%i!<=PNO$K=PNO$7$^$9!#(B
 .Pp
 $B;HMQ2DG=$J%*%W%7%g%s(B:
 .Bl -tag -width Ds
@@ -77,24 +75,42 @@
 $B$,B8:_$7!"(B
 .Fl a
 $B%U%i%0$,;XDj$5$l$J$+$C$?>l9g!"%U%!%$%k$O>e=q$-$5$l$^$9!#(B
+.It Fl p
+POSIX.2 $B$K=>$C$?=PNO$r!"(B
+.Nm
+$B$K$5$;$^$9(B ($B3F;~4V$,3F9T$KI=<($5$l$^$9(B)$B!#(B
 .El
 .Pp
+$B$[$H$s$I$N%7%'%k(B (
 .Xr csh 1
-$B$OFH<+$N(B
+$B$r4^$_$^$9(B) $B$OFH<+$N(B
 .Nm
-$B$r%S%k%H%$%s%3%^%s%I$H$7$F<BAu$7$F$$$^$9!#(B
-$B%7%'%k$K(B
-.Xr csh
-$B$r;HMQ$7$F$$$k>l9g!"(B
+$B$rAH$_9~$_%3%^%s%I$H$7$F<BAu$7$F$$$^$9!#(B
+$B$3$l$i$N%7%'%k$r;HMQ$7$F$$$k>l9g!"(B
 $B$3$3$G@bL@$5$l$F$$$k(B
 .Nm
 $B$r<B9T$9$k$H$-$O(B
 .Pa /usr/bin/time
 $B$H%?%$%W$7$F2<$5$$!#(B
+.Sh $B?GCG(B
+.Ar command
+$B$r@.8yN"$K;~4V7WB,$G$-$?>l9g!"%3%^%s%I$N=*N;>uBV$,JV$5$l$^$9!#(B
+.Ar command
+$B$,0[>o=*N;$7$?>l9g!"7Y9p%a%C%;!<%8$,I8=`%(%i!<=PNO$K=PNO$5$l$^$9!#(B
+.Ar command
+$B$,8+IU$+$C$?$b$N$N<B9T$G$-$J$+$C$?>l9g!"=*N;>uBV$O(B 126 $B$K$J$j$^$9!#(B
+.Ar command
+$B$,8+IU$+$i$J$+$C$?>l9g!"=*N;>uBV$O(B 127 $B$K$J$j$^$9!#(B
+.Nm
+$B$,B>$N%(%i!<$H$J$C$?>l9g!"=*N;>uBV$O(B 1 $B0J>e(B 125 $B0J2<$H$J$j$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr csh 1 ,
 .Xr getrusage 2 ,
 .Xr wait 2
+.Sh $B5,3J(B
+.Nm
+$B%f!<%F%#%j%F%#$O!"(B
+ISO/IEC 9945-2:1993 (``POSIX'') $B$K=>$C$F$$$k$H4|BT$5$l$F$$$^$9!#(B
 .Sh $BNr;K(B
 .Nm
 $B$O(B
diff -ur man/man1/troff.1 man/man1/troff.1
--- man/man1/troff.1	Fri Feb 12 00:44:39 1999
+++ man/man1/troff.1	Sun Apr 25 21:44:07 1999
@@ -28,7 +28,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH TFMTODIT 1 "8 September 1996" "Groff Version 1.10"
+.TH TFMTODIT 1 "8 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 troff \- $BJ8=q$r%U%)!<%^%C%H$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/tsort.1 man/man1/tsort.1
--- man/man1/tsort.1	Wed Feb 25 13:54:17 1998
+++ man/man1/tsort.1	Sun Apr 25 21:44:07 1999
@@ -56,7 +56,7 @@
 $B$+$i!"$"$k$$$O;XDj$,$J$$>l9g$OI8=`F~NO$+$iFI$_9~$_$^$9!#(B
 .Pp
 $BF~NO$K$*$$$F%N!<%IL>$O6uGr$G6h@Z$j$^$9!#(B
-$B%N!<%IBP$N?t$O6v?t8D$G$J$1$l$P$J$j$^$;$s!#(B
+$B%N!<%I$N?t$O6v?t8D$G$J$1$l$P$J$j$^$;$s!#(B
 .Pp
 $B%0%i%UCf$N%N!<%I$O(B
 $B<+J,<+?H$X$N%"!<%/$r;}$D%N!<%I$H$7$F5-=R$9$k$3$H$,$G$-$^$9!#(B
diff -ur man/man1/uniq.1 man/man1/uniq.1
--- man/man1/uniq.1	Sat Sep 26 15:19:59 1998
+++ man/man1/uniq.1	Sun Apr 25 21:44:08 1999
@@ -33,9 +33,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\"	%Id: uniq.1,v 1.3 1997/09/07 15:09:22 joerg Exp %
-.\" jpman %Id: uniq.1,v 1.2 1997/03/29 11:56:16 horikawa Stab %
+.\"	%Id: uniq.1,v 1.3.2.1 1999/03/15 02:58:24 billf Exp %
 .\"
+.\" jpman %Id: uniq.1,v 1.2 1997/03/29 11:56:16 horikawa Stab %
 .Dd June 6, 1993
 .Dt UNIQ 1
 .Os
diff -ur man/man1/vidcontrol.1 man/man1/vidcontrol.1
--- man/man1/vidcontrol.1	Tue Oct 27 23:33:12 1998
+++ man/man1/vidcontrol.1	Sun Apr 25 21:44:08 1999
@@ -11,9 +11,9 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\"	%Id: vidcontrol.1,v 1.14 1998/09/23 10:00:15 yokota Exp %
-.\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
+.\"	%Id: vidcontrol.1,v 1.14.2.1 1999/04/08 13:53:31 ghelmer Exp %
 .\"
+.\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
 .Dd May 22, 1994
 .Dt VIDCONTROL 1
 .Os
@@ -40,7 +40,7 @@
 .Sh $B2r@b(B
 .Nm
 $B%3%^%s%I$rMQ$$$F(B syscons $B2hLL%I%i%$%P$NMM!9$J%*%W%7%g%s!"Nc$($P!"(B
-$B2hLL%b!<%I!"?'!"%+!<%=%k!"2hLL%^%C%W(B(scrnmap)$B!"(B
+$B2hLL%b!<%I!"?'!"%+!<%=%k!"2hLL%^%C%W(B (scrnmap)$B!"(B
 $B%U%)%s%H!"%9%/%j!<%s%;!<%P%?%$%`%"%&%H$r@_Dj$9$k$3$H$,$G$-$^$9!#(B
 .Pp
 $B0J2<$N%3%^%s%I%i%$%s%*%W%7%g%s$r%5%]!<%H$7$F$$$^$9(B:
@@ -77,12 +77,12 @@
 $BA05-$NA4%b!<%I$r(B
 $B%S%G%*%+!<%I$,%5%]!<%H$7$F$$$k$H$O8B$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
 $B$^$?!"(B VESA $B%S%G%*%b!<%I$b$7$/$O(B 132 $B7e%b!<%I$r;HMQ$9$k>l9g$K$O!"(B
-VESA BIOS $B%5%]!<%H$r%+!<%M%k$K%j%s%/$9$k$+(B LKM $B$K$F%m!<%I$9$kI,MW$,$"$k$3$H$K$b(B
+VESA BIOS $B%5%]!<%H$r%+!<%M%k$K%j%s%/$9$k$+(B KLD $B$K$F%m!<%I$9$kI,MW$,$"$k$3$H$K$b(B
 $BCm0U$7$F$/$@$5$$!#(B
 .It fgcol Op bgcol
 $B%F%-%9%H$rI=<($9$k:]$N?'$rJQ99$7$^$9!#(B
-$BA07J?'(B($BNc(B: "vidcontrol white")$B!"$"$k$$$O(B
-$BA07J?'$*$h$SGX7J?'(B($BNc(B: "vidcontrol yellow blue")$B$r;XDj$9$k$3$H$K$h$j(B
+$BA07J?'(B ($BNc(B: "vidcontrol white")$B!"$"$k$$$O(B
+$BA07J?'$*$h$SGX7J?'(B ($BNc(B: "vidcontrol yellow blue") $B$r;XDj$9$k$3$H$K$h$j(B
 $BJQ99$G$-$^$9!#(B
 .It show
 $B;XDj$7$?%W%i%C%H%U%)!<%`$G%5%]!<%H$5$l$F$$$k?'$rI=<($7$^$9!#(B
@@ -95,11 +95,11 @@
 .It Fl b Ar color
 $B%\!<%@?'$r(B
 .Ar color
-$B$K@_Dj$7$^$9(B(VGA $B%O!<%I%&%'%"$G$N$_%5%]!<%H$5$l$F$$$^$9(B)$B!#(B
+$B$K@_Dj$7$^$9(B (VGA $B%O!<%I%&%'%"$G$N$_%5%]!<%H$5$l$F$$$^$9(B)$B!#(B
 .It Fl c Ar normal|blink|destructive
 $B%+!<%=%k$N304Q$rJQ99$7$^$9!#(B
-$B%+!<%=%k$O!"H?E>%V%m%C%/(B(normal)$B!"H?E>%V%m%C%/$NE@LG(B(blink)$B!"(B
-$B$"$k$$$O8E$$%O!<%I%&%'%"%+!<%=%kMM$N$b$N(B(destructive)$B$N$$$:$l$+$G$9!#(B
+$B%+!<%=%k$O!"H?E>%V%m%C%/(B (normal)$B!"H?E>%V%m%C%/$NE@LG(B (blink)$B!"(B
+$B$"$k$$$O8E$$%O!<%I%&%'%"%+!<%=%kMM$N$b$N(B (destructive) $B$N$$$:$l$+$G$9!#(B
 $B8e<T$O<B:]$K$O%7%_%e%l!<%H$7$F$$$^$9!#(B
 .It Fl d
 $B8=:_$N2hLL=PNO%^%C%W$rI=<($7$^$9!#(B
@@ -119,7 +119,7 @@
 $B$^$?$O(B
 .Ar off
 $B$7$^$9!#(B
-$B%F%-%9%H%b!<%I$G$N%+%C%H(B&$B%Z!<%9%H5!G=$rMxMQ$9$k$?$a$K(B moused $B%G!<%b%s$H6&$K(B
+$B%F%-%9%H%b!<%I$G$N%+%C%H(B & $B%Z!<%9%H5!G=$rMxMQ$9$k$?$a$K(B moused $B%G!<%b%s$H6&$K(B
 $B;HMQ$7$^$9!#(B
 .It Fl f Ar size Ar file
 $B%5%$%:(B
@@ -139,7 +139,7 @@
 .It Fl t Ar N|off
 $B%9%/%j!<%s%;!<%P$N%?%$%`%"%&%HCM$r(B
 .Ar N
-$BIC$K@_Dj!"$"$k$$$O%9%/%j!<%s%;!<%P$rL58z(B(
+$BIC$K@_Dj!"$"$k$$$O%9%/%j!<%s%;!<%P$rL58z(B (
 .Ar off
 )$B$K$7$^$9!#(B
 .It Fl x
diff -ur man/man1/whois.1 man/man1/whois.1
--- man/man1/whois.1	Sat Sep 26 15:20:00 1998
+++ man/man1/whois.1	Sun Apr 25 21:44:09 1999
@@ -30,10 +30,10 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\"	%Id: whois.1,v 1.4 1998/02/19 19:07:49 wollman Exp %
-.\" jpman %Id: whois.1,v 1.3 1997/06/14 04:30:33 kubo Stab %
+.\"	%Id: whois.1,v 1.4.2.1 1999/03/17 03:20:46 billf Exp %
 .\"
-.Dd February 19, 1998
+.\" jpman %Id: whois.1,v 1.3 1997/06/14 04:30:33 kubo Stab %
+.Dd February 1, 1999
 .Dt WHOIS 1
 .Os BSD 4.3
 .Sh $BL>>N(B
@@ -41,7 +41,7 @@
 .Nd $B%$%s%?!<%M%C%H$N%I%a%$%sL>$H%M%C%H%o!<%/HV9f$N%G%#%l%/%H%j%5!<%S%9(B
 .Sh $B=q<0(B
 .Nm whois
-.Op Fl adpr
+.Op Fl adgprR
 .Op Fl h Ar host
 .Ar name ...
 .Sh $B2r@b(B
@@ -62,11 +62,14 @@
 .Tn RIPE
 $B0J30$,%+%P!<$9$kA4@$3&$N(B IP $BHV9f$,$"$j$^$9!#(B
 .It Fl d
-(US Military) Defense Data Network
-.Pq Tn DDN
+US Department of Defense
 $B%G!<%?%Y!<%9$r;HMQ$7$^$9!#(B
 .Tn \&.MIL
 $B$N%5%V%I%a%$%s$NO"Mm@h$,$"$j$^$9!#(B
+.It Fl g
+US $B$N730J30$NO"K.@/I\%G!<%?%Y!<%9$r;HMQ$7$^$9!#(B
+.Tn \&.GOV
+$B$N%5%V%I%a%$%s$NO"Mm@h$,$"$j$^$9!#(B
 .It Fl h Ar host
 $B%G%U%)%k%H$N(B NIC (whois.internic.net) $B$KBe$($F!";XDj$7$?%[%9%HMQ$$$^$9!#(B
 $B%[%9%HL>$b$7$/$O(B IP $BHV9f$r;XDj2DG=$G$9!#(B
@@ -80,7 +83,14 @@
 R\(aaeseaux IP Europ\(aaeens
 .Pq Tn RIPE
 $B%G!<%?%Y!<%9$r;HMQ$7$^$9!#(B
-$B$3$3$K$O!"%h!<%m%C%Q$N%I%a%$%sHV9f$H%I%a%$%s$NO"Mm@h>pJs$,$"$j$^$9!#(B
+$B$3$3$K$O!"%h!<%m%C%Q$N%M%C%H%o!<%/HV9f$H%I%a%$%s$NO"Mm@h>pJs$,$"$j$^$9!#(B
+.It Fl R
+Russia Network Information Center
+.Pq Tn RIPN
+$B%G!<%?%Y!<%9$r;HMQ$7$^$9!#(B
+$B$3$3$K$O!"(B
+.Tn \&.RU
+$B$N%M%C%H%o!<%/HV9f$H%I%a%$%s$NO"Mm@h>pJs$,$"$j$^$9!#(B
 .El
 .Pp
 .Nm
@@ -106,7 +116,13 @@
 .Ar name
 $B$K;XDj$7$F2<$5$$!#(B
 .Sh $B4XO"9`L\(B
-RFC 812: Nicname/Whois
+.Rs
+.%A Ken Harrenstien
+.%A Vic White
+.%T NICNAME/WHOIS
+.%D 1 March 1982
+.%O RFC 812
+.Re
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
Only in man: man1aout
diff -ur man/man5/gettytab.5 man/man5/gettytab.5
--- man/man5/gettytab.5	Thu Feb  4 07:10:35 1999
+++ man/man5/gettytab.5	Sun Apr 25 21:44:41 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	%Id: gettytab.5,v 1.18 1998/06/10 12:34:25 phk Exp %
+.\"	%Id: gettytab.5,v 1.18.2.1 1999/04/07 05:35:25 peter Exp %
 .\"
 .\" jpman %Id: gettytab.5,v 1.3 1998/07/30 15:25:14 horikawa Stab %
 .\" "
@@ -90,11 +90,12 @@
 .Bl -column $BL>>N(B $BJ8;zNs(B /usr/bin/login
 .It Sy $BL>>N(B	$B7?(B	$B%G%U%)%k%H(B	$B2r@b(B
 .It "ac	$BJ8;zNs(B	unused	$B%b%G%`1~Ez$N$?$a$NA[DjJ8;zNs(B-$B1~Ez%A%c%C%H%9%/%j%W%H(B"
+.It "al	$BJ8;zNs(B	unused	$B%W%m%s%W%H$r=P$5$:$K<+F0%m%0%$%s$9$k%f!<%6(B"
 .It "ap	bool	$B56(B	$BC<Kv$O$I$N%Q%j%F%#$G$b<u$1IU$1$k(B"
 .It "bk	$BJ8;zNs(B	0377	$BBeMQ$N9TKvJ8;z(B ($BF~NO%V%l!<%/(B)"
-.It "c0	$B?tCM(B	unused	$B%a%C%;!<%8=q$-=P$7$N$?$a$N(B tty $B%3%s%H%m!<%k%U%i%072(B"
-.It "c1	$B?tCM(B	unused	$B%m%0%$%sL>FI$_9~$_$N$?$a$N(B tty $B%3%s%H%m!<%k%U%i%072(B"
-.It "c2	$B?tCM(B	unused	$BC<Kv$r5n$k$H$-$N%3%s%H%m!<%k%U%i%072(B"
+.It "c0	$B?tCM(B	unused	$B%a%C%;!<%8=q$-=P$7$N$?$a$N(B tty $B@)8f%U%i%072(B"
+.It "c1	$B?tCM(B	unused	$B%m%0%$%sL>FI$_9~$_$N$?$a$N(B tty $B@)8f%U%i%072(B"
+.It "c2	$B?tCM(B	unused	$BC<Kv$r5n$k$H$-$N@)8f%U%i%072(B"
 .It "ce	bool	$B56(B	crt $BJ8;z>C5n%"%k%4%j%:%`$rMQ$$$k(B"
 .It "ck	bool	$B56(B	crt $B9T:o=|%"%k%4%j%:%`$rMQ$$$k(B"
 .It "cl	$BJ8;zNs(B" Ta Dv NULL Ta
@@ -104,7 +105,7 @@
 $B$r%m%0%$%s%W%m%s%W%H$N8e$KDI2C$9$k(B
 .It "ct	$B?tCM(B	10	ac/ic $B%9%/%j%W%H$N$?$a$N%A%c%C%H%?%$%`%"%&%H(B"
 .It "dc	$B?tCM(B	0	$B%A%c%C%H%G%P%C%0MQ%S%C%H%^%9%/(B"
-.It "de	$B?tCM(B	0	$B$3$NIC?t$@$1BT$C$F!":G=i$N%W%m%s%W%H$rIA$/A0$KF~NO$r%U%i%C%7%e$9$k(B"
+.It "de	$B?tCM(B	0	$B$3$NIC?t$@$1BT$C$F!":G=i$N%W%m%s%W%H$r=q$/A0$KF~NO$r%U%i%C%7%e$9$k(B"
 .It "ds	$BJ8;zNs(B" Ta So Li ^Y Sc Ta
 .No "$BCY1d$5$l$?%5%9%Z%s%IJ8;z(B"
 .It "dx	bool	$B56(B	"
@@ -157,7 +158,7 @@
 .No "$BL>A0$rF@$?$H$-$K<B9T$9$k%W%m%0%i%`(B"
 .It "mb	bool	$B56(B	$B%-%c%j%"$K4p$E$$$?%U%m!<@)8f$r9T$&(B"
 .It "nl	bool	$B56(B	$BC<Kv$K$O2~9TJ8;z$,$"$k(B ($B$"$k$$$O!"$"$k$O$:$G$"$k(B)"
-.It "np	bool	$B56(B	$BC<Kv$O%Q%j%F%#$rMQ$$$J$$(B ($B$D$^$j(B 8bit $BJ8;z(B)"
+.It "np	bool	$B56(B	$BC<Kv$O%Q%j%F%#$rMQ$$$J$$(B ($B$D$^$j(B 8 $B%S%C%HJ8;z(B)"
 .It "nx	$BJ8;zNs(B	default	($BB.EY$N<+F0A*Br$N$?$a$N(B) $B<!$N%F!<%V%k(B"
 .It "o0	$B?tCM(B	unused	$B%a%C%;!<%8=q$-=P$7$N$?$a$N(B tty $B=PNO%U%i%072(B"
 .It "o1	$B?tCM(B	unused	$B%m%0%$%sL>FI$_9~$_$N$?$a$N(B tty $B=PNO%U%i%072(B"
@@ -191,7 +192,7 @@
 .It "ub	bool	$B56(B	($B%W%m%s%W%H$J$I$N(B) $B%P%C%U%!%j%s%0$7$J$$=PNO$r9T$&(B"
 .It "we	$BJ8;zNs(B" Ta So Li ^W Sc Ta
 .No "$BC18l>C5nJ8;z(B"
-.It xc	bool	$B56(B	$B%3%s%H%m!<%kJ8;z$r(B
+.It xc	bool	$B56(B	$B@)8fJ8;z$r(B
 .Ql ^X
 $B$N7A$G=PNO(B
 .Tn $B$7$J$$(B
@@ -215,7 +216,7 @@
 .It "uc	bool	$B56(B	$BC<Kv$G$OBgJ8;z$7$+;H$($J$$(B"
 .El
 .Pp
-$B2s@~B.EY$,;XDj$5$l$F$$$J$$>l9g!"(B getty $B$,5/F0$5$l$?;~$K@_Dj$5$l$F$$$kB.EY$O(B
+$B2s@~B.EY$,;XDj$5$l$F$$$J$$>l9g!"(Bgetty $B$,5/F0$5$l$?;~$K@_Dj$5$l$F$$$kB.EY$O(B
 $BJQ99$5$l$^$;$s!#(B
 $BF~NOB.EY$^$?$O=PNOB.EY$r;XDj$7$?$H$-$O!"(B
 $B;XDj$7$?J}8~$N2s@~B.EY$N$_$,>e=q$-99?7$5$l$^$9!#(B
@@ -237,9 +238,8 @@
 .Em \&l2 ,
 .Em \&o0 ,
 .Em \&o1 ,
-$B$^$?$O(B
 .Em \&o2
-$B$N$I$l$+$G>e=q$-$5$l$^$9!#(B
+$B$N$$$:$l$+$G>e=q$-$5$l$^$9!#(B
 $B$3$l$i$N?tCM;XDj$G$O!"%U%i%0$NCM(B
 ($BDL>o$O!"(B0 $B$rF,$K$D$1$?(B 8 $B?J?t(B)
 $B$=$N$b$N$r;XDj$9$k$3$H$,$G$-$^$9!#(B
@@ -255,10 +255,10 @@
 .Em \&f1 ,
 $B$*$h$S(B
 .Em \&f2
-$B$O(BTTY$B%5%V%7%9%F%`$N5lHG$N<BAu$KBP$9$k8eJ}8_49@-$r0U?^$7$?J*$G$9!#(B
+$B$O(B TTY $B%5%V%7%9%F%`$N5lHG$N<BAu$KBP$9$k8eJ}8_49@-$r0U?^$7$?J*$G$9!#(B
 $B$3$l$i$N%U%i%0$K$O!"(Bsgttyb $B$N(B
 .Em sg_flags
-$B%U%#!<%k%I$N(B (32$B%S%C%H(B) $BCM$N2<0L(B16$B%S%C%H$,4^$^$l$^$9!#$^$?!">e0L(B16$B%S%C%H$O(B
+$B%U%#!<%k%I$N(B (32 $B%S%C%H(B) $BCM$N2<0L(B 16 $B%S%C%H$,4^$^$l$^$9!#$^$?!">e0L(B 16 $B%S%C%H$O(B
 $B%m!<%+%k%b!<%I$r<}$a$k%o!<%I$rI=$7$^$9!#(B
 .Pp
 $B$b$7(B
@@ -323,7 +323,7 @@
 $B%^%7%s$N7?!"%*%Z%l!<%F%#%s%0%7%9%F%`$N%j%j!<%9!"%*%Z%l!<%F%#%s%0%7%9%F%`$N(B
 $BL>A0!"$=$7$F%+!<%M%k$N%P!<%8%g%s$G$9!#(B
 .It \&%%
-1$B8D$N(B
+1 $B8D$N(B
 .Dq %
 $BJ8;z!#(B
 .El
@@ -396,7 +396,7 @@
 $B0J8e$bF1MM$K=hM}$r?J$a$^$9!#(B
 $B;XDj$5$l$?J8;zNs$O(B 1 $B8D0J>e$N%?%V$"$k$$$O%9%Z!<%9$G6h@Z$i$l$F$$$^$9!#(B
 $BJ8;zNs$K$OI8=`(B ASCII $BJ8;z$H!"FCJL$J!V%(%9%1!<%W!W$r4^$a$k$3$H$,(B
-$B$G$-$^$9!#%(%9%1!<%W$O!"%P%C%/%9%i%C%7%e$KB3$-(B1$BJ8;z0J>e$NJ8;z$,(B
+$B$G$-$^$9!#%(%9%1!<%W$O!"%P%C%/%9%i%C%7%e$KB3$-(B 1 $BJ8;z0J>e$NJ8;z$,(B
 $BB3$$$?$b$N$G!"$=$l$O(B
 $B0J2<$N$h$&$K2r<a$5$l$^$9!#(B
 .Pp
@@ -441,7 +441,7 @@
 ($B%3%^%s%I%(%3!<$rM^@)$7!"1~Ez$rJV$9:]$K>iD9%b!<%I$GJV$9(B)
 $B$K3N<B$K$J$k$h$&$J%7!<%1%s%9$rAw$j!"$=$l$+$i<+F01~Ez$r(B
 $B@Z$j$^$9!#(B
-$B=*N;$9$kA0$K!"(B "OK" $B$H$$$&H?1~$rBT$A$^$9!#(B
+$B=*N;$9$kA0$K!"(B"OK" $B$H$$$&H?1~$rBT$A$^$9!#(B
 $B$3$N=i4|2=%7!<%1%s%9$O!"%b%G%`$N1~Ez$r%A%'%C%/$7$F(B
 $B%b%G%`$,@5$7$/5!G=$7$F$$$k$+$r3N$+$a$k$?$a$K(B
 $BMQ$$$i$l$^$9!#(B
@@ -477,7 +477,7 @@
 $B$KE,MQ$5$l$k%?%$%`%"%&%H$NCM$r;XDj$7$^$9!#$3$N%?%$%`%"%&%H$O(B
 $BJ8;zNsBT$A$r9T$&$4$H!"$*$h$SJ8;zNsAw?.$r9T$&$4$H$K@_Dj$5$l$^$9!#(B
 $B>/$J$/$H$b%j%b!<%H$H%m!<%+%k$N%b%G%`$N4V$N%3%M%/%7%g%s$,3NN)$5$l$k(B
-$B$N$K$+$+$k;~4V(B ($BDL>o$*$h$=(B10$BIC(B) $B$@$1$ND9$5$OI,MW$G$9!#(B
+$B$N$K$+$+$k;~4V(B ($BDL>o$*$h$=(B 10 $BIC(B) $B$@$1$ND9$5$OI,MW$G$9!#(B
 .Pp
 $B$[$H$s$I$N>p67$G!"%3%M%/%7%g%s$,8!=P$5$l$?8e$K(B
 $BDI2C$NF~NO$N$9$Y$F$r%U%i%C%7%e$7$?$$$H;W$&$b$N$G$9$,!"(B
@@ -501,7 +501,7 @@
 $B$K$h$C$F%7%9%F%`$N%G%U%)%k%H$K:F@_Dj$5$l$F$7$^$$$^$9!#(B
 .Em $B>o$K!"(B
 $B%m%0%$%sL>$H$7$F%?%$%W$7$?(B '#' $B$"$k$$$O(B '^H' $B$O(B1$BJ8;z>C5n$H$7$F(B
-$B07$o$l!"(B '@' $B$O9T>C5n$H$7$F07$o$l$^$9!#(B
+$B07$o$l!"(B'@' $B$O9T>C5n$H$7$F07$o$l$^$9!#(B
 .Pp
 $BCY1d5!G=$O<B%/%m%C%/$G$9!#(B
 $BA4HLE*$K=@Fp@-$,$J$$$H$$$&LdBj$O$5$F$*$-!"CY1d%"%k%4%j%:%`$N$$$/$D$+$O(B
diff -ur man/man5/groff_font.5 man/man5/groff_font.5
--- man/man5/groff_font.5	Fri Aug 14 16:06:56 1998
+++ man/man5/groff_font.5	Sun Apr 25 21:44:42 1999
@@ -33,7 +33,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_font \- groff $B$N%G%P%$%9$H%U%)%s%H$r5-=R$9$k%U%!%$%k$N=q<0(B
 .SH $B2r@b(B
diff -ur man/man5/groff_out.5 man/man5/groff_out.5
--- man/man5/groff_out.5	Fri Aug 14 16:06:56 1998
+++ man/man5/groff_out.5	Sun Apr 25 21:44:42 1999
@@ -28,7 +28,7 @@
 .\" WORD: print			$B0u;z(B
 .ie \n(.g .ds ic \/
 .el .ds ic \^
-.TH GROFF_OUT 5 "11 May 1998" "Groff Version 1.10"
+.TH GROFF_OUT 5 "11 May 1998" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_out \- groff $B$NCf4V=PNO%U%)!<%^%C%H(B
 .SH $B2r@b(B
diff -ur man/man5/group.5 man/man5/group.5
--- man/man5/group.5	Sat Sep 26 15:20:10 1998
+++ man/man5/group.5	Fri Apr  9 22:45:20 1999
@@ -61,7 +61,7 @@
 .El
 .Pp
 $B:G=i$NHs6uGrJ8;z$,%]%s%I%5%$%s(B (#) $B$G$"$k9T$O%3%a%s%H$G$"$j!"L5;k$5$l$^$9!#(B
-$B6uGr!&%?%V!&2~9T$N$_$+$i$J$k9T$O6u9T$O$G$"$j!"$3$l$bL5;k$5$l$^$9!#(B
+$B6uGr!&%?%V!&2~9T$N$_$+$i$J$k9T$O6u9T$G$"$j!"$3$l$bL5;k$5$l$^$9!#(B
 .Pp
 .Ar group
 $BMs$O!"$=$N%0%k!<%W$N%a%s%P$G$"$k%f!<%6$K%U%!%$%k%"%/%;%9$r5v2D$9$k$?$a$K(B
diff -ur man/man5/rc.conf.5 man/man5/rc.conf.5
--- man/man5/rc.conf.5	Mon Feb  1 23:37:38 1999
+++ man/man5/rc.conf.5	Sun Apr 25 21:44:43 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     %Id: rc.conf.5,v 1.27 1999/01/14 09:13:00 jkh Exp %
+.\"     %Id: rc.conf.5,v 1.27.2.1 1999/03/24 17:24:32 brian Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -133,6 +133,10 @@
 ($B%V!<%kCM(B)
 .Ar YES
 $B$K%;%C%H$9$k$H5/F0;~$K%3%s%=!<%k>e$G(B ipfw $B5,B'$NI=<($r9T$J$$$^$;$s!#(B
+.It Ar natd_program
+($BJ8;zNs(B)
+.Xr natd 8
+$B$N%Q%9!#(B
 .It Ar natd_enable
 ($B%V!<%kCM(B)
 .Ar YES
diff -ur man/man7/groff_char.7 man/man7/groff_char.7
--- man/man7/groff_char.7	Tue Jan 26 00:29:00 1999
+++ man/man7/groff_char.7	Sun Apr 25 21:45:01 1999
@@ -42,7 +42,7 @@
 ..
 .Ac \(vc \(ah c
 .Ac \(vC \(ah C
-.TH GROFF_CHAR 7 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_CHAR 7 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_char \- groff $B$NJ8;zL>(B
 .SH $B2r@b(B
diff -ur man/man7/groff_me.7 man/man7/groff_me.7
--- man/man7/groff_me.7	Tue Jan 26 00:29:00 1999
+++ man/man7/groff_me.7	Sun Apr 25 21:45:02 1999
@@ -18,7 +18,7 @@
 .\"
 .\" Modified for groff by jjc@jclark.com
 .hc %
-.TH GROFF_ME 7 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_ME 7 "7 September 1996" "Groff Version 1.11"
 .UC 3
 .SH $BL>>N(B
 groff_me \- $BO@J8$r@07A$9$k$?$a$N(B troff $B%^%/%m(B
diff -ur man/man7/groff_mm.7 man/man7/groff_mm.7
--- man/man7/groff_mm.7	Tue Jan 26 00:29:00 1999
+++ man/man7/groff_mm.7	Sun Apr 25 21:45:05 1999
@@ -50,7 +50,7 @@
 \fB\\$1\fP
 .br
 ..
-.TH GROFF_MM 7 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_MM 7 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_mm \- groff mm $B%^%/%m(B
 .SH $B=q<0(B
diff -ur man/man7/groff_mmse.7 man/man7/groff_mmse.7
--- man/man7/groff_mmse.7	Tue Jan 26 00:29:00 1999
+++ man/man7/groff_mmse.7	Sun Apr 25 21:45:05 1999
@@ -3,7 +3,7 @@
 .\" jpman %Id: groff_mmse.7,v 1.3 1998/11/21 12:55:00 horikawa Stab %
 .\" Skrivet av Joergen Haegg, Lund, Sverige
 .\"
-.TH GROFF_MMSE 7 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_MMSE 7 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_mmse \- groff $BMQ%9%&%'!<%G%s8lHG(B mm $B%^%/%m(B
 .SH $B=q<0(B
diff -ur man/man7/groff_ms.7 man/man7/groff_ms.7
--- man/man7/groff_ms.7	Tue Jan 26 00:29:00 1999
+++ man/man7/groff_ms.7	Sun Apr 25 21:45:06 1999
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: groff_ms.7,v 1.3 1999/01/06 22:32:03 vanitas Stab %
-.TH GROFF_MS 7 "7 September 1996" "Groff Version 1.10"
+.TH GROFF_MS 7 "7 September 1996" "Groff Version 1.11"
 .SH $BL>>N(B
 groff_ms \- groff ms $B%^%/%m(B
 .SH $B=q<0(B
diff -ur man/man7/security.7 man/man7/security.7
--- man/man7/security.7	Sun Mar  7 18:27:10 1999
+++ man/man7/security.7	Sun Apr 25 21:45:08 1999
@@ -2,9 +2,9 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\"	%Id: security.7,v 1.4 1998/12/26 05:19:42 dillon Exp %
-.\" jpman %Id: security.7,v 1.3 1999/02/11 11:18:48 vanitas Stab %
+.\"	%Id: security.7,v 1.4.2.1 1999/04/01 02:10:38 ghelmer Exp %
 .\"
+.\" jpman %Id: security.7,v 1.3 1999/02/11 11:18:48 vanitas Stab %
 .Dd December 20, 1998
 .Dt SECURITY 7
 .Os
@@ -64,7 +64,9 @@
 $B%5!<%P$r<B9T$5$;$F$$$k%7%9%F%`4IM}<T$OB?$$$N$G$9!#$3$l$i$N(B
 $B%5!<%P$O!"%G%U%)%k%H$G$O!"0E9f2=$5$l$?%3%M%/%7%g%s>e$GF0:n$7$F$$$^$;$s!#(B
 $B$=$N7k2L!"Jz$($F$$$k%f!<%6?t$,I8=`$/$i$$$G$"$l$P!"%j%b!<%H%m%0%$%s(B
-.Pq $B$=$N%7%9%F%`$K%m%0%$%s$9$k$K$O:G$bIaDL$GJXMx$JJ}K!$G$9(B
+.Po
+$B$=$N%7%9%F%`$K%m%0%$%s$9$k$K$O:G$bIaDL$GJXMx$JJ}K!$G$9(B
+.Pc
 $B$7$F$$$k%f!<%6$N$&$A0l?M0J>e$O!"%Q%9%o!<%I$rGA$-8+$i$l$F(B
 $B$7$^$&$G$7$g$&!#(B
 $B%7%9%F%`4IM}<T$,Cm0U?<$$?M$J$i$P!"$?$H$(%m%0%$%s$,@.8y$7$F$$$?$H$7$F$b!"(B
@@ -133,7 +135,7 @@
 $BF0:n$5$;$k$K$O!"$5$i$KDI2C$N%Q%9%o!<%IG'>Z$,I,MW$G$"$k$h$&$K$7$F(B
 $B$*$-$^$9!#(Broot $B$G%"%/%;%92DG=$H$9$kJ}K!$N0l$D$H$7$F!"(B
 $BE,@Z$J%9%?%C%U%"%+%&%s%H$r(B
-.Pq /etc/group $B$N(B
+.Pq Pa /etc/group $B$N(B
 wheel $B%0%k!<%W$K2C$($k$3$H$,$"$j$^$9!#(B
 wheel $B%0%k!<%W$KCV$+$l$?%9%?%C%U%a%s%P$K$O!"(B
 .Sq su
@@ -262,8 +264,12 @@
 $B%7%9%F%`$N(B root $B8"8B$N@x:_E*$J7j$GB>$KBg$-$J$b$N$H$7$F!"%7%9%F%`$K(B
 $B%$%s%9%H!<%k$5$l$?(B suid-root/sgid $B%P%$%J%j$,$"$j$^$9!#(B
 $B$3$l$i$N%P%$%J%j$O!"(Brlogin$B$N$h$&$K!"(B
-/bin, /sbin, /usr/bin, /usr/sbin $B$K(B
-$BB8:_$9$k$b$N$,$[$H$s$I$G$9!#(B100% $B0BA4$J$b$N$OB8:_$7$J$$$H$O$$$(!"%7%9%F%`%G%U%)%k%H$N(B
+.Pa /bin ,
+.Pa /sbin ,
+.Pa /usr/bin ,
+.Pa /usr/sbin
+$B$KB8:_$9$k$b$N$,$[$H$s$I$G$9!#(B
+100% $B0BA4$J$b$N$OB8:_$7$J$$$H$O$$$(!"%7%9%F%`%G%U%)%k%H$N(B
 siud/sgid $B%P%$%J%j$OHf3SE*0BA4$H$$$($^$9!#$=$l$G$b$J$*!"(Broot $B$N7j$,(B
 $B$3$l$i$N%P%$%J%j$K$H$-$*$jH/8+$5$l$F$$$^$9!#(B1998 $BG/$K(B Xlib $B$G8+$D$+$C$?(B
 root $B$N7j$O!"(Bxterm
@@ -272,12 +278,15 @@
 $B0BA4$G$"$kJ}$,$h$$$N$G!"MQ?4?<$$%7%9%F%`4IM}<T$O;DG0$K;W$$$J$,$i$b!"(B
 $B%9%?%C%U$N$_$,<B9T$9$kI,MW$,$"$k(B suid $B%P%$%J%j$O!"%9%?%C%U$N$_$,(B
 $B%"%/%;%92DG=$JFCJL$J%0%k!<%W$K4^$a$k$h$&$K@)8B$r2C$(!"(B
-$BC/$b;H$o$J$$(B suid $B%P%$%J%j$O(B chmod 000 $B$r<B9T$7$FJRIU$1$F$7$^$&$G(B
-$B$7$g$&!#(B
+$BC/$b;H$o$J$$(B suid $B%P%$%J%j$O(B
+.Pq chmod 000 $B$r<B9T$7$F(B
+$BJRIU$1$F$7$^$&$G$7$g$&!#(B
 $B%G%#%9%W%l%$$r;}$?$J$$%5!<%P$O!"0lHLE*$K(B xterm $B$N%P%$%J%j$rI,MW$H$7$^$;$s!#(B
 sgid $B%P%$%J%j$b$[$H$s$IF1MM$N4m81$JB8:_$K$J$jF@$^$9!#(B
 $B?/F~<T$,(B kmem $B$K(B sgid $B$5$l$?%P%$%J%j$rGK$k$3$H$,$G$-$?>l9g!"(B
-$B$=$N?/F~<T$O(B /dev/kmem $B$rFI$_=P$9$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
+$B$=$N?/F~<T$O(B
+.Pa /dev/kmem
+$B$rFI$_=P$9$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 $B$D$^$j!"0E9f2=$5$l$?%Q%9%o!<%I%U%!%$%k$rFI$_=P$9$3$H$,$G$-$k(B
 $B$h$&$K$J$k$N$G!"%Q%9%o!<%I$r;}$D$I$N%"%+%&%s%H$r$b!"(B
 .Pq $B@x:_E*$J(B
@@ -306,13 +315,15 @@
 $B$G$-$k$@$1B?$/$N%Q%9%o!<%I$r(B\ * $B$G30$7!"$=$l$i$N%"%+%&%s%H$N%"%/%;%9$K$O(B
 ssh $B$d(B kerberos $B$r;H$&$h$&$K$9$k$3$H$,!"M#0l$N3N<B$JJ}K!$G$9!#$?$H$(0E9f2=(B
 $B%Q%9%o!<%I%U%!%$%k(B 
-.Pq /etc/spwd.db
+.Pq Pa /etc/spwd.db
 $B$,(B root $B$G$N$_FI$_=P$72DG=$@$H$7$F$b!"(B
 $B?/F~<T$,$=$N%U%!%$%k$NFI$_=P$7%"%/%;%98"8B$rF@$k$3$H$O2DG=$+$b$7$l$^$;$s!#$?$H$((B root $B$N=q$-9~$_8"8B$,F@$i$l$J$$$K$7$F$b$G$9!#(B
 .Pp
 $B%;%-%e%j%F%#%9%/%j%W%H$O>o$K%Q%9%o!<%I%U%!%$%k$NJQ99$r%A%'%C%/$7!"Js9p(B
-$B$9$k$h$&$K$9$Y$-$G$9!#(B
-.Pq $B8e=R$N!V%U%!%$%k$N40A4@-$N%A%'%C%/!W$r;2>H$7$F2<$5$$!#(B
+$B$9$k$h$&$K$9$Y$-$G$9(B
+.Po
+$B8e=R$N!V%U%!%$%k$N40A4@-$N%A%'%C%/!W$r;2>H$7$F2<$5$$(B
+.Pc $B!#(B
 .Sh $B%+!<%M%k$N%3%"!"(Braw $B%G%P%$%9!"%U%!%$%k%7%9%F%`$N0BA4@-$r9b$a$k(B
 .Pp
 root $B$N8"8B$rGK$k$H!"967b<T$O2?$G$b$G$-$^$9$,!"(B
@@ -326,19 +337,21 @@
 $B%G%P%$%9$H8F$P$l$F$$$^$9!#?/F~<T$OIaDL!"4m81$K;/$5$l$?(B
 $B%^%7%s$G%Q%1%C%HGA$-8+%W%m%0%i%`$r<B9T$5$;$h$&$H;n$_$^$9!#?/F~<T$K(B
 $B$o$6$o$6$=$&$$$&5!G=$rDs6!$9$kI,MW$O$J$$$N$G!"$[$H$s$I$N%7%9%F%`$G(B bpf
-$B%G%P%$%9$rAH$_9~$`$Y$-$G$O$"$j$^$;$s!#$7$+$7!"IT9,$J$3$H$K!":G6a$N%+!<%M%k$N$b$&0l$D$NFCD'$H$7$F!"%m!<%@%V%k%+!<%M%k(B
-$B%b%8%e!<%k(B 
-.Pq Loadable Kernel Module:LKM
-$B%$%s%?%U%'!<%9$H8F$P$l$k(B
-$B5!G=$,$"$j$^$9!#$d$k5$$^$s$^$s$N?/F~<T$O!"(BLKM $B$r;H$C$F(B
-$B<+J,FH<+$N(B bpf $B$b$7$/$O$=$NB>GA$-8+%G%P%$%9$rF0:nCf$N%+!<%M%k$K(B
-$B%$%s%9%H!<%k$9$k$3$H$,$G$-$^$9!#(B
-$B%b%8%e!<%k%m!<%@$r;H$&I,MW$,$J$$$N$G$"$l$P!"%+!<%M%k@_Dj$G(B
-NO_LKM $B%*%W%7%g%s$r@_Dj$7$F$3$N5!G=$rL58z$K$7$F2<$5$$!#(B
+$B%G%P%$%9$rAH$_9~$`$Y$-$G$O$"$j$^$;$s!#(B
 .Pp
-bpf $B%G%P%$%9$r30$7!"%b%8%e!<%k%m!<%@$rL58z$K$7$F$b!"(B/dev/mem $B$H(B /dev/kmem
+bpf $B%G%P%$%9$r30$7!"%b%8%e!<%k%m!<%@$rL58z$K$7$F$b!"(B
+.Pa /dev/mem
+$B$H(B
+.Pa /dev/kmem
 $B$H$$$&G:$_$N<o$,$^$@;D$C$F$$$^$9!#$3$NLdBj$K4X$7$F$O!"?/F~<T$O(B raw
-$B%G%P%$%9$K=q$-9~$`$3$H$b$G$-$^$9!#$3$NLdBj$rHr$1$k$?$a!"%7%9%F%`4IM}<T$O(B
+$B%G%P%$%9$K=q$-9~$`$3$H$b$G$-$^$9!#(B
+$B$^$?!"(B
+.Xr kldload 8
+$B$H$$$&!"JL$N%+!<%M%k5!G=$,$"$j$^$9!#(B
+$B$d$k5$$^$s$^$s$N?/F~<T$O!"(BKLD $B%b%8%e!<%k$r;H$C$F(B
+$B<+J,FH<+$N(B bpf $B$b$7$/$O$=$NB>GA$-8+%G%P%$%9$rF0:nCf$N%+!<%M%k$K(B
+$B%$%s%9%H!<%k$9$k$3$H$,$G$-$^$9!#(B
+$B$3$NLdBj$rHr$1$k$?$a!"%7%9%F%`4IM}<T$O(B
 $B%+!<%M%k$r$h$j9b$$0BA4%l%Y%k(B
 .Pq securelevel
 $B!">/$J$/$H$b0BA4%l%Y%k(B 1 $B$G<B9T$5$;$kI,MW$,$"$j$^$9!#(B
@@ -367,7 +380,8 @@
 $B%7%9%F%`7PM3$G9T$J$&J}K!$@$1$G$9!#(B
 .Sq $B0BA4(B
 $B$J%7%9%F%`$r=`Hw$9$k$3$H$OHf3SE*(B
-$BMF0W$G$9!#C1$K$=$N%7%9%F%`>e$G!"%5!<%S%9$r0l@Z<B9T$7$J$$$h$&$K$9$k$@$1$G$9!#0BA4$J%7%9%F%`(B
+$BMF0W$G$9!#C1$K$=$N%7%9%F%`>e$G!"%5!<%S%9$r0l@Z<B9T$7$J$$$h$&$K$9$k$@$1$G$9!#(B
+$B0BA4$J%7%9%F%`(B
 $B$rMQ$$$F!"(Bssh $B7PM3$GB>$N%7%9%F%`$N(B root $B6u4V$K%"%/%;%9$7$^$9!#$3$l$O(B
 $B%;%-%e%j%F%#$NKvC<$N$h$&$K8+$($k$+$b$7$l$^$;$s!#$7$+$7!"4IM}<T$K$O?.Mj$r(B
 $B$I$3$+$KCV$/I,MW$,$"$j$^$9!#$$$-$"$?$j$P$C$?$j$G%5!<%P%W%m%;%9$r(B
@@ -383,7 +397,13 @@
 .Xr scp 1
 $B$7$F$+$i!"(B
 $B%j%b!<%H%7%9%F%`$N$9$Y$F$N%U%!%$%k(B
-.Pq $B$b$7$/$O!">/$J$/$H$b(B /, /var, /usr $B%Q!<%F%#%7%g%s(B!
+.Po
+$B$b$7$/$O!">/$J$/$H$b(B
+.Pa / ,
+.Pa /var ,
+.Pa /usr
+$B%Q!<%F%#%7%g%s(B!
+.Pc
 $B$KBP$7$F(B md5 $B$rE,MQ$9$k%7%'%k%3%^%s%I$r(B
 ssh $B$r;H$C$F%j%b!<%H%^%7%s$G<B9T$9$k$b$N$G$9!#(B
 $B0BA4$J%^%7%s$O!"%A%'%C%/7k2L$r%U%!%$%k$K%3%T!<$7!"A02s$N%A%'%C%/7k2L$H$N:9J,$r<h$j(B
@@ -417,7 +437,10 @@
 $B$7$+$7$J$,$i!"%f!<%6$N%G%#%9%/6u4V$rBgNL$K;}$D>l9g!"(B
 $B%f!<%6%Q!<%F%#%7%g%s>e$G(B suid $B$5$l$?%P%$%J%j$H%G%P%$%9$rIT5v2D$K(B
 $B$7$F$*$-(B
-('nodev' $B%*%W%7%g%s(B)$B!"(B
+.Po
+.Pq nodev
+$B%*%W%7%g%s(B
+.Pc $B!"(B
 $B$=$N%Q!<%F%#%7%g%s$r%9%-%c%s$7$J$$$G:Q$^$;$k$3$H$bM-1W$+$b$7$l$^$;$s!#(B
 $B$=$l$G$b;d$J$i$P!"$H$b$+$/!">/$J$/$H$b=5$K(B 1 $B2s$O%9%-%c%s$9$k(B
 $B$G$7$g$&!#$H$$$&$N$O!"%?%^%M%.$N$3$NAX$NL\E*$O?/F~$r8!CN$9$k$3$H(B
@@ -553,13 +576,16 @@
 $B4m81$K;/$9$3$H$J$/<uMFE*$JF0:n$r5v$9$3$H$,$G$-$^$9!#(B
 .Bx Free
 $B$G$O!"(Bnet.inet.ip.portrange $B$X$N(B sysctl
-.Pq sysctl -a \&| fgrep portrange ,
+.Pq sysctl -a \&| fgrep portrange
 $B$r$$$m$$$m;HMQ$9$k$3$H$G!"(B
 $BF0E*%P%$%s%I$K;HMQ$5$l$k%]!<%HHV9f$NHO0O$r@)8f$G$-$k$3$H$r5-21$K$H$I$a$F(B
 $B$*$$$F2<$5$$!#$3$l$K$h$j%U%!%$%"%&%)!<%k$N@_Dj$NJ#;(@-$r4KOB$G$-$^$9!#(B
 $B;d$O!"%U%!%$%"%&%)!<%k$KDL>o$N(Bfirst/last $B$NHO0O$H$7$F!"(B 4000 $B$+$i(B 5000 $B$r!"(B
 $B9b0L%]!<%H$NHO0O$H$7$F!"(B49152 $B$+$i(B 65535 $B$r;HMQ$7$F$$$^$9!#$=$7$F!"(B
-.Pq $B$$$/$D$+$N%$%s%?!<%M%C%H%"%/%;%92DG=$J%]!<%H$r%V%m%C%/$+$i=|30$9$k$N$O$b$A$m$s$G$9$,(B
+.Po
+$B$$$/$D$+$N%$%s%?!<%M%C%H%"%/%;%92DG=$J%]!<%H$r(B
+$B%V%m%C%/$+$i=|30$9$k$N$O$b$A$m$s$G$9$,(B
+.Pc
 4000 $B$h$j2<$N$9$Y$F$r%V%m%C%/$7$F$$$^$9!#(B
 .Pp
 $B$^$?JL$N$"$j$U$l$?%5!<%S%9ITG=967b$H$7$F!"F'$_Bf967b(B
@@ -614,7 +640,7 @@
 .Xr sysctl 8
 $B$rMQ$$$F(B rtexpire $B$H(B rtminexpire $B$H$r<jF0$G>e=q$-$7$F$*$/$3$H$,;WN8?<$$$3$H(B
 $B$H$$$($^$9!#(B
-.Pq $B<+J,$N%^%7%s$r%/%i%C%7%e$5$;$?$/$J$$$N$G$"$l$P(B:-)
+.Pq $B<+J,$N%^%7%s$r%/%i%C%7%e$5$;$?$/$J$$$N$G$"$l$P(B :-)
 $B$I$A$i$+0lJ}$G$b(B 0 $B$K(B
 $B$O7h$7$F$7$J$$$G2<$5$$!#N>%Q%i%a!<%?$r(B 2 $BIC$K@_Dj$9$l$P!"(B
 $B967b$+$i7PO)>pJs%F!<%V%k$r<i$k$K$O==J,$G$7$g$&!#(B
@@ -637,6 +663,6 @@
 .An Matthew Dillon
 $B$K$h$C$F=q$+$l$^$7$?!#(B
 $B:G=i$K8=$l$?$N$O!"(B
-.Bx Free -3.0.1
+.Fx 3.1
 $B$G(B 1998 $BG/(B 12 $B7n$N$3$H$G$9!#(B
 .\" translated by Norihiro Kumagai, 98-12-29
diff -ur man/man8/fsdb.8 man/man8/fsdb.8
--- man/man8/fsdb.8	Sat Sep 26 15:20:18 1998
+++ man/man8/fsdb.8	Sun Apr 25 21:45:16 1999
@@ -26,9 +26,9 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	%Id: fsdb.8,v 1.8 1998/06/15 07:12:18 charnier Exp %
-.\" jpman %Id: fsdb.8,v 1.3 1997/06/23 15:01:41 horikawa Stab %
+.\"	%Id: fsdb.8,v 1.8.2.1 1999/04/13 02:44:04 ghelmer Exp %
 .\"
+.\" jpman %Id: fsdb.8,v 1.3 1997/06/23 15:01:41 horikawa Stab %
 .Dd September 14, 1995
 .Dt FSDB 8
 .Os FreeBSD
@@ -53,7 +53,7 @@
 $B$O8=:_A*Br$5$l$F$$$k(B i-number $B$H$J$j$^$9!#:G=i$KA*Br$5$l$F$$$k(B inode 
 $B$O%U%!%$%k%7%9%F%`$N%k!<%H(B (i-number 2) $B$H$J$j$^$9!#(B
 $B%3%^%s%I%W%m%;%C%5$K$O(B
-.Xr libedit 3
+.Xr editline 3
 $B%i%$%V%i%j$r;HMQ$7$F$*$j!"%3%^%s%I9T$rJT=8$9$k$3$H$K$h$C$F%?%$%T%s%0$N(B
 $BNL$r8:$i$9$3$H$,$G$-$^$9!#(B
 $B%3%^%s%I%k!<%W$+$iH4$1$F=*N;$9$k;~$K$O!"%U%!%$%k%7%9%F%`$N%9!<%Q%V%m%C%/(B
@@ -74,7 +74,7 @@
 .El
 .Sh $B%3%^%s%I(B
 $BAH$_9~$_$N(B
-.Xr libedit 3
+.Xr editline 3
 $B$N%3%^%s%I$NB>$K(B
 .Nm
 $B$O0J2<$N%3%^%s%I$r%5%]!<%H$7$F$$$^$9(B:
@@ -222,7 +222,7 @@
 $B%W%m%0%i%`$r=*N;$7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
-.Xr libedit 3 ,
+.Xr editline 3 ,
 .Xr fs 5 ,
 .Xr clri 8 ,
 .Xr fsck 8
@@ -235,9 +235,6 @@
 $BB?J,(B
 .Nm
 $B$K<BAu$5$l$F$$$J$$$3$H$G!"$b$C$H$d$j$?$$$3$H$,Bt;3$"$k$G$7$g$&!#(B
-.br
-.Xr libedit 3
-$B$N%j%U%!%l%s%9%Z!<%8$O$^$@=q$+$l$F$$$^$;$s!#(B
 .Sh $BNr;K(B
 .Nm
 $B$O(B
diff -ur man/man8/ibcs2.8 man/man8/ibcs2.8
--- man/man8/ibcs2.8	Fri Mar 19 23:07:17 1999
+++ man/man8/ibcs2.8	Sun Apr 25 21:45:16 1999
@@ -25,9 +25,9 @@
 .\" (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: ibcs2.8,v 1.6.2.1 1999/02/15 08:46:22 fenner Exp %
-.\" jpman %Id: ibcs2.8,v 1.3 1997/09/08 08:46:54 kuma Stab %
+.\" %Id: ibcs2.8,v 1.6.2.2 1999/04/06 13:59:14 ghelmer Exp %
 .\"
+.\" jpman %Id: ibcs2.8,v 1.3 1997/09/08 08:46:54 kuma Stab %
 .Dd November 27, 1995
 .Dt IBCS2 8
 .Os FreeBSD
@@ -46,15 +46,15 @@
 FreeBSD $B$G$NG[I[$K$O6&M-%i%$%V%i%j$ODs6!$5$l$F$$$^$;$s!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /usr/share/examples/ibcs2/* -compact
-.It Pa /lkm/ibcs2_mod.o
-.It Pa /lkm/ibcs2_coff_mod.o
+.It Pa /modules/ibcs2.ko
+.It Pa /modules/ibcs2_coff.ko
 iBCS2 $B%m!<%@%V%k%+!<%M%k%b%8%e!<%k!#(B
 .Pp
 .It Pa /usr/share/examples/ibcs2/*
 $B%(%_%e%l!<%?8!::MQ$N%5%s%W%k%*%V%8%'%/%H%U%!%$%k!#(B
 .Sh $B4XO"9`L\(B
-.Xr lkm 4 ,
-.Xr modload 8
+.\"no equivalent yet for kld:.Xr lkm 4 ,
+.Xr kldload 8
 .Sh $B%P%0(B
 $B%(%_%e%l!<%?$OA4$/IT40A4$G$9!#(B
 .Pp
diff -ur man/man8/ipfw.8 man/man8/ipfw.8
--- man/man8/ipfw.8	Mon Feb  1 23:37:39 1999
+++ man/man8/ipfw.8	Sun Apr 25 21:45:17 1999
@@ -496,12 +496,12 @@
 $B$3$l$O%Q%1%C%H$H$7$F$OM-8z$J$b$N$G$9$,!"MxMQL\E*$O%U%!%$%"%&%)!<%k$r(B
 $B$+$$$/$0$k$3$H$7$+$"$j$^$;$s!#(B
 .Pp
-$B%M%C%H%o!<%/1[$7$K%m%0%$%s$7$F$$$k>l9g!"(BLKM $BHG$N(B
+$B%M%C%H%o!<%/1[$7$K%m%0%$%s$7$F$$$k>l9g!"(BKLD $BHG$N(B
 .Nm
 $B$r%m!<%I$9$k$3$H$O$=$l$[$IC1=c$J$3$H$G$O$"$j$^$;$s!#(B
 $B0J2<$N%3%^%s%I$r>)$a$^$9!#(B
 .Bd -literal -offset center
-modload /lkm/ipfw_mod.o && \e
+kldload /modules/ipfw.ko && \e
 ipfw add 32000 allow all from any to any
 .Ed
 .Pp
@@ -558,6 +558,7 @@
 .Xr protocols 5 ,
 .Xr services 5 ,
 .Xr init 8 ,
+.Xr kldload 8 ,
 .Xr reboot 8 ,
 .Xr sysctl 8 ,
 .Xr syslogd 8
diff -ur man/man8/joy.8 man/man8/joy.8
--- man/man8/joy.8	Sun Jan 31 00:44:17 1999
+++ man/man8/joy.8	Sun Apr 25 21:45:18 1999
@@ -22,9 +22,9 @@
 .\" (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: joy.8,v 1.4 1997/02/22 12:48:18 peter Exp %
-.\" jpman %Id: joy.8,v 1.3 1997/07/22 16:48:04 horikawa Stab %
+.\" %Id: joy.8,v 1.4.2.1 1999/04/06 13:55:20 ghelmer Exp %
 .\"
+.\" jpman %Id: joy.8,v 1.3 1997/07/22 16:48:04 horikawa Stab %
 .Dd March 16, 1996
 .Dt JOY 8
 .Os FreeBSD
@@ -37,10 +37,10 @@
 .Nm
 $B$O!"%8%g%$%9%F%#%C%/%I%i%$%P$N%+!<%M%k%b%8%e!<%k$rFI$_9~$_$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /lkm/joy_mod.o 
-.It Pa /lkm/joy_mod.o
+.Bl -tag -width /modules/joy.ko 
+.It Pa /modules/joy.ko
 $B%8%g%$%9%F%#%C%/$NFI$_9~$_2DG=%+!<%M%k%b%8%e!<%k(B
 .Sh $B4XO"9`L\(B
 .Xr joy 4 ,
-.Xr lkm 4 ,
-.Xr modload 8
+.\"no equivalent for kld's yet":.Xr lkm 4 ,
+.Xr kldload 8
diff -ur man/man8/linux.8 man/man8/linux.8
--- man/man8/linux.8	Sun Jan 31 00:44:17 1999
+++ man/man8/linux.8	Sun Apr 25 21:45:18 1999
@@ -22,9 +22,9 @@
 .\" (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: linux.8,v 1.3 1997/02/22 12:48:26 peter Exp %
-.\" jpman %Id: linux.8,v 1.3 1997/07/22 16:50:43 horikawa Stab %
+.\" %Id: linux.8,v 1.3.2.1 1999/04/06 13:51:38 ghelmer Exp %
 .\"
+.\" jpman %Id: linux.8,v 1.3 1997/07/22 16:50:43 horikawa Stab %
 .Dd January 9, 1997
 .Dt LINUX 8
 .Os FreeBSD
@@ -35,11 +35,13 @@
 .Nm linux
 .Sh $B2r@b(B
 .Nm
-$B$O!"(B Linux $B%(%_%e%l!<%?$N%+!<%M%k%b%8%e!<%k$rFI$_9~$_$^$9!#(B
+$B$O!"(BLinux $B%(%_%e%l!<%?$N%+!<%M%k%b%8%e!<%k$rFI$_9~$_$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /lkm/linux_mod.o 
-.It Pa /lkm/linux_mod.o
+.Bl -tag -width /modules/linux.ko 
+.It Pa /modules/linux.ko
 Linux $B%(%_%e%l!<%?$NFI$_9~$_2DG=%+!<%M%k%b%8%e!<%k(B
 .Sh $B4XO"9`L\(B
-.Xr lkm 4 ,
-.Xr modload 8
+.\"Can't find equivalent for modules (n_hibma@freebsd.org):.Xr lkm 4 ,
+.Xr kldload 8 ,
+.Xr kldunload 8 ,
+.Xr kldstat 8
diff -ur man/man8/mount.8 man/man8/mount.8
--- man/man8/mount.8	Fri Mar 19 23:07:17 1999
+++ man/man8/mount.8	Sun Apr 25 21:45:19 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"	%Id: mount.8,v 1.24 1998/10/16 00:06:56 des Exp %
+.\"	%Id: mount.8,v 1.24.2.1 1999/04/08 14:00:59 ghelmer Exp %
 .\"
 .\" jpman %Id: mount.8,v 1.2 1997/05/03 11:26:50 horikawa Stab %
 .\"
@@ -333,7 +333,7 @@
 $B%+!<%M%k$O$=$N%U%!%$%k%7%9%F%`%?%$%W$r%5%]!<%H$7$F$$$^$;$s!#(B
 $B%U%!%$%k%7%9%F%`$N%5%]!<%H$O!"(B
 $B@EE*(B ($B%+!<%M%k%3%s%Q%$%k;~(B) $B$b$7$/$OF0E*(B (
-.Xr modload 8
+.Xr kldload 8
 $B$K$h$C$F%+!<%M%k%b%8%e!<%k$H$7$F%m!<%I$5$l$k(B) $B$G$9!#(B
 $BDL>o!"(B
 .Nm
@@ -347,6 +347,7 @@
 .Xr mount 2 ,
 .Xr vfsload 3 ,
 .Xr fstab 5 ,
+.Xr kldload 8 ,
 .Xr mount_cd9660 8 ,
 .Xr mount_devfs 8 ,
 .Xr mount_fdesc 8 ,
diff -ur man/man8/mountd.8 man/man8/mountd.8
--- man/man8/mountd.8	Tue Oct 27 23:33:16 1998
+++ man/man8/mountd.8	Sun Apr 25 21:45:19 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\"	%Id: mountd.8,v 1.14 1998/10/15 13:37:35 mckay Exp %
+.\"	%Id: mountd.8,v 1.14.2.1 1999/04/08 14:04:30 ghelmer Exp %
 .\"
 .\" jpman %Id: mountd.8,v 1.3 1997/05/19 17:06:05 horikawa Stab %
 .\"
@@ -122,13 +122,13 @@
 $B$O!"(B
 .Xr vfsload 3
 $B$rMQ$$$k(B
-.Xr modload 8
+.Xr kldload 8
 $B%3%^%s%I$r;H$C$F!"(B
 .Tn NFS
 $B$r4^$`%m!<%@%V%k%+!<%M%k%b%8%e!<%k$N%m!<%I$r;n$_$^$9!#(B
 $B$3$l$,<:GT$9$k$+!"(B
-.Tn NFS LKM
-$B$,;HMQ$G$-$J$$>l9g$O!"(B
+.Tn NFS
+KLD $B$,;HMQ$G$-$J$$>l9g$O!"(B
 .Nm
 $B$O%(%i!<=*N;$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
@@ -146,7 +146,7 @@
 .Sh $B4XO"9`L\(B
 .Xr nfsstat 1 ,
 .Xr exports 5 ,
-.Xr modload 8 ,
+.Xr kldload 8 ,
 .Xr nfsd 8 ,
 .Xr portmap 8 ,
 .Xr showmount 8
diff -ur man/man8/mrouted.8 man/man8/mrouted.8
--- man/man8/mrouted.8	Thu Feb  4 07:10:35 1999
+++ man/man8/mrouted.8	Sun Apr 25 21:45:21 1999
@@ -1,5 +1,5 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
-.\"%Id: mrouted.8,v 1.12 1999/01/20 07:55:51 fenner Exp %
+.\"%Id: mrouted.8,v 1.12.2.1 1999/03/20 04:29:56 billf Exp %
 .\" jpman %Id: mrouted.8,v 1.3 1997/07/26 22:00:11 horikawa Stab %
 .Dd May 8, 1995
 .Dt MROUTED 8
@@ -156,7 +156,6 @@
 .Pp
 $B%U%!%$%k$N7A<0$O<+M3$G$9!#$9$J$o$A!"6uGrJ8;z(B ($B2~9T$b4^$_$^$9(B) $B$O0UL#$r(B
 $B;}$A$^$;$s!#(B
-.\" send-pr $B$9$k$3$H(B (.IR mrouted 's -> .Nm mrouted Ns 's)
 .Nm mrouted
 $B$NA`:nA4BN$^$?$O%G%U%)%k%H@_Dj$KE,MQ$5$l$k%3%^%s%I$+$i!"%U%!%$%k$O3+;O$7$^$9!#(B
 .Bl -tag -width indent
diff -ur man/man8/natd.8 man/man8/natd.8
--- man/man8/natd.8	Sat Sep 26 15:20:19 1998
+++ man/man8/natd.8	Sun Apr 25 21:45:22 1999
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" %Id: natd.8,v 1.15 1998/07/15 03:32:45 jkoshy Exp $%
+.\"	%Id: natd.8,v 1.16.2.1 1999/03/24 17:12:59 brian Exp %
 .\" jpman %Id%
 .Dd 15 April 1997
 .Os FreeBSD
@@ -11,7 +11,6 @@
 .Sh $B=q<0(B
 .Nm
 .Op Fl ldsmvu
-.Op Fl permanent_link
 .Op Fl dynamic
 .Op Fl i Ar inport
 .Op Fl o Ar outport
@@ -23,11 +22,12 @@
 .Nm
 .Op Fl log
 .Op Fl deny_incoming
+.Op Fl log_denied
 .Op Fl use_sockets
 .Op Fl same_ports
 .Op Fl verbose
+.Op Fl log_facility Ar facility_name
 .Op Fl unregistered_only
-.Op Fl permanent_link
 .Op Fl dynamic
 .Op Fl inport Ar inport
 .Op Fl outport Ar outport
@@ -37,6 +37,10 @@
 .Op Fl config Ar configfile
 .Op Fl redirect_port Ar linkspec
 .Op Fl redirect_address Ar localIP publicIP
+.Op Fl reverse
+.Op Fl proxy_only
+.Op Fl proxy_rule Ar proxyspec
+.Op Fl pptpalias Ar localIP
 
 .Sh $B2r@b(B
 $B$3$N%W%m%0%i%`$O!"(BFreeBSD $B$K$*$1$k(B 
@@ -53,7 +57,7 @@
 $B$ODL>o!"%G!<%b%s$H$7$F%P%C%/%0%i%&%s%I$G<B9T$7$^$9!#(B
 .Nm
 $B$O%^%7%s$KF~$C$F$/$k%Q%1%C%H!"$^$?$O%^%7%s$+$i=P$F9T$/%Q%1%C%H$r(B
-$B@8(B(raw)$B$N$^$^07$$!">l9g$K$h$j(B IP $B%Q%1%C%H%9%H%j!<%`$K(B
+$B@8(B (raw) $B$N$^$^07$$!">l9g$K$h$j(B IP $B%Q%1%C%H%9%H%j!<%`$K(B
 $B:F$SAw$j=P$9A0$K<j$r2C$($^$9!#(B
 
 .Pp
@@ -82,6 +86,16 @@
 $B8=:_$N(B IP $B%"%I%l%9$X8~$+$&%Q%1%C%H$N$&$A!"FbItJQ49%F!<%V%k$K(B
 $B%(%s%H%j$NL5$$$b$N$r5qH]$7$^$9!#(B
 
+.It Fl log_denied
+$B5qH]$7$?F~NO%Q%1%C%H$r(B syslog $B$r2p$7$F%m%0$7$^$9(B
+(log_facility $B$r;2>H$7$F$/$@$5$$(B)$B!#(B
+
+.It Fl log_facility Ar facility_name
+syslog $B$r2p$7$F>pJs$r%m%0$9$k$H$-$K!";XDj$7$?%m%0%U%!%7%j%F%#$r;HMQ$7$^$9!#(B
+$B%U%!%7%j%F%#L>$O(B
+.Xr syslog.conf 5
+$B$K$"$kDL$j$G$9!#(B
+
 .It Fl use_sockets | s
 FTP data $B%3%M%/%7%g%s$d(B IRC DCC send $B%3%M%/%7%g%s$r3NN)$9$k$N$K(B
 .Xr socket 2
@@ -108,16 +122,13 @@
 rfc 1918 $B$K$h$l$P!"EPO?$5$l$F$$$J$$H/?.85%"%I%l%9$O(B 10.0.0.0/8 $B$H(B
 172.16.0.0/12 $B$H(B 192.168.0.0/16 $B$H$J$C$F$$$^$9!#(B
 
-.It Fl redirect_port Ar linkspec
+.It Fl redirect_port Ar proto targetIP:targetPORT [aliasIP:]aliasPORT [remoteIP[:remotePORT]]
 $B;XDj$5$l$?%]!<%H$KF~$C$F$/$k%3%M%/%7%g%s$rJL$N%[%9%H$H%]!<%H$K(B
-$B%j%@%$%l%/%H$7$^$9!#(Blinkspec $B$N=q<0$O(B
-
-  proto targetIP:targetPORT [aliasIP:]aliasPORT [remoteIP[:remotePORT]]
-
-$B$N$h$&$K$J$j$^$9!#(Bproto $B$O(B tcp $B$b$7$/$O(B udp $B!"(B targetIP $B$O4uK>$9$k(B
-( $B%j%@%$%l%/%H@h(B ) $BBP>](B IP $B%"%I%l%9!"(BtargetPORT $B$O4uK>$9$kBP>]%]!<%HHV9f!"(B
-aliasPORT $B$O(B ( $B%/%i%$%"%s%H$,(B ) $BMW5a$9$k%]!<%HHV9f!"(BaliasIP $B$O(B alias $B$r(B
-$B9T$&%"%I%l%9$G$9!#(B
+$B%j%@%$%l%/%H$7$^$9!#(B
+proto $B$O(B tcp $B$^$?$O(B udp$B!"(B
+targetPORT $B$O4uK>$9$kBP>]%]!<%HHV9f!"(B
+aliasPORT $B$O(B ($B%/%i%$%"%s%H$,(B) $BMW5a$9$k%]!<%HHV9f!"(B
+aliasIP $B$O(B alias $B$r9T$&%"%I%l%9$G$9!#(B
 remoteIP $B$H(B remotePORT $B$O!"I,MW$J>l9g$K$h$j@53N$J%3%M%/%7%g%s$r(B
 $B;XDj$9$k$N$KMxMQ$G$-$^$9!#(B
 $BNc$($P!"(B
@@ -150,25 +161,6 @@
 (192.168.0.4) $B$K8~$1$i$l$^$9$,!":G=i$NFs$D$N%"%I%l%9$N=P$F9T$/(B
 $B%Q%1%C%H$NN.$l$O;XDj$5$l$?8x<0%"%I%l%9$X$N(B alias $B$N$^$^$K$J$j$^$9!#(B
 
-.It Fl permanent_link Ar linkspec
-$BFbIt(B alias $B%F!<%V%k$K915WE*$J%(%s%H%j$r:n@.$7$^$9!#(Blinkspec $B$N=q<0$O(B
-
-  proto targetIP:targetPORT sourceIP:sourcePORT aliasPORT
-
-$B$N$h$&$K$J$j$^$9!#(Bproto $B$O(B tcp $B$b$7$/$O(B udp $B!"(B targetIP $B$O4uK>$9$k(B
-( $B%j%@%$%l%/%H@h(B ) $BBP>](B IP $B%"%I%l%9!"(B targetPORT $B$O4uK>$9$kBP>](B
-$B%]!<%HHV9f!"(B sourceIP $B$H(B sourcePORT $B$OF~$C$F$/$k%Q%1%C%H$K%^%C%A$9$k(B
-$B$b$N!"(BaliasPORT $B$O(B ( $B%/%i%$%"%s%H$,(B ) $BMW5a$9$k%]!<%HHV9f!"$H$J$j$^$9!#(B
-$BCM(B 0 $B$O%o%$%k%I%+!<%I$H$7$F07$o$l$^$9!#Nc$($P!"(B
-
-.Ar tcp inside1:telnet outside1:0 6666
-
-$B$O%^%7%s(B outside1 ( $B$NG$0U$N%]!<%H(B ) $B$+$i$3$N%^%7%s$N%]!<%H(B 6666 $B$K(B
-$B8~$1$i$l$?(B tcp $B%Q%1%C%H$,!"%^%7%s(B inside1 $B$N(B telnet $B%]!<%H$KAw$i$l$k(B
-$B$3$H$r<($7$^$9!#(B
-
-$B?75,$KF3F~$9$k>l9g$O!"Be$o$j$K(B redirect_port $B$r;H$&$h$&$K$7$F$/$@$5$$!#(B
-
 .It Fl dynamic
 .Fl n
 $B%*%W%7%g%s$d(B
@@ -292,6 +284,41 @@
 .Fl log
 $B$HF1$80UL#$K$J$j$^$9!#6u9T$H(B '#' $B$G;O$^$k9T$OL5;k$5$l$^$9!#(B
 
+.It Fl reverse
+natd $B$N5UA`:n$G$9!#(B
+$B=PNO%H%i%U%#%C%/$,%m!<%+%k%^%7%s$K%j%@%$%l%/%H$5$l!"(B
+natd $B$,F~NO%$%s%?%U%'!<%9$GAv9T$7$F$$$k(B ($BDL>o$O=PNO%$%s%?%U%'!<%9$GAv9T$7$^$9(B) 
+$B$H$$$C$?!"F)2a%W%m%-%7$r<B9T$7$F$$$k>u67$GM-MQ$J>l9g$,$"$j$^$9!#(B
+
+.It Fl proxy_only
+natd $B$,F)2a%W%m%-%7$N$_$r<B9T$9$k$h$&6/@)$7$^$9!#(B
+$BDL>o$N%"%I%l%9JQ49$O<B9T$5$l$^$;$s!#(B
+
+.It Fl proxy_rule Ar [type encode_ip_hdr|encode_tcp_stream] port xxxx server a.b.c.d:yyyy
+$BF)2a%W%m%-%7$rM-8z$K$7$^$9!#(B
+$B;XDj$7$?%]!<%H$N%Q%1%C%H$G$3$N%[%9%H$+$iB>$N%[%9%H$X8~$+$&$b$N$O!"(B
+$B;XDj$7$?%5!<%P$N%]!<%H$X%j%@%$%l%/%H$5$l$^$9!#(B
+$B%*%W%7%g%s$H$7$F!"85$N08@h%"%I%l%9$,%Q%1%C%H$K%(%s%3!<%I$5$l$^$9!#(B
+.Dq encode_ip_hdr
+$B$O!"$3$N>pJs$r(B IP $B%*%W%7%g%s%U%#!<%k%I$KCV$-$^$9!#(B
+.Dq encode_tcp_stream
+$B$O!"$3$N%G!<%?$r(B TCP $B%9%H%j!<%`$N@hF,$KA^F~$7$^$9!#(B
+
+.It Fl pptpalias Ar localIP
+PPTP $B%Q%1%C%H$,;XDj$7$?(B localIP $B%"%I%l%9$K9T$/$3$H$r5v2D$7$^$9!#(B
+PPTP $B$O!"(BVPN $B$^$?$O0BA4$J(B IP $B%H%s%M%k5;=Q$G$"$j!"(B
+$B:G=i$K(B Microsoft $B$,3+H/$7$^$7$?!#(B
+$B0E9f2=$7$?%H%i%U%#%C%/MQ$K!"(B
+GRE (47) $B$H8F$P$l$k8E$$(B IP $B%+%W%;%k2=%W%m%H%3%k$r;HMQ$7$^$9!#(B
+$B$3$N(B natd $B%*%W%7%g%s$O!"(B
+$B$3$N%W%m%H%3%k$N$9$Y$F$N%H%i%U%#%C%/$rC10l$N;XDj$7$?(B IP $B%"%I%l%9$KJQ49$7$^$9!#(B
+$B$3$l$K$h$j!"(B
+$BC10l$N%/%i%$%"%s%H$^$?$OC10l$N%5!<%P$KBP$9$k%5!<%S%9$r(B natd $B$,5v2D$7$^$9!#(B
+$B%5!<%P$r@_Dj$9$k>l9g!"(B
+PPTP $B@_Dj$N(B TCP $B%H%i%U%#%C%/$r5v$9$3$H$rK:$l$J$$$G$/$@$5$$!#(B
+$B%U%!%$%"%&%)!<%k%j%9%H$,M-8z$J$i$P!"(B
+$B%/%i%$%"%s%H$^$?$O%5!<%P$N$?$a$K(B GRE (protocol 47) $B$r5v2D$9$kI,MW$,$"$j$^$9!#(B
+
 .El
 
 .Sh NATD $B$N<B9T(B
@@ -361,7 +388,7 @@
 
   natd -interface ed0
 
-$B$H$$$&9T$G$[$H$s$I$N>l9g=<J,$G$9(B($B@5$7$$%$%s%?%U%'!<%9L>$KCV$-49$($F(B
+$B$H$$$&9T$G$[$H$s$I$N>l9g=<J,$G$9(B ($B@5$7$$%$%s%?%U%'!<%9L>$KCV$-49$($F(B
 $B$/$@$5$$(B)$B!#(B
 .Nm
 $B$,5/F0$5$l$?$i!"%Q%1%C%H$NN.$l$NJ}8~$,(B natd $B$NJ}$KJQ$o$k(B 
@@ -429,5 +456,7 @@
 (IRC $B%5%]!<%H$H$=$NB>$NDI2C(B)
 .An Ari Suutari Aq suutari@iki.fi
 (natd)
+.An Dru Nelson Aq dnelson@redwoodsoft.com
+(PPTP $B%5%]!<%H(B)
 .An Brian Somers Aq brian@awfulhak.org
 ($B$^$H$aLr(B)
diff -ur man/man8/nfsd.8 man/man8/nfsd.8
--- man/man8/nfsd.8	Sun Jul 26 21:08:39 1998
+++ man/man8/nfsd.8	Sun Apr 25 21:45:22 1999
@@ -114,7 +114,7 @@
 $B$O(B
 .Xr vfsload 3
 $B$r7PM3$7$F(B
-.Xr modload 8
+.Xr kldload 8
 $B$K$h$j!"(B
 .Tn NFS
 $B$r%5%]!<%H$7$?%m!<%I2DG=%+!<%M%k%b%8%e!<%k$rFI$_9~$b$&$H$7$^$9!#(B
@@ -124,12 +124,12 @@
 LKM $B$,MQ0U$5$l$F$$$J$$$H$-$K$O%(%i!<=*N;$7$^$9!#(B
 .Pp
 .Nm nfsd
-$B$O!"@.8y$7$?>l9g$O(B0$B$r!"%(%i!<$,5/$-$?>l9g$O(B0$B$h$jBg$-$JCM$rJV$7$^$9!#(B
+$B$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Pp
 .Sh $B4XO"9`L\(B
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
-.Xr modload 8 ,
+.Xr kldload 8 ,
 .Xr mountd 8 ,
 .Xr portmap 8
 .Sh $BNr;K(B
diff -ur man/man8/nfsiod.8 man/man8/nfsiod.8
--- man/man8/nfsiod.8	Sat Sep 26 15:20:19 1998
+++ man/man8/nfsiod.8	Sun Apr 25 21:45:23 1999
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"	%Id: nfsiod.8,v 1.6 1998/07/15 06:35:20 charnier Exp %
-.\" jpman %Id: nfsiod.8,v 1.3 1997/08/10 18:33:51 horikawa Stab %
+.\"	%Id: nfsiod.8,v 1.6.2.1 1999/04/13 02:21:10 ghelmer Exp %
 .\"
+.\" jpman %Id: nfsiod.8,v 1.3 1997/08/10 18:33:51 horikawa Stab %
 .Dd September 22, 1994
 .Dt NFSIOD 8
 .Os
@@ -72,7 +72,7 @@
 $B$,8!=P$7$?>l9g!"(B
 .Nm
 $B$O(B
-.Xr modload 8
+.Xr kldload 8
 $B$K4^$^$l$k(B
 .Xr vfsload 3
 $B$N5!G=$rMQ$$$F!"(B
@@ -80,7 +80,7 @@
 $B%3!<%I$r4^$`%m!<%@%V%k%+!<%M%k%b%8%e!<%k$r%m!<%I$7$h$&$H$7$^$9!#(B
 $B$3$l$,<:GT$7$?>l9g!"$^$?$O(B
 .Tn NFS
-$B%m!<%@%V%k%+!<%M%k%b%8%e!<%k$,B8:_$7$J$$>l9g!"(B
+KLD $B$,B8:_$7$J$$>l9g!"(B
 .Nm
 $B$O%(%i!<$rJV$7$F=*N;$7$^$9!#(B
 .Pp
@@ -89,7 +89,7 @@
 .Sh $B4XO"9`L\(B
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
-.Xr modload 8 ,
+.Xr kldload 8 ,
 .Xr mountd 8 ,
 .Xr portmap 8
 .Sh $BNr;K(B
diff -ur man/man8/nslookup.8 man/man8/nslookup.8
--- man/man8/nslookup.8	Sat Sep 26 15:20:19 1998
+++ man/man8/nslookup.8	Sun Apr 25 21:45:24 1999
@@ -113,7 +113,8 @@
 $B%(%9%1!<%WJ8;z(B 
 .Pq \e
 $B$rF,$K$D$1$^$9!#(B
-.Sy $BCm0U(B: $B2r<a$G$-$J$$%3%^%s%I$O%[%9%HL>$H$7$F07$o$l$^$9!#(B
+.Sy $BCm0U(B:
+$B2r<a$G$-$J$$%3%^%s%I$O%[%9%HL>$H$7$F07$o$l$^$9!#(B
 .Bl -tag -width "lserver"
 .It Ar host Op Ar server
 .Ar host
diff -ur man/man8/pciconf.8 man/man8/pciconf.8
--- man/man8/pciconf.8	Sun Jan 31 00:44:17 1999
+++ man/man8/pciconf.8	Sun Apr 25 21:45:24 1999
@@ -1,4 +1,4 @@
-.\"	%Id: pciconf.8,v 1.4 1998/11/12 00:22:30 ken Exp %
+.\"	%Id: pciconf.8,v 1.4.2.1 1999/04/06 14:06:17 ghelmer Exp %
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
@@ -153,7 +153,7 @@
 .Sh $B4XO"9`L\(B
 .Xr ioctl 2 ,
 .\" .Xr pci 4 ,
-.Xr modload 8 
+.Xr kldload 8 
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
@@ -162,7 +162,7 @@
 .Fl a
 $B%*%W%7%g%s$O(B
 .Tn PCI
-LKM $B%5%]!<%H$N$?$a$K(B
+KLD $B%5%]!<%H$N$?$a$K(B
 .Fx 3.0
 $B$GDI2C$5$l$^$7$?!#(B
 .Sh $B:n<T(B
@@ -187,8 +187,8 @@
 $B%*%W%7%g%s$H(B
 .Fl r
 $B%*%W%7%g%s$r;H$&$3$H$r5v2D$9$k$3$H$OM-MQ$+$b$7$l$^$;$s$,!"(B
-LKM $B%I%i%$%P$G%G%P%$%9$r6!5k$9$k$?$a$K(B
-.Nm modload
+KLD $B%I%i%$%P$G%G%P%$%9$r6!5k$9$k$?$a$K(B
+.Nm kldload
 $B$r<B9T$G$-$k$N$O(B root $B$@$1$G$7$g$&$7!"(B
 $B0lIt$NAF0-$J(B
 .Tn PCI
