From owner-man-jp-reviewer@jp.freebsd.org  Sun Jun 25 11:12:33 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id LAA99020;
	Sun, 25 Jun 2000 11:12:33 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.rdc1.wa.home.com (imail@ha1.rdc1.wa.home.com [24.0.2.66])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id LAA99015
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 25 Jun 2000 11:12:26 +0900 (JST)
	(envelope-from kuma@c9795-a.vncvr1.wa.home.com)
Received: from c9795-a.vncvr1.wa.home.com ([24.16.208.128])
          by mail.rdc1.wa.home.com (InterMail vM.4.01.02.00 201-229-116)
          with ESMTP
          id <20000625021209.GVWA10161.mail.rdc1.wa.home.com@c9795-a.vncvr1.wa.home.com>
          for <man-jp-reviewer@jp.freebsd.org>;
          Sat, 24 Jun 2000 19:12:09 -0700
To: man-jp-reviewer@jp.freebsd.org
From: kuma@nk.rim.or.jp (Norihiro Kumagai)
In-reply-to: Your message of "Fri, 23 Jun 2000 11:11:51 EDT."
             <20000623111151D.horikawa@psinet.com>
Date: Sat, 24 Jun 2000 19:12:20 -0700
Message-ID: <6931.961899140@c9795-a.vncvr1.wa.home.com>
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: man-jp-reviewer 2648
Subject: [man-jp-reviewer 2648] 3.4-20000416 man8 (top - ppp.8)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: kuma@c9795-a.vncvr1.wa.home.com

$B7'C+$G$9!#(B

$B!t%1!<%V%k%$%s%?!<%M%C%HF3F~$K$H$b$J$$<+Bp4D6-$r@0Hw$7$^$7$?!#(B
$B!t$h$&$d$/%a!<%k$,=P$;$k$h$&$K$J$j$^$7$?!#(B

$BCY$/$J$j$^$7$?$,!"(B3.5-RELEASE $BDI$C$+$1$N(B man8 $BA0H>$rG<IJCW$7$^$9!#(B
$BK\BN$OJLESKY@n$5$s08%a!<%k$GAw$j$^$9!#(B
$B=$@52U=j$N35MW$O0J2<$N$H$*$j(B:

chkgrp.8:      $B:n<TL>$N(B7bit$B2=(B($B%h!<%m%C%Q?M$+$J(B mule$B5c$+$;$J$N$G(B)
chown.8:       -v $B%*%W%7%g%s$N5-=RDI2C(B
comcontrol.8: $B!V(Bsiocontrol $B$H$$$&L>A0$K$9$Y$-!W5-=R:o=|(B(BUGS$B$N9`(B)
dhclient.8:   /sbin/dhclient-exit-hooks -> /etc/dhclient-exit-hooks
inetd.8:      $B%m%0F0:n$N<c43$NJQ99(B
ipfw.8:       tee $B$,L$<BAu(B (4.0-RELEASE $B$HHf$Y$F(B)
moused.8:     $BJQ99B??t(B (USB $B4D6-BP1~(B/$BFf$N(BN1-N4$B%*%W%7%g%s$J$I(B)
  ($BJ#?t%^%&%9BP1~$N@bL@$,DI2C$5$l$?$N$K$O467c(B)
portmap.8:    hosts_access(5) $B$K4X$9$k5-=R$NDI2C(B
ppp.8:        DNS $B4X78$N%3%^%s%IDI2C(B

$B%P!<%8%g%sJ8;zNs$N99?7$OA4It$d$C$?$D$b$j$G$9$,!D(B

In Message <20000623111151D.horikawa@psinet.com>,
  Kazuo Horikawa <horikawa@psinet.com> writes:
>  $BKY@n$G$9!#(B
>  ppp.8 $B$O(B 1.142.2.22 $B$K$7$F$b$i$($k$H$J$*$"$j$,$?$$$G$9!#(B

$BBP1~CW$7$^$7$?!#$J$s$+$^$?JQ$J%*%W%7%g%s$,$A$g$m$3$HA}$($F$^$7$?!#(B

>  3.5-RELEASE $B$O(B 6/22 $B$K(B ftp.freebsd.org $B$KCV$+$l$F$$$^$9(B ($B%?%0$O(B 6/15 
> $B$KBG$?$l$?$_$?$$(B)$B!#(B
>  $B:#F|L@F|Cf(B ($BF|MK$K$J$kA0(B) $B$KAw$C$F$b$i$($k$H!"$3$C$A$N<jN%$l$NET9g>e!"(B
> $B$"$j$,$?$$$G$9!#(B

$B$3$N!VF|MK!W$H$$$&$N$OElItI8=`;~$G$9$h$M!#F|K\$O$b$&F|MK$G$9$,!D(B
$B4V$K9g$($P$$$$$N$G$9$,$I$J$$$J$b$s$G$7$g$&$+!#(B

>  $B2~9T$@$1$N=$@50J30$N:9J,$@$1$rE,MQ$9$k$H!"3Z$@$C$?$+$b!#(B

4.0-RELEASE $B$N$b3hMQ$7$^$7$?!#$G$@$$$V3Z$K$J$C$?$h$&$K;W$$$^$7$?$,!"(B
$B$J$K$V$s86J8$,D9$$$N$G!D(B

>  $B:n6H3+;OA0$K=q$1$P$h$+$C$?$+$b$7$l$J$$$G$9$,!"5$$E$$$?$H$-$K$O7'C+(B
> $B$5$s(B ppp.8 $B:n6HCf$@$C$?(B ($B=*$C$?$i5"$k$H$*$C$7$c$C$F$?(B) $B$N$G!"%?%$%_%s%0(B
> $B$r0o$C$7$F$$$^$7$?!#(B

$B$$$($$$(!#(B

>  ppp.8 $B$d(B vinum.8 $B$NBgJ*$O!"@lG$$rIU$1$F%&%)%C%A$7$F$$$F$b$i$&J}$,NI$$(B
> $B$H;W$&$N$G$9$,!"N)8uJd<T$,$$$i$C$7$c$i$J$$$N$G!"$$$D$b:G8e$K%\%H%k%M%C%/(B
> $B$K$J$C$F$7$^$&798~$K$"$j$^$9!#(B

$B$&!<$s!"$7$g$&$,$J$$$+$i(B ppp.8 $B$r0z$-<h$k$3$H$K$7$^$9!#(B
$B!t8I;y$r0z$-<h$C$FH~$7$/2D0&$/0i$F$k$N$OBg?M$N9CHe@-$G$9$+$i$J!#(B

> > ($B%1!<%V%k(BISP$B7@LsM=Dj!"%0%m!<%P%k(BIP$BK\Ev$K$/$l$k$N$+(B) $B7'C+(B $BE5Bg(B
>  $B$&$i$d$^$7$$!#(B

$B$A$c$s$H$/$l$^$7$?!#5U0z$-$b$G$-$F$k!#(B
$B$=$&$=$&4JC1$K$O$+$o$i$J$5$=$&!#$X$C$X$C$X!#(B
$B!t>:$j(B128kbps/$B2<$j<B<A(B50$B!A(B60kB/sec
$B!t(BDSL $B$N0lHV0B$$$N$h$j$b$A$g$C$HB.$/$J$C$F$$$k!#(B
$B!tNI$/$G$-$F$k$o!#(B
--
$B7'C+(B $BE5Bg(B

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff -ur man8-org/IPXrouted.8 man8/IPXrouted.8
--- man8-org/IPXrouted.8	Sat Dec 11 08:55:37 1999
+++ man8/IPXrouted.8	Thu Jun 15 15:29:52 2000
@@ -31,8 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.3.4.2 1999/12/11 14:34:45 jhay Exp %
-.\"
+.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.3.4.3 2000/03/06 11:35:36 sheldonh Exp %.\"
 .\" jpman %Id: IPXrouted.8,v 1.3 1997/07/27 13:00:54 horikawa Stab %
 .\"
 .Dd Oct 11, 1995
diff -ur man8-org/adduser.8 man8/adduser.8
--- man8-org/adduser.8	Sun Oct 17 04:00:32 1999
+++ man8/adduser.8	Thu Jun 15 15:30:13 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.26.2.1 1999/08/29 15:39:01 peter Exp %
+.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.26.2.2 2000/03/06 11:35:37 sheldonh Exp %
 .\" jpman %Id: adduser.8,v 1.4 1997/08/07 17:53:51 ken Stab %
 .\"
 .Dd January 9, 1995
diff -ur man8-org/adjkerntz.8 man8/adjkerntz.8
--- man8-org/adjkerntz.8	Sun Nov 28 05:15:56 1999
+++ man8/adjkerntz.8	Thu Jun 15 15:31:27 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.16.2.1 1999/08/29 15:12:13 peter Exp %
+.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.16.2.2 2000/03/03 14:59:49 sheldonh Exp %
 .\" jpman %Id: adjkerntz.8,v 1.4 1997/07/26 21:28:35 horikawa Stab %
 .\"
 .Dd April 4, 1996
diff -ur man8-org/amd.8 man8/amd.8
--- man8-org/amd.8	Sun Nov 28 05:05:06 1999
+++ man8/amd.8	Thu Jun 15 15:32:48 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.1 1999/11/27 04:46:21 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.2 2000/05/09 14:27:15 sheldonh Exp %
 .\"
 .\" jpman %Id: amd.8,v 1.2 1997/04/15 00:24:08 mutoh Stab %
 .\"
@@ -333,9 +333,9 @@
 Department of Computer Science, Columbia University,
 New York, USA.
 .Pp
-.An am-utils $B$N!"B>$N:n<T$*$h$S9W8%<T$O!"(B
+am-utils $B$N!"B>$N:n<T$*$h$S9W8%<T$O!"(B
 am-utils $B$H$H$b$KG[I[$5$l$F$$$k(B
-.Nm AUTHORS 
+.Pa AUTHORS 
 $B%U%!%$%k$K5-=R$5$l$F$$$^$9!#(B
 .Sh $BNr;K(B
 .Nm amd
diff -ur man8-org/apm.8 man8/apm.8
--- man8-org/apm.8	Tue Aug 31 08:25:13 1999
+++ man8/apm.8	Thu Jun 15 15:38:43 2000
@@ -8,8 +8,8 @@
 .\" responsible for the proper functioning of this software, nor does 
 .\" the author assume any responsibility for damages incurred with its 
 .\" use.
-.\"
-.\" Original Revision: 1.10
+.\" 
+.\" %FreeBSD: src/usr.sbin/apm/apm.8,v 1.10.2.1 2000/03/06 11:35:39 sheldonh Exp %
 .\" jpman %Id: apm.8,v 1.4 1997/07/26 21:52:01 horikawa Stab %
 .Dd November 1, 1994
 .Dt APM 8
diff -ur man8-org/badsect.8 man8/badsect.8
--- man8-org/badsect.8	Tue Aug 31 08:25:19 1999
+++ man8/badsect.8	Thu Jun 15 15:39:35 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.7.2.1 1999/08/29 15:12:32 peter Exp %
+.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.7.2.2 2000/03/03 15:12:54 sheldonh Exp %
 .\" jpman %Id: badsect.8,v 1.2 1997/03/31 13:30:12 horikawa Stab %
 .\"
 .Dd June 5, 1993
diff -ur man8-org/bootparamd.8 man8/bootparamd.8
--- man8-org/bootparamd.8	Tue Aug 31 08:25:21 1999
+++ man8/bootparamd.8	Thu Jun 15 15:40:20 2000
@@ -1,6 +1,6 @@
 .\" @(#)bootparamd.8
+.\" %FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.6.2.1 2000/03/06 11:35:41 sheldonh Exp %
 .\"
-.\" Original Revision: 1.6
 .\" jpman %Id: bootparamd.8,v 1.3 1997/07/26 21:54:02 horikawa Stab %
 .Dd November 8, 1989
 .Dt BOOTPARAMD 8
diff -ur man8-org/camcontrol.8 man8/camcontrol.8
--- man8-org/camcontrol.8	Sun Dec 19 05:35:38 1999
+++ man8/camcontrol.8	Thu Jun 15 15:40:56 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.10 2000/03/03 15:12:55 sheldonh Exp %
 .\"
 .\" jpman %Id: camcontrol.8,v 1.4 1998/12/22 02:35:45 oku Stab %
 .\" WORD: defect list		$B%G%#%U%'%/%H%j%9%H(B[camcontrol.8]
diff -ur man8-org/chat.8 man8/chat.8
--- man8-org/chat.8	Tue Aug 31 08:25:26 1999
+++ man8/chat.8	Thu Jun 15 15:41:37 2000
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.1 1999/08/29 15:26:06 peter Exp %
+.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.2 2000/03/06 11:34:11 sheldonh Exp %
 .\" jpman %Id: chat.8,v 1.3 1997/08/31 14:02:42 horikawa Stab %
 .\" SH section heading
 .\" SS subsection heading
diff -ur man8-org/chkgrp.8 man8/chkgrp.8
--- man8-org/chkgrp.8	Tue Aug 31 08:25:27 1999
+++ man8/chkgrp.8	Sat Jun 24 19:05:09 2000
@@ -1,4 +1,6 @@
-.\" Copyright (c) 1998 Dag-Erling Co..dan Sm..grav
+.\" Copyright (c) 1998 Dag-Erling Co\idan Sm/ograv
+.\"   (\i is i with two-umlaut, /o is o with slash)
+.\"   (Please forgive our change to avoid confliction with Japanese chars)
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,20 +26,21 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.4.2.1 1999/08/29 15:40:17 peter Exp %
+.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.4.2.3 2000/06/13 09:14:54 ru Exp %
 .\" jpman %Id: chkgrp.8,v 1.3 1998/10/10 09:04:49 yohta Stab %
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
-.Os
+.Os FreeBSD
 .Sh $BL>>N(B
 .Nm chkgrp
 .Nd $B%0%k!<%W%U%!%$%k$N9=J8$r%A%'%C%/$9$k(B
 .Sh $B=q<0(B
-.Nm chkgrp
+.Nm
 .Op Ar groupfile
 .Sh $B2r@b(B
-.Nm chkgrp
+.Nm
+$B%f!<%F%#%j%F%#(B
 $B$OM?$($i$l$?%U%!%$%k$+!"%U%!%$%k$,M?$($i$l$J$1$l$P%7%9%F%`%o%$%I$J(B
 $B%0%k!<%W%U%!%$%k$rD4$Y$F%(%i!<$rC5$7$^$9!#FC$K!"6u9T$G$b(B
 $B%3%a%s%H9T$G$b$J$$3F%(%s%H%j$K$D$$$F!"%3%m%s$G6h@Z$i$l$k(B 4 $B$D$N(B
@@ -45,8 +48,10 @@
 $B4^$^$J$$$3$H!"(B3 $BHVL\$N%U%#!<%k%I(B ($B%0%k!<%W(B ID) $B$O?t;z$G$"$k$3$H$r(B
 $B%A%'%C%/$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /dev/null -compact
+.Bl -tag -width /etc/group -compact
 .It Pa /etc/group
+$B%0%k!<%W%G!<%?%Y!<%9%U%!%$%k(B
+.El
 .Sh $B4XO"9`L\(B
 .Xr getgrent 3 ,
 .Xr group 5
@@ -56,20 +61,24 @@
 $B$OD4$Y$F$$$k%U%!%$%k$NL>A0$H%(%i!<$N$"$C$?9THV9f$r4^$`(B
 $B%(%i!<%a%C%;!<%8$r=PNO$7$^$9!#%(%i!<$,$J$1$l$P!"2?$b=PNO$7$^$;$s!#(B
 .Pp
-.Nm chkgrp
-$B$O%0%k!<%W%U%!%$%k$K%(%i!<$,8+$D$+$l$P(B EX_DATAERR $B$r!"(B
-$B8+$D$+$i$J$1$l$P(B EX_OK $B$rJV$7$^$9!#(B
+.Nm
+$B%f!<%F%#%j%F%#$O%0%k!<%W%U%!%$%k$K%(%i!<$,8+$D$+$l$P(B
+.Dv EX_DATAERR
+$B$r!"8+$D$+$i$J$1$l$P(B
+.Dv EX_OK
+$B$rJV$7$^$9!#(B
 .Sh $BNr;K(B
 .Nm
-$B%3%^%s%I$O(B
+$B%f!<%F%#%j%F%#$O(B
 .Fx 3.0
 $B$GEP>l$7$^$7$?!#(B
 .Sh $B:n<T(B
-.Nm chkgrp
+.Nm
+$B%f!<%F%#%j%F%#(B
 $B$HK\%^%K%e%"%k%Z!<%8$O(B
 .ie t .An Dag-Erling Co\(:idan Sm\(/orgav Aq des@FreeBSD.org
 .el .An Dag-Erling Coidan Smorgav Aq des@FreeBSD.org
 $B$,:n@.$7$^$7$?!#(B
 .Sh $B%P%0(B
-$B%U%#!<%k%IFb$K2DG=$J(B / $BIT2DG=$JJ8;z$r$b$C$HE0DlE*$K%A%'%C%/$7!"(B
+$B%U%#!<%k%IFb$K2DG=$J(B/$BIT2DG=$JJ8;z$r$b$C$HE0DlE*$K%A%'%C%/$7!"(B
 $B%0%k!<%W(B ID $B$NHO0O$b%A%'%C%/$9$k$Y$-$G$9!#(B
diff -ur man8-org/chown.8 man8/chown.8
--- man8-org/chown.8	Tue Aug 31 08:25:28 1999
+++ man8/chown.8	Sat Jun 24 16:39:40 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.6.2.1 1999/08/29 15:40:19 peter Exp %
+.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.6.2.2 1999/12/29 19:55:08 obrien Exp %
 .\"
 .\" jpman %Id: chown.8,v 1.3 1997/05/19 16:59:53 horikawa Stab %
 .\"
@@ -48,8 +48,9 @@
 .Oc
 .Op Fl f
 .Op Fl h
-.Ar owner Op Ar :group
-.Ar
+.Op Fl v
+.Ar owner Ns Op Ar :group
+.Ar file ...
 .Nm chown
 .Oo
 .Fl R
@@ -57,6 +58,7 @@
 .Oc
 .Op Fl f
 .Op Fl h
+.Op Fl v
 .Ar :group
 .Ar
 .Sh $B2r@b(B
@@ -90,6 +92,9 @@
 $B%U%!%$%k$,%7%s%\%j%C%/%j%s%/$N>l9g!"(B
 $B%j%s%/$,;X$9%U%!%$%k$G$O$J$/%j%s%/<+?H$N%f!<%6(B ID $B$*$h$S(B/$B$^$?$O%0%k!<%W(B ID
 $B$rJQ99$7$^$9!#(B
+.It Fl v
+.Nm
+$B$rqA@e$K$7$^$9!#=jM-<T$,JQ99$5$l$k$H$-$K%U%!%$%k$bI=<($7$^$9!#(B
 .El
 .Pp
 .Fl H ,
@@ -130,6 +135,13 @@
 $BMQ$$$F$$$^$7$?!#(B
 $B$3$NJ8;z$O%3%m%s(B (``:'') $B$KJQ99$5$l$?$?$a!"(B
 $B%f!<%6L>$d%0%k!<%WL>$K%I%C%H$r4^$s$G$b9=$$$^$;$s!#(B
+.Pp
+$BK\%7%9%F%`$N0JA0$N%P!<%8%g%s$G$O!"%7%s%\%j%C%/%j%s%/$O=jM-<T$r(B
+$B;}$C$F$$$^$;$s$G$7$?!#(B
+.Pp
+.Fl v
+$B%*%W%7%g%s$OI8=`$G5,Dj$5$l$F$$$^$;$s$N$G!"%9%/%j%W%H$G$N;HMQ$O(B
+$B$*4+$a$7$^$;$s!#(B
 .Pp
 .Sh $B4XO"9`L\(B
 .Xr chgrp 1 ,
diff -ur man8-org/comcontrol.8 man8/comcontrol.8
--- man8-org/comcontrol.8	Tue Aug 31 08:25:29 1999
+++ man8/comcontrol.8	Thu Jun 15 16:07:16 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/comcontrol/comcontrol.8,v 1.14.2.1 1999/08/29 15:13:22 peter Exp %
+.\" %FreeBSD: src/sbin/i386/comcontrol/comcontrol.8,v 1.14.2.2 2000/05/04 16:56:01 phantom Exp %
 .\" jpman %Id: comcontrol.8,v 1.3 1997/08/16 13:09:13 horikawa Stab %
 .Dd May 15, 1994
 .Dt COMCONTROL 8
@@ -54,11 +54,6 @@
 $B%@%$%d%k%"%&%H%G%P%$%9!#(B
 .Sh $B:n<T(B
 Christopher G. Demetriou
-.Sh $B%P%0(B
-.Nm
-$B$O(B
-.Nm siocontrol
-$B$H$$$&L>A0$K$9$Y$-$G$9!#(B
 .Sh $BNr;K(B
 $B%*%j%8%J%k$O(B 386BSD 0.1 $B$KBP$9$k(B cgd $B$N(B com $B%Q%C%1!<%8%Q%C%A$N(B
 $B%P!<%8%g%s(B 0.2.1 $B$G$9!#(B
diff -ur man8-org/dhclient-script.8 man8/dhclient-script.8
--- man8-org/dhclient-script.8	Tue Aug 31 08:25:34 1999
+++ man8/dhclient-script.8	Fri Jun 23 17:31:31 2000
@@ -36,37 +36,41 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" Original Revision: 1.2.2.3
+.\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.2.2.4 2000/01/13 17:20:53 asmodai Exp %
+.\"
+.\"
 .\" jpman %Id: dhclient-script.8,v 1.4 1999/05/13 14:01:25 horikawa Stab %
 .TH dhclient-script 8
 .SH $BL>>N(B
 dhclient-script - DHCP $B%/%i%$%"%s%H$N%M%C%H%o!<%/@_Dj%9%/%j%W%H(B
 .SH $B=q<0(B
 DHCP $B%/%i%$%"%s%H$N%M%C%H%o!<%/@_Dj%9%/%j%W%H$O!"(B
-$B;~$"$k$4$H$K(B \fBdhclient(8)\fR $B$,8F$S=P$7$^$9!#(B
+$BI,MW$K1~$8$F$=$NETEY(B \fBdhclient(8)\fR $B$,8F$S=P$7$^$9!#(B
 DHCP $B%/%i%$%"%s%H$O!"K\%9%/%j%W%H$r;HMQ$9$k$3$H$K$h$j!"(B
-$B%"%I%l%9MW5a$K@hN)$D3F%$%s%?%U%'!<%9$N=i4|@_Dj$H!"(B
-$BIUM?$5$l$?%"%I%l%9$N8!::$H!"(B
-$B%j!<%93MF@;~$N%$%s%?%U%'!<%9$N:G=*@_Dj$r9T$$$^$9!#(B
-$B%j!<%9$,3MF@$5$l$J$+$C$?>l9g!"(B
-$BDj5A:Q$_$N%j!<%9$,B8:_$9$k$J$i$P$3$l$r8!::$9$k$?$a$KK\%9%/%j%W%H$O;HMQ$5$l!"(B
-$BM-8z$J%j!<%9$,H=L@$7$J$+$C$?>l9g$K$b$b$&(B 1 $B2s$3$N%9%/%j%W%H$,8F$P$l$^$9!#(B
+$B%"%I%l%9MW5a$K@hN)$A3F%$%s%?%U%'!<%9$r=i4|@_Dj$7!"(B
+$BIUM?$5$l$?%"%I%l%9$r8!::$7!"(B
+$B%j!<%93MF@;~$K%$%s%?%U%'!<%9$N:G=*@_Dj$r9T$$$^$9!#(B
+$B%j!<%9$r3MF@$G$-$J$+$C$?>l9g!"(B
+$B$"$i$+$8$aDj5A$5$l$?%j!<%9$,B8:_$9$k$J$i$P!"(B
+$B$3$l$r8!::$9$k$?$a$KK\%9%/%j%W%H$O;HMQ$5$l!"(B
+$BM-8z$J%j!<%9$,F@$i$l$J$+$C$?>l9g$K$O$5$i$K(B 1 $B2s$3$N%9%/%j%W%H$,8F$P$l$^$9!#(B
 .PP
-$BK\%9%/%j%W%H$O!"%(%s%I%f!<%6$K%+%9%?%^%$%:$5$l$k$3$H$r0U?^$7$F$$$^$;$s!#(B
+$BK\%9%/%j%W%H$O!"%(%s%I%f!<%6$,%+%9%?%^%$%:$9$k$3$H$r0U?^$7$F$$$^$;$s!#(B
 $B%m!<%+%k$J%+%9%?%^%$%:$,I,MW$J>l9g!"(B
-$B$3$l$OF~(B (enter) $B$H=P(B (exit) $B$H$$$&%U%C%/$r;HMQ$9$k$3$H$G2DG=$H$J$j$^$9(B
-($B>\:Y$O%U%C%/;2>H(B)$B!#(B
-$B$3$l$i$N%U%C%/$O!"(B
+$B$3$l$OF~(B (enter) $B$H=P(B (exit) $B$H$$$&%U%C%/$N;HMQ$,2DG=$G$9$+$i(B
+$B$=$l$i$r;H$o$M$P$J$j$^$;$s(B ($B>\:Y$O%U%C%/;2>H(B)$B!#(B
+$B$3$l$i$N%U%C%/$K$h$j!"(B
 .B /etc/resolv.conf
-$B:n@.;~$K!"(B
-$B%/%i%$%"%s%H$N%G%U%)%k%HF0:n$r%f!<%6$,%*!<%P%i%$%I$G$-$k$h$&$K$7$^$9!#(B
+$B:n@.;~$N!"(B
+$B%/%i%$%"%s%H$N%G%U%)%k%HF0:n$r%f!<%6$,%*!<%P%i%$%I$G$-$k$h$&$K(B
+$B$J$j$^$9!#(B
 .PP
-$BFCDj$N%*%Z%l!<%F%#%s%0%7%9%F%`$G$O!"(B
-$B%/%i%$%"%s%H$N<BBN$OF0:n$9$k$H$7$F$b!"(B
-$BI8=`$N%9%/%j%W%H$,F0:n$7$J$$$+$b$7$l$^$;$s!#(B
-$B@h6nE*$J%f!<%6$,?75,%9%/%j%W%H$r:n@.$7$?$j4{B8$N$b$N$r=$$7$?$j$9$kI,MW$,$"$k(B
-$B$3$H$O$b$C$H$b$J$3$H$G$9!#(B
-$B0lHLE*$K$O!"$=$l$>$l$N%3%s%T%e!<%?$K8GM-$N%+%9%?%^%$%:$O(B
+$B%*%Z%l!<%F%#%s%0%7%9%F%`$K$h$C$F$O!"(B
+$B%/%i%$%"%s%H$O<B:]$KF0:n$9$k$H$7$F$b!"(B
+$BI8=`$N%9%/%j%W%H$H$$$&$b$N$,$H$/$KB8:_$7$J$$$3$H$,$"$j$^$9!#(B
+$B@h6nE*$J%f!<%6$,?7$7$$%9%/%j%W%H$r:n@.$7$?$j4{B8$N$b$N$r=$@5$7$?$j(B
+$B$9$kI,MW$,$"$k$H$7$F$bL5M}$+$i$L$b$N$,$"$j$^$9!#(B
+$B0lHLE*$K$O!"$=$l$>$l$N%3%s%T%e!<%?$4$H$K8GM-$N%+%9%?%^%$%:$O(B
 .B /etc/dhclient.conf
 $B%9%/%j%W%H$G9T$&$Y$-$G$9!#(B
 .B /etc/dhclient.conf
@@ -99,7 +103,7 @@
 $B$9$Y$F$N=hM}$N40N;8e$K!"(B
 .B /sbin/dhclient-script
 $B$O<B9T2DG=$J(B
-.B /sbin/dhclient-exit-hooks
+.B /etc/dhclient-exit-hooks
 $B%9%/%j%W%H$NB8:_$r8!::$7!"B8:_$9$k>l9g$K$O(B '.' $B%3%^%s%I$G$3$l$r5/F0$7$^$9!#(B
 $B=*N;>uBV$O(B exit_status $B%7%'%kJQ?t$KEO$5$l!"(B
 $B5/F0$5$l$?;E;v$K%9%/%j%W%H$,@.8y$7$?>l9g$K$OCM$O>o$K(B 0 $B$K$J$j$^$9!#(B
diff -ur man8-org/dump.8 man8/dump.8
--- man8-org/dump.8	Tue Aug 31 08:25:39 1999
+++ man8/dump.8	Sat Jun 24 15:02:35 2000
@@ -31,14 +31,15 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/dump/dump.8,v 1.22.2.1 1999/08/29 15:12:51 peter Exp %
+.\" %FreeBSD: src/sbin/dump/dump.8,v 1.22.2.3 2000/03/03 15:12:56 sheldonh Exp %
 .\" jpman %Id: dump.8,v 1.2 1997/06/12 05:57:09 yugawa Stab %
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
 .Os BSD 4
 .Sh $BL>>N(B
-.Nm dump
+.Nm dump ,
+.Nm rdump
 .Nd $B%U%!%$%k%7%9%F%`$N%P%C%/%"%C%W(B
 .Sh $B=q<0(B
 .Nm dump
@@ -363,11 +364,11 @@
 .Pp
 $B%;%-%e%j%F%#E*$JNr;K$K$h$j!"(B
 .Nm
-$B$O!"(Broot $B0J30$N%f!<%6$G%j%b!<%H%P%C%/%"%C%W$r9T$&$3$H$O$G$-$^$;$s!#(B
+$B$O!"(Broot $B$K$J$i$J$$8B$j%j%b!<%H%P%C%/%"%C%W$r9T$&$3$H$O$G$-$^$;$s!#(B
 $B$3$l$O!"(B
 .Bx Free
 $B$N:#8e$N%P!<%8%g%s$G$O=$@5$5$l$k$G$7$g$&!#(B
-$B8=>u$G$O!"(B($B=>MhDL$j(B) setuid $B$5$l$F$$$l$P@5>o$KF0:n$7$^$9$,!"(B
+$B8=>u$G$O!"(B($B=>MhDL$j(B) setuid $B$7$F$*$1$P@5>o$KF0:n$7$^$9$,!"(B
 $B%;%-%e%j%F%#E*$J%j%9%/$rH<$$$^$9!#(B
 .Sh $BNr;K(B
 .Nm
diff -ur man8-org/fdcontrol.8 man8/fdcontrol.8
--- man8-org/fdcontrol.8	Sat Sep  4 09:45:31 1999
+++ man8/fdcontrol.8	Thu Jun 15 16:11:07 2000
@@ -24,7 +24,8 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\" 
-.\" Original Revision: 1.5
+.\" %FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.5.2.1 2000/03/06 11:35:47 sheldonh Exp %
+.\" 
 .\" jpman %Id: fdcontrol.8,v 1.3 1997/08/16 13:14:53 horikawa Stab %
 .Dd May 22, 1994
 .Os
diff -ur man8-org/fore_dnld.8 man8/fore_dnld.8
--- man8-org/fore_dnld.8	Sun Oct 31 01:52:23 1999
+++ man8/fore_dnld.8	Thu Jun 15 16:56:19 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.1.2.1 1999/08/29 15:12:27 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.1.2.2 2000/03/03 14:59:51 sheldonh Exp %
 .\" jpman %Id: fore_dnld.8,v 1.3 1998/11/21 14:56:04 horikawa Stab %
 .\"
 .\" WORD: COPYRIGHT	$BCx:n8"(B[.SH]
diff -ur man8-org/ifconfig.8 man8/ifconfig.8
--- man8-org/ifconfig.8	Tue Dec 14 07:43:52 1999
+++ man8/ifconfig.8	Sat Jun 24 15:35:20 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.18.2.2 1999/12/13 02:02:20 jkh Exp %
+.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.18.2.3 2000/03/03 15:12:58 sheldonh Exp %
 .\" jpman %Id: ifconfig.8,v 1.2 1997/03/31 14:09:47 horikawa Stab %
 .\"
 .Dd February 13, 1996
@@ -108,9 +108,10 @@
 $BB>$N%Q%i%a!<%?$N2r<a$K1F6A$9$k%M%C%H%o!<%/(B
 .Ar "address family"
 $B$r;XDj$7$^$9!#(B
-$B%$%s%?%U%'!<%9$,0[$J$k%W%m%H%3%k$NAw?.$r0[$J$kL>A0IU$1BN7O$G(B
-$B<u$1$k$3$H$,$"$k$N$G!"%"%I%l%9%U%!%_%j$r;XDj$7$F$*$/$3$H$r$*4+$a$7$^$9!#(B
-$BK\%3%^%s%I$G%5%]!<%H$5$l$k%W%m%H%3%k%U%!%_%j$O!"(B
+$B0[$J$k%"%I%l%9L>A0IU$1BN7O$r;}$D%W%m%H%3%k$NAw?.$r(B
+$B<u$1IU$1$k%$%s%?%U%'!<%9$b$"$k$N$G!"(B
+$B%"%I%l%9%U%!%_%j$r;XDj$7$F$*$/$3$H$r$*4+$a$7$^$9!#(B
+$BK\%3%^%s%I$G8=:_%5%]!<%H$5$l$F$$$k%W%m%H%3%k%U%!%_%j$O!"(B
 .Dq inet ,
 .Dq atalk ,
 .\".Dq iso ,
@@ -162,7 +163,7 @@
 $B%^!<%/$5$l$?%$%s%?%U%'!<%9$KBP$7$F$O!"%7%9%F%`$O%a%C%;!<%8$NAw?.$r9T$J$$(B
 $B$^$;$s!#2DG=$G$"$l$P!"$=$N%$%s%?%U%'!<%9$O<u?.$bIT2DG=$H$J$k$h$&$K(B
 $B%j%;%C%H$5$l$^$9!#$3$NF0:n$O!"$=$N%$%s%?%U%'!<%9$rMQ$$$k(B
-$B%k!<%F%#%s%0$r;HMQ$7$J$$$h$&<+F0E*$K@_Dj$9$k$b$N$G$O$"$j$^$;$s!#(B
+$B7PO)$r;HMQ$7$J$$$h$&<+F0E*$K@_Dj$9$k$b$N$G$O$"$j$^$;$s!#(B
 .\" .It Cm ipdst
 .\" $B%j%b!<%H%M%C%H%o!<%/8~$1(B NS $B%Q%1%C%H$r%+%W%;%k2=$7$F$$$k(B IP $B%Q%1%C%H$r(B
 .\" $B<u?.$9$k!"%$%s%?!<%M%C%H%[%9%H$r;XDj$9$k$?$a$K;HMQ$7$^$9!#(B
@@ -263,7 +264,7 @@
 .\" (inet $B$H(B ISO)
 (inet $B$N$_(B)
 $B%M%C%H%o!<%/$r%5%V%M%C%H%o!<%/$K:YJ,3d$9$k:]$K!"%M%C%H%o!<%/%"%I%l%9$H$7$F(B
-$B%j%6!<%V$9$k%"%I%l%9$r;XDj$7$^$9!#(B
+$B3NJ]$9$k%"%I%l%9$r;XDj$7$^$9!#(B
 mask $B$,;XDj$9$kItJ,$O!"(B
 $B%"%I%l%9$N%M%C%H%o!<%/It$H%5%V%M%C%HIt$G$9!#(B
 $B%5%V%M%C%HIt$O%"%I%l%9$N%[%9%HIt$N0lIt$G$9!#(B
@@ -272,10 +273,10 @@
 $B%M%C%H%o!<%/%F!<%V%k(B 
 .Xr networks 5
 $B$K5-=R$5$l$F$$$k2>A[%M%C%H%o!<%/L>$N$$$:$l$+$G;XDj$G$-$^$9!#(B
-mask $B$G$N(B 32$B%S%C%H%"%I%l%9$K$*$1$k(B 1 $B$G$"$k%S%C%H$NItJ,$O!"(B
+mask $B$N(B 32 $B%S%C%H%"%I%l%9$N$&$A(B 1 $B$N%S%C%H$NItJ,$O!"(B
 $B%M%C%H%o!<%/It$b$7$/$O%5%V%M%C%HIt$H$7$F;HMQ$7$^$9!#(B
-0 $B$G$"$k%S%C%H$NItJ,$O%[%9%HIt$H$7$F;HMQ$7$^$9!#(B
-mask $B$O>/$J$/$H$b%M%C%H%o!<%/It$r4^$`I,MW$,$"$j!"(B
+0 $B$N%S%C%H$NItJ,$O%[%9%HIt$H$7$F;HMQ$7$^$9!#(B
+mask $B$O>/$J$/$H$bI8=`$,Dj$a$k%M%C%H%o!<%/It$r4^$`I,MW$,$"$j!"(B
 $B%5%V%M%C%HIt$O%M%C%H%o!<%/It$KO"B3$9$kI,MW$,$"$j$^$9!#(B
 .\" see
 .\" Xr eon 5 .
@@ -308,7 +309,7 @@
 .Em netrange
 $B$KJVEz$9$k$h$&$K%$%s%?%U%'!<%9$r@_Dj$7$^$9!#(B
 $B=q<0$O(B startnet-endnet $B$G$9!#(B
-Appletalk $B$O(B netmask $B$G$O$J$/$3$NJ}K!$r;HMQ$7$^$9$,!"(B
+Appletalk $B$O(B netmask $B$r;H$o$:$K$3$NJ}<0$r;HMQ$7$^$9$,!"(B
 .Bx Free
 $B$NFbIt$K$*$$$F$O(B netmask $B$N=89g$H$7$F<BAu$7$F$$$^$9!#(B
 .It Cm phase
@@ -332,13 +333,14 @@
 $BK\%*%W%7%g%s$O!"(B
 .Dq ifconfig down
 $B$r9T$J$C$?8e$K%$%s%?%U%'!<%9$rM-8z$K$9$k$N$KMQ$$$i$l$^$9!#(B
-$B:G=i$K%$%s%?%U%'!<%9$K%"%I%l%9$r@_Dj$7$?>l9g$K$O!"<+F0E*$KK\;XDj$O$5$l$?$b$N$H(B
+$B:G=i$K%$%s%?%U%'!<%9$K%"%I%l%9$r@_Dj$7$?>l9g$K$O!"<+F0E*$K$3$N;XDj$,(B
+$B$J$5$l$?$b$N$H(B
 $B$7$F07$$$^$9!#$b$7!"(Bdown $B$H%^!<%/$5$l$F$$$?%$%s%?%U%'!<%9$,%j%;%C%H$5$l$?>l9g!"(B
 $B%O!<%I%&%'%"$O:F=i4|2=$5$l$^$9!#(B
 .El
 .Pp
 .Nm
-$B$O0z?t$H$7$F%M%C%H%o!<%/%$%s%?%U%'!<%90J30$K2?$N%*%W%7%g%s$bM?$($i$l$J$$>l9g!"(B
+$B$K%M%C%H%o!<%/%$%s%?%U%'!<%90J30$K2?$N%*%W%7%g%s$b0z?t$H$7$FM?$($J$$>l9g!"(B
 $B%M%C%H%o!<%/%$%s%?%U%'!<%9$N8=:_$N@_Dj>uBV$rI=<($7$^$9!#(B
 $B%W%m%H%3%k%U%!%_%j$,;XDj$5$l$F$$$k>l9g!"(B
 .Nm
diff -ur man8-org/ilmid.8 man8/ilmid.8
--- man8-org/ilmid.8	Sun Oct 31 01:52:24 1999
+++ man8/ilmid.8	Sat Jun 24 15:48:29 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.1.2.1 1999/08/29 15:12:30 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.1.2.2 2000/03/03 15:12:53 sheldonh Exp %
 .\" jpman %Id: ilmid.8,v 1.3 1998/12/23 21:22:41 vanitas Stab %
 .\"
 .\"
@@ -51,19 +51,19 @@
 .fi
 .SH $B2r@b(B
 .B ilmid
-$B$O!"(BATM $B%M%C%H%o!<%/%9%$%C%A$K(B ILMI ATM $B%"%I%l%9EPO?<jB3$-$r9T$&!"(B
-HARP ATM $B%G!<%b%s$G$9!#(B
+$B$O(B HARP ATM $B%G!<%b%s$G!"(B
+ATM $B%M%C%H%o!<%/%9%$%C%A$K(B ILMI ATM $B%"%I%l%9EPO?<jB3$-$r9T$$$^$9!#(B
 $BDL>o!"%V!<%H;~$K!"(BATM $B%9%?!<%H%"%C%W%9%/%j%W%H$+$i5/F0$5$l$^$9!#(B
 .fi
 .PP
-UNI $B%7%0%J%j%s%0%^%M!<%8%c$,%"%?%C%A$5$l$?(B ATM $B%$%s%?%U%'!<%9Kh$K!"(B
+UNI $B%7%0%J%j%s%0%^%M!<%8%c$,%"%?%C%A$5$l$?(B ATM $B%$%s%?%U%'!<%9$4$H$K!"(B
 .B ilmid
 $B$O(B ILMI PVC (VPI = 0, VCI = 16) $B$r%*!<%W%s$7!"(B
 $B%$%s%?%U%'!<%9$N(B ATM $B%"%I%l%9$r%9%$%C%A$KEPO?$7$^$9!#(B
 $B%"%I%l%9EPO?<jB3$-$N0lIt$H$7$F!"(B
 ATM $B%9%$%C%A$O%(%s%I%7%9%F%`(B ($B%m!<%+%k%[%9%H(B) $B$KBP$7!"(B
-$B%(%s%I%7%9%F%`(B ATM $B%"%I%l%9$N!V%M%C%H%o!<%/%W%l%U%#%C%/%9!WItJ,$rDLCN$7$^$9!#(B
-$B$^$?!"(B
+$B%(%s%I%7%9%F%`(B ATM $B%"%I%l%9$N!V%M%C%H%o!<%/%W%l%U%#%C%/%9!WItJ,$r(B
+$BDLCN$7$^$9!#5U$K!"(B
 .B ilmid
 $B$O%9%$%C%A$KBP$7!"%(%s%I%7%9%F%`$N%"%I%l%9$N!V%f!<%6ItJ,!W(B
 ($BE57?E*$K$O%$%s%?%U%'!<%9%+!<%I$N(B MAC $B%"%I%l%9(B) $B$rDLCN$7$^$9!#(B
@@ -71,7 +71,7 @@
 .SH $B%*%W%7%g%s(B
 .TP
 .B \-d level
-$B%*%W%7%g%s$N%W%m%H%3%k%H%l!<%9$N$?$a$K!"%G%P%C%0%l%Y%k$r;XDj$7$^$9!#(B
+$B%*%W%7%g%s5!G=$G$"$k%W%m%H%3%k%H%l!<%9$N%G%P%C%0%l%Y%k$r;XDj$7$^$9!#(B
 $B%a%C%;!<%8$O(B /var/log/ilmid $B$K=q$-9~$^$l$^$9!#(B
 .TP
 .B \-f
@@ -89,7 +89,7 @@
 $BFC$K!"(B
 ATM $B%"%I%l%9%F!<%V%k$,6u$G$"$k$3$H$rJ]>Z$9$k$?$a$N!"(B
 $B%M%C%H%o!<%/%5%$%I$KBP$9$kLd$$9g$o$;$r!"$^$C$?$/9T$$$^$;$s!#(B
-$B$^$?!"(BILMI $B$N0lIt$H$7$F;XDj$5$l$F$$$k(B ATM Forum MIB $B$b!"(B
+$B$^$?!"(BILMI $B$N0lIt$H$7$F5,Dj$5$l$F$$$k(B ATM Forum MIB $B$b!"(B
 $B$^$C$?$/<BAu$7$F$$$^$;$s!#(B
 .fi
 .PP
diff -ur man8-org/inetd.8 man8/inetd.8
--- man8-org/inetd.8	Sat Nov 20 07:28:35 1999
+++ man8/inetd.8	Sat Jun 24 16:09:57 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp %
+.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.7 2000/03/04 08:14:16 sheldonh Exp %
 .\"
 .\" jpman %Id: inetd.8,v 1.2 1997/05/16 07:22:24 yugawa Stab %
 .Dd February 7, 1996
@@ -81,30 +81,32 @@
 .It Fl d
 $B%G%P%C%0%b!<%I$K$7$^$9!#(B
 .It Fl l
-$B%m%0$r$H$j$^$9!#(B
+$B%3%M%/%7%g%s$,@.8y$7$?$b$N$N%m%0$r$H$j$^$9!#(B
 .It Fl w
 $B30It%5!<%S%9$KBP$7$F(B TCP Wrapping $B$r%*%s$K$7$^$9!#(B
 TCP Wrappers $B%5%]!<%H$K$D$$$F$N99$J$k>pJs$K$D$$$F$O!"(B
-.Sx "$B<BAu$K4X$9$kCm(B"
+.Sx "$B!V<BAu$K4X$9$kCm!W(B"
 $B$N@a$r;2>H$7$F$/$@$5$$!#(B
 .It Fl W
 .Nm
 $BAH$_9~$_$NFbIt%5!<%S%9$KBP$7$F(B TCP Wrapping $B$r%*%s$K$7$^$9!#(B
 .It Fl c Ar maximum
-$B5/F02DG=$J%5!<%S%9$N%G%U%)%k%H$K$*$1$k:GBgCM$r;XDj$7$^$9!#(B
-$B%5!<%S%9$4$H$K;XDj$5$l$k(B "max-child" $B%Q%i%a!<%?$K$h$C$F>e=q$-$5$lF@$^$9!#(B
+$B5/F02DG=$J%5!<%S%9$N?t$N%G%U%)%k%H$K$*$1$k:GBgCM$r;XDj$7$^$9!#(B
+$B%5!<%S%9$4$H$K;XDj$5$l$k(B "max-child" $B%Q%i%a!<%?$K$h$C$F(B
+$B>e=q$-$5$l$k2DG=@-$,$"$j$^$9!#(B
 .It Fl C Ar rate
-1 $BJ,4V$KC10l$N(B IP $B%"%I%l%9$+$i5/F0$5$l$k%5!<%S%9$N%G%U%)%k%H$K$*$1$k:GBgCM(B
-$B$r;XDj$7$^$9!#(B
+$BC10l$N(B IP $B%"%I%l%9$+$i5/F0$5$l$k(B1 $BJ,$"$?$j$N%5!<%S%9$N?t$N(B
+$B%G%U%)%k%H$K$*$1$k:GBgCM$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$OL$@_Dj$G$9!#(B
 $B%5!<%S%9$4$H$K;XDj$5$l$k(B "max-connections-per-ip-per-minute"
 $B%Q%i%a!<%?$K$h$C$F>e=q$-$5$lF@$^$9!#(B
 .It Fl R Ar rate
-1 $BJ,4V$K5/F0$G$-$k:GBg$N%5!<%S%9?t$r;XDj$7$^$9!#%G%U%)%k%H$O(B 256 $B$G$9!#(B
+1 $BJ,4V$K5/F0$G$-$k%5!<%S%9$N?t$N:GBgCM$r;XDj$7$^$9!#%G%U%)%k%H$O(B 256 $B$G$9!#(B
 .It Fl a
 $B4F;k$9$k(B IP $B%"%I%l%9$r;XDj$7$^$9!#(B
 .It Fl p
-$B%G%U%)%k%H$H$O0[$J$k%W%m%;%9(B ID $B$rJ];}$9$k%U%!%$%k$r;XDj$7$^$9!#(B
+$B%G%U%)%k%H$H$O0[$J$k%U%!%$%k$K%W%m%;%9(B ID $B$rJ];}$9$k:]$K!"(B
+$B$=$N%U%!%$%kL>$r;XDj$7$^$9!#(B
 .El
 .Pp
 .Nm
@@ -112,7 +114,7 @@
 $B%G%U%)%k%H$G$O@_Dj%U%!%$%k$O(B
 .Pa /etc/inetd.conf
 $B$G$9!#(B
-$B@_Dj%U%!%$%k$N3F%U%#!<%k%I$K$O%(%s%H%j$,(B 1 $B$D$J$1$l$P$J$j$^$;$s!#(B
+$B@_Dj%U%!%$%k$N%U%#!<%k%I$4$H$K%(%s%H%j$,(B 1 $B$DB8:_$9$kI,MW$,$"$j$^$9!#(B
 $B3F%U%#!<%k%I$N%(%s%H%j$O%?%V$d%9%Z!<%9$G6h@Z$j$^$9!#(B
 $B%3%a%s%H$O9TF,$K(B
 .Dq #
@@ -415,6 +417,15 @@
 $B$O@\B3$r<u$1IU$1$k$?$S!"%(%s%H%j$r(B syslog $B$K5-O?$7$^$9!#(B
 $B$3$N:]!"MxMQ2DG=$G$"$l$P!"(B
 $BA*Br$5$l$?%5!<%S%9$HMW5a$rH/$7$?%j%b!<%H$N(B IP $BHV9f$r5-O?$7$^$9!#(B
+$B@_Dj%U%!%$%k$G$=$l0J30$r;XDj$7$J$$8B$j!"$+$D!"(B
+.Fl W
+$B$H(B
+.Fl w
+$B%*%W%7%g%s$,$H$b$K;XDj$5$l$F$$$J$$>l9g!"(B
+.Nm
+$B$O%m%0$r(B
+.Dq daemon
+$B%U%!%7%j%F%#$G5-O?$7$^$9!#(B
 .Pp
 .Dv SIGHUP
 $B$r<u$1$H$k$H!"(B
@@ -444,13 +455,15 @@
 $B%5!<%S%9$,%i%C%T%s%0$5$l$^$9!#(B
 $BN>J}$N%*%W%7%g%s$,;XDj$5$l$?>l9g!"(B
 $BFbIt%5!<%S%9$H30It%5!<%S%9$NN>J}$r%i%C%T%s%0$9$k$h$&$K$J$j$^$9!#(B
-.Pp
+$B$I$A$i$+$N%i%C%T%s%0%*%W%7%g%s$,;XDj$5$l$F$$$k$3$H$K$h$j!"(B
+$B%3%M%/%7%g%s$N<:GT$,(B
+.Dq auth
+$B%U%!%7%j%F%#$G5-O?$5$l$k$h$&$K$J$j$^$9!#(B
+$B%i%C%T%s%0%*%W%7%g%s$K2C$(!"$5$i$K!"(B
 .Fl l
-$B%*%W%7%g%s$,;XDj$5$l$?>l9g!"(B
-$B$9$Y$F$N@\B3$N;n$_$O!"(B
-$B5v2D$5$l$F$$$k!&5qH]$5$l$F$$$k!&%i%C%T%s%0$5$l$F$$$J$$$N(B
-$B$$$:$l$G$"$k$+$,5-O?$5$l$^$9!#(B
-$B;XDj$5$l$J$$>l9g!"5qH]$5$l$?MW5a$N$_$,5-O?$5$l$^$9!#(B
+$B%U%i%0$r;XDj$7$?>l9g!"@.8y$7$?%3%M%/%7%g%s$b4^$a(B
+.Dq auth
+$B%U%!%7%j%F%#$G5-O?$5$l$^$9!#(B
 .Pp
 .Dq wait
 $B%5!<%S%9$KBP$9$kMW5a$O!"(B
@@ -476,8 +489,7 @@
 $B%5!<%S%9$N%G!<%b%sL>$H$7$F$O!"(B
 .Pa inetd.conf
 $B$G;XDj$5$l$k%5!<%S%9L>$r;HMQ$9$Y$-$G$9!#(B
-.Sh TCPMUX
-.Pp
+.Sx TCPMUX
 .Tn RFC 1078 
 $B$O(B TCPMUX $B%W%m%H%3%k$K$D$$$F=R$Y$F$$$^$9!#(B
 $B!V(B TCP $B%/%i%$%"%s%H$OB>$N%[%9%H$K(B TCP $B%]!<%HHV9f(B 1 $B$G@\B3$7$^$9!#(B
@@ -557,7 +569,7 @@
 $BIQHK$KMW5a$7$9$.$F$$$k!#(B
 .It
 $B0-0U$"$k%f!<%6$,$"$k%W%m%0%i%`$r5/F0$7!"(B
-$B%5!<%S%9$,(B '$B5qH](B' $B$5$l$k$h$&$K967b$7$F$$$k!#(B
+$B%5!<%S%9ITG=967b$r;E3]$1$F$$$k!#(B
 .It
 $B5/F0$5$l$?%5!<%S%9%W%m%0%i%`$K%(%i!<$,$"$j!"(B
 $B%/%i%$%"%s%H$,$9$0$K%j%H%i%$$r5/$3$7$F$7$^$&!#(B
@@ -642,7 +654,7 @@
 4.1
 $B$,6!5k$5$l$F$+$i!"(B
 $B$=$l$K$J$i$C$F:n$i$l$^$7$?!#(B
-.Tn FreeBSD
+.Fx
 $B$N(B TCP Wrappers $B%5%]!<%H$,:G=i$KEP>l$7$?$N$O(B
 .Fx 3.2
 $B$G$9!#(B
diff -ur man8-org/init.8 man8/init.8
--- man8-org/init.8	Fri Dec 10 07:12:11 1999
+++ man8/init.8	Thu Jun 15 17:41:45 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.6 1999/12/07 07:57:57 sheldonh Exp %
+.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.7 2000/03/03 15:12:59 sheldonh Exp %
 .\"
 .\" jpman %Id: init.8,v 1.2 1997/05/27 08:12:44 yugawa Stab %
 .\"
diff -ur man8-org/ipfw.8 man8/ipfw.8
--- man8-org/ipfw.8	Tue Nov 23 08:13:30 1999
+++ man8/ipfw.8	Sat Jun 24 17:26:15 2000
@@ -1,96 +1,235 @@
 .\"
-.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp %
+.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.12 2000/03/03 11:06:44 ru Exp %
 .\"
 .\" jpman %Id: ipfw.8,v 1.4 1997/05/19 17:19:51 horikawa Stab %
-.Dd July 20, 1996
-.Dt IPFW 8 SMM
+.Dd February 16, 2000
+.Dt IPFW 8
 .Os FreeBSD
 .Sh $BL>>N(B
 .Nm ipfw
-.Nd IP$B%U%!%$%"%&%)!<%k@)8f%f!<%F%#%j%#%F%#(B
+.Nd IP $B%U%!%$%"%&%)!<%k$H%H%i%U%#%C%/%7%'%$%Q$N@)8f%f!<%F%#%j%#%F%#(B
 .Sh $B=q<0(B
 .Nm ipfw
 .Op Fl q
 .Oo
 .Fl p Ar preproc
-.Op Fl D Ar macro Ns Op Ns =value
+.Oo Fl D
+.Sm off
+.Ar macro
+.Op = Ar value
+.Sm on
+.Oc
 .Op Fl U Ar macro
 .Oc
 .Ar file
 .Nm ipfw
-.Oo
-.Fl f
-|
-.Fl q
-.Oc
-flush
+.Op Fl f | q
+.Cm flush
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-zero
+.Op Fl q
+.Es \&{ \&}
+.En Cm zero | resetlog | delete
 .Op Ar number ...
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-resetlog
+.Op Fl s Op Ar field
+.Op Fl aftN
+.Es \&{ \&}
+.En Cm list | show
 .Op Ar number ...
 .Nm ipfw
-delete
-.Ar number ...
+.Op Fl q
+.Cm add
+.Op Ar number
+.Ar rule-body 
 .Nm ipfw
-.Op Fl aftN
-list
-.Op Ar number ...
+.Cm pipe
+.Ar number
+.Cm config
+.Ar pipe-config-options
 .Nm ipfw
-.Oo
-.Fl ftN
-.Oc
-show
+.Cm pipe
+.Es \&{ \&}
+.En Cm delete |list | show
 .Op Ar number ...
-.Nm ipfw
-.Oo
-.Fl q
-.Oc
-add
-.Op Ar number
-.Op prob match_probability
-.Ar action 
-.Op log Op Ar logamount Ar number
-.Ar proto
-from
-.Ar src
-to
-.Ar dst
-.Op via Ar name | ipno
-.Op Ar options
 .Sh $B2r@b(B
-$B=q<0$N(B 1 $B9TL\$N$h$&$K;XDj$7$?>l9g$O!"(B
+.Nm
+$B$O!"(B
+.Fx
+$B$N(B
+.Xr ipfirewall 4
+$B$H(B
+.Xr dummynet 4
+$B%H%i%U%#%C%/%7%'%$%Q$r@)8f$9$k%f!<%6%$%s%?%U%'!<%9$G$9!#(B
+.Pp
+$B3FF~=PNO%Q%1%C%H$O(B
+.Nm
+$B%k!<%k$rDL$5$l$^$9!#(B
+$B%[%9%H$,%2!<%H%&%'%$$H$7$FF0:n$7$F$$$k>l9g!"(B
+$B%2!<%H%&%'%$$,E>Aw$9$k%Q%1%C%H$O(B
+.Nm
+$B$,(B 2 $BEY=hM}$7$^$9!#(B
+$B%[%9%H$,%V%j%C%8$H$7$FF0:n$7$F$$$k>l9g!"(B
+$B%V%j%C%8$,E>Aw$9$k%Q%1%C%H$O(B
+.Nm
+$B$,(B 1 $BEY=hM}$7$^$9!#(B
+.Pp
+$B%U%!%$%"%&%)!<%k@_Dj$O!"HV9fIU$1$5$l$?%k!<%k$N%j%9%H$+$i$J$j$^$9!#(B
+$B$"$k%k!<%k$K%^%C%A$7$=$l$K4XO"$9$kF0:n$,<B9T$5$l$k$^$G!"(B
+$B3F%Q%1%C%H$O%k!<%k$N%j%9%H$KBP$7>H9g$5$l$^$9!#(B
+$BF0:n$H%7%9%F%`$N@_Dj$K$h$C$F$O!"%^%C%A$7$?%k!<%k$ND>8e$G!"(B
+$B%Q%1%C%H$,%U%!%$%"%&%)!<%k$K:FCmF~$5$l!"(B
+$B99$K=hM}$,7QB3$9$k$3$H$b$"$j$^$9!#(B
+$BA4$F$N%k!<%k$,A4$F$N%$%s%?%U%'!<%9$KE,MQ$5$l$^$9$N$G!"(B
+$B%A%'%C%/$N2s?t$,:G>.$H$J$k$h$&$J%k!<%k=89g$r=q$/$N$O(B
+$B%7%9%F%`4IM}<T$N@UG$$G$9!#(B
+.Pp
+$B$I$N@_Dj$b>o$K!"(B
+.Em DEFAULT
+$B%k!<%k(B ($BHV9f(B 65535) $B$r4^$_$^$9!#$3$N%k!<%k$O%W%m%0%i%^$,JQ99$G$-$:!"(B
+$B>o$K%Q%1%C%H$K%^%C%A$7$^$9!#(B
+$B%G%U%)%k%H%k!<%k$K4XO"IU$1$k%k!<%k$O(B
+.Cm deny
+$B$+(B
+.Ar allow
+$B$N$I$A$i$+$K$J$j$^$9$,!"(B
+$B$3$l$O$I$N$h$&$K%+!<%M%k$r@_Dj$7$?$+$K0MB8$7$^$9!#(B
+.Pp
+$B%k!<%k=89g$,(B
+.Cm keep-state
+$B%*%W%7%g%sIU$-$N%k!<%k$r4^$`>l9g!"(B
+.Nm
+$B$O(B
+.Em $B%9%F!<%H%U%k(B ($B>uBV0MB87?(B)
+$B$GF0:n$7$^$9!#$9$J$o$A!"$"$k%^%C%A$N7k2L!"(B
+$B%^%C%A$7$?%Q%1%C%H$N%Q%i%a!<%?$K$A$g$&$I0lCW$9$k%k!<%k$,(B
+$BF0E*$K@8@.$5$l$^$9!#(B
+.Pp
+$B$3$l$i$NF0E*%k!<%k$N<wL?$OM-8B$G!"(B
+.Cm check-state
+$B$^$?$O(B
+.Cm keep-state
+$B%k!<%k$,:G=i$K@8$8$?>l=j$G%A%'%C%/$5$l$^$9!#(B
+$BF0E*%k!<%k$O!"9gK!E*$J%H%i%U%#%C%/$r%*%s%G%^%s%I$G(B
+$B%U%!%$%"%&%)!<%k$rDL2a$5$;$k$?$a$KMQ$$$k$3$H$,IaDL$G$9!#(B
+.Nm
+$B$N%9%F!<%H%U%k$JF0:n$K$D$$$F99$K>pJs$,I,MW$J$i$P!"(B
+$B0J2<$N(B
+.Sx $B%k!<%k=q<0(B
+$B$^$?$O(B
+.Sx $B;HMQNc(B
+$B%;%/%7%g%s$r;2>H$7$F2<$5$$!#(B
+.Pp
+$BF0E*%k!<%k$b4^$a$9$Y$F$N%k!<%k$O!"(B
+$B$=$l$K4XO"$9$k%+%&%s%?$r$$$/$D$+;}$C$F$$$^$9!#(B
+$B$=$l$O!"%Q%1%C%H%+%&%s%H!"%P%$%H%+%&%s%H!"%m%0%+%&%s%H!"(B
+$B:G8e$K%^%C%A$7$?;~9o$r<($9%?%$%`%9%?%s%W$G$9!#(B
+$B%+%&%s%?$O!"(B
+.Nm
+$B%3%^%s%I$K$h$C$F!"I=<($*$h$S%j%;%C%H2DG=$G$9!#(B
+.Pp
+$B%k!<%k$NDI2C$O(B
+.Cm add
+$B%3%^%s%I$K$F2DG=$G$9!#(B
+$B8D!9$N%k!<%k$N:o=|$O(B
+.Cm delete
+$B%3%^%s%I$K$F2DG=$G$"$j!"$9$Y$F$N%k!<%k$N:o=|$O(B
+.Cm flush
+$B%3%^%s%I$K$F2DG=$G$9!#(B
+$B%k!<%k$NI=<($O!"(B
+.Ar show
+$B%3%^%s%I$*$h$S(B
+.Ar list
+$B%3%^%s%I$K$F2DG=$G$9!#(B
+$B$3$l$i$K$h$j!"%*%W%7%g%s$G%+%&%s%?FbMF$b4^$a$FI=<($5$;$k$3$H$,$G$-$^$9!#(B
+$B:G8e$K!"%+%&%s%?$N%j%;%C%H$O(B
+.Ar zero
+$B%3%^%s%I$*$h$S(B
+.Ar resetlog
+$B%3%^%s%I$K$F2DG=$G$9!#(B
+.Pp
+$B<!$N%*%W%7%g%s$,MxMQ2DG=$G$9(B:
+.Bl -tag -width indent
+.It Fl a
+$B%j%9%HCf$K%+%&%s%?CM$r<($7$^$9!#(B
+.Dq show
+$B%3%^%s%I$b$"$o$;$F8+$F$/$@$5$$!#(B
+.It Fl f
+$B8m$C$F;HMQ$9$k$HLdBj$r5/$92DG=@-$N$"$k%3%^%s%I!"(B
+.No $B$9$J$o$A(B Cm flush
+$B$KBP$7$F!"<B9T$N3NG'$r9T$$$^$;$s!#(B
+.Em $BCm(B :
+$B%W%m%;%9$K4XO"IU$1$i$l$?(B tty $B$,L5$$>l9g!"$3$N%*%W%7%g%s$,(B
+$B0EL[$N$&$A$K;XDj$5$l$?$H$7$F=hM}$5$l$^$9!#(B
+.It Fl q
+.Cm add ,
+.Cm zero ,
+.Cm resetlog ,
+.Cm flush
+$B<B9TCf!"F0:n$K$D$$$FJs9p$7$^$;$s(B
+.Po
+$B0EL[$N$&$A$K(B
+.Fl f
+$B$,;XDj$5$l$^$9(B
+.Pc
+$B!#(B
+$B%9%/%j%W%H(B
+.Po
+$BNc$($P(B
+.Sq sh /etc/rc.firewall
+.Pc
+$B$NCf$GJ#?t$N(B
+.Nm
+$B%3%^%s%I$r<B9T$7$F%k!<%k$rJQ99$9$k>l9g$d!"(B
+$B%j%b!<%H%m%0%$%s%;%C%7%g%s7PM3$GB??t$N(B
+.Nm
+$B%k!<%k$r4^$`%U%!%$%k$r=hM}$9$k$3$H$K$h$j%k!<%k$rJQ99$9$k>l9g$K(B
+$BM-MQ$G$9!#(B
+$BDL>o(B ($B>iD9(B) $B%b!<%I$G(B ($B%G%U%)%k%H%+!<%M%k@_Dj$G(B) flush $B$r9T$C$?>l9g!"(B
+$B%a%C%;!<%8$rI=<($7$^$9!#(B
+$B$9$Y$F$N%k!<%k$,<N$F$i$l$^$9$N$G!"(B
+$B%a%C%;!<%8$O%m%0%$%s%;%C%7%g%s$XEO$;$^$;$s!#(B
+$B$D$^$j!"%j%b!<%H%m%0%$%s%;%C%7%g%s7PM3$N>l9g!"%;%C%7%g%s$O%/%m!<%:$5$l!"(B
+$B;D$j$N%k!<%k%;%C%H$O=hM}$5$l$^$;$s!#(B
+$B$3$N>uBV$+$i2sI|$9$k$?$a$K$O%3%s%=!<%k$X$N%"%/%;%9$,I,MW$K$J$j$^$9!#(B
+.It Fl t
+$B%j%9%H:n@.;~$K!":G8e$K%^%C%A$7$?%?%$%`%9%?%s%W$rI=<($7$^$9!#(B
+.It Fl N
+$B=PNOCf$N%"%I%l%9$H%5!<%S%9L>$r2r7h$7$h$&$H$7$^$9!#(B
+.It Fl s Op Ar field
+$B%Q%$%W7PM3$G%j%9%H=PNO$7$F$$$k:]$K!"(B4$B$D$N%+%&%s%?$N(B1$B$D$K$D$$$F(B
+$B@0Ns$5$;$^$9(B ($B8=:_$N%Q%1%C%H?t(B)$B!#(B
+.El
+.Pp
+$B@_Dj$r4JC1$K$9$k$?$a$K!"%k!<%k$r%U%!%$%k$K5-=R$7$F!"(B
+$B$3$l$r(B
+.Nm
+$B$N:G=i$N=q<09T$r;H$C$F=hM}$7$^$9!#$3$N>l9g(B
 .Ar file
 $B$r(B 1 $B9T$:$D!"(B
 .Nm
-$B%3%^%s%I$X$N0z?t$H$7$FFI$_9~$_$^$9!#(B
+$B%f!<%F%#%j%F%#$X$N0z?t$H$7$FFI$_9~$_$^$9!#(B
 .Pp
 .Fl p Ar preproc
 $B$r;HMQ$7$F!"(B
 .Ar file
 $B$,%Q%$%W$5$l$k%W%j%W%m%;%C%5$r;XDj$9$k$3$H$b$G$-$^$9!#(B
-$BM-MQ$J%W%j%W%m%;%C%5$K$O(B
+$BM-MQ$J%W%j%W%m%;%C%5$K$O!"(B
 .Xr cpp 1
 $B$H(B
 .Xr m4 1
 $B$,$"$j$^$9!#(B
 .Ar preproc
-$B$N:G=i$NJ8;z$,%9%i%C%7%e$+$i;O$^$i$J$$>l9g!"(B
+$B$N:G=i$NJ8;z$,%9%i%C%7%e(B
+.Pq Ql /
+$B$+$i;O$^$i$J$$>l9g!"(B
 .Ev PATH
-$B$r;HMQ$7$?DL>o$NL>A08!:w9T$o$l$^$9!#(B
+$B$r;HMQ$7$?DL>o$NL>A08!:w$,9T$o$l$^$9!#(B
 .Nm
 $B$,<B9T$5$l$k$H$-$^$G$KA4%U%!%$%k%7%9%F%`$,(B ($B$^$@(B) $B%^%&%s%H$5$l$J$$$h$&$J4D6-(B
-($BNc$($P(B NFS $B7PM3$G%^%&%s%H$5$l$k>l9g(B) $B$G$O!"K\7o$KCm0U$7$F$/$@$5$$!#(B
+($BNc$($P(B NFS $B7PM3$G%^%&%s%H$5$l$k>l9g(B) $B$G$O!"$3$N$3$H$KCm0U$7$F$/$@$5$$!#(B
 $B$R$H$?$S(B
 .Fl p
-$B$,;XDj$5$l$k$H!"%*%W%7%g%s$N(B
+$B$,;XDj$5$l$k$H!"%*%W%7%g%s$H$7$F(B
 .Fl D
 $B$H(B
 .Fl U
@@ -99,277 +238,130 @@
 $B=@Fp@-$N$"$k@_Dj%U%!%$%k$r:n@.2DG=$H$J$j!"(BIP $B%"%I%l%9$N$h$&$K(B
 $BIQHK$KI,MW$H$J$k0z?t$r=8Cf4IM}$9$k$?$a$N%^%/%m$r;HMQ2DG=$H$J$j$^$9!#(B
 .Pp
-$B<u?.$5$l$?$"$k$$$OAw?.$5$l$k3F%Q%1%C%H$O(B
-.Nm
-$B$N%k!<%k$rDL2a$7$^$9!#(B
-$B%[%9%H$,%2!<%H%&%'%$$H$7$FF0:n$7$F$$$k>l9g!"(B
-$B%[%9%H$K$h$C$FE>Aw$5$l$k%Q%1%C%H$O(B
+$B8e=R$N(B
+.Sx $B%H%i%U%#%C%/%7%'%$%Q@_Dj(B
+$B$N@a$G<($9$h$&$K!"(B
 .Nm
-$B$K$h$C$F(B 2 $B2s=hM}$5$l$^$9(B
-.Po
-1 $B2s$OF~$C$FMh$?;~!"$b$&(B 1 $B2s$O=P$F$$$/;~$G$9(B
-.Pc $B!#(B
-$B0J2<$N>pJs$r4p$K3F%Q%1%C%H$r%U%#%k%?$9$k$3$H$,=PMh$^$9!#(B
-.Pp
-.Bl -tag -offset indent -compact -width xxxx
-.It $B<u?.%$%s%?%U%'!<%9(B Pq Ar recv
-$B%Q%1%C%H$,<u?.$5$l$?%$%s%?%U%'!<%9(B
-.It $BAw?.%$%s%?%U%'!<%9(B Pq Ar xmit
-$B%Q%1%C%H$,Aw=P$5$l$k%$%s%?%U%'!<%9(B
-.It Incoming Pq Ar in
-$B%Q%1%C%H$,<u?.$5$l$?(B
-.It Outgoing Pq Ar out
-$B%Q%1%C%H$,Aw=P$5$l$?(B
-.It $B;OE@(B IP $B%"%I%l%9(B
-$BAw?.<T$N(B IP $B%"%I%l%9(B
-.It $B08@h(B IP $B%"%I%l%9(B
-$B%?!<%2%C%H$N(B IP $B%"%I%l%9(B
-.It $B%W%m%H%3%k(B
-IP
-.Pq Ar ip ,
-UDP
-.Pq Ar udp ,
-TCP
-.Pq Ar tcp ,
-ICMP
-.Pq Ar icmp
-$B$K8B$i$J$$$,!"$=$l$i$r4^$`(B IP $B%W%m%H%3%k(B
-.It $B;OE@%]!<%H(B
-$BAw?.<T$N(B UDP $B$+(B TCP $B$N%]!<%H(B
-.It $B08@h%]!<%H(B
-$B%?!<%2%C%H$N(B UDP $B$+(B TCP $B%]!<%H(B
-.It $B%3%M%/%7%g%s%U%i%0(B Pq Ar setup
-$B$3$N%Q%1%C%H$O(B TCP $B%3%M%/%7%g%s%;%C%H%"%C%W$NMW5a$G$"$k(B
-.It $B%3%M%/%7%g%s3NN)%U%i%0(B Pq Ar established
-$B$3$N%Q%1%C%H$O3NN)$5$l$?(B TCP $B%3%M%/%7%g%s$N0lIt$G$"$k(B
-.It $B$9$Y$F$N(B TCP $B%U%i%0(B Pq Ar tcpflags
-1 $B$D0J>e$N(B TCP $B%U%i%0(B: $B%3%M%/%7%g%s2rJ|(B
-.Pq Ar fin ,
-$B%3%M%/%7%g%s%*!<%W%s(B
-.Pq Ar syn ,
-$B%3%M%/%7%g%s%j%;%C%H(B
-.Pq Ar rst ,
-$B%W%C%7%e(B
-.Pq Ar push ,
-$B3NG'1~Ez(B
-.Pq Ar ack ,
-$B6[5^(B
-.Pq Ar urg
-.It $BCGJR2=%U%i%0(B Pq Ar frag
-$B$3$N%Q%1%C%H$O(B IP $B%Q%1%C%H$NCGJR2=$G$"$k(B
-.It IP $B%*%W%7%g%s(B Pq Ar ipoptions
-1 $B$D0J>e$N(B IP $B%*%W%7%g%s(B: $B87L)$J%=!<%9%k!<%H(B
-.Pq Ar ssrr ,
-$B%k!<%9%=!<%9%k!<%H(B
-.Pq Ar lsrr ,
-$B%k!<%H5-O?(B
-.Pq Ar rr ,
-$B%?%$%`%9%?%s%W(B
-.Pq Ar ts
-.It ICMP $B%?%$%W(B Pq Ar icmptypes
-1 $B$D0J>e$N(B ICMP $B%?%$%W(B: $B%(%3!<JVEz(B
-.Pq Ar 0 ,
-$B=*E@ITE~C#(B
-.Pq Ar 3 ,
-$BH/?.M^@)(B
-.Pq Ar 4 ,
-$B8~$1D>$7(B
-.Pq Ar 5 ,
-$B%(%3!<MW5a(B
-.Pq Ar 8 ,
-$B%k!<%?9-9p(B
-.Pq Ar 9 ,
-$B%k!<%?MW@A(B
-.Pq Ar 10 ,
-$B;~4VD62a(B
-.Pq Ar 11 ,
-IP $B%X%C%@0[>o(B
-.Pq Ar 12 ,
-$B%?%$%`%9%?%s%WMW5a(B
-.Pq Ar 13 ,
-$B%?%$%`%9%?%s%W1~Ez(B
-.Pq Ar 14 ,
-$B>pJsMW5a(B
-.Pq Ar 15 ,
-$B>pJsJVEz(B
-.Pq Ar 16 ,
-$B%"%I%l%9%^%9%/MW5a(B
-.Pq Ar 17 ,
-$B%"%I%l%9%^%9%/1~Ez(B
-.Pq Ar 18
-.El
-.Pp
-$B;OE@(B IP $B%"%I%l%9$d;OE@(B TCP/UDP $B%]!<%H$r%U%#%k%?$9$k$3$H$O(B
-$B%9%W!<%U$5$l$d$9$/$J$k$N$GCm0U$7$F2<$5$$!#(B
+.Cm pipe
+$B%3%^%s%I$r;HMQ$7$F!"%H%i%U%#%C%/%7%'%$%Q$r9=C[2DG=$G$9!#(B
 .Pp
+.Sh $B%k!<%k=q<0(B
 .Nm
-$B$O%Q%1%C%H$4$H$K!"%^%C%A$9$k%k!<%k$,8+$D$+$k$^$G%k!<%k%j%9%H$rD4$Y$^$9!#(B
-$B3F%k!<%k$K$O%Q%1%C%H?t$H%Q%1%C%H%5%$%:$N(B 2 $B$D$N%+%&%s%?$,MQ0U$5$l$F$$$F!"(B
-$B%Q%1%C%H$,%^%C%A$9$k$H%+%&%s%?CM$O99?7$5$l$^$9!#(B
-.Pp
-$B%k!<%k$K!">JN,2DG=$J(B
-.Dq prob match_probability
-$B;XDj;R$,IU$$$F$$$k>l9g!";XDj$7$?3NN($G$N$_%^%C%A$,@k8@$5$l$^$9!#(B
-match_probability $B$O!"(B0 $B$+$i(B 1 $B$^$G$NIbF0>.?tE@?t$G$9!#(B
-$B%i%s%@%`$K%Q%1%C%H$rMn$H$9MQES$d!"(B
-.Pf ( Xr dummynet 4
-$B$H6&$K;HMQ$7$F(B)
-$BJ#?t%Q%9$r%7%_%e%l!<%H$7$F%Q%1%C%HG[Aw=g=x$rMp$l$5$;$kMQES$J$I$KM-MQ$G$9!#(B
-.Pp
-$BA4%k!<%k$O(B 1 $B$+$i(B 65534 $B$NHO0O$N(B
-.Dq $B9THV9f(B
-$B$G=g=xIU$1$i$l$^$9!#$3$NHV9f$K$h$C$F(B
-$B%k!<%k$NJB$YJQ$($H:o=|$r9T$J$$$^$9!#(B
-$B%k!<%k$N%^%C%A%s%0$O>:=g$G9T$J$o$l!":G=i$K%^%C%A$7$?$b$N$,E,MQ$5$l$^$9!#(B
-$BJ#?t$N%k!<%k$,F1$8HV9f$r6&M-$9$k$3$H$b2DG=$G$9!#$3$N>l9g$O%k!<%k$,DI2C$5$l$?(B
-$B=g=x$G%^%C%A%s%0$,9T$J$o$l$^$9!#(B
-.Pp
-$BHV9f$r;XDj$;$:$K%k!<%k$rDI2C$7$?>l9g$O!"(B
-$B4{$KDj5A$5$l$F$$$k%k!<%k$N:GBg$NHV9f$K(B 100 $B$r2C$($?$b$N$H$J$j$^$9!#(B
-$B%k!<%k$NHV9f$,(B 65435 $B0J>e$N>l9g$O!"?7$7$$%k!<%k$OF1$8HV9f$,M?$($i$l$^$9!#(B
-.Pp
-delete $BA`:n$O!"(B
-.Ar number 
-$B$G;XDj$5$l$?HV9f$r;}$D:G=i$N%k!<%k$r!"$b$7M-$l$P!":o=|$7$^$9!#(B
-.Pp
-list $BA`:n$O!"8=:_$N%k!<%k0lMw$r=PNO$7$^$9!#(B
-.Pp
-show $BA`:n$O!"(B`ipfw -a list' $B$HF1$87k2L$r=PNO$7$^$9!#(B
-.Pp
-zero $BA`:n$O!"(B
-.Ar number
-$B$G;XDj$5$l$?HV9f$r;}$D%k!<%k$N%+%&%s%?$r%/%j%"$7$^$9!#(B
-.Pp
-resetlog $BA`:n$O!"%k!<%kHV9f(B
-.Ar number
-$B$K4XO"IU$1$i$l$?%m%0%+%&%s%?$r%j%;%C%H$7$^$9!#(B
-.Pp
-flush $BA`:n$O!"A4%k!<%k$r:o=|$7$^$9!#(B
-.Pp
-$B5-9f(B `#' $B$G;O$^$k9T$*$h$S6u9T$OL5;k$5$l$^$9!#(B
-.Pp
-$B$I$s$J>l9g$G$b<!$N%k!<%k$OB8:_$7$^$9(B:
-.Bd -literal -offset center
-65535 deny all from any to any
-.Ed
-.Pp
-$BA4%Q%1%C%H$r5qH]$9$k$N$,%G%U%)%k%H$N%]%j%7$G$9!#(B
-$B$3$l$r=$@5$7!"I,MW$J%k!<%k$r@_Dj$7$F2<$5$$!#(B
-.Pp
-$B$7$+$7$J$,$i!"%+!<%M%k%*%W%7%g%s(B
-.Dq IPFIREWALL_DEFAULT_TO_ACCEPT
-$B$,M-8z$J>l9g!"%k!<%k$O<!$N$h$&$K$J$j$^$9(B:
-.Bd -literal -offset center
-65535 allow all from any to any
+$B%k!<%k%U%)!<%^%C%H$O<!$NDL$j$G$9!#(B
+.Bd -ragged
+.Op Cm prob Ar match_probability
+.Ar action
+.Op Cm log Op Cm logamount Ar number
+.Ar proto
+.Cm from Ar src
+.Cm to Ar dst
+.Op Ar interface-spec
+.Op Ar options
 .Ed
 .Pp
-$B$3$N%P%j%(!<%7%g%s$G$O$9$Y$F$,DL2a2DG=$G$9!#(B
-$B$3$N%*%W%7%g%s$rM-8z$K$7$F$h$$$N$OFCDj$N>u67$@$1$G$"$j!"(B
-$BNc$($PDL>o$O2rJ|$7$F$*$j!"(B
-$BI,MW$K1~$8$F%5!<%S%95qH](B (denial-of-service) $B%U%#%k%?$H$J$k(B
-$B%U%!%$%"%&%)!<%k%7%9%F%`$r;HMQ$9$k>l9g$,$3$l$K3:Ev$7$^$9!#(B
+$B3F%Q%1%C%H$r%U%#%k%?$9$k:]$K$O!"0J2<$N>pJs$K4p$E$/$3$H$,$G$-$^$9!#(B
 .Pp
-$B%*%W%7%g%s$O0J2<$N$b$N$,MxMQ2DG=$G$9!#(B
-.Bl -tag -width indent
-.It Fl a
-list $BA`:n$N;~!"%+%&%s%?$NCM$rI=<($7$^$9!#(B
-show $B$N9`$r;2>H$N$3$H!#(B
-.It Fl f
-$BA`:n$r<B9T$9$k:]$K3NG'%a%C%;!<%8$rI=<($7$^$;$s!#(B
-flush $BA`:n$bL5>r7o$K<B9T$5$l$^$9!#(B
-.Ar ($BCm0U(B)
-$B%W%m%;%9$K(B tty $B$,4XO"IU$1$i$l$F$$$J$$>l9g$K$O!"(B
-$B$3$N%*%W%7%g%s$,;XDj$5$l$F$$$k$b$N$H$7$F<B9T$5$l$^$9!#(B
-.It Fl q
-$B%k!<%k$r(B add, zero, resetlog, flush $B$9$k:]$K!"%a%C%;!<%8$N=PNO$rM^@)$7$^$9(B (
-.Fl f
-$B$b4^$^$l$^$9(B)$B!#(B
-$B$3$N%*%W%7%g%s$O!"%j%b!<%H%m%0%$%s%;%C%7%g%s$G%k!<%k$rD4@0$9$k:]$K!"(B
-($BNc$($P(B sh /etc/rc.firewall $B$N$h$&$K$7$F(B)
-$B%9%/%j%W%H$NCf$+$iJ#?t$N(B ipfw $B%3%^%s%I(B
-$B$r(B
-$B<B9T$9$k>l9g$d!"(B
-$BB??t$N(B ipfw $B%k!<%k$r5-=R$7$?%U%!%$%k$rMQ$$$k>l9g$K(B
-$BJXMx$G$9!#(B
-flush $BA`:n$,DL>o$N(B ($B>i@e$J(B) $B>uBV(B ($B%G%U%)%k%H$N%+!<%M%k$N@_Dj(B)
-$B$G<B9T$5$l$k$H!"%a%C%;!<%8$,=PNO$5$l$^$9!#(B
-$B$3$3$G!"$9$Y$F$N%k!<%k$O:o=|$5$l$k$N$G!"%a%C%;!<%8$r%m%0%$%s%;%C%7%g%s$K(B
-$BAw$k$3$H$,$G$-$:!"%m%0%$%s%;%C%7%g%s$,%/%m!<%:$5$l$F$7$^$&$N$G!"(B
-$B;D$j$N%k!<%k%;%C%H$O<B9T$5$l$^$;$s!#(B
-$B$3$N>uBV$r=$I|$9$k$K$O%3%s%=!<%k$X$N%"%/%;%9$,I,MW$H$J$j$^$9!#(B
-.It Fl t
-list $BA`:n$N;~$K!":G8e$K%^%C%A$7$?%Q%1%C%H$N%?%$%`%9%?%s%W$rI=<($7$^$9!#(B
-.It Fl N
-IP $B%"%I%l%9$H%5!<%S%9L>$r2r7h$7$F%[%9%HL>$GI=<($7$^$9!#(B
+.Bl -tag -width "$BAw?.85$*$h$S08@h(B IP $B%"%I%l%9(B" -offset indent -compact
+.It $BAw<u?.%$%s%?%U%'!<%9(B
+($BL>A0$^$?$O%"%I%l%9(B)
+.It $BJ}8~(B
+($BF~NO$^$?$O=PNO(B)
+.It $BAw?.85$*$h$S08@h(B IP $B%"%I%l%9(B
+($B%^%9%/;HMQ2D(B)
+.It $B%W%m%H%3%k(B
+(TCP, UDP, ICMP $BEy(B)
+.It $BAw?.85$*$h$S08@h%]!<%H(B
+($B%j%9%H!"HO0O!"%^%9%/$N$$$:$l$+(B)
+.It TCP $B%U%i%0(B
+.It IP $B%U%i%0%a%s%H%U%i%0(B
+.It IP $B%*%W%7%g%s(B
+.It ICMP $B%?%$%W(B
+.It $B%Q%1%C%H$K4XO"IU$1$i$l$?%=%1%C%H$N%f!<%6(B ID $B$H%0%k!<%W(B ID
 .El
 .Pp
-.Ar action :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar allow
+$BAw?.85(B IP $B%"%I%l%9$d08@h(B TCP/UDP $B%]!<%H$K$h$k%U%#%k%?$O(B
+$B4m81$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$J$<$J$i!"$3$l$i$N:>>N$O4JC1$@$+$i$G$9!#(B
+.Bl -tag -width indent
+.It Cm prob Ar match_probability
+$B;XDj$7$?3NN((B (0 $B$+$i(B 1 $B$^$G$NIbF0>.?tE@?t$G$9(B)
+$B$G$N$_%^%C%A$,@k8@$5$l$^$9!#(B
+$B%i%s%@%`$K%Q%1%C%H$rMn$H$91~MQ$H$7$FMQ$$$k>l9g$d!"(B
+.Po
+.Xr dummynet 4
+$B$H6&$K;HMQ$7$F(B
+.Pc
+$B%Q%1%C%HE~C#=g=x$NMp$l$r0z$-5/$3$9J#?t7PO)$N8z2L$r%7%_%e%l!<%H$9$k:]$K(B
+$BM-MQ$G$9!#(B
+.It Ar action :
+.Bl -tag -width indent
+.It Cm allow
 $B%^%C%A$9$k%Q%1%C%H$rDL2a$5$;!"%^%C%A%s%0$r=*N;$7$^$9!#(B
-.Ar pass ,
-.Ar permit ,
-.Ar accept
-$B$HF1$8$G$9!#(B
-.It Ar deny
+.Cm pass ,
+.Cm permit ,
+.Cm accept
+$B$O$3$l$NJLL>$G$9!#(B
+.It Cm deny
 $B%^%C%A$9$k%Q%1%C%H$rGK4~$7!"%^%C%A%s%0$r=*N;$7$^$9!#(B
-.Ar drop
+.Cm drop
 $B$O(B
-.Ar deny
-$B$HF1$8$G$9!#(B
-.It Ar reject
-($B2ACM$,Dc2<$7$F$$$^$9!#(B)
+.Cm deny
+$B$NJLL>$G$9!#(B
+.It Cm reject
+.Pq $B$3$N;HMQ$O?d>)$5$l$^$;$s(B
 $B%^%C%A$9$k%Q%1%C%H$rGK4~$7!"(B
-ICMP $B$N(B host unreachable $B$rAw?.$7$F!"=*N;$7$^$9!#(B
-.It Ar unreach code
+ICMP $B$N(B host unreachable $B$rAw?.$7!"(B
+$B%^%C%A%s%0$r=*N;$7$^$9!#(B
+.It Cm unreach Ar code
 $B%^%C%A$9$k%Q%1%C%H$rGK4~$7!"(B
 ICMP $B$N(B unreachable $B$K(B
 .Ar code
-$B$rIU$1$FAw?.$7$^$9!#(B
+$B$rIU$1$FAw?.$7$^$9!#$3$3$G!"(B
 .Ar code
 $B$O!"(B0 $B$+$i(B 256 $B$^$G$N?t;z!"$b$7$/$O!"0J2<$KNs5s$9$kJLL>$N$$$:$l$+$G$9(B:
-.Ar net,
-.Ar host ,
-.Ar protocol ,
-.Ar port ,
-.Ar needfrag ,
-.Ar srcfail ,
-.Ar net-unknown ,
-.Ar host-unknown ,
-.Ar isolated ,
-.Ar net-prohib ,
-.Ar host-prohib ,
-.Ar tosnet ,
-.Ar toshost ,
-.Ar filter-prohib ,
-.Ar host-precedence ,
-.Ar precedence-cutoff
-$B!#Aw?.8e!"=*N;$7$^$9!#(B
-.It Ar reset
-TCP $B%Q%1%C%H$N$_$KBP1~!#(B
-$B%Q%1%C%H$rGK4~$7!"(BTCP $B$N(B (RST) $B$rAw?.$7!"=*N;$7$^$9!#(B
-.It Ar count
-$B%^%C%A$9$k%Q%1%C%H$N%+%&%s%?$r99?7$7!"0zB3$-%^%C%A%s%0$r9T$J$$$^$9!#(B
-.It Ar divert port
+.Cm net , host , protocol , port ,
+.Cm needfrag , srcfail , net-unknown , host-unknown ,
+.Cm isolated , net-prohib , host-prohib , tosnet ,
+.Cm toshost , filter-prohib , host-precedence ,
+.Cm precedence-cutoff
+$B!#%^%C%A%s%0$O=*N;$7$^$9!#(B
+.It Cm reset
+TCP $B%Q%1%C%H$N$_BP>]!#(B
+$B%Q%1%C%H$rGK4~$7!"(BTCP $B$N(B reset (RST) $B$rAw?.$7!"(B
+$B%^%C%A%s%0$r=*N;$7$^$9!#(B
+.It Cm count
+$B%k!<%k$K%^%C%A$9$k%Q%1%C%H$9$Y$F$N%+%&%s%?$r99?7$7!"(B
+$B0zB3$-%^%C%A%s%0$r9T$J$$$^$9!#(B
+.It Cm check-state
+$BF0E*%k!<%k=89g$KBP$7$F%Q%1%C%H$N%A%'%C%/$r9T$J$$$^$9!#(B
+$B%^%C%A$7$?>l9g!"%^%C%A%s%0$O=*N;$7$^$9!#(B
+$B%^%C%A$7$J$+$C$?>l9g!"<!$N%k!<%k$K0\$j$^$9!#(B
+.Cm check-state
+$B%k!<%k$,8+$D$+$i$J$$$H$-$O!"F0E*%k!<%k=89g$O:G=i$N(B
+.Cm keep-state
+$B%k!<%k$N>l=j$G%A%'%C%/$5$l$^$9!#(B
+.It Cm divert Ar port
 $B%^%C%A$9$k%Q%1%C%H$r(B
 .Ar port 
 $B$G;XDj$5$l$?%]!<%H$K%P%$%s%I$5$l$F$$$k(B
 .Xr divert 4
 $B%=%1%C%H$KAw$j!"%^%C%A%s%0$r=*N;$7$^$9!#(B
-.It Ar tee port
+.It Cm tee Ar port
 $B%^%C%A$9$k%Q%1%C%H$N%3%T!<$r(B
 .Ar port
 $B$G;XDj$5$l$?%]!<%H$K%P%$%s%I$5$l$F$$$k(B
 .Xr divert 4
-$B%=%1%C%H$KAw$j!"0zB3$-%^%C%A%s%0$r9T$J$$$^$9!#(B
-$B$3$N5!G=$OL$<BAu$G$9!#(B
-.It Ar fwd ipaddr Op ,port
+$B%=%1%C%H$KAw$j$^$9!#(B
+$B$3$N5!G=$O$^$@<BAu$5$l$F$$$^$;$s!#(B
+.It Cm fwd Ar ipaddr Ns Xo
+.Op , Ns Ar port
+.Xc
 $B%^%C%A$7$?%Q%1%C%H$N<!$N%[%C%W$r(B
 .Ar ipaddr
 $B$KJQ99$7$^$9!#$3$l$O%I%C%HIU$-(B 4 $B$DAH$N(B IP $B%"%I%l%9$G$b%[%9%HL>$G$b$h$$$G$9!#(B
 .Ar ipaddr
 $B$,D>@\E~C#2DG=$J%"%I%l%9$G$O$J$$>l9g!"$=$N(B IP $B$KBP$7$F(B
-$B%m!<%+%k%k!<%F%#%s%0%F!<%V%k$G$_$D$+$k7PO)$r;HMQ$7$^$9!#(B
+$B%m!<%+%k%k!<%F%#%s%0%F!<%V%k$G$_$D$+$C$?7PO)$r;HMQ$7$^$9!#(B
 .Ar ipaddr
 $B$,%m!<%+%k%"%I%l%9$N>l9g!"(B
 $B%j%b!<%H%[%9%H$+$i$3$N%7%9%F%`$K%Q%1%C%H$,E~Ce$9$k$H!"(B
@@ -382,199 +374,195 @@
 $B$3$l$OF)2aE*%W%m%-%7%5!<%P$N$?$a$K$"$j$^$9!#(B
 IP $B$,(B $B%m!<%+%k%"%I%l%9$G$O$J$$>l9g!"%]!<%HHV9f$O(B ($B;XDj$5$l$F$$$F$b(B) $BL5;k$5$l!"(B
 $B%k!<%k$O%7%9%F%`$+$i=P$F9T$/%Q%1%C%H$KBP$7$F$N$_E,MQ$5$l$^$9!#(B
-$B$^$?!"(B
-$B%Q%1%C%H%m!<%+%k$K@8@.$5$l$?;~$K$b%"%I%l%9$r%m!<%+%k%]!<%H$K%^%C%W$7$^$9!#(B
-$B8!:w$O%k!<%k$,%^%C%A$7$?$H$-$K=*N;$7$^$9!#(B
-$B%]!<%HHV9f$,M?$($i$l$J$+$C$?>l9g!"%Q%1%C%HCf$N%]!<%HHV9f$,;HMQ$5$l!"(B
-$B30It%^%7%s$N%]!<%H(B Y $B$X$N%Q%1%C%H$O(B $B%m!<%+%k%]!<%H(B Y $B$XE>Aw$5$l$^$9!#(B
+$B%Q%1%C%H$,%m!<%+%k$K@8@.$5$l$?$H$-$K$O!"%"%I%l%9$r%m!<%+%k%]!<%H$K(B
+$B%^%C%W$7$^$9!#(B
+$B8!:w$O$3$N%k!<%k$,%^%C%A$7$?$H$-$K=*N;$7$^$9!#(B
+$B%]!<%HHV9f$,M?$($i$l$J$+$C$?>l9g!"(B
+$B30It%^%7%s$N%]!<%H(B Y $B$X$N%Q%1%C%H$O(B $B%m!<%+%k%]!<%H(B Y $B$XE>Aw$5$l$k$h$&$K!"(B
+$B%Q%1%C%HCf$N%]!<%HHV9f$,;HMQ$5$l$^$9!#(B
 $B%+!<%M%k$O!"(B
 $B%*%W%7%g%s(B IPFIREWALL_FORWARD $BIU$-$G%3%s%Q%$%k$5$l$F$$$kI,MW$,$"$j$^$9!#(B
-.It Ar pipe pipe_nr
+.It Cm pipe Ar pipe_nr
 $B%Q%1%C%H$r(B
 .Xr dummynet 4
-``$B%Q%$%W(B'' $B$XEO$7$^$9(B ($B%P%s%II}@)8B!"CY1dEy$N$?$a(B)$B!#(B
+.Dq $B%Q%$%W(B
+$B$XEO$7$^$9(B ($B%P%s%II}@)8B!"CY1dEy$N$?$a(B)$B!#(B
 $B99$J$k>pJs$K$D$$$F$O(B
 .Xr dummynet 4
 $B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 $B8!:w$O=*N;$7$^$9!#(B
-$B$7$+$7!"%Q%$%W$+$iH4$1$?$H$-$K(B sysctl $BJQ?t(B
-net.inet.ip.fw.one_pass $B$,%;%C%H$5$l$F$$$J$$>l9g!"(B
+$B$7$+$7!"%Q%$%W$+$iH4$1$?$H$-$K(B
+.Xr sysctl 8
+$BJQ?t(B
+.Em net.inet.ip.fw.one_pass
+$B$,%;%C%H$5$l$F$$$J$$>l9g!"(B
 $B%Q%1%C%H$O%U%!%$%"%&%)!<%k%3!<%I$X:FEYEO$5$l$F<!$N%k!<%k$+$i3+;O$7$^$9!#(B
-.It Ar skipto number
+.It Cm skipto Ar number
 .Ar number
 $B$h$j>.$5$JHV9f$N%k!<%k$rHt$S1[$7$F!"(B
 .Ar number
 $B0J>e$NHV9f$N%k!<%k$G:G=i$KB8:_$9$k$b$N$+$i!"%^%C%A%s%0$r7QB3$7$^$9!#(B
-.It Ar uid user
-.Ar user
-$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
-$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
-.Ar user
-$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
-.It Ar gid group
-$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
-$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
-.Ar group
-$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
 .El
-.Pp
-$B%Q%1%C%H$,(B
-.Ar divert
-$B$d(B
-.Ar tee
-$B$N$I$A$i$+$R$H$D0J>e!"$b$7$/$ON>J}$NAH$_9g$o$;$N!"J#?t$N%k!<%k$K%^%C%A$7$?>l9g!"(B
-$B:G8e$N$b$N$r=|$-!"L5;k$7$^$9!#(B
-.Pp
+.It Cm log Op Cm logamount Ar number
 $B%+!<%M%k$,(B
 .Dv IPFIREWALL_VERBOSE
-$B%*%W%7%g%sIU$-$G%3%s%Q%$%k$5$l$F$$$k>l9g$K!"(B``log'' $B$,;XDj$5$l$F$$$k%k!<%k$H(B
-$B%^%C%A$7$?;~$O!"%a%C%;!<%8$r%3%s%=!<%k$KI=<($7$^$9!#(B
-$B$b$7!"(B
+$B%*%W%7%g%sIU$-$G%3%s%Q%$%k$5$l$F$$$k>l9g$K!"(B
+.Cm log
+$B%-!<%o!<%I$,;XDj$5$l$F$$$k%k!<%k$H%^%C%A$7$?;~!"(B
+$B%a%C%;!<%8$r%3%s%=!<%k$XI=<($7$^$9!#(B
+$B%+!<%M%k$,!"(B
 .Dv IPFIREWALL_VERBOSE_LIMIT
 $B%*%W%7%g%sIU$-$G%3%s%Q%$%k$5$l$F$$$k>l9g!"(B
 $B%G%U%)%k%H$G$O!"(B
 $B0lO"$N%k!<%k$KBP$7;XDj$5$l$?%Q%1%C%H(B
 $B?t$r<u?.$7$?8e!"%a%C%;!<%8$NI=<($rCf;_$7$^$9!#(B
 $B$7$+$7(B
-.Ar logamount Ar number
+.Cm logamount Ar number
 $B$,;HMQ$5$l$?>l9g!"(B
 .Dv IPFIREWALL_VERBOSE_LIMIT
 $B$NBe$j$K$3$N(B
 .Ar number
 $B$,%G%U%)%k%H$N%m%0@)8B$K$J$j$^$9!#(B
-$B%Q%1%C%H$N%+%&%s%?$r%/%j%"$9$l$P:F$S%a%C%;!<%8$r=PNO$7$^$9!#(B
+$B$3$N%(%s%H%j$KBP$9$k%m%.%s%0%+%&%s%?$^$?$O%Q%1%C%H%+%&%s%?$r(B
+$B%/%j%"$9$l$P!"%m%.%s%0$O:F$SM-8z$K$J$j$^$9!#(B
 .Pp
-$B%3%s%=!<%k$X$NI=<($H$=$N@)8B?t$O!"(B
+$B%3%s%=!<%k%m%0$H%G%U%)%k%H%m%0@)8B?t$O!"(B
 .Xr sysctl 8
 $B$rDL$8$F(B MIB $B%Y!<%9(B
 .Dv net.inet.ip.fw
-$B$K$FD>@\@_Dj$G$-$^$9!#(B
-.Pp
-.Ar proto :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar ip
-$BA4%Q%1%C%H$,%^%C%A$7$^$9!#JLL>(B
-.Ar all
-$B$b;H$($^$9!#(B
-.It Ar tcp
-TCP $B%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-.It Ar udp
-UDP $B%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-.It Ar icmp
-ICMP $B%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-.It Ar <number|name>
-$B;XDj$5$l$?%W%m%H%3%k$N%Q%1%C%H$N$_%^%C%A$7$^$9(B (
+$B$K$FF0E*$K@_Dj$G$-$^$9!#(B
+.It Ar proto
+$BL>A0$^$?$O?tCM$G;XDj$9$k(B IP $B%W%m%H%3%k(B ($B>\:Y$O(B
 .Pa /etc/protocols
-$B$N%j%9%H$r;2>H$N;v(B)$B!#(B
-.El
-.Pp
-.Ar src 
-$B$H(B
-.Ar dst :
-.Pp
-.Bl -hang -offset flag
-.It Ar <address/mask>
+$B$N%j%9%H$r;2>H$N$3$H(B)$B!#(B
+.Cm ip
+$B$^$?$O(B
+.Cm all
+$B$N%-!<%o!<%I$r;HMQ$9$k$H!"$9$Y$F$N%W%m%H%3%k$,%^%C%A$7$^$9!#(B
+.It Ar src No $B$H(B Ar dst :
+.Aq Ar address Ns / Ns Ar mask
 .Op Ar ports
-.El
 .Pp
-.Em <address/mask>
+.Aq Ar address Ns / Ns Ar mask
 $B$O0J2<$N$h$&$K;XDj$G$-$^$9!#(B
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -tag -width indent
 .It Ar ipno
-IP$BHV9f$r(B 1.2.3.4 $B$N7A<0$G;XDj$7$^$9!#;XDj$5$l$?%"%I%l%9$N$_$,%^%C%A$7$^$9!#(B
-.It Ar ipno/bits
-IP$BHV9f$H%M%C%H%^%9%/$NI}$r(B 1.2.3.4/24 $B$N7A<0$G;XDj$7$^$9!#(B
-$B$3$N>l9g$O(B 1.2.3.0 $B$+$i(B 1.2.3.255 $B$N%"%I%l%9$,%^%C%A$7$^$9!#(B
-.It Ar ipno:mask
-IP$BHV9f$H%M%C%H%^%9%/$NI}$r(B 1.2.3.4:255.255.240.0 $B$N7A<0$G;XDj$7$^$9!#(B
+IP $BHV9f$r(B 1.2.3.4 $B$N7A<0$G;XDj$7$^$9!#(B
+$B$3$N(B IP $BHV9f$K$N$_%^%C%A$7$^$9!#(B
+.It Ar ipno Ns / Ns Ar bits
+IP $BHV9f$H%M%C%H%^%9%/$NI}$r(B 1.2.3.4/24 $B$N7A<0$G;XDj$7$^$9!#(B
+$B$3$NNc$N>l9g$O(B 1.2.3.0 $B$+$i(B 1.2.3.255 $B$N%"%I%l%9$,%^%C%A$7$^$9!#(B
+.It Ar ipno Ns : Ns Ar mask
+IP $BHV9f$H%M%C%H%^%9%/$r(B 1.2.3.4:255.255.240.0 $B$N7A<0$G;XDj$7$^$9!#(B
 $B$3$N>l9g$O(B 1.2.0.0 $B$+$i(B 1.2.15.255 $B$N%"%I%l%9$,%^%C%A$7$^$9!#(B
 .El
 .Pp
-$B%"%I%l%9$NA0$K(B ``not'' $B$rIU$1$k$3$H$K$h$C$F!"%^%C%A$N0UL#$rH?E>$5$;$k(B
-$B$3$H$,$G$-$^$9(B ($B;XDj$5$l$?%"%I%l%90J30$NAm$F$N%"%I%l%9$,%^%C%A$7$^$9(B)$B!#(B
-$B$3$l$O%]!<%HHV9f$K$O1F6A$7$^$;$s!#(B
+$B%"%I%l%9$NA0$K(B
+.Cm not
+$B$rIU$1$k$3$H$K$h$C$F!"%^%C%A$N0UL#$rH?E>$5$;$k(B
+$B$3$H$,$G$-$^$9(B ($B;XDj$5$l$?%"%I%l%90J30$N$9$Y$F$N%"%I%l%9$,%^%C%A$7$^$9(B)$B!#(B
+$B$3$l$O%]!<%HHV9f$NA*Br$K$O1F6A$7$^$;$s!#(B
 .Pp
 TCP $B$H(B UDP $B$G$O$5$i$K!"(B
 .Em ports
 $B$r0J2<$N$h$&$K;XDj$G$-$^$9!#(B
+.Bd -ragged -offset indent
+.Sm off
+.Eo \&{
+.Ar port |
+.Ar port No \&- Ar port |
+.Ar port : mask
+.Ec \&} Op , Ar port Op , Ar ...
+.Sm on
+.Ed
 .Pp
-.Bl -hang -offset flag
-.It Ns {port|port-port} Ns Op ,port Ns Op ,...
-.El
+$B5-9f(B
+.Ql \&-
+$B$K$h$kI=8=$O!"%]!<%HHO0O(B ($BN>C<4^$`(B) $B$r;XDj$7$^$9!#(B
+.Pp
+$B5-9f(B
+.Ql \&:
+$B$K$h$kI=8=$O!"%]!<%H$H%^%9%/$r;XDj$7$^$9!#(B
+$B%^%C%A$,@k8@$5$l$k$N$O!"(B
+$B%Q%1%C%HCf$N%]!<%HHV9f$,%k!<%kCf$N%]!<%HHV9f$K%^%C%A$9$k$H$-$G$9$,!"(B
+$B%^%C%ABP>]$N%S%C%H$O%^%9%/Cf$G;XDj$5$l$?$b$N$K8BDj$5$l$^$9!#(B
 .Pp
 $B%]!<%HHV9f$NBe$o$j$K(B ($B%U%!%$%k(B
 .Pa /etc/services
 $B$+$i<h$C$?(B) $B%5!<%S%9L>$r;HMQ$G$-$^$9!#(B
-port-port $B$N=q<0$G!":G=i$NCM$K8B$jHO0O;XDj$G$-$^$9!#(B
+$B%]!<%HHO0O;XDj$N=q<0$O!":G=i$NCM$H$7$F$N$_;XDj$G$-$^$9!#(B
 $BNs5s=PMh$k%]!<%H?t$O(B  
 .Pa /usr/src/sys/netinet/ip_fw.h 
 $B$G(B
 .Dv IP_FW_MAX_PORTS
 $B$H$7$FDj5A$5$l$F$$$^$9!#(B
-.Ql \e
+$B%P%C%/%9%i%C%7%e(B
+.Pq Ql \e
 $B$r;HMQ$9$k$3$H$K$h$j!"%5!<%S%9L>Cf$N(B
-.Ql -
+.Pq Ql -
 $BJ8;z$r%(%9%1!<%W2DG=$G$9(B:
 .Pp
 .Dl ipfw add count tcp from any ftp\e\e-data-ftp to any
 .Pp
 $BCGJR2=$5$l$?%Q%1%C%H$G%*%U%;%C%H$,Hs(B 0 $B$N$b$N(B
 ($B$9$J$o$A!":G=i$NCGJR$G$O$J$$$b$N(B) $B$O!"(B
-1 $B$D0J>e$N%]!<%H;EMM$r;}$D%k!<%k$K$O%^%C%A$7$^$;$s!#(B
+1 $B$D0J>e$N%]!<%H;XDj$r;}$D%k!<%k$K$O%^%C%A$7$^$;$s!#(B
 $BCGJR2=$5$l$?%Q%1%C%H$X$N%^%C%A%s%0$K4X$9$k>\:Y$O(B
-.Ar frag
+.Cm frag
 $B%*%W%7%g%s$r;2>H$7$F$/$@$5$$!#(B
-.Pp
-$B%^%C%A%s%0$N%k!<%k$O!"F~$C$F$/$k%Q%1%C%H$+!"=P$F$$$/%Q%1%C%H!"$b$7$/$O$=$NN>J}(B
-$B$KBP$7E,1~$5$l$^$9!#(B
-.Ar in
-$B$r;XDj$9$l$P!"F~$C$F$/$k%Q%1%C%H$N$_$K%k!<%k$rE,1~$7$^$9!#(B
-.Ar out
-$B$r;XDj$9$l$P!"=P$F$$$/%Q%1%C%H$N$_$KE,1~$7$^$9!#(B
-.Pp
-$BFCDj$N%$%s%?%U%'!<%9$rDL2a$9$k%Q%1%C%H$K$O!"(B
-.Ar via
-$B$rMQ$$$F%$%s%?%U%'!<%9$r;XDj$7$^$9(B:
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar via ifX
+.It Ar interface-spec
+$B<!$N;XDj;R$NAH$_9g$o$;$r;HMQ2DG=$G$9(B:
+.Bl -tag -width "via ipno"
+.It Cm in
+$BF~NO%Q%1%C%H$K$N$_%^%C%A$7$^$9!#(B
+.It Cm out
+$B=PNO%Q%1%C%H$K$N$_%^%C%A$7$^$9!#(B
+.It Cm via Ar ifX
+$B%Q%1%C%H$O%$%s%?%U%'!<%9(B
 .Ar ifX
-$B$rDL2a$9$k%Q%1%C%H$r;XDj$7$^$9!#(B
-.It Ar via if*
+$B$rDL2a$;$M$P$J$j$^$;$s!#(B
+.It Cm via Ar if Ns Cm *
+$B%Q%1%C%H$O%$%s%?%U%'!<%9(B
 .Ar ifX
-$B$rDL2a$9$k%Q%1%C%H$r;XDj$7$^$9!#(BX $B$O$$$:$l$+$N%f%K%C%H$NHV9f$G$9!#(B
-.It Ar via any
+$B$rDL2a$;$M$P$J$j$^$;$s!#$3$N(B
+.Ar X
+$B$O$I$s$J%f%K%C%HHV9f$G$b$+$^$$$^$;$s!#(B
+.It Cm via any
+$B%Q%1%C%H$O(B
 .Em $B$$$:$l$+(B
-$B$N%$%s%?%U%'!<%9$rDL2a$9$k%Q%1%C%H$r;XDj$7$^$9!#(B
-.It Ar via ipno
-IP $B%"%I%l%9$,(B
+$B$N%$%s%?%U%'!<%9$rDL2a$;$M$P$J$j$^$;$s!#(B
+.It Cm via Ar ipno
+$B%Q%1%C%H$O!"(B
+IP $B%"%I%l%9(B
 .Ar ipno
-$B$N%$%s%?%U%'!<%9$rDL2a$9$k%Q%1%C%H$r;XDj$7$^$9!#(B
+$B$r;}$D%$%s%?%U%'!<%9$rDL2a$;$M$P$J$j$^$;$s!#(B
 .El
 .Pp
-.Ar via
+.Cm via
 $B$rMQ$$$k$H!">o;~;XDj$5$l$?%$%s%?%U%'!<%9$,%A%'%C%/$5$l$^$9!#(B
-.Ar recv
+.Cm recv
 $B$d(B
-.Ar xmit
+.Cm xmit
 $B$r!"(B
-.Ar via
+.Cm via
 $B$NBe$o$j$K;XDj$9$k$H!"(B
-$B<u?.!"$b$7$/$OAw?.%$%s%?%U%'!<%9$N$_$,(B ($B3F!9$K(B) $B%A%'%C%/$5$l$^$9!#(B
+$B<u?.!"$b$7$/$OAw?.%$%s%?%U%'!<%9$N$_$,(B ($B$*$N$*$N(B) $B%A%'%C%/$5$l$^$9!#(B
 $BN>J}$r;XDj$9$l$P!"(B
-$B<u?.$HAw?.$NN>J}$N%$%s%?%U%'!<%9$rDL$k%Q%1%C%H$r;XDj$G$-$^$9!#(B
+$B<u?.%$%s%?%U%'!<%9$HAw?.%$%s%?%U%'!<%9$NN>J}$K4p$E$-%Q%1%C%H$r(B
+$B%^%C%A$5$;$k$3$H$,2DG=$K$J$j$^$9!#(B
 $BNc(B :
 .Pp
 .Dl "ipfw add 100 deny ip from any to any out recv ed0 xmit ed1"
 .Pp
-.Ar recv
+.Cm recv
 $B$G;XDj$7$?%$%s%?%U%'!<%9$G$O!"<u?.$HAw?.!"N>J}$N%Q%1%C%H$r%A%'%C%/$G$-$^$9!#(B
 $B$=$l$KBP$7!"(B
-.Ar xmit
+.Cm xmit
 $B$G;XDj$7$?%$%s%?%U%'!<%9$G$O!"Aw?.%Q%1%C%H$N$_$H$J$j$^$9!#(B
 $B$=$l$f$($K!"(B
-.Ar xmit
+.Cm xmit
 $B$r;XDj$9$k$H(B
-.Ar out
+.Cm out
 $B$,!"I,?\$G$9(B (
 .Ar in
 $B$OIT2D(B)$B!#(B
@@ -585,29 +573,47 @@
 .Ar recv
 $B$r;XDj$9$k;v$O$G$-$^$;$s!#(B
 .Pp
-$B8D!9$N%Q%1%C%H$O!"<u?.MQ$J$$$7Aw?.MQ%$%s%?%U%'!<%9$r;}$?$J$$$+$b$7$l$^$;$s!#(B
+$B%Q%1%C%H$O!"<u?.MQ$J$$$7Aw?.MQ%$%s%?%U%'!<%9$r;}$?$J$$>l9g$,$"$j$^$9!#(B
 $B%m!<%+%k%[%9%H$GH/@8$7$?%Q%1%C%H$K$O<u?.MQ$N%$%s%?%U%'!<%9$O$"$j$^$;$s$7!"(B
 $B%m!<%+%k%[%9%HFb08$N%Q%1%C%H$K$OAw?.MQ%$%s%?%U%'!<%9$O$"$j$^$;$s!#(B
+.It Ar options :
+.Bl -tag -width indent
+.It Cm keep-state Op Ar method
+$B%^%C%A$N:]$K!"%U%!%$%"%&%)!<%k$,F0E*%k!<%k$r@8@.$7$^$9!#$3$N%k!<%k$N(B
+$B%G%U%)%k%H$NF0:n$O!"F10l%W%m%H%3%k$rMQ$$$kH/?.85$H08@h$N(B IP/port
+$B4V$GAPJ}8~$KDL2a$9$k%Q%1%C%H$X$N%^%C%A$G$9!#(B
+$B$3$N%k!<%k$N@8B84|4V$OM-8B$G$9(B (
+.Xr sysctl 8
+$BJQ?t$N=89g$K$h$j@)8f$5$l$^$9(B)$B!#$3$N@8B84|4V$O!"%Q%1%C%H$N%^%C%A$,(B
+$B@8$8$k$?$S$K99?7$5$l$^$9!#(B
 .Pp
-$BDI2CMQ(B
-.Ar options :
-.Bl -hang -offset flag -width 1234567890123456
-.It frag
-$B%Q%1%C%H$,CGJR(B ($B%U%i%0%a%s%H(B) $B2=$5$l$?%G!<%?%0%i%`$N0lIt$G!"$+$D%G!<%?%0%i%`$N(B
-$B@hF,$NCGJR$G$J$$>l9g$K%^%C%A$7$^$9!#(B
-.Ar frag
+$B<B:]$NF0:n$O!"0[$J$k(B
+.Ar method
+$B$r;XDj$9$k$3$H$K$h$jJQ99$,2DG=$G$9!#(B
+.It Cm bridged
+$B%V%j%C%8$5$l$k%Q%1%C%H$K$N$_%^%C%A$7$^$9!#(B
+$B$3$l$O%^%k%A%-%c%9%H$d%V%m!<%I%-%c%9%H$N%Q%1%C%H$r07$&:]$KM-MQ$G$9!#(B
+$B$3$l0J30$NJ}K!$G$O!"%Q%1%C%H$O!"%V%j%C%8$N:]$K0lEY!"(B
+$B%m!<%+%k%9%?%C%/$KEO$5$l$k:]$K$b$&0lEY$H!"(B
+$B%U%!%$%"%&%)!<%k$r(B 2 $BEYDL2a$7$F$7$^$$$^$9!#(B
+.Pp
+$B%Q%U%)!<%^%s%9>e$N$o$:$+$JB;<:$O$H$b$+$/!"(B
+.Em pipe
+$B$rMQ$$$k:]$K$bLdBj$K$J$j$^$9!#$3$l$O!"%P%s%II}!"%-%e!<@jM-EY$J$I$N(B
+$B%+%&%s%?$K4X$7$F!"F1$8%Q%1%C%H$,(B 2 $BEY%+%&%s%H$5$l$F$7$^$&$?$a$G$9!#(B
+.It Cm frag
+$B%Q%1%C%H$,CGJR(B ($B%U%i%0%a%s%H(B) $B2=$5$l$?%G!<%?%0%i%`$N0lIt$G!"(B
+$B$+$D%G!<%?%0%i%`$N@hF,$NCGJR$G$J$$>l9g$K%^%C%A$7$^$9!#(B
+.Cm frag
 $B$r!"(B
-.Ar tcpflags
-$B$d(B TCP/UDP $B%]!<%H;EMM$H6&$K;HMQ$9$k$3$H$O$G$-$^$;$s!#(B
-.It in
-$B%M%C%H%o!<%/$+$i<u?.$7$?%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-.It out
-$B%M%C%H%o!<%/$XAw?.$9$k%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-.It ipoptions Ar spec
+.Cm tcpflags
+$B$d(B TCP/UDP $B%]!<%H;XDj$H6&$K;HMQ$9$k$3$H$O$G$-$^$;$s!#(B
+.It Cm ipoptions Ar spec
 IP $B%X%C%@$,!"(B
 .Ar spec 
 $B$K;XDj$5$l$?%3%s%^$G6h@Z$i$l$?%*%W%7%g%s$N%j%9%H$r4^$`>l9g$K$N$_%^%C%A$7$^$9!#(B
 $B%5%]!<%H$5$l$F$$$k(B IP $B%*%W%7%g%s$O(B
+.Pp
 .Ar ssrr 
 (strict source route),
 .Ar lsrr 
@@ -616,42 +622,187 @@
 (record packet route),
 .Ar ts 
 (timestamp) $B$G$9!#(B
-``!'' $B$K$h$C$F!"FCDj$N%*%W%7%g%s$r4^$a$J$$$h$&;XDj$G$-$^$9!#(B
-.It established
+.Ql !
+$B$K$h$C$F!"FCDj$N%*%W%7%g%s$r4^$^$J$$;XDj$,5-=R$G$-$^$9!#(B
+.It Cm established
+TCP $B%Q%1%C%H$N$_$KE,MQ$5$l$^$9!#(B
 RST $B$^$?$O(B ACK $B%S%C%H$,%;%C%H$5$l$F$$$k%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-$B$3$N%S%C%H$,%;%C%H$5$l$k$3$H$,$"$k$N$O(B TCP $B$N%Q%1%C%H$N$_$G$9!#(B
-.It setup
+.It Cm setup
+TCP $B%Q%1%C%H$N$_$KE,MQ$5$l$^$9!#(B
 SYN $B%S%C%H$,%;%C%H$5$l(B ACK $B$,%;%C%H$5$l$F$$$J$$%Q%1%C%H$N$_%^%C%A$7$^$9!#(B
-$B$3$N%S%C%H$,%;%C%H$5$l$k$3$H$,$"$k$N$O(B TCP $B$N%Q%1%C%H$N$_$G$9!#(B
-.It tcpflags Ar spec
+.It Cm tcpflags Ar spec
+TCP $B%Q%1%C%H$N$_$KE,MQ$5$l$^$9!#(B
 TCP $B%X%C%@$,(B
 .Ar spec 
 $B$K;XDj$5$l$?%3%s%^$G6h@Z$i$l$?%U%i%0$N%j%9%H$r4^$`>l9g$K$N$_%^%C%A$7$^$9!#(B
 $B%5%]!<%H$5$l$F$$$k%U%i%0$O!"(B
-.Ar fin ,
-.Ar syn ,
-.Ar rst ,
-.Ar psh ,
-.Ar ack ,
-.Ar urg 
+.Pp
+.Cm fin ,
+.Cm syn ,
+.Cm rst ,
+.Cm psh ,
+.Cm ack ,
+.Cm urg 
 $B$G$9!#(B
-``!'' $B$K$h$C$F!"FCDj$N%U%i%0$r4^$a$J$$$h$&;XDj$G$-$^$9!#(B
-.Ar tcpflags
-$B;EMM$r4^$`%k!<%k$OHs(B 0 $B$N%*%U%;%C%H$r;}$DCGJR2=$5$l$?%Q%1%C%H$K(B
+.Ql !
+$B$K$h$C$F!"FCDj$N%U%i%0$r4^$^$J$$;XDj$r5-=R$G$-$^$9!#(B
+.Cm tcpflags
+$B;XDj$r4^$`%k!<%k$O!"Hs(B 0 $B$N%*%U%;%C%H$r;}$DCGJR2=$5$l$?%Q%1%C%H$K(B
 $B%^%C%A$9$k$3$H$O$"$j$^$;$s!#(B
 $BCGJR2=$5$l$?%Q%1%C%H$K4X$9$k%^%C%A$K$D$$$F$N>\:Y$O(B
-.Ar frag
+.Cm frag
 $B%*%W%7%g%s$r;2>H$7$F$/$@$5$$!#(B
-.It icmptypes Ar types
+.It Cm icmptypes Ar types
+ICMP $B%Q%1%C%H$N$_$KE,MQ$5$l$^$9!#(B
 ICMP $B%?%$%W$,(B
 .Ar types 
-$B$G;XDj$5$l$?%j%9%HCf$KB8:_$9$k>l9g$K$N$_E,MQ$5$l$k%k!<%k$H$J$j$^$9!#(B
-$B%j%9%H$O%l%s%8$NAH$_9g$o$;$G$b!"3F%?%$%W$r%3%s%^$G6h@Z$C$?$b$N$G$b$I$A$i$G$b(B
-$B$+$^$$$^$;$s!#(B
+$B$G;XDj$5$l$?%j%9%HCf$KB8:_$9$k>l9g$K$N$_%^%C%A$7$^$9!#(B
+$B%j%9%H$OHO0O;XDj$G$b!"%?%$%W$*$N$*$N$r%3%s%^$G6h@Z$C$?$b$N$G$b(B
+$B$I$A$i$NAH$_9g$o$;$G$b$+$^$$$^$;$s!#(B
+$B%5%]!<%H$5$l$F$$$k(B ICMP $B%?%$%W$O<!$NDL$j$G$9(B:
+.Pp
+$B%(%3!<JVEz(B
+.Pq Cm 0 ,
+$B=*E@ITE~C#(B
+.Pq Cm 3 ,
+$BH/?.M^@)(B
+.Pq Cm 4 ,
+$B%j%@%$%l%/%H(B
+.Pq Cm 5 ,
+$B%(%3!<MW5a(B
+.Pq Cm 8 ,
+$B%k!<%?9-9p(B
+.Pq Cm 9 ,
+$B%k!<%?MW@A(B
+.Pq Cm 10 ,
+$B;~4VD62a(B
+.Pq Cm 11 ,
+IP $B%X%C%@0[>o(B
+.Pq Cm 12 ,
+$B%?%$%`%9%?%s%WMW5a(B
+.Pq Cm 13 ,
+$B%?%$%`%9%?%s%W1~Ez(B
+.Pq Cm 14 ,
+$B>pJsMW5a(B
+.Pq Cm 15 ,
+$B>pJsJVEz(B
+.Pq Cm 16 ,
+$B%"%I%l%9%^%9%/MW5a(B
+.Pq Cm 17 ,
+$B%"%I%l%9%^%9%/1~Ez(B
+.Pq Cm 18
+.It Cm uid Ar user
+.Ar user
+$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
+$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
+.Ar user
+$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
+.It Cm gid Ar group
+.Ar group
+$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
+$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
+.Ar group
+$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
+.El
+.El
+.Sh $B%H%i%U%#%C%/%7%'%$%Q@_Dj(B
+.Nm
+$B%f!<%F%#%j%F%#$O!"(B
+.Xr dummynet 4
+$B%H%i%U%#%C%/%7%'%$%Q$X$N%f!<%6%$%s%?%U%'!<%9$bDs6!$7$^$9!#(B
+$B%7%'%$%Q$O!"%Q%1%C%H$r(B
+.Em pipe
+($B%Q%$%W(B) $B$H8F$P$l$k%*%V%8%'%/%H$XEO$9$3$H$K$h$C$FF0:n$7$^$9!#(B
+$B%Q%$%W$O!"M?$($i$l$?%P%s%II}!"CY1d;~4V!"%-%e!<$ND9$5!"%Q%1%C%HAS<:N($r(B
+$B$b$D%j%s%/$r%(%_%e%l!<%H$7$^$9!#(B
+.Nm
+$B%Q%$%W@_Dj=q<0$O<!$NDL$j$G$9!#(B
+.Pp
+.Cm pipe Ar number Cm config
+.Op Cm bw Ar bandwidth
+.Oo
+.Cm queue
+.Es \&{ \&}
+.En Ar slots | size
+.Oc
+.Op Cm delay Ar ms-delay
+.Op Cm plr Ar loss-probability
+.Op Cm mask Ar mask-specifier
+.Op Cm buckets Ar hash-table-size
+.Pp
+$B<!$N%Q%i%a!<%?$r%Q%$%W$KBP$7$F@_Dj2DG=$G$9(B:
+.Bl -tag -width indent
+.It Cm bw Ar bandwidth
+$B%P%s%II}$G$"$j!"C10L$O(B
+.Sm off
+.Oo
+.Cm K | M
+.Oc Eo \&{
+.Cm bit/s | Byte/s
+.Ec \&}
+.Sm on
+$B$GB,Dj$7$^$9!#(B
+.Pp
+$BCM(B 0 ($B%G%U%)%k%H(B) $B$OL58B$N%P%s%II}$r0UL#$7$^$9!#(B
+$BC10L$O?tCM$ND>8e$KB3$1$F=q$/I,MW$,$"$j!"(B
+.Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
+$B$N$h$&$K$7$^$9!#(B
+.It Cm delay Ar ms-delay
+$BCY1d;~4V$G$"$j!"%_%jICC10L$G;XDj$7$^$9!#(B
+$BCM$O!"%/%m%C%/%F%#%C%/$NG\?t(B
+($BE57?E*$K$O(B 10ms $B$G$9$,!"(B
+$B%+!<%M%k$r(B "options HZ=1000" $B$GF0:n$5$;$F@:EY$r(B 1ms $B0J2<$K$9$k$HNI$$(B
+$B$3$H$,7P83E*$KCN$i$l$F$$$^$9(B) $B$K4]$a$i$l$^$9!#(B
+$B%G%U%)%k%HCM$O(B 0 $B$G$"$j!"CY1dL5$7$r0UL#$7$^$9!#(B
+.It Cm queue Xo
+.Es \&{ \&}
+.En Ar slots | size Ns Cm Kbytes
+.Xc
+$B%-%e!<$NBg$-$5$G$"$j!"%9%m%C%H?t$+(B KBytes $B$G$9!#(B
+$B%G%U%)%k%HCM$O(B 50 $B%9%m%C%H$G$"$j!"(B
+$B%$!<%5%M%C%H%G%P%$%9$NE57?E*$J%-%e!<$NBg$-$5$G$9!#(B
+$BDcB.%j%s%/$G$O%-%e!<$NBg$-$5$rC;$/$9$Y$-$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$5$b$J$$$H!"%H%i%U%#%C%/$O?SBg$J%-%e!<CY1d$K$h$k1F6A$r<u$1$F$7$^$$$^$9!#(B
+$BNc$($P!"(B
+50 $B8D$N:GBg%$!<%5%M%C%H%Q%1%C%H(B (1500 $B%P%$%H(B) $B$O(B 600Kbit $B$G$"$j!"(B
+30Kbit/s $B$N%Q%$%W$G$O(B 20 $BIC$N%-%e!<$r0UL#$7$^$9!#(B
+$B$h$jBg$-$J(B MTU $B$N%$%s%?%U%'!<%9$+$i%Q%1%C%H$r<u$1<h$k$H$-$K$O!"(B
+$B$h$j0-$$7k2L$H$J$j$^$9!#(B
+$BNc$($P!"%k!<%W%P%C%/%$%s%?%U%'!<%9$K$*$$$F(B 16KB $B%Q%1%C%H$r<u$1<h$k$H$-$G$9!#(B
+.It Cm plr Ar packet-loss-rate
+$B%Q%1%C%HAS<:N($G$9!#(B
+$B0z?t(B
+.Ar packet-loss-rate
+$B$O(B 0 $B$H(B 1 $B$N4V$NIbF0>.?tE@?t$G$"$j!"(B
+0 $B$OAS<:L5$7$r0UL#$7!"(B1 $B$O(B 100% $B$NAS<:$r0UL#$7$^$9!#(B
+$BAS<:N($OFbItE*$K$O(B 31 $B%S%C%H$GI=8=$5$l$^$9!#(B
+.It Cm mask Ar mask-specifier
+.Xr dummynet 4
+$B$G$O!"%Q%$%W;XDj0l$D$G!"%U%m!<$4$H$N%-%e!<$r@8@.2DG=$G$9!#(B
+$B%U%m!<<1JL;R$O!"%Q%$%W@_Dj$K$*$$$F;XDj$5$l$k(B
+IP $B%"%I%l%9!"%]!<%H!"%W%m%H%3%k%?%$%W$G%^%9%/$9$k$3$H$G9=C[$5$l$^$9!#(B
+$B%^%9%/8e$KF1$8<1JL;R$r;}$D%Q%1%C%H$O!"F1$8%-%e!<$KMn$A$^$9!#(B
+$B;HMQ2DG=$J%^%9%/;XDj;R$O!"<!$rAH$_9g$o$;$?$b$N$G$9(B:
+.Cm dst-ip Ar mask ,
+.Cm src-ip Ar mask ,
+.Cm dst-port Ar mask ,
+.Cm src-port Ar mask ,
+.Cm proto Ar mask ,
+.Cm all
+$B!#(B
+$B:G8e$N;XDj;R$O!"(B
+$B$9$Y$F$N%U%#!<%k%I$N$9$Y$F$N%S%C%H$,=EMW$G$"$k$3$H$r0UL#$7$F$$$^$9!#(B
+.It Cm buckets Ar hash-table-size
+$BMM!9$J%-%e!<$r3JG<$9$k$?$a$K;HMQ$9$k%O%C%7%eI=$NBg$-$5$r;XDj$7$^$9!#(B
+$B%G%U%)%k%HCM$O(B 64 $B$G$"$j!"(B
+.Xr sysctl 8
+$BJQ?t(B
+.Em net.inet.ip.dummynet.hash_size
+$B$G@)8f$5$l!";HMQ2DG=$JHO0O$O(B 16 $B$+$i(B 1024 $B$G$9!#(B
 .El
 .Sh $B%A%'%C%/%j%9%H(B
 $B%k!<%k$r9=@.$9$k:]$K9MN8$9$Y$-=EMW$JE@$r=R$Y$^$9!#(B
-.Bl -bullet -hang -offset flag 
+.Bl -bullet
 .It 
 $B$+$J$i$:Aw?.%Q%1%C%H$H<u?.%Q%1%C%H$NN>J}$N%Q%1%C%H$r%U%#%k%?%j%s%0$7$^$9!#(B
 $B$[$H$s$I$N%M%C%H%o!<%/%3%M%/%7%g%s$G$O%Q%1%C%H$,APJ}8~$KN.$l$k$3$H$,I,MW$G$9!#(B
@@ -662,22 +813,24 @@
 $B%k!<%W%P%C%/%$%s%?%U%'!<%9$N$3$H$rK:$l$F$O$J$j$^$;$s!#(B
 .El
 .Sh $BD9=j(B
-$B%U%!%$%"%&%)!<%k$,>o$KGK4~$9$k%Q%1%C%H$,(B 1 $B<oN`$"$j$^$9!#(B
+$B$3$N%U%!%$%"%&%)!<%k$,>o$KGK4~$9$k%Q%1%C%H$,(B 1 $B<oN`$"$j$^$9!#(B
 $B%U%i%0%a%s%H%*%U%;%C%H$,(B 1 $B$N%U%i%0%a%s%H%Q%1%C%H$G$9!#(B
 $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!"(BKLD $BHG$N(B
+$B%M%C%H%o!<%/1[$7$K%m%0%$%s$7$F$$$k>l9g!"(B
+.Xr kld 4
+$B%P!<%8%g%s$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
+.Bd -literal -offset indent
 kldload /modules/ipfw.ko && \e
-ipfw add 32000 allow all from any to any
+ipfw add 32000 allow ip from any to any
 .Ed
 .Pp
 $B$3$l$K0zB3$-!"F1$8$h$&$J>u67$G(B
-.Bd -literal -offset center
+.Bd -literal -offset indent
 ipfw flush
 .Ed
 .Pp
@@ -688,12 +841,62 @@
 .Xr init 8
 $B$r;2>H$7$F$/$@$5$$(B)$B!#(B
 .Sh $B%Q%1%C%H$N9T$-@hJQ99(B
-$B;XDj$5$l$?%]!<%H$r8+$F$$$k%=%1%C%H$O!"$=$N%]!<%H$X9T$-@hJQ99$5$l$?%Q%1%C%H$r!"(B
+$B;XDj$5$l$?%]!<%H$K%P%$%s%I$5$l$?(B
+.Xr divert 4
+$B%=%1%C%H$O!"(B
+$B$=$N%]!<%H$X9T$-@hJQ99$5$l$?%Q%1%C%H$r!"(B
 $BA4It<u$1$H$j$^$9!#(B
-.Xr divert 4 
-$B$r;2>H$7$F2<$5$$!#%]!<%H$r8+$F$$$k%=%1%C%H$,$J$$>l9g$d%+!<%M%k$,%Q%1%C%H$N(B
-$B9T$-@hJQ99$r%5%]!<%H$9$k$h$&$K$O%3%s%Q%$%k$5$l$F$$$J$$>l9g!"(B
+$B08@h%]!<%H$K%P%$%s%I$5$l$?%=%1%C%H$,$J$$>l9g$d!"(B
+$B%+!<%M%k$,%Q%1%C%H$N9T$-@hJQ99%=%1%C%H$r%5%]!<%H$9$k$h$&$K$O(B
+$B%3%s%Q%$%k$5$l$F$$$J$$>l9g!"(B
 $B%Q%1%C%H$OGK4~$5$l$^$9!#(B
+.Sh SYSCTL $BJQ?t(B
+$B%U%!%$%"%&%)!<%k$NF0:n$r@)8f$9$k(B
+.Xr sysctl 8
+$BJQ?t$N=89g$,$"$j$^$9!#$3$l$i$r!"%G%U%)%k%H$NCM$H0UL#$H$H$b$K(B
+$B0J2<$K<($7$^$9!#(B
+.Bl -tag -width indent
+.It Em net.inet.ip.fw.debug : No 1
+.Nm ipfw
+$B$,@8@.$9$k%G%P%C%0%a%C%;!<%8$r@)8f$7$^$9!#(B
+.It Em net.inet.ip.fw.one_pass : No 1
+$B%;%C%H$5$l$k$H!"%U%!%$%"%&%)!<%k$NDL2a$,(B 1 $B2s$@$15v$5$l$k$h$&$K(B
+$B$J$j$^$9!#%;%C%H$5$l$J$$>l9g!"(Bpipe $B$d9T$-@hJQ99=hM}$N$"$H!"(B
+$B%Q%1%C%H$O:F$S%U%!%$%"%&%)!<%k$KA^F~$5$l!"<!$N%k!<%k$+$i:F3+$5$l$^$9!#(B
+.It Em net.inet.ip.fw.verbose : No 1
+$B>iD9$J%a%C%;!<%8$r=PNO$9$k$h$&$K$7$^$9!#(B
+.It Em net.inet.ip.fw.enable : No 1
+$B%U%!%$%"%&%)!<%k$rF0:n2DG=$K$7$^$9!#(B
+$B$3$NJQ?t$r(B 0 $B$K@_Dj$9$k$H!"%U%!%$%"%&%)!<%k$r%3%s%Q%$%k$7$F(B
+$B;E9~$s$G$$$F$b%U%!%$%"%&%)!<%k$J$7$GF0:n$7$^$9!#(B
+.It Em net.inet.ip.fw.verbose_limit : No 0
+$B>iD9$J%U%!%$%"%&%)!<%k$,@8@.$9$k%a%C%;!<%8$N?t$r@)8B$7$^$9!#(B
+.It Em net.inet.ip.fw.dyn_buckets : No 256
+.It Em net.inet.ip.fw.curr_dyn_buckets : No 256
+$BF0E*%k!<%k$rJ];}$9$k$?$a$K;HMQ$9$k%O%C%7%eI=$N@_Dj%5%$%:$H(B
+$B8=:_$N%5%$%:$G$9!#$3$NCM$O(B 2 $B$N$Y$->h$K$9$kI,MW$,$"$j$^$9!#(B
+$B%O%C%7%eI=$N%5%$%:$NJQ99$O!"I=$,6u$N>l9g$N$_9T$J$o$l$^$9!#(B
+$B$7$?$,$C$F!"<B9TCf$KI=$N%5%$%:$rJQ99$9$k$?$a$K$O!"(B
+.Cm flush
+$B$7$F%k!<%k=89g$r:F%m!<%I$9$kI,MW$,$"$k$G$7$g$&!#(B
+.It Em net.inet.ip.fw.dyn_count : No 3
+$B8=:_$NF0E*%k!<%k$N?t$G$9(B
+.Pq $BFI$_9~$_@lMQ(B
+$B!#(B
+.It Em net.inet.ip.fw.dyn_max : No 1000
+$BF0E*%k!<%k$N:GBgCM$G$9!#$3$N8B3&$K$$$-$D$/$H!"(B
+$B8E$$%k!<%k$,L58z$K$J$k$^$G$O!"$=$l0J>e!"F0E*%k!<%k$r(B
+$BAH$_9~$`$3$H$O$G$-$^$;$s!#(B
+.It Em net.inet.ip.fw.dyn_ack_lifetime : No 300
+.It Em net.inet.ip.fw.dyn_syn_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_fin_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_rst_lifetime : No 5
+.It Em net.inet.ip.fw.dyn_short_lifetime : No 30
+$B$3$l$i$NCM$O!"F0E*%k!<%k$N@8B84|4V$rICC10L$G%3%s%H%m!<%k$7$^$9!#(B
+$B:G=i$N(B SYN $B8r49$N:]$K!"@8B84|4V$,(B short $B$K$J$j!"(B
+SYN $B$rN>J}$H$b8+$?8e$KA}$d$5$l!":G8e$N(B FIN $B8r49$N4V!"(B
+$B$^$?$O(B RST $B$,@8$8$k:]$K:F$S8:$i$5$l$^$9!#(B
+.El
 .Sh $B;HMQNc(B
 $B<!$N%3%^%s%I$O(B
 .Em cracker.evil.org
@@ -701,15 +904,59 @@
 .Em wolf.tambov.su
 $B$N(B telnet $B%]!<%H$XAw$i$l$k$9$Y$F$N(B TCP $B%Q%1%C%H$r5qH]$9$k%k!<%k$rDI2C$7$^$9!#(B
 .Pp
-.Dl ipfw add deny tcp from cracker.evil.org to wolf.tambov.su 23
+.Dl "ipfw add deny tcp from cracker.evil.org to wolf.tambov.su telnet"
 .Pp 
 $B<!$N%3%^%s%I$O%/%i%C%+!<$N%M%C%H%o!<%/A4BN$+$i%[%9%H(B my $B$X$N(B
 $B$9$Y$F$N%3%M%/%7%g%s$r5qH]$7$^$9!#(B
 .Pp
-.Dl ipfw add deny all from 123.45.67.0/24 to my.host.org
+.Dl "ipfw add deny ip from 123.45.67.0/24 to my.host.org"
+.Pp
+$B:G=i$K8zN(NI$/(B ($BF0E*%k!<%k$rMQ$$$:$K(B) $B%"%/%;%9$r@)8B$9$kJ}K!$O!"(B
+$B<!$N%k!<%k$rMQ$$$k$3$H$G$9!#(B
+.Pp
+.Dl "ipfw add allow tcp from any to any established"
+.Dl "ipfw add allow tcp from net1 portlist1 to net2 portlist2 setup"
+.Dl "ipfw add allow tcp from net3 portlist3 to net3 portlist3 setup"
+.Dl "..."
+.Dl "ipfw add deny tcp from any to any"
+.Pp
+$B:G=i$N%k!<%k$ODL>o$N(B TCP $B%Q%1%C%H$K$9$0$K%^%C%A$7$^$9$,!"(B
+$B:G=i$N(B SYN $B%Q%1%C%H$K$O%^%C%A$7$^$;$s!#(B
+$B;XDj$7$?H/?.85(B/$B08@h$NAH$N(B SYN $B%Q%1%C%H$N$_!"<!$N(B
+.Cm setup
+$B%k!<%k$K%^%C%A$7$^$9!#$3$l$i0J30$N(B SYN $B%Q%1%C%H$O!":G8e$N(B
+.Cm deny
+$B%k!<%k$K$h$j5Q2<$5$l$^$9!#(B
+.Pp
+$B$K$;$N(B TCP $B%Q%1%C%H$r4^$`E\Es$N967b(B (flood attack) $B$+$i(B
+$B%5%$%H$rJ]8n$9$k$?$a$K$O!"<!$NF0E*%k!<%k$rMQ$$$?J}$,0BA4$G$9!#(B
+.Pp
+.Dl "ipfw add check-state"
+.Dl "ipfw add deny tcp from any to any established"
+.Dl "ipfw add allow tcp from my-net to any setup keep-state"
+.Pp
+$B$3$l$i$N%k!<%k$K$h$j!"%U%!%$%"%&%)!<%k$O!"<+J,$?$A$N%M%C%H%o!<%/$N(B
+$BFbB&$+$iE~Ce$9$kDL>o$N(B SYN $B%Q%1%C%H$G;O$^$k%3%M%/%7%g%s$KBP$7$F(B
+$B$N$_F0E*%k!<%k$rAH$_9~$_$^$9!#F0E*%k!<%k$O!":G=i$N(B
+.Cm check-state
+$B%k!<%k!"$^$?$O!"(B
+.Cm keep-state
+$B%k!<%k$KAx6x$7$?;~E@$G%A%'%C%/$5$l$^$9!#(B
+$B%k!<%k=89g$N%9%-%c%sNL$r:G>.$K$9$k$?$a$K!"(B
+.Cm check-state
+$B%k!<%k$O!"%k!<%k=89g$N:G=i$N$[$&$KCV$/$3$H$K$J$k$N$,IaDL$G$9!#(B
+$B<B:]$NG3Hq$OJQF0$7$^$9!#(B
+.Pp
+.Em $BCm0U(B :
+$B%9%F!<%H%U%k$J%k!<%k$O!"E\Es$N(B SYN $B967b$K$h$j6K$a$FBgNL$NF0E*%k!<%k$r(B
+$B:n$C$F$7$^$$!"%5!<%S%9ITG=967b$r<u$1$k$3$H$K$J$k2DG=@-$,$"$j$^$9!#(B
+$B%U%!%$%"%&%)!<%k$NF0:n$r%3%s%H%m!<%k$9$k(B
+.Xr sysctl 8
+$BJQ?t$K=>$$%U%!%$%"%&%)!<%k$,F0:n$9$k$3$H$K$h$C$F!"(B
+$B$3$N$h$&$J967b$N1F6A$rItJ,E*$K$G$b@)8B$9$k$3$H$O$G$-$^$9!#(B
 .Pp
 $B<!$O%+%&%s%H$5$l$F$$$k>pJs$H%?%$%`%9%?%s%W>pJs$r8+$k(B
-.Ar list
+.Cm list
 $B%3%^%s%I$N$h$$Nc$G$9!#(B
 .Pp
 .Dl ipfw -at l
@@ -721,10 +968,93 @@
 $B<!$N%k!<%k$O(B 192.168.2.0/24 $B$+$i$N$9$Y$F$N<u?.%Q%1%C%H$r!"(B5000 $BHV$N%]!<%H$K(B
 $B9T$-@hJQ99$9$k$b$N$G$9!#(B
 .Pp
-.Dl ipfw divert 5000 all from 192.168.2.0/24 to any in
+.Dl ipfw divert 5000 ip from 192.168.2.0/24 to any in
+.Pp
+$B<!$N%k!<%k$O!"(B
+.Nm
+$B$H(B
+.Xr dummynet 4
+$B$r%7%_%e%l!<%7%g%s$J$I$G;H$&:]$N;HMQJ}K!$r<($7$F$$$^$9!#(B
+.Pp
+$B$3$N%k!<%k$O(B 5% $B$N3NN($G%i%s%@%`$K%Q%1%C%H$rMn$7$^$9!#(B
+.Pp
+.Dl "ipfw add prob 0.05 deny ip from any to any in"
+.Pp
+$BF1MM$N8z2L$O(B dummynet $B%Q%$%W$G<B8=2DG=$G$9(B:
+.Pp
+.Dl "ipfw add pipe 10 ip from any to any"
+.Dl "ipfw pipe 10 config plr 0.05"
+.Pp
+$B?M9)E*$K%P%s%II}$r@)8B$9$k$?$a$K%Q%$%W$r;HMQ2DG=$G$9!#(B
+$BNc$($P%k!<%?$H$7$FF0:n$9$k%^%7%s>e$G!"(B
+192.168.2.0/24 $B>e$N%m!<%+%k%/%i%$%"%s%H$+$i$N%H%i%U%#%C%/$r@)8B$7$?$$>l9g!"(B
+$B<!$N$h$&$K$7$^$9(B:
+.Pp
+.Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
+.Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
+.Pp
+.Cm out
+$B;X<(;R$r;HMQ$7$F$$$k$N$G!"%k!<%k$,(B 2 $BEY;H$o$l$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+.Nm
+$B%k!<%k$O!"<B:]$K$O!"(B
+$BF~NO%Q%1%C%H$H=PNO%Q%1%C%H$NN>J}$KE,MQ$5$l$k$3$H$r3P$($F$*$$$F$/$@$5$$!#(B
+.Pp
+$B%P%s%II}$K@)8B$,$"$kAPJ}8~%j%s%/$r%7%_%e%l!<%H$9$k>l9g!"(B
+$B@5$7$$J}K!$O<!$NDL$j$G$9(B:
+.Pp
+.Dl "ipfw add pipe 1 ip from any to any out"
+.Dl "ipfw add pipe 2 ip from any to any in"
+.Dl "ipfw pipe 1 config bw 64Kbit/s queue 10Kbytes"
+.Dl "ipfw pipe 2 config bw 64Kbit/s queue 10Kbytes"
+.Pp
+$B>e=R$NJ}K!$OHs>o$KM-MQ$J>l9g$,$"$j!"(B
+$BNc$($P$"$J$?$NAu>~E*$J%&%'%V%Z!<%8$,(B
+$BDcB.%j%s%/$N$_$G@\B3$5$l$F$$$k:_Bp%f!<%6$K$I$&8+$($F$$$k$+(B
+$BCN$j$?$$>l9g$KM-MQ$G$9!#(B
+$BH>Fs=E%a%G%#%"(B ($BNc$($P(B appletalk, Ethernet, IRDA) $B$r%7%_%e%l!<%H$7$?$$(B
+$B>l9g$r=|$-!"C10l$N%Q%$%W$rN>J}$NJ}8~$K;HMQ$9$Y$-$G$O$"$j$^$;$s!#(B
+$BN>J}$N%Q%$%W$,F1$8@_Dj$G$"$kI,MW$O$J$$$N$G!"(B
+$BHsBP>N%j%s%/$r%7%_%e%l!<%H2DG=$G$9!#(B
+.Pp
+$B%H%i%U%#%C%/%7%'%$%Q$NB>$NE57?E*$J1~MQ$O!"(B
+$B$$$/$P$/$+$NDL?.CY1d$rF3F~$9$k$3$H$G$9!#(B
+$B$3$l$O!"1s3V<jB3$-8F$S=P$7$rB?MQ$9$k%"%W%j%1!<%7%g%s$G!"(B
+$B%P%s%II}$h$j$b@\B3$N%i%&%s%I%H%j%C%W;~4V$,$7$P$7$P@)Ls>r7o$H$J$k(B
+$B%"%W%j%1!<%7%g%s$K!"Bg$-$J1F6A$rM?$($^$9(B:
+.Pp
+.Dl "ipfw add pipe 1 ip from any to any out"
+.Dl "ipfw add pipe 2 ip from any to any in"
+.Dl "ipfw pipe 1 config delay 250ms bw 1Mbit/s"
+.Dl "ipfw pipe 2 config delay 250ms bw 1Mbit/s"
+.Pp
+$B%U%m!<$4$H$N%-%e!<$O$5$^$6$^$JMQES$KM-MQ$G$9!#(B
+$BHs>o$KC1=c$JMQES$O!"%H%i%U%#%C%/$N7W?t$G$9(B:
+.Pp
+.Dl "ipfw add pipe 1 tcp from any to any"
+.Dl "ipfw add pipe 1 udp from any to any"
+.Dl "ipfw add pipe 1 ip from any to any"
+.Dl "ipfw pipe 1 config mask all"
+.Pp
+$B>e=R$N%k!<%k%;%C%H$O!"(B
+$B$9$Y$F$N%H%i%U%#%C%/$KBP$9$k%-%e!<$r@8@.(B ($B$7$FE}7W>pJs$r<}=8(B) $B$7$^$9!#(B
+$B%Q%$%W$K$O@)8B$r$D$1$F$$$J$$$N$G!"E}7W>pJs$r=8$a$k8z2L$7$+$"$j$^$;$s!#(B
+$B:G8e$N%k!<%k$@$1$G$J$/(B 3 $B8D$N%k!<%k$,I,MW$J$3$H$KCm0U$7$F$/$@$5$$!#(B
+.Nm
+$B$,(B IP $B%Q%1%C%H$N%^%C%A$r;n$_$k$H$-$K%]!<%H$r9MN8$7$J$$$?$a!"(B
+$BJL!9$N%]!<%H>e$N@\B3$O2f!9$K$OF1$8$b$N$K8+$($^$9!#(B
+.Pp
+$B$h$j@vN}$5$l$?Nc$O!"(B
+$B%M%C%H%o!<%/$N=PNO%H%i%U%#%C%/$r!"(B
+$B%M%C%H%o!<%/Kh$K@)Ls$9$k$N$G$O$J$/!"%[%9%HKh$K@)Ls$9$k$b$N$G$9(B:
+.Pp
+.Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
+.Dl "ipfw add pipe 2 ip from any to 192.168.2.0/24 in"
+.Dl "ipfw pipe 1 config mask src-ip 0x000000ff bw 200Kbit/s queue 20Kbytes"
+.Dl "ipfw pipe 2 config mask dst-ip 0x000000ff bw 200Kbit/s queue 20Kbytes"
 .Sh $B4XO"9`L\(B
 .Xr cpp 1 ,
 .Xr m4 1 ,
+.Xr bridge 4 ,
 .Xr divert 4 ,
 .Xr dummynet 4 ,
 .Xr ip 4 ,
@@ -738,35 +1068,52 @@
 .Xr syslogd 8
 .Sh $B%P%0(B
 .Pp
+$B$3$N?tG/$GJ8K!$,Bg$-$/$J$C$F$7$^$$!"(B
+$BHs>o$K$9$C$-$j$7$F$$$k$H$O8@$$Fq$$$G$9!#(B
+.Pp
 .Em WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!
 .Pp
-$B$3$N%W%m%0%i%`$O%3%s%T%e!<%?$r$+$J$j;H$$$K$/$$>uBV$K$7$F$7$^$&2DG=@-$,$"$j$^$9(B
-$B!#(B
+$B$3$N%W%m%0%i%`$O%3%s%T%e!<%?$r$+$J$j;H$$$K$/$$>uBV$K$7$F$7$^$&(B
+$B2DG=@-$,$"$j$^$9!#(B
 $B$O$8$a$F;HMQ$9$k;~$O%3%s%=!<%k>e$G<B9T$7!"M}2r$7$F$$$J$$A`:n$O(B
 .Em $B@dBP$K<B9T$7$J$$(B
 $B$h$&$K$7$F2<$5$$!#(B
 .Pp
-$BO"B3$7$?%(%s%H%j$NA`:n$b$7$/$ODI2C$K:]$7!"%5!<%S%9L>$d%W%m%H%3%kL>$O;HMQ$G$-$^(B
-$B$;$s!#(B
+$BO"B3$7$?%(%s%H%j$NA`:n$b$7$/$ODI2C$K:]$7!"(B
+$B%5!<%S%9L>$d%W%m%H%3%kL>$O;HMQ$G$-$^$;$s!#(B
 .Pp
 $BF~$C$F$-$?%Q%1%C%H$NCGJR(B ($B%U%i%0%a%s%H(B) $B$,(B
-.Ar divert
-$B$K$h$C$F9T$-@h$rJQ99$5$l$k$H!"%=%1%C%H$KG[Aw$5$l$kA0$K!"AH$_N)$FD>$7$r$7$^$9!#(B
-$B$=$l$KBP$7!"(B
-.Ar tee
-$B$r7PM3$7$?CGJR(B ($B%U%i%0%a%s%H(B) $B$O!"AH$_N)$FD>$7$5$l$^$;$s!#(B
-.Pp
-``tee'' $B%"%/%7%g%s$OL$<BAu$G$9!#(B
+.Cm divert
+$B$K$h$C$F9T$-@h$rJQ99$5$l$k(B
+$B$H!"%=%1%C%H$KG[Aw$5$l$kA0$K%Q%1%C%H$O:F9=@.$5$l$^$9!#(B
+.Pp
+$B$3$N%P!<%8%g%s$N(B
+.Fx
+$B$G$O!"(B
+.Cm tee
+$B%"%/%7%g%s$O<BAu$5$l$F$$$^$;$s!#(B
 .Sh $B:n<T(B
 .An Ugen J. S. Antsilevich ,
 .An Poul-Henning Kamp ,
 .An Alex Nash ,
-.An Archie Cobbs .
+.An Archie Cobbs ,
+.An Luigi Rizzo .
+.Pp
 API $B$O(B
-.An Daniel Boulet
-$B$,(B BSDI $B8~$1$K5-=R$7$?%3!<%I$K4p$E$$$F$$$^$9!#(B
+Daniel Boulet
+$B$,(B BSDI $BMQ$K5-=R$7$?%3!<%I$K4p$E$$$F$$$^$9!#(B
+.Pp
+.Xr dummynet 4
+$B%H%i%U%#%C%/%7%'%$%Q$O(B Akamba Corp $B$,%5%]!<%H$7$^$7$?!#(B
 .Sh $BNr;K(B
 .Nm
 $B$O!"(B
 .Fx 2.0
 $B$G:G=i$K8=$l$^$7$?!#(B
+.Xr dummynet 4
+$B$O(B
+.Fx 2.2.8
+$B$+$iF3F~$5$l$^$7$?!#(B
+$B%9%F!<%H%U%k3HD%$O!"(B
+.Fx 4.0
+$B$+$iF3F~$5$l$^$7$?!#(B
diff -ur man8-org/isdnd.8 man8/isdnd.8
--- man8-org/isdnd.8	Sat Nov 20 07:28:37 1999
+++ man8/isdnd.8	Thu Jun 15 18:08:17 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.3 1999/11/15 22:40:55 joe Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.4 2000/03/06 11:35:53 sheldonh Exp % 
 .\"
 .\"	last edit-date: [Thu May 20 14:37:42 1999]
 .\"
diff -ur man8-org/isdndebug.8 man8/isdndebug.8
--- man8-org/isdndebug.8	Sat Nov 20 07:41:34 1999
+++ man8/isdndebug.8	Thu Jun 15 18:09:43 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.3 1999/11/15 22:41:02 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.4 2000/03/06 11:35:57 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sat May 29 11:03:15 1999]
 .\"
diff -ur man8-org/isdndecode.8 man8/isdndecode.8
--- man8-org/isdndecode.8	Sat Nov 20 07:28:38 1999
+++ man8/isdndecode.8	Thu Jun 15 18:10:01 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.3 1999/11/15 22:41:05 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.4 2000/03/06 11:35:59 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sun Feb 14 10:16:25 1999]
 .\"
diff -ur man8-org/isdnmonitor.8 man8/isdnmonitor.8
--- man8-org/isdnmonitor.8	Tue Aug 31 08:26:00 1999
+++ man8/isdnmonitor.8	Thu Jun 15 18:10:32 2000
@@ -20,7 +20,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.1.2.2 1999/08/29 15:42:02 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.1.2.3 2000/03/06 11:36:00 sheldonh Exp %
 .\"
 .\"	last edit-date: [Fri Jan 30 22:49:48 1998]
 .\"
diff -ur man8-org/isdntel.8 man8/isdntel.8
--- man8-org/isdntel.8	Sat Nov 20 07:28:39 1999
+++ man8/isdntel.8	Thu Jun 15 18:10:57 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Sun Feb 14 10:19:44 1999]
 .\"	
-.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.3 1999/11/15 22:41:11 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.4 2000/03/06 11:36:02 sheldonh Exp %
 .\"
 .\" jpman %Id: isdntel.8,v 1.3 1999/02/07 01:45:29 yohta Stab %
 .\" WORD: answering machine	$BN1<iHV%^%7%s(B [isdntel.8]
diff -ur man8-org/isdntelctl.8 man8/isdntelctl.8
--- man8-org/isdntelctl.8	Sat Nov 20 07:28:39 1999
+++ man8/isdntelctl.8	Thu Jun 15 18:11:35 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.2 1999/11/15 22:41:12 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.3 2000/03/06 11:36:04 sheldonh Exp %
 .\" jpman %Id: isdntelctl.8,v 1.3 1999/02/07 01:48:07 yohta Stab %
 .\" WORD: sound format	$B2;$N7A<0(B [isdntelctl.8]
 .\"
diff -ur man8-org/isdntrace.8 man8/isdntrace.8
--- man8-org/isdntrace.8	Sat Nov 20 07:28:40 1999
+++ man8/isdntrace.8	Thu Jun 15 18:11:58 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.3 1999/11/15 22:41:15 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.4 2000/03/06 11:36:06 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sun Feb 14 10:22:24 1999]
 .\"
diff -ur man8-org/ispcvt.8 man8/ispcvt.8
--- man8-org/ispcvt.8	Tue Aug 31 08:26:02 1999
+++ man8/ispcvt.8	Thu Jun 15 18:12:53 2000
@@ -28,8 +28,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)ispcvt.1, 3.20, Last Edit-Date: [Tue Apr  4 12:35:54 1995]
+.\" %FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.6.2.1 2000/03/06 11:36:42 sheldonh Exp %
 .\"
-.\" Original Revision: 1.6
 .\" jpman %Id: ispcvt.8,v 1.3 1997/09/09 04:05:01 yugawa Stab %
 .\"
 .Dd April 4, 1995
diff -ur man8-org/ldconfig.8 man8/ldconfig.8
--- man8-org/ldconfig.8	Fri Dec 10 07:05:03 1999
+++ man8/ldconfig.8	Thu Jun 15 18:14:18 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.16.2.1 1999/08/29 15:14:02 peter Exp %
+.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.16.2.2 2000/03/03 15:13:00 sheldonh Exp %
 .\" jpman %Id: ldconfig.8,v 1.3 1997/07/22 16:49:42 horikawa Stab %
 .\"
 .Dd October 3, 1993
diff -ur man8-org/lpc.8 man8/lpc.8
--- man8-org/lpc.8	Tue Aug 31 08:26:11 1999
+++ man8/lpc.8	Thu Jun 15 18:15:01 2000
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
 .\"
-.\" Original Revision: 1.5
+.\" %FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.5.2.1 2000/03/06 11:36:15 sheldonh Exp %
 .\" jpman %Id: lpc.8,v 1.2 1997/05/23 00:47:48 mutoh Stab %
 .\"
 .Dd April 28, 1995
diff -ur man8-org/lpd.8 man8/lpd.8
--- man8-org/lpd.8	Sun Oct 17 04:00:36 1999
+++ man8/lpd.8	Thu Jun 15 18:57:50 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\"	%FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.9.2.1 1999/09/20 09:49:58 phantom Exp %
+.\"	%FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.9.2.2 2000/03/06 11:36:17 sheldonh Exp %
 .\"
 .\" jpman %Id: lpd.8,v 1.2 1997/03/31 13:34:37 horikawa Stab %
 .\"
diff -ur man8-org/lptcontrol.8 man8/lptcontrol.8
--- man8-org/lptcontrol.8	Tue Aug 31 08:26:12 1999
+++ man8/lptcontrol.8	Thu Jun 15 19:08:42 2000
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.7.2.3 1999/08/29 15:43:37 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.7.2.4 2000/03/06 11:36:21 sheldonh Exp %
 .\"
 .\" jpman %Id: lptcontrol.8,v 1.3 1997/08/16 13:20:55 horikawa Stab %
 .Dd September 3, 1994
diff -ur man8-org/map-mbone.8 man8/map-mbone.8
--- man8-org/map-mbone.8	Tue Aug 31 08:26:16 1999
+++ man8/map-mbone.8	Thu Jun 15 19:09:14 2000
@@ -1,4 +1,4 @@
-.\" Original Revision: 1.5
+.\" %FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.5.2.1 2000/03/06 11:36:30 sheldonh Exp %
 .\" jpman %Id: map-mbone.8,v 1.2 1997/06/06 10:31:25 bobson Stab %
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
diff -ur man8-org/memcontrol.8 man8/memcontrol.8
--- man8-org/memcontrol.8	Thu Jan  6 05:46:36 2000
+++ man8/memcontrol.8	Thu Jun 15 19:10:53 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2.2.1 1999/11/03 05:47:13 chris Exp %
+.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2.2.2 2000/03/06 11:36:23 sheldonh Exp %
 .\" 
 .\" jpman %Id: memcontrol.8,v 1.3 1999/12/05 08:25:43 horikawa Stab %
 .Dd September 28, 1999
diff -ur man8-org/mergemaster.8 man8/mergemaster.8
--- man8-org/mergemaster.8	Thu Jan  6 05:46:36 2000
+++ man8/mergemaster.8	Thu Jun 15 19:11:11 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.1 1999/11/03 20:58:47 billf Exp %
+.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.2 2000/03/06 11:36:25 sheldonh Exp %
 .\"
 .\" jpman %Id: mergemaster.8,v 1.3 1999/12/05 08:25:49 horikawa Stab %
 .Dd September 10, 1999
diff -ur man8-org/mixer.8 man8/mixer.8
--- man8-org/mixer.8	Sat Nov 20 07:28:41 1999
+++ man8/mixer.8	Thu Jun 15 19:12:44 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.1 1999/10/30 19:38:52 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.2 2000/03/06 11:36:26 sheldonh Exp %
 .\" jpman %Id: mixer.8,v 1.3 1997/08/16 13:24:56 horikawa Stab %
 .Dd January 9, 1997
 .Dt MIXER 8
diff -ur man8-org/mknod.8 man8/mknod.8
--- man8-org/mknod.8	Tue Aug 31 08:26:18 1999
+++ man8/mknod.8	Thu Jun 15 19:19:10 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.7.2.1 1999/08/29 15:14:06 peter Exp %
+.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.7.2.2 2000/03/03 15:13:01 sheldonh Exp %
 .\" jpman %Id: mknod.8,v 1.2 1997/03/31 13:37:12 horikawa Stab %
 .\"
 .Dd December 11, 1993
diff -ur man8-org/modload.8 man8/modload.8
--- man8-org/modload.8	Tue Aug 31 08:26:18 1999
+++ man8/modload.8	Thu Jun 15 19:19:26 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/modload/modload.8,v 1.11.2.1 1999/08/29 15:14:09 peter Exp %
+.\" %FreeBSD: src/sbin/modload/modload.8,v 1.11.2.2 2000/03/03 11:43:13 sheldonh Exp %
 .\" jpman %Id: modload.8,v 1.2 1997/04/25 00:25:43 mutoh Stab %
 .\"
 .Dd September 22, 1994
diff -ur man8-org/mount.8 man8/mount.8
--- man8-org/mount.8	Tue Aug 31 08:26:20 1999
+++ man8/mount.8	Thu Jun 15 19:19:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" %FreeBSD: src/sbin/mount/mount.8,v 1.24.2.3 1999/08/29 15:14:18 peter Exp %
+.\" %FreeBSD: src/sbin/mount/mount.8,v 1.24.2.4 2000/03/03 15:13:02 sheldonh Exp %
 .\"
 .\" jpman %Id: mount.8,v 1.2 1997/05/03 11:26:50 horikawa Stab %
 .\"
diff -ur man8-org/mount_cd9660.8 man8/mount_cd9660.8
--- man8-org/mount_cd9660.8	Tue Dec 21 06:09:46 1999
+++ man8/mount_cd9660.8	Thu Jun 15 19:20:24 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" %FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.6.2.4 1999/08/29 15:14:21 peter Exp %
+.\" %FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.6.2.5 2000/06/08 07:01:04 kris Exp %
 .\"
 .\" jpman %Id: mount_cd9660.8,v 1.2 1997/04/12 15:50:31 horikawa Stab %
 .Dd March 27, 1994
diff -ur man8-org/mount_msdos.8 man8/mount_msdos.8
--- man8-org/mount_msdos.8	Thu Jan  6 05:38:28 2000
+++ man8/mount_msdos.8	Thu Jun 15 19:22:34 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.8,v 1.15.2.2 1999/09/03 08:53:58 jkh Exp %
+.\" %FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.8,v 1.15.2.3 2000/03/03 11:43:15 sheldonh Exp %
 .\" jpman %Id: mount_msdos.8,v 1.3 1997/09/08 01:55:26 seki Stab %
 .\"
 .Dd April 7, 1994
diff -ur man8-org/mount_nfs.8 man8/mount_nfs.8
--- man8-org/mount_nfs.8	Tue Aug 31 08:26:23 1999
+++ man8/mount_nfs.8	Thu Jun 15 19:23:00 2000
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.14.2.1 1999/08/29 15:14:25 peter Exp %
+.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.14.2.2 2000/03/03 15:13:03 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_nfs.8,v 1.3 1997/05/19 17:04:14 horikawa Stab %
 .\""
diff -ur man8-org/mount_ntfs.8 man8/mount_ntfs.8
--- man8-org/mount_ntfs.8	Tue Aug 31 08:26:23 1999
+++ man8/mount_ntfs.8	Thu Jun 15 19:23:34 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.2.2.4 1999/08/29 15:14:28 peter Exp %
+.\" %FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.2.2.5 2000/03/03 15:13:05 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_ntfs.8,v 1.2 1999/05/07 11:25:09 horikawa Stab %
 .\" revision 1.2.2.2 $B$KDI=>:Q(B
diff -ur man8-org/mount_portal.8 man8/mount_portal.8
--- man8-org/mount_portal.8	Tue Aug 31 08:26:24 1999
+++ man8/mount_portal.8	Thu Jun 15 19:24:06 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.4.2.3 1999/08/29 15:14:33 peter Exp %
+.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.4.2.4 2000/03/03 15:13:06 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_portal.8,v 1.2 1997/03/31 13:38:30 horikawa Stab %
 .\"
diff -ur man8-org/moused.8 man8/moused.8
--- man8-org/moused.8	Sun Dec 19 05:35:40 1999
+++ man8/moused.8	Sat Jun 24 17:51:33 2000
@@ -28,10 +28,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.7 1999/12/17 09:59:07 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.10 2000/04/21 14:21:39 yokota Exp %
 .\"
 .\" jpman %Id: moused.8,v 1.3 1997/07/22 16:52:17 horikawa Stab %
-.Dd December 3, 1997
+.Dd April 1, 2000
 .Dt MOUSED 8
 .Os FreeBSD
 .Sh $BL>>N(B
@@ -39,7 +39,7 @@
 .Nd $B%^%&%9%G!<%?$r%3%s%=!<%k%I%i%$%P$KEO$9(B
 .Sh $B=q<0(B
 .Nm
-.Op Fl 3DPRcdfs
+.Op Fl DPRcdfs
 .Op Fl I Ar file
 .Op Fl F Ar rate
 .Op Fl r Ar resolution
@@ -49,6 +49,7 @@
 .Op Fl w Ar N
 .Op Fl z Ar target
 .Op Fl t Ar mousetype
+.Op Fl 3 Op Fl E Ar timeout
 .Fl p Ar port
 .Pp
 .Nm
@@ -106,6 +107,15 @@
 .Ar mousesystems
 $B%b!<%I$G(B 3 $B%\%?%s%^%&%9$rA`:n$9$k$?$a$K$O!"(B
 DTR $B%i%$%s$rMn$H$9$3$H$,I,MW$+$b$7$l$^$;$s!#(B
+.It Fl E Ar timeout
+3$B%\%?%s%(%_%e%l!<%7%g%s$,M-8z$K$J$C$F$$$k$H$-$K!"(B
+.Pq $B>e$r;2>H(B
+.Nm
+$B%G!<%b%s$O!"%\%?%s(B 2 $B$D$,F1;~$K2!$5$l$F$$$k$+$I$&$+$NH=Dj$r2<$9$^$G(B
+$B>e8B(B
+.Ar timeout
+$B%_%jIC$^$GBT$A$^$9!#(B
+$B%G%U%)%k%H$N%?%$%`%"%&%H$NCM$O(B 100 $B%_%jIC$G$9!#(B
 .It Fl F Ar rate
 $B%5%]!<%H$5$l$F$$$l$P!"%G%P%$%9$N%l%]!<%HIQEY(B($BIC$"$?$j$N2s?t(B)$B$r@_Dj$7$^$9!#(B
 .It Fl I Ar file
@@ -240,6 +250,10 @@
 $B$rA*Br$7$F$/$@$5$$!#(B
 $B$3$l$i$N%^%&%9$G$O%7%j%"%k%^%&%9%W%m%H%3%k$OF0:n$7$^$;$s!#(B
 .Pp
+USB $B%^%&%9$G$O!"%W%m%H%3%k$O(B
+.Ar auto
+$B$G$"$k$3$H$,I,MW$G$9!#B>$N%W%m%H%3%k$O(B USB $B%^%&%9$GF0:n$7$^$;$s!#(B
+.Pp
 $B$3$N%*%W%7%g%s$K$*$1$kM-8z$J%?%$%W$r0J2<$KNs5s$7$^$9!#(B
 .Pp
 $B%7%j%"%k%^%&%9(B:
@@ -300,6 +314,11 @@
 PS/2 $B%^%&%9$O%V%i%s%I$K0M$i$:$3$N%*%W%7%g%s$r(B
 $B;XDj$9$kI,MW$,$"$j$^$9!#(B
 .El
+.Pp
+USB $B%^%&%9$G$O!"(B
+.Ar auto
+$B$,;HMQ2DG=$JM#0l$N%W%m%H%3%k$G$"$j!"(B
+$B%V%i%s%I$K$+$+$o$i$:(B USB $B%^%&%9$K$O$3$l$r;XDj$9$Y$-$G$9!#(B
 .It Fl w Ar N
 $BJ*M}%\%?%s(B
 .Ar N
@@ -320,20 +339,55 @@
 .It Ar y
 X $B$^$?$O(B Y $B<4$N0\F0$H$7$F!"8!CN$7$?(B Z $B<40\F0$rJs9p$7$^$9!#(B
 .It Ar N
-$B2>A[%\%?%s(B
+$BIi(B/$B@5$N(B Z $B<40\F0$r8!CN$7$?$H$-$K!"(B
+$B2>A[%\%?%s$r2!$7$?%$%Y%s%H(B
 .Ar N 
 $B$*$h$S(B
 .Ar N+1 
-$B$r2!$7$?%$%Y%s%H$H$7$F!"8!CN$7$?Ii(B/$B@5$N(B Z $B<40\F0$r$=$l$>$lJs9p$7$^$9!#(B
+$B$N$=$l$>$l$rJs9p$7$^$9!#(B
 $BJ*M}%\%?%s(B
 .Ar N
 $B$H(B
 .Ar N+1
 $B$,B8:_$9$kI,MW$O$"$j$^$;$s!#(B
 $BO@M}%\%?%s$X$N3d$jIU$1$O(B Z $B<40\F0$r2>A[%\%?%s$X3d$jIU$1$?8e$K9T$o$l$^$9!#(B
+.It Ar N1 N2
+$BIi(B/$B@5$N(B Z $B<40\F0$r8!CN$7$?$H$-$K!"(B
+$B2>A[%\%?%s$r2!$7$?%$%Y%s%H(B
+.Ar N1
+$B$*$h$S(B
+.Ar N2
+$B$N$=$l$>$l$rJs9p$7$^$9!#(B
+.It Ar N1 N2 N3 N4
+$B$3$l$O!"(B
+$B%[%$!<%k$r(B2$B$D;}$A!"(B2$BHVL\$N%[%$!<%k$r?eJ?J}8~$N%9%/%m!<%kA`:n$KMQ$$$k(B
+$B%^%&%9$KBP$7$FM-MQ$G$9!#(B
+$B$^$?!"?eJ?J}8~$K2C$($i$l$kNO$r8!=P$G$-$k(B
+$B%N%V$+%9%F%#%C%/$r;}$D%^%&%9$KBP$7$F$bM-MQ$G$9!#(B
+.Pp
+2$BHVL\$N%[%$!<%k$NF0$-$O!"IiJ}8~$O%\%?%s(B
+.Ar N3
+$B$K!"@5J}8~$O(B
+.Ar N4 ,
+$B$K3d$jIU$1$i$l$^$9!#(B
+$B%\%?%s(B
+.Ar N3
+$B$H(B
+.Ar N4
+$B$H$,<B:]$KB8:_$9$k>l9g!"$=$l$i$NF0$-$O8!=P$5$l$^$;$s!#(B
+.Pp
+$B?eJ?J}8~$NF0$-!"$b$7$/$O(B 2 $BHVL\$N%m!<%i(B / $B%[%$!<%k$NF0$-$O(B
+$B>o$K8!=P$5$l$k$H$O8B$i$J$$$3$H$KCm0U$7$F2<$5$$!#(B
+$B$3$l$r$I$N$h$&$K%3!<%I2=$9$k$+$K4X$9$kI8=`$,B8:_$7$J$$$H(B
+$B;W$o$l$k$?$a$G$9!#(B
+.Pp
+$B%^%&%9$K$h$C$F$O!":8$rIi$N?eJ?J}8~$H;W$&$b$N$b$"$j$^$9$7!"$=$N5U$K(B
+$B;W$&$b$N$b$"$j$^$9!#$=$N>e!"%[%$!<%k$,(B2$B$D$H$b?bD>J}8~$KCV$+$l$F$$$k(B
+$B$b$N$d!"(B2$BHVL\$N?bD>%[%$!<%k$NJ}8~$,:G=i$N$b$N$NJ}8~$H0lCW$7$J$$(B
+$B$b$N$b$"$j$^$9!#(B
 .El
 .El
-.Ss $B%^%&%9%G!<%b%s$N9=@.(B
+.Ss $B%^%&%9%G!<%b%s$N@_Dj(B
 $B$^$:!";HMQM=Dj%^%&%9$N%$%s%?%U%'!<%9%?%$%W$rCN$k$3$H$,I,MW$G$9!#(B
 $B$3$l$O%^%&%9$N%3%M%/%?$r8+$l$PJ,$+$j$^$9!#(B
 $B%7%j%"%k%"%&%9$O(B D-Sub $B$N(B 9 $B%T%s$^$?$O(B 25 $B%T%s$N%a%9$G$9!#(B
@@ -342,6 +396,7 @@
 $B%^%&%9$K$h$C$F$O%3%M%/%?$rJL$N7A>u$KJQ492DG=$J%3%M%/%?$,ImB0$7$F$$$^$9!#(B
 $B$3$N$h$&$J%"%@%W%?$r;HMQ$9$k>l9g$K$O!"(B
 $B%^%&%9$+$i0lHV1s$$%3%M%/%?$N7A>u$r8+$F$/$@$5$$!#(B
+USB $B%^%&%9$O!"J?$i$JD9J}7A$N%3%M%/%?$r;}$A$^$9!#(B
 .Pp
 $B<!$K7h$a$M$P$J$i$J$$$3$H$O!"%$%s%?%U%'!<%9$N$?$a$K;HMQ$9$k%]!<%H$G$9!#(B
 $B%P%9!"(BInPort$B!"(BPS/2 $B%^%&%9$G$O!"A*Br;h$O$"$j$^$;$s(B:
@@ -352,9 +407,14 @@
 .Pa /dev/psm0
 $B$r;HMQ$7$^$9!#(B
 $B%7%j%"%k%^%&%9$N>l9g!"@\B32DG=$J%]!<%H$,J#?t$"$j$($^$9!#(B
-$BB?$/$N?M$,AH$_9~$_$N%7%j%"%k%]!<%H(B
+$BAH$_9~$_$N%7%j%"%k%]!<%H(B
 .Pa /dev/cuaa0
-$B$r%^%&%9$K3dEv$F$^$9!#(B
+$B$r%^%&%9$K3dEv$F$k?M$,B?$$$h$&$G$9!#(B
+$BJ#?t$N(B USB $B%^%&%9$r%7%9%F%`$^$?$O(B USB $B%O%V$K@\B32DG=$G$9!#(B
+$B$=$l$i$O(B
+.Pa /dev/ums0, /dev/ums1
+$B$N$h$&$K%"%/%;%92DG=$G$9!#(B
+.Pa
 $B%7%s%\%j%C%/%j%s%/(B
 .Pa /dev/mouse
 $B$G%^%&%9$N<B:]$N%]!<%H$r;X$9$h$&$K$7$F!"(B
@@ -393,12 +453,12 @@
 $B$KBP$7$F(B
 .Fl t
 $B%*%W%7%g%s$r;HMQ$7!"%W%m%H%3%k%?%$%W$r;XDj$9$kI,MW$,$"$j$^$9!#(B
-$BM=B,$7$F;n9T$9$kI,MW$,$"$j$^$9!#(B
+$B4*$G;n$7$F$_$kI,MW$,$"$j$^$9!#(B
 $B0J2<$K7P83B'$r<($7$^$9(B:
 .Pp
 .Bl -tag -compact -width 1.X
 .It 1.
-$B%P%9$*$h$S(B InPort $B%^%&%9$O%V%i%s%I$K0M$i$:(B
+$B%P%9%^%&%9$*$h$S(B InPort $B%^%&%9$O%V%i%s%I$K0M$i$:(B
 .Ar busmouse
 $B%W%m%H%3%k$r;HMQ$7$^$9(B
 .It 2.
@@ -406,20 +466,24 @@
 .Ar ps/2
 $B%W%m%H%3%k$r;HMQ$7$^$9(B
 .It 3.
+USB $B%^%&%9$K$O(B
+.Ar auto
+$B%W%m%H%3%k$r;XDj$9$kI,MW$,$"$j$^$9!#(B
+.It 4.
 $B$[$H$s$I$N(B 2 $B%\%?%s%7%j%"%k%^%&%9$O(B
 .Ar microsoft
 $B%W%m%H%3%k$r%5%]!<%H$7$^$9!#(B
-.It 4.
+.It 5.
 3 $B%\%?%s%7%j%"%k%^%&%9$O(B
 .Ar mousesystems
 $B%W%m%H%3%k$GF0:n$9$k$+$b$7$l$^$;$s!#F0:n$7$J$$>l9g$K$O!"(B
-$B;0HVL\(B($BCf(B)$B%\%?%s$,5!G=$;$:$K(B
+3 $BHVL\(B($BCf(B)$B%\%?%s$,5!G=$;$:$K(B
 .Ar microsoft
 $B%W%m%H%3%k$GF0:n$9$k$G$7$g$&!#(B
-3 $B%\%?%s%7%j%"%k%^%&%9$O!"4|BTDL$j;0HVL\$N%\%?%s$,F0:n$7$D$D(B
+3 $B%\%?%s%7%j%"%k%^%&%9$O!"4|BTDL$j(B 3 $BHVL\$N%\%?%s$,F0:n$7$D$D(B
 .Ar mouseman
 $B%W%m%H%3%k$GF0:n$9$k$+$b$7$l$^$;$s!#(B
-.It 5.
+.It 6.
 3 $B%\%?%s%^%&%9$K$O>.$5$J%9%$%C%A$,IU$$$F$$$F!"(B
 ``MS'' $B$H(B ``PC'' $B$^$?$O(B ``2'' $B$H(B ``3'' $B$H$GA*Br$G$-$k$G$-$k$h$&$K$J$C$F$$$k(B
 $B$+$b$7$l$^$;$s!#(B
@@ -429,7 +493,7 @@
 ``PC'' $B$H(B ``3'' $B$O(B
 .Ar mousesystems
 $B%W%m%H%3%k$rA*Br$7$^$9!#(B
-.It 6.
+.It 7.
 $B%^%&%9$K%m!<%i$d%[%$!<%k$,IU$$$F$$$k>l9g!"(B
 .Ar intellimouse
 $B%W%m%H%3%k8_49$G$7$g$&!#(B
@@ -450,22 +514,25 @@
 ^C $B$r%?%$%W$9$k$H!"%3%^%s%I$ODd;_$7$^$9!#(B
 .Ss $BJ#?t$N%^%&%9(B
 $B%7%9%F%`$K@\B3$7$?%^%&%9$HF1$8?t$@$1!"%^%&%9%G!<%b%s$rF1;~<B9T2DG=$G$9(B;
-$B0l$D$N%^%&%9%G!<%b%s$,0l$D$N%^%&%9$KBP1~$7$^$9!#(B
-$B%i%C%W%H%C%W%3%s%T%e!<%?AH$_9~$_$N(B PS/2 $B%]%$%s%F%#%s%0%G%P%$%9$r0\F0Cf;HMQ$7!"(B
+1 $B$D$N%^%&%9%G!<%b%s$,(B 1 $B$D$N%^%&%9$KBP1~$7$^$9!#(B
+$B%^%&%9%G!<%b%s$NF1;~<B9T$O!"(B
+$B%i%C%W%H%C%W%3%s%T%e!<%?$G(B
+$BAH$_9~$_$N(B PS/2 $B%]%$%s%F%#%s%0%G%P%$%9$r0\F0Cf;HMQ$7!"(B
 $B%*%U%#%9$G$O%I%C%-%s%0%9%F!<%7%g%s@\B3$N%7%j%"%k%^%&%9$r;HMQ$9$k(B
 $B>l9g$KM-MQ$G$9!#(B
-$B%^%&%9%G!<%b%s$rFs$D<B9T$7!"%"%W%j%1!<%7%g%s%W%m%0%i%`(B
+$B%^%&%9%G!<%b%s$r(B 2 $B$D<B9T$7!"%"%W%j%1!<%7%g%s%W%m%0%i%`(B
 .Pq $BNc$($P(B X Window System
 $B$K(B
 .Xr sysmouse
 $B$r;HMQ$5$;$^$9!#(B
 $B$9$k$H%"%W%j%1!<%7%g%s%W%m%0%i%`$O>o$KN>%^%&%9$+$i%^%&%9%G!<%?$r<u$1<h$j$^$9!#(B
 $B%7%j%"%k%^%&%9$,<h$jIU$1$i$l$F$$$J$$>l9g!"(B
-$BBP1~$9$k%^%&%9%G!<%b%s$O0\F0$d%\%?%s>uBV$NJQ2=$r8!=P$7$^$;$s$N$G!"(B
+$B$=$A$i$KBP1~$9$k%^%&%9%G!<%b%s$O0\F0$d%\%?%s>uBV$NJQ2=$r8!=P$7$^$;$s$N$G!"(B
 $B%"%W%j%1!<%7%g%s%W%m%0%i%`$O(B PS/2 $B%^%&%9$N%G!<%b%s$+$i$N%^%&%9%G!<%?(B
 $B$N$_$r;H$$$^$9!#(B
 $B0lJ}$3$N9=@.$GN>J}$N%^%&%9$r@\B3$7F1;~$KN>J}$rF0$+$7$?>l9g!"(B
-$B%^%&%9$N0\F0$r$9$Y$FAH$_9g$o$;$?$h$&$K%^%&%9%]%$%s%?$,%9%/%j!<%s>e$r0\F0$7$^$9!#(B
+$B%^%&%9$N0\F0$r$9$Y$FAH$_9g$o$;$?$h$&$K%^%&%9%]%$%s%?$,(B
+$B%9%/%j!<%s>e$r0\F0$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /dev/consolectl -compact
 .It Pa /dev/consolectl
@@ -478,6 +545,8 @@
 $B2>A[2=$5$l$?%^%&%9%I%i%$%P(B
 .It Pa /dev/ttyv%d
 $B2>A[%3%s%=!<%k(B
+.It Pa /dev/ums%d
+USB $B%^%&%9%I%i%$%P(B
 .It Pa /var/run/moused.pid
 $B8=:_<B9TCf$N(B
 .Nm
@@ -543,7 +612,7 @@
 $BB>$N%Q%C%I%G%P%$%9$HF1MM$N8z2L$rF@$i$l$^$9!#(B
 .Pp
 $B2>A[%3%s%=!<%k$G$N%+%C%H$H%Z!<%9%H$N5!G=$O!"(B
-$B%^%&%9$K(B 3 $B%\%?%s$"$k$3$H$r2>Dj$7$F$$$^$9!#(B
+$B%^%&%9$K%\%?%s$,(B 3 $B$D$"$k$3$H$rA[Dj$7$F$$$^$9!#(B
 $BO@M}%\%?%s(B 1 ($BO@M}E*$K:8(B) $B$O!"(B
 $B%3%s%=!<%k$N%F%-%9%HNN0h$rA*Br$7$F%+%C%H%P%C%U%!$K%3%T!<$7$^$9!#(B
 $BO@M}%\%?%s(B 3 ($BO@M}E*$K1&(B) $B$O!"(B
@@ -566,7 +635,8 @@
 .Xr pcvt 4 ,
 .Xr psm 4 ,
 .Xr screen 4 ,
-.Xr sysmouse 4
+.Xr sysmouse 4 ,
+.Xr ums 4
 .Sh $B5,3J(B
 .Nm
 $B%3%^%s%I$O(B
@@ -575,8 +645,8 @@
 $B%5%]!<%H$7!"(BPnP $B%7%j%"%k%^%&%9$r%5%]!<%H$7$^$9!#(B
 $B$7$+$7$J$,$i!"%7%j%"%k%^%&%9$4$H$K;EMM=<B-$NEY9g$,0[$J$j$^$9$N$G!"(B
 $BI8=`$N%P!<%8%g%s(B 1.0 $B$K40A4$K=>$C$F$O$$$^$;$s!#(B
-$B$3$N$h$&$K87L)$5$r7g$$$?J}K!$G$b!"%7%j%"%k%^%&%9$NE,@Z$J%W%m%H%3%k%?%$%W(B
-$B$r>o$K7hDj$G$-$k$o$1$G$O$"$j$^$;$s!#(B
+$B$3$N$h$&$K$$$/$V$s87L)$5$r7g$$$?J}K!$K$h$j!"%7%j%"%k%^%&%9$KBP$7$F!"(B
+$BE,@Z$J%W%m%H%3%k%?%$%W$r>o$K7hDj$G$-$k$o$1$G$O$"$j$^$;$s!#(B
 .Sh $B:n<T(B
 .Nm
 $B%3%^%s%I$O!"(B
diff -ur man8-org/mrinfo.8 man8/mrinfo.8
--- man8-org/mrinfo.8	Tue Aug 31 08:26:28 1999
+++ man8/mrinfo.8	Fri Jun 16 16:05:56 2000
@@ -1,4 +1,4 @@
-.\" Original Revision: 1.7
+.\" %FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.7.2.1 2000/03/06 11:36:30 sheldonh Exp %
 .\" jpman %Id: mrinfo.8,v 1.2 1997/05/25 15:18:08 horikawa Stab %
 .Dd May 8, 1995
 .Dt MRINFO 8
diff -ur man8-org/mrouted.8 man8/mrouted.8
--- man8-org/mrouted.8	Tue Aug 31 08:26:30 1999
+++ man8/mrouted.8	Fri Jun 16 16:06:10 2000
@@ -1,5 +1,5 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
-.\"%FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.12.2.2 1999/08/29 15:43:56 peter Exp %
+.\"%FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.12.2.3 2000/03/06 11:36:31 sheldonh Exp %
 .\" jpman %Id: mrouted.8,v 1.3 1997/07/26 22:00:11 horikawa Stab %
 .Dd May 8, 1995
 .Dt MROUTED 8
diff -ur man8-org/natd.8 man8/natd.8
--- man8-org/natd.8	Sat Nov 20 07:28:42 1999
+++ man8/natd.8	Fri Jun 16 16:16:44 2000
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.6 1999/10/28 18:55:35 ru Exp %
+.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.8 2000/03/03 15:13:08 sheldonh Exp %
 .\" jpman %Id%
 .Dd 15 April 1997
 .Os FreeBSD
diff -ur man8-org/newfs.8 man8/newfs.8
--- man8-org/newfs.8	Mon Jan 24 17:23:20 2000
+++ man8/newfs.8	Fri Jun 16 16:34:40 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.2 1999/08/29 15:14:53 peter Exp %
+.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.4 2000/06/08 07:00:10 kris Exp %
 .\"
 .\" jpman %Id: newfs.8,v 1.3 1997/07/26 22:02:06 horikawa Stab %
 .Dd May 3, 1995
@@ -345,7 +345,7 @@
 $B$N(B nosuid $B$H(B nodev $B$N%*%W%7%g%s$r;XDj$7!"(B
 64 MB $B$NBg$-$5$N%a%b%j%U%!%$%k%7%9%F%`$r(B /tmp $B$K%^%&%s%H$7$^$9!#(B
 .Sh $B%P%0(B
-.Bx Free
+.Fx
 $B$N%V!<%H%3!<%I$O!"%+!<%M%k$,CV$+$l$F$$$k%U%!%$%k%7%9%F%`$N%V%m%C%/%5%$%:(B
 $B$,(B 8 $B%-%m%P%$%H$G%U%i%0%a%s%H(B 1 $B%-%m%P%$%H$G$"$k$3$H$r2>Dj$7$F$$$^$9!#(B
 $BB>$N%5%$%:$r;HMQ$7$F$$$k%U%!%$%k%7%9%F%`$+$i%V!<%H$9$k$3$H$O$G$-$^$;$s!#(B
@@ -353,12 +353,12 @@
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
+.Xr camcontrol 8 ,
 .Xr disklabel 8 ,
 .Xr diskpart 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
 .Xr mount 8 ,
-.Xr scsiformat 8 ,
 .Xr tunefs 8
 .Rs
 .%A M. McKusick
diff -ur man8-org/newfs_msdos.8 man8/newfs_msdos.8
--- man8-org/newfs_msdos.8	Sun Oct 31 01:52:29 1999
+++ man8/newfs_msdos.8	Fri Jun 16 16:35:28 2000
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.5.2.1 1999/08/29 15:14:54 peter Exp %
+.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.5.2.2 2000/03/03 15:13:10 sheldonh Exp %
 .\" jpman %Id: newfs_msdos.8,v 1.3 1998/10/10 09:07:02 yohta Stab %
 .\" 
 .Dd July 6, 1998
diff -ur man8-org/newsyslog.8 man8/newsyslog.8
--- man8-org/newsyslog.8	Tue Aug 31 08:26:40 1999
+++ man8/newsyslog.8	Fri Jun 16 16:35:48 2000
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.14.2.3 1999/08/29 15:44:31 peter Exp %
+.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.14.2.4 2000/03/06 11:36:33 sheldonh Exp %
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
diff -ur man8-org/nextboot.8 man8/nextboot.8
--- man8-org/nextboot.8	Tue Aug 31 08:26:40 1999
+++ man8/nextboot.8	Fri Jun 16 16:36:15 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.8.2.2 1999/08/29 15:13:36 peter Exp %
+.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.8.2.3 2000/03/03 15:12:57 sheldonh Exp %
 .\" jpman %Id: nextboot.8,v 1.3 1997/08/16 13:35:00 horikawa Stab %
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
diff -ur man8-org/ngctl.8 man8/ngctl.8
--- man8-org/ngctl.8	Thu Jan  6 05:46:36 2000
+++ man8/ngctl.8	Sat Jun 24 17:54:48 2000
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.2.2.2 1999/12/01 19:41:41 julian Exp %
+.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.2.2.4 2000/03/06 11:36:35 sheldonh Exp %
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .\" jpman %Id: ngctl.8,v 1.3 1999/12/17 05:27:44 mitchy Stab %
@@ -41,7 +41,7 @@
 .Nm ngctl
 .Nd netgraph $B@)8f%f!<%F%#%j%F%#(B
 .Sh $B=q<0(B
-.Nm ngctl
+.Nm
 .Op Fl d
 .Op Fl f Ar filename
 .Op Fl n Ar nodename
@@ -52,16 +52,18 @@
 .Em socket
 $B%?%$%W$N(B netgraph $B%N!<%I$r:n@.$7$^$9!#(B
 .Fl f
-$B%U%i%0$r;XDj$;$:!"%3%^%s%I%i%$%s>e$G(B command $B$r;XDj$7$J$$>l9g$G!"(B
-$BI8=`F~NO$,(B tty $B$G$"$k$H$-!"(B
-.Nm ngctl
+$B%U%i%0$r;XDj$;$:!"(B
+$B%3%^%s%I%i%$%s>e$G(B command $B$r;XDj$7$J$$>l9g$GI8=`F~NO$,(B tty $B$G$"$k$H$-!"(B
+.Nm
 $B$OBPOC%b!<%I$KF~$j$^$9!#$=$&$G$J$$>l9g!"(B
-.Nm ngctl
+.Nm
 $B$OM?$($i$l$?%3%^%s%I(B ($BJ#?t2D(B) $B$r<B9T$7!"$9$0$K=*N;$7$^$9!#(B
 .Pp
 $B%N!<%I$O!":n@.!":o=|!"Aj8_@\B3Ey$,2DG=$G$9!#(B
 $B%N!<%I$,%P%$%J%j(B / ASCII $B@)8f%a%C%;!<%8$NJQ49$r%5%]!<%H$7$F$$$k>l9g!"(B
-$B$=$N%N!<%I$KBP$7$F(B ASCII $B7A<0$N@)8f%a%C%;!<%8$rAw?.2DG=$G$9!#(B
+$B$=$N%N!<%I$KBP$7$F(B
+.Tn ASCII
+$B7A<0$N@)8f%a%C%;!<%8$rAw?.2DG=$G$9!#(B
 .Pp
 $BBPOC%b!<%I$G$O!"(B
 $B%=%1%C%H%N!<%I$,<u?.$7$?$9$Y$F$N@)8f%a%C%;!<%8$H%G!<%?%Q%1%C%H$r(B
@@ -69,14 +71,18 @@
 $B$OI=<($7$^$9!#(B
 $B@)8f%a%C%;!<%8$K$D$$$F$O!"(B
 $BAw=P85$N%N!<%I$,JQ49$r%5%]!<%H$7$F$$$k>l9g$K$O!"(B
-$B%a%C%;!<%8$N0z?t$O(B ASCII $B7A<0$GI=<($5$l$^$9!#(B
+$B%a%C%;!<%8$N0z?t$O(B
+.Tn ASCII
+$B7A<0$GI=<($5$l$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O<!$NDL$j$G$9(B:
 .Bl -tag -width indent
 .It Fl f Ar nodeinfo
 $B;XDj$7$?%U%!%$%k$+$i%3%^%s%I$rFI$_9~$_$^$9!#(B
 $BC10l$N%@%C%7%e$OI8=`F~NO$r<($7$^$9!#(B
-$B6u9T$*$h$S(B ``#'' $B$+$i3+;O$9$k9T$OL5;k$5$l$^$9!#(B
+$B6u9T$*$h$S(B
+.Dq #
+$B$+$i3+;O$9$k9T$OL5;k$5$l$^$9!#(B
 .It Fl n Ar nodename
 $B?75,:n@.$5$l$?(B netgraph $B%N!<%I$K(B
 .Em nodename
@@ -88,7 +94,7 @@
 $B%G%P%C%0MQ>iD9%l%Y%k$rA}2C$7$^$9!#(B
 .El
 .Sh $B%3%^%s%I(B
-.Nm ngctl
+.Nm
 $B$,8=:_%5%]!<%H$7$F$$$k%3%^%s%I$O<!$NDL$j$G$9(B:
 .Pp
 .Bd -literal -offset indent -compact
@@ -109,8 +115,13 @@
 .Ed
 .Pp
 $B%3%^%s%I$K$OJLL>$r;}$D$b$N$,$"$j$^$9!#(B
-$BNc$($P(B ``ls'' $B$O(B ``list'' $B$HF1$8$G$9!#(B
-``help'' $B%3%^%s%I$O!"(B
+$BNc$($P(B
+.Dq ls
+$B$O(B
+.Dq list
+$B$HF1$8$G$9!#(B
+.Dq help
+$B%3%^%s%I$O!"(B
 $B;HMQ2DG=$J%3%^%s%I$H!"$=$l$i$NMQK!$HJLL>!"C;$$2r@b$rI=<($7$^$9!#(B
 .Sh $B=*N;CM(B
 .Nm
@@ -119,10 +130,11 @@
 .Xr netgraph 3 ,
 .Xr netgraph 4 ,
 .Xr nghook 8
-.Sh $B:n<T(B
-Archie Cobbs <archie@whistle.com>
 .Sh $BNr;K(B
-.Em netgraph
+.Nm netgraph
 $B%7%9%F%`$N%G%6%$%s$H:G=i$N<BAu$O!"(BWhistle Communications, Inc. $B$G!"(B
-Whistle InterJet $B8~$1$K%+%9%?%^%$%:$5$l$?(B FreeBSD 2.2 $B$G(B
-$B9T$o$l$^$7$?!#(B
+Whistle InterJet $B8~$1$K%+%9%?%^%$%:$5$l$?(B
+.Fx 2.2
+$B$G9T$o$l$^$7$?!#(B
+.Sh $B:n<T(B
+.An Archie Cobbs Aq archie@whistle.com
diff -ur man8-org/nghook.8 man8/nghook.8
--- man8-org/nghook.8	Thu Jan  6 05:46:36 2000
+++ man8/nghook.8	Fri Jun 16 17:10:52 2000
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\"  %FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.1.2.1 1999/11/17 07:06:04 julian Exp %
+.\"  %FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.1.2.3 1999/12/22 01:26:19 archie Exp %
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .\" jpman %Id: nghook.8,v 1.3 1999/12/17 05:28:07 mitchy Stab %
@@ -40,7 +40,7 @@
 .Sh $BL>>N(B
 .Nm nghook
 .Nd
-.Xr netgraph 8
+.Xr netgraph 4
 $B%N!<%I$X@\B3$9$k(B
 .Sh $B=q<0(B
 .Nm
@@ -51,14 +51,16 @@
 .Sh $B2r@b(B
 .Nm
 $B$O(B
-.Xr netgraph 8
+.Xr ng_socket 8
 $B%=%1%C%H%?%$%W%N!<%I$r:n@.$7!"$3$l$r(B
 .Ar path
 $B$K$"$k%N!<%I$N%U%C%/(B
 .Ar hookname
 $B$X@\B3$7$^$9!#(B
 .Ar hookname
-$B$,>JN,$5$l$k$H!"(B``debug'' $B$r;XDj$7$?$b$N$H$5$l$^$9!#(B
+$B$,>JN,$5$l$k$H!"(B
+.Dq debug
+$B$r;XDj$7$?$b$N$H$5$l$^$9!#(B
 .Pp
 $B@\B3$5$l$k$H!"I8=`F~NO$X=q$-9~$^$l$kA4%G!<%?$,$3$N%N!<%I$KAw$i$l!"(B
 $B$3$N%N!<%I$+$i<u$1<h$kA4%G!<%?$,I8=`=PNO$XEO$5$l$^$9!#(B
@@ -67,7 +69,9 @@
 .Pp
 .Bl -tag -width indent
 .It Fl a
-$B3FFI$_9~$_%Q%1%C%H$r(B ASCII $B$G=PNO$7$^$9!#(B
+$B3FFI$_9~$_%Q%1%C%H$r(B
+.Tn ASCII
+$B$G=PNO$7$^$9!#(B
 .It Fl d
 $B%G%P%C%0MQ>iD9%l%Y%k$rA}2C$7$^$9!#(B
 .El
@@ -78,10 +82,11 @@
 .Xr netgraph 4 ,
 .Xr netgraph 3 ,
 .Xr ngctl 8
-.Sh $B:n<T(B
-Archie Cobbs <archie@whistle.com>
 .Sh $BNr;K(B
 .Em netgraph
 $B%7%9%F%`$N%G%6%$%s$H:G=i$N<BAu$O!"(BWhistle Communications, Inc. $B$G!"(B
-Whistle InterJet $B8~$1$K%+%9%?%^%$%:$5$l$?(B FreeBSD 2.2 $B$G(B
-$B9T$o$l$^$7$?!#(B
+Whistle InterJet $B8~$1$K%+%9%?%^%$%:$5$l$?(B
+.Fx 2.2
+$B$G9T$o$l$^$7$?!#(B
+.Sh $B:n<T(B
+.An Archie Cobbs Aq archie@whistle.com
diff -ur man8-org/ntpq.8 man8/ntpq.8
--- man8-org/ntpq.8	Sun Oct 17 04:00:38 1999
+++ man8/ntpq.8	Fri Jun 16 17:13:44 2000
@@ -1,23 +1,23 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/xntpd/doc/ntpq.8,v 1.5.2.3 1999/09/20 09:50:01 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/xntpd/doc/ntpq.8,v 1.5.2.4 2000/03/03 11:29:21 sheldonh Exp %
 .\"
 .\" jpman %Id: ntpq.8,v 1.3 1997/09/21 12:35:15 seki Stab %
 .\"
 .\" $BBPLu3P$(=q$-(B (seki@sysrap.cs.fujitsu.co.jp $B:n@.(B)
-.\" association		$B%"%=%7%(!<%7%g%s(B
-.\" association identifier	$B%"%=%7%(!<%7%g%sHV9f(B ($BLu$7$9$.$+(B?)
-.\" authentication	$BG'>Z(B
-.\" clock		$B;~7W(B
-.\" dispersion		$B$P$i$D$-(B
-.\" fuzzball		fuzzball ($B8GM-L>;l(B; xntpd $B%Y!<%9$G$J$$(B NTP $B%5!<%P(B)
-.\" offset		$B$:$l(B
-.\" peer		peer $B$N$^$^(B
-.\" poll		$B%]!<%j%s%0$9$k(B
-.\" query		$BLd$$9g$o$;(B
-.\" reference clock	$B;2>H;~7W(B
-.\" request		$BMW5a(B
-.\" status word		$B>uBV%o!<%I(B
-.\" time out ($BL>;l(B)	$B@)8B;~4V(B
+.\" WORD: association		$B%"%=%7%(!<%7%g%s(B[ntpq.8]
+.\" WORD: association identifier	$B%"%=%7%(!<%7%g%sHV9f(B ($BLu$7$9$.$+(B?)[ntpq.8]
+.\" WORD: authentication	$BG'>Z(B[ntpq.8]
+.\" WORD: clock			$B;~7W(B[ntpq.8]
+.\" WORD: dispersion		$B$P$i$D$-(B[ntpq.8]
+.\" WORD: fuzzball		fuzzball ($B8GM-L>;l(B; xntpd $B%Y!<%9$G$J$$(B NTP $B%5!<%P(B)[ntpq.8]
+.\" WORD: offset		$B$:$l(B[ntpq.8]
+.\" WORD: peer			peer $B$N$^$^(B[ntpq.8]
+.\" WORD: poll			$B%]!<%j%s%0$9$k(B[ntpq.8]
+.\" WORD: query			$BLd$$9g$o$;(B[ntpq.8]
+.\" WORD: reference clock	$B;2>H;~7W(B[ntpq.8]
+.\" WORD: request		$BMW5a(B[ntpq.8]
+.\" WORD: status word		$B>uBV%o!<%I(B[ntpq.8]
+.\" WORD: time out ($BL>;l(B)	$B@)8B;~4V(B[ntpq.8]
 .Dd December 21, 1993
 .Dt NTPQ 8
 .Os
diff -ur man8-org/pam_radius.8 man8/pam_radius.8
--- man8-org/pam_radius.8	Sat Sep 18 21:30:10 1999
+++ man8/pam_radius.8	Fri Jun 16 17:54:03 2000
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.1.2.2 1999/08/29 14:57:23 peter Exp %
+.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.1.2.3 2000/03/03 14:59:40 sheldonh Exp %
 .\" jpman %Id: pam_radius.8,v 1.3 1999/09/15 14:34:02 yt-kage Stab %
 .\"
 .Dd August 2, 1999
diff -ur man8-org/pccardd.8 man8/pccardd.8
--- man8-org/pccardd.8	Tue Aug 31 08:26:49 1999
+++ man8/pccardd.8	Fri Jun 16 17:54:38 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.10.2.4 1999/08/29 15:44:45 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.10.2.5 2000/03/06 11:36:37 sheldonh Exp %
 .\"
 .\" jpman %Id: pccardd.8,v 1.4 1997/07/26 22:04:06 horikawa Stab %
 .\"
diff -ur man8-org/pciconf.8 man8/pciconf.8
--- man8-org/pciconf.8	Tue Aug 31 08:26:49 1999
+++ man8/pciconf.8	Fri Jun 16 17:55:09 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.4.2.2 1999/08/29 15:44:50 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.4.2.3 2000/03/06 11:36:39 sheldonh Exp %
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
diff -ur man8-org/ping.8 man8/ping.8
--- man8-org/ping.8	Tue Aug 31 08:26:51 1999
+++ man8/ping.8	Fri Jun 16 17:55:38 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/ping/ping.8,v 1.19.2.2 1999/08/29 15:15:07 peter Exp %
+.\" %FreeBSD: src/sbin/ping/ping.8,v 1.19.2.3 2000/03/03 15:13:10 sheldonh Exp %
 .\"
 .\" jpman %Id: ping.8,v 1.3 1997/10/11 08:00:36 horikawa Stab %
 .Dd March 1, 1997
diff -ur man8-org/portmap.8 man8/portmap.8
--- man8-org/portmap.8	Tue Aug 31 08:26:52 1999
+++ man8/portmap.8	Fri Jun 16 18:15:29 2000
@@ -31,8 +31,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)portmap.8	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.4.2.1 2000/03/03 00:16:14 cwt Exp %
 .\"
-.\" Original Revision: 1.4
 .\" jpman %Id: portmap.8,v 1.2 1997/03/31 14:54:58 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -79,6 +79,12 @@
 .Tn RPC
 $B%5!<%P$,5/F0$5$l$kA0$K3+;O$5$l$kI,MW$,$"$j$^$9!#(B
 .Pp
+.Nm
+$B$O!"%G%U%)%k%H$G$O(B
+.Xr hosts_access 5
+$B$N%"%/%;%9@)8f$r;HMQ$7$^$9!#(B
+$B%"%/%;%9@)8f%Q%?!<%s$G;2>H$G$-$k$N$O(B IP $B%"%I%l%9$@$1$G$9!#(B
+.Pp
 $BDL>o!"(B
 .Nm
 $B$O!"B>$N%G!<%b%s$HF1$8$h$&$K!"5/F0$5$l$?C<Kv$NF0:n$K$O1F6A$5$l$^$;$s!#(B
@@ -94,9 +100,10 @@
 $B$r%G!<%b%s$H$7$FF0:n$5$;$k$N$r2sHr$7$^$9!#$=$7$F!"%(%i!<$*$h$S(B
 $B%G%P%C%0>pJs$rI8=`%(%i!<=PNO$K=PNO$5$;$^$9!#(B
 .It Fl v
-$B%"%/%;%9%3%s%H%m!<%k%A%'%C%/$K4X$9$k>iD9$J%m%0$r<h$j$^$9!#(B
+$B%"%/%;%9%3%s%H%m!<%k%A%'%C%/$K4X$7>iD9$J%m%0$r<h$j$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
+.Xr hosts_access 5 ,
 .Xr inetd.conf 5 ,
 .Xr inetd 8 ,
 .Xr rpcinfo 8
diff -ur man8-org/ppp.8 man8/ppp.8
--- man8-org/ppp.8	Tue Dec 14 07:43:58 1999
+++ man8/ppp.8	Sat Jun 24 18:24:49 2000
@@ -1,7 +1,9 @@
-.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.16 1999/11/19 23:48:01 brian Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.21 2000/06/12 09:07:40 brian Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.22 2000/06/15 17:09:11 brian Exp %
 .\"
 .\" jpman %Id: ppp.8,v 1.4 1997/06/08 18:41:58 saeki Stab %
-.\" WORD: expect string	$B<u?.BT$AJ8;zNs(B (chat.8)
+.\"
+.\" WORD: expect string	$B<u?.BT$AJ8;zNs(B[chat.8,ppp.8]
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -483,7 +485,9 @@
 .Pa /etc/resolv.conf
 $B$r99?7$9$k$3$H$,$G$-$^$9!#>\:Y$O8e=R$N(B
 .Dq enable dns
-$B%3%^%s%I$r;2>H$7$F$/$@$5$$!#(B
+$B%3%^%s%I$H(B
+.Dq resolv
+$B%3%^%s%I$H$r;2>H$7$F$/$@$5$$!#(B
 .El
 .Sh $B<jF0%@%$%d%k(B
 $B<!$NNc$G$O!"$"$J$?$N%^%7%sL>$,(B
@@ -1106,7 +1110,7 @@
 $B$rJT=8$7$^$9!#(B
 $BNc$($P!"<!$N$h$&$K@_Dj$9$l$PNI$$$G$7$g$&(B:
 .Pp
-.Dl ttyd1  "/usr/libexec/getty std.38400" dialup on secure
+.Dl ttyd1 "/usr/libexec/getty std.38400" dialup on secure
 .Pp
 .Xr getty 8
 $B$r5/F0$9$k$?$a$K(B
@@ -1169,7 +1173,7 @@
 $B$3$NJ}K!$O!"(B
 .Xr login 1
 $B$G$O$J$/(B
-.Nm ppp
+.Nm
 $B$G@\B3$NG'>Z$r9T$&$H$$$&E@$,0[$J$j$^$9!#(B
 .Bl -enum
 .It
@@ -1947,8 +1951,10 @@
 set speed 115200
 .Ed
 .Pp
-FreeBSD $B$G$O(B cuaa0 $B$,(B 1 $B$D$a$N%7%j%"%k%]!<%H$K$J$j$^$9!#(B
-OpenBSD $B$G(B
+.Fx
+$B$G$O(B cuaa0 $B$,(B 1 $B$D$a$N%7%j%"%k%]!<%H$K$J$j$^$9!#(B
+.Ox
+$B$G(B
 .Nm
 $B$r<B9T$7$F$$$k>l9g$K$O(B cua00 $B$,(B 1 $B$D$a$G$9!#(B
 $B$"$J$?$N%b%G%`$,(B 28800 $B$+$=$l0J>e$N%S%C%H%l!<%H$GDL?.$9$k$3$H$,(B
@@ -2033,9 +2039,16 @@
 $B<!$N$h$&$J9T$r2C$(!"(BISP $B$K%M!<%`%5!<%P%"%I%l%9$r3NG'$7$F$/$@$5$$!#(B
 .Bd -literal -offset indent
 enable dns
-.Pp
 .Ed
-$B%m!<%+%k(B DNS $B$rAv$i$;$F$$$k>l9g$K$O!"$3$l$r(B
+.Pp
+$B%m!<%+%k(B DNS $B$rAv$i$;$F$$$k>l9g$K$O!"(B
+.Dq resolv readonly
+$B$r;H$o$:!"$+$D!"(B
+.Dq resolv restore
+$B$r(B
+.Pa /etc/ppp/ppp.linkdown
+$B$K4^$a$F$$$J$$$J$i$P!"(B
+$B$3$l$r(B
 .Em $B$d$i$J$$(B
 $B$G$/$@$5$$!#(B
 .Nm
@@ -2076,6 +2089,8 @@
 $BJ8;zNs(B "CONNECT" $B$r4^$`%A%c%C%H9T$N%m%0!#(B
 .It Li Debug
 $B%G%P%C%0>pJs$N%m%0!#(B
+.It Li DNS
+DNS QUERY $B%Q%1%C%H$N%m%0!#(B
 .It Li HDLC
 HDLC $B%Q%1%C%H$N(B 16 $B?J%@%s%W!#(B
 .It Li ID0
@@ -2539,7 +2554,9 @@
 $B@\B3Aj<j$,F10U$7$?>l9g!"N>C<$OF10U$7$?4V3V$G(B LQR $B%Q%1%C%H$r8r49$7!"(B
 LQM $B%m%.%s%0$rM-8z$K$9$k$3$H$G!">\:Y$J%j%s%/IJ<A$r4F;k$9$k$3$H$,(B
 $B2DG=$K$J$j$^$9!#(B
-$B@\B3Aj<j$,F10U$7$J$+$C$?>l9g!"(Bppp $B$OBe$j$K(B ECHO LQR $BMW5a$r(B
+$B@\B3Aj<j$,F10U$7$J$+$C$?>l9g!"(B
+.Nm
+$B$OBe$j$K(B ECHO LQR $BMW5a$r(B
 $BAw$j$^$9!#$3$l$i$N%Q%1%C%H$O6=L#$"$k>pJs$r2?$bEO$7$^$;$s$,!"(B
 .Em $BI,$:(B
 $B@\B3Aj<j$K1~Ez$7$J$1$l$P$J$j$^$;$s!#(B
@@ -2738,6 +2755,10 @@
 $B%"%I%l%9$r;HMQ$7$F!"(B
 .Nm
 $B$,(B ARP $BI=$KC10l%(%s%H%j$r:n@.$9$k$3$H$r0UL#$7$^$9!#(B
+$B$3$l$K$h$j!"(B
+$BAj<j<+?H$,$=$N(B LAN $B$K@\B3$5$l$?$+$N$h$&$J>uBV$G!"(B
+LAN $B$K@\B3$5$l$?B>$N%^%7%s$HAj<j$H$,(B
+$BDL?.$G$-$k$h$&$K$J$j$^$9!#(B
 .Dv HISADDR
 $B$,(B LAN $B$+$i$N%"%I%l%9$G$O$J$$>l9g!"BeM}%(%s%H%j$O:n@.$G$-$^$;$s!#(B
 .It proxyall
@@ -2819,7 +2840,7 @@
 $BK\%*%W%7%g%s$r(B enable $B$K$9$k$H!"(B
 .Nm
 $B$O8E$$%$%s%?%U%'!<%9%"%I%l%9$N%H%i%U%#%C%/$r(B NAT $B%(%s%8%s(B
-.Pq Xr libalias 5 $B;2>H(B
+.Pq Xr libalias 3 $B;2>H(B
 $B$rDL$9$h$&$K$J$j!"(B(
 .Fl auto
 $B%b!<%I$G$O(B)
@@ -2886,18 +2907,20 @@
 .Xr route 8
 $B;2>H(B) $B$K$F7PO)$r99?7$7$^$9!#(B
 .Pp
-.Dq HISADDR
-$B$b$7$/$O(B
-.Dq MYADDR
-$B$r4^$`7PO)$O(B
+.Dq HISADDR ,
+.Dq MYADDR ,
+.Dq DNS0 ,
+.Dq DNS1
+$B$N$$$:$l$+$r4^$`7PO)$O(B
 .Sq $B%9%F%#%C%-!<(B
 $B$H8+$J$5$l$^$9!#$3$l$i$O%j%9%H(B ($B%j%9%H$r8+$k$K$O(B
 .Dq show ipcp
 $B%3%^%s%I$r;HMQ$7$^$9(B) $B$K3JG<$5$l!"(B
 .Dv HISADDR
-$B$b$7$/$O(B
-.Dv MYADDR
-$B$NCM$,JQ99$5$l$kEY$K!"7PO)I=$N4XO"$9$k%(%s%H%j$,99?7$5$l$^$9!#(B
+.Dq MYADDR ,
+.Dq DNS0 ,
+.Dq DNS1
+$B$N$$$:$l$+$NCM$,JQ99$5$l$kEY$K!"7PO)I=$N4XO"$9$k%(%s%H%j$,99?7$5$l$^$9!#(B
 $B$3$N5!G=$O(B
 .Dq disable sroutes
 $B$r;HMQ$9$k$3$H$GL58z$K$G$-$^$9!#(B
@@ -3020,7 +3043,6 @@
 $B$3$N%*%W%7%g%s$O!"(BNAT $B$NMM!9$JE}7W$H>pJs$,%U%!%$%k(B
 .Pa /var/log/alias.log
 $B$K5-O?$5$l$k$h$&$K$7$^$9!#(B
-$B$3$N%U%!%$%kL>$O!"6a$$>-MhJQ$o$k$G$7$g$&!#(B
 .It nat port Ar proto Ar targetIP Ns Xo
 .No : Ns Ar targetPort Ns
 .Oo
@@ -3106,6 +3128,20 @@
 RPC $B$d(B LPD $B$H$$$C$?!"(B
 $B%&%'%k%N%&%s%]!<%H(B (well known port) $B$+$i$N@\B3$rMW5a$9$k(B
 $B%W%m%H%3%k$r%5%]!<%H$9$k$N$KM-MQ$G$9!#(B
+.It nat target Op Ar address
+$B%"%I%l%9$r;XDj$7$?$H$-$O!"$=$N%"%I%l%9$r%?!<%2%C%H%"%I%l%9$H$7$F@_Dj$7!"(B
+$B;XDj$7$J$$$H$-$O!"%?!<%2%C%H%"%I%l%9$N@_Dj$r%/%j%"$7$^$9!#(B
+$B%?!<%2%C%H%"%I%l%9$O!"%G%U%)%k%H$G$I$N$h$&$K<u?.%Q%1%C%H$r(B
+NAT $B$9$k$+$r;XDj$9$k$?$a$K(B libaliases $B$,;HMQ$7$^$9!#(B
+$B%?!<%2%C%H%"%I%l%9$,@_Dj$5$l$F$$$J$$$+!"$^$?$O(B
+.Dq default
+$B$,M?$($i$l$F$$$k>l9g!"%Q%1%C%H$OJQ99$5$l$J$$$^$^FbIt%M%C%H%o!<%/$K(B
+$B%k!<%F%#%s%0$5$l$k$h$&$K$J$j$^$9!#(B
+.Pp
+$B%?!<%2%C%H%"%I%l%9$r(B
+.Dq MYADDR
+$B$K@_Dj$9$k$3$H$b$G$-!"$=$N>l9g!"(Blibaliases $B$O$9$Y$F$N%Q%1%C%H$r(B
+$BFbIt%M%C%H%o!<%/$K%j%@%$%l%/%H$7$^$9!#(B
 .It nat use_sockets yes|no
 $BM-8z$K$J$k$H!"(B
 $B%M%C%H%o!<%/%"%I%l%9JQ49%(%s%8%s$K%=%1%C%H$r:n@.$5$;!"(B
@@ -3163,6 +3199,10 @@
 $B$3$l$O!"(BPAP $B$b$7$/$O(B CHAP $B$GG'>Z$5$l$?%f!<%6L>$HCV$-49$($i$l$^$9!#(B
 $BDL>o!"$3$NJQ?t$O(B -direct $B%b!<%I$G$N$_3d$jEv$F$i$l$^$9!#(B
 $B$3$NCM$O!"(Butmp $B%m%.%s%0$,M-8z$K$J$C$F$$$k$+$I$&$+$K4X$o$i$:!"MxMQ2DG=$G$9!#(B
+.It Li DNS0 No " & " Li DNS1
+$B$3$l$O!"$=$l$>$l%W%i%$%^%j(B DNS $B%5!<%P!"%;%+%s%@%j(B DNS $B%5!<%P$N(B
+IP $B%"%I%l%9$KCV$-49$($i$l$^$9!#(BIPCP $B$K$h$j%M!<%`%5!<%P$,(B
+$B%M%4%7%(!<%7%g%s$5$l$?>l9g!"$3$N%^%/%m$NCM$OJQ$o$j$^$9!#(B
 .El
 .Pp
 $B$3$l$i$NCV49$O(B
@@ -3492,6 +3532,69 @@
 .Sq cuaa0 ,
 .Sq USR
 $B$N$$$:$l$+$KJQ99$9$k$H!"%m%0%U%!%$%k$N2DFI@-$,8~>e$9$k$+$bCN$l$^$;$s!#(B
+.It resolv Ar command
+$B$3$N%3%^%s%I$O(B
+.Nm
+$B$,9T$J$&(B
+.Xr resolv.conf 5
+$B%U%!%$%k$NA`:n$r@)8f$7$^$9!#(B
+.Nm
+$B$N5/F0;~$K!"0J8e$N;2>H$KHw$(!"$3$N%U%!%$%k$NFbMF$r%a%b%j$KFI$_9~$_(B
+$BJ];}$7$^$9!#(B
+.Ar command
+$B$O<!$N$$$:$l$+$G$9!#(B
+.Bl -tag -width readonly
+.It Em readonly
+.Pa /etc/resolv.conf
+$B$rFI$_9~$_@lMQ$H$7$^$9!#(B
+.Dq dns
+$B$,M-8z$K$5$l$F$$$k>l9g!"(B
+.Nm
+$B$O!"@\B3Aj<j$H$N4V$G%M!<%`%5!<%P$N%M%4%7%(!<%7%g%s$r;n$_$^$9!#(B
+$B%M%4%7%(!<%7%g%s$N7k2L$O!"%^%/%m(B
+.Dv DNS0 ,
+.Dv DNS1
+$B$rDL$8$FMxMQ2DG=$H$J$j$^$9!#(B
+$B$3$N%3%^%s%I$O!"(B
+.Dq resolv writable
+$B%3%^%s%I$NH?BP$G$9!#(B
+.It Em reload
+.Pa /etc/resolv.conf
+$B$r%a%b%j$K:F%m!<%I$7$^$9!#(B
+$BNc$($P!"(BDHCP $B%/%i%$%"%s%H$,(B
+.Pa /etc/resolv.conf
+$B$r>e=q$-$9$k>l9g$J$I$K!"$3$N%3%^%s%I$,I,MW$K$J$j$^$9!#(B
+.It Em restore
+.Pa /etc/resolv.conf
+$B$r!"5/F0;~$KFI$_9~$s$@85$N%P!<%8%g%s$+!"$b$7$/$O(B
+.Dq resolv reload
+$B%3%^%s%I$G:G8e$KFI$_9~$s$@>uBV$N$b$N$KLa$7$^$9!#(B
+$B$3$N%3%^%s%I$O!"(B
+.Pa /etc/ppp/ppp.linkdown
+$B%U%!%$%k$NCf$G$&$^$/;H$($k$3$H$,$"$j$^$9!#(B
+.It Em rewrite
+.Pa /etc/resolv.conf
+$B%U%!%$%k$r=q$-49$($^$9!#(B
+$B$3$N%3%^%s%I$O!"(B
+.Dq resolv readonly
+$B%3%^%s%I$,4{$K;HMQ$5$l$F$$$F$bF0:n$7$^$9!#(B
+$BB>$N%3%^%s%I$,40N;$9$k$^$G(B
+.Pa /etc/resolv.conf
+$B$N99?7$rCY$i$;$?$$>l9g$K!"(B
+.Pa /etc/ppp/ppp.linkup
+$B$NCf$G$&$^$/;H$($k$3$H$,$"$j$^$9!#(B
+.It Em writable
+.Dq dns
+$B$,M-8z$K$J$C$F$*$j!"(BDNS $B$N(B
+$B%M%4%7%(!<%7%g%s$,@.8y$7$?>l9g$K!"(B
+.Nm
+$B$,(B
+.Pa /etc/resolv.conf
+$B$r99?7$G$-$k$h$&$K$7$^$9!#(B
+$B$3$l$O(B
+.Dq resolv readonly
+$B%3%^%s%I$NH?BP$G$9!#(B
+.El
 .It save
 $B$3$N%*%W%7%g%s$O(B ($B$^$@(B) $B<BAu$5$l$F$$$^$;$s!#(B
 .It set Ns Xo
@@ -3668,7 +3771,7 @@
 .Ar option
 $B$O2<5-$NDL$j$G$9(B ($BM%@hEY=g(B):
 .Pp
-.Bl -tag
+.Bl -tag -width Ds
 .It auth
 $B%3!<%k%P%C%/1~EzB&$O!"G'>Z$K4p$E$$$F%3!<%k%P%C%/HV9f$r(B
 $B7hDj$9$k$3$H$,5a$a$i$l$^$9!#(B
@@ -3760,25 +3863,54 @@
 $B$,;XDj$5$l$?>l9g$K$O!"(B
 .Nm
 $B@\B3Aj<j$,HV9f$r;XDj$9$k$b$N$HA[Dj$7$^$9!#(B
-.It "set cd off|" Ns Ar seconds Ns Op \&!
-$BDL>o!"%m%0%$%s%9%/%j%W%H40N;$N(B 1 $BIC8e$K!"(B
+.It set cd Oo
+.No off| Ns Ar seconds Ns Op \&!
+.Oc
+$BDL>o!"%*!<%W%s$7$?%G%P%$%9$N%?%$%W$K$h$j!"(B
 .Nm
 $B$O%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9!#(B
-$B%-%c%j%"$,@_Dj$5$l$F$$$J$$$H!"(B
+.Bl -tag -width XXX -offset XXX
+.It $BC<Kv%G%P%$%9(B
+$B%m%0%$%s%9%/%j%W%H40N;8e!"(B1 $BIC4V%-%c%j%"$,%A%'%C%/$5$l$^$9!#(B
+$B$3$N%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$>l9g!"(B
 $B%G%P%$%9$,%-%c%j%"$r%5%]!<%H$7$F$$$J$$(B
 ($B$[$H$s$I$N(B
 .Dq laplink
 $B%L%k%b%G%`%1!<%V%k$N>l9g$,$=$&$G$9(B) $B$H(B
 .Nm
-$B$O2>Dj$7!"$3$N;v<B$r5-O?$7$F!"%-%c%j%"$N%A%'%C%/$r;_$a$^$9!#(B
-$B$7$+$7!"%b%G%`$K$h$C$F$O%-%c%j%"$N%"%5!<%H$K;~4V$,$+$+$k$b$N$,$"$k$N$G!"(B
-$B%j%s%/$,Mn$A$?$H$-$r(B
-.Nm ppp
-$B$O8!CN$G$-$J$/$J$j$^$9!#(B
+$B$O2>Dj$7!"$3$N;v<B$r%m%0$K<h$C$F!"%-%c%j%"$N%A%'%C%/$r;_$a$^$9!#(B
+.Pp
+$B2>A[C<Kv(B (pty) $B$O(B TIOCMGET ioctl $B$r%5%]!<%H$7$F$$$J$$$?$a!"(B
+$B%G%P%$%9$,2>A[C<Kv$G$"$k$3$H$r8!CN$7$?>l9g!"(B
+$BC<Kv%G%P%$%9$O$9$Y$F$N%-%c%j%"8!=P$r%*%U$K$7$^$9!#(B
+.It ISDN (i4b) $B%G%P%$%9(B
+6 $BIC4V!"(B1 $BIC$4$H$K(B 1 $B2s%-%c%j%"$N8!=P$r9T$J$$$^$9!#(B
+6 $BIC8e$K%-%c%j%"$,@_Dj$5$l$J$$>l9g!"@\B3$N;n$_$O<:GT$7$?$H8+$J$5$l!"(B
+$B%G%P%$%9$O%/%m!<%:$5$l$^$9!#(B
+i4b $B%G%P%$%9$N>l9g!"%-%c%j%"$,>o$KMW5a$5$l$^$9!#(B
+.It PPPoE (netgraph) $B%G%P%$%9(B
+5 $BIC4V!"(B1 $BIC$4$H$K(B 1 $B2s%-%c%j%"$N8!=P$r9T$J$$$^$9!#(B
+5 $BIC8e$K%-%c%j%"$,@_Dj$5$l$J$$>l9g!"@\B3$N;n$_$O<:GT$7$?$H8+$J$5$l!"(B
+$B%G%P%$%9$O%/%m!<%:$5$l$^$9!#(B
+PPPoE $B%G%P%$%9$N>l9g!"%-%c%j%"$,>o$KMW5a$5$l$^$9!#(B
+.El
+.Pp
+$BB>$N$9$Y$F$N%G%P%$%9%?%$%W$O%-%c%j%"$r%5%]!<%H$7$F$$$^$;$s!#(B
+$B%G%P%$%9$r%*!<%W%s$9$k$H$-$K%-%c%j%"$r@_Dj$9$k$H7Y9p$,=P$^$9!#(B
+.Pp
+$B%b%G%`$K$h$C$F$O!"@\B3$,3NN)$7$F$+$i%-%c%j%"?.9f@~$,%"%5!<%H$5$l$k$^$G(B
+1 $BIC0J>e$+$+$k$b$N$,$"$j$^$9!#$3$NCY$l$rA}$d$;$J$$>l9g!"(B
+.Nm
+$B$O$=$N%G%P%$%9$,%-%c%j%"$r%"%5!<%H$G$-$J$$$H8+$J$9$N$G!"(B
+.Nm
+$B$O%j%s%/$N%I%m%C%W$r8!=P$G$-$J$$$3$H$K$J$j$^$9!#(B
+.Pp
+.Dq set cd
+$B%3%^%s%I$O%G%U%)%k%H$N%-%c%j%"$NF0:n$r>e=q$-$7$^$9!#(B
 .Ar seconds
 $B$O!"%@%$%d%k%9%/%j%W%H$,40N;$7$F$+$i%-%c%j%"$,MxMQ2DG=$+H=CG$9$kA0$K!"(B
 .Nm
-$B$,BT$D$Y$-IC?t$r;XDj$7$^$9!#(B
+$B$,BT$D$Y$-IC?t$N>e8B$r;XDj$7$^$9!#(B
 .Pp
 .Dq off
 $B$,;XDj$5$l$k$H!"(B
@@ -3788,7 +3920,13 @@
 .Ar seconds
 $B$NIC?t$,7P2a$9$k$^$G!"(B
 .Nm
-$B$O%m%0%$%s%9%/%j%W%H$X$O?J$_$^$;$s!#(B
+$B$O%m%0%$%s%9%/%j%W%H$X$O?J$_$^$;$s!#$3$N$H$-!"(B
+.Ar seconds
+$B$NIC?t$,7P2a$7$?;~E@$G!"(B
+.Nm
+$B$O%G%P%$%9$,%-%c%j%"$r@_Dj$G$-$J$$$HA[Dj$7$^$9!#(B
+.Pp
+$B0z?t$rM?$($J$$>l9g!"%-%c%j%"@_Dj$O%G%U%)%k%H$NCM$KLa$j$^$9!#(B
 .Pp
 .Ar seconds
 $B$ND>8e$K%(%/%9%/%i%a!<%7%g%s%^!<%/(B
@@ -3800,23 +3938,6 @@
 $B$7$^$9!#(B
 .Ar seconds
 $BIC8e$K%-%c%j%"$,8!CN$5$l$J$$$H!"%j%s%/$O@ZCG$5$l$^$9!#(B
-.Pp
-ISDN $B%G%P%$%9$G$O!"(B
-.Nm
-$B$O>o$K%-%c%j%"$K8G<9$7$^$9(B ($BCM(B
-.Dq off
-$B$OIT@5$G$9(B)$B!#(B
-$B8F$,@\B3$7$?8e$G$N$_!"(B
-i4brbchX $B%G%P%$%9%I%i%$%P$O%-%c%j%"$rN)$A>e$2$^$9!#$=$l$f$(!"(B
-.Ar 6
-$BIC$J$I$NE,@Z$JCM$K@_Dj$9$k$Y$-$G$9!#(B
-.Pp
-$B%j%s%/$,B>$N%G%P%$%9$N>l9g!"%-%c%j%"$N(B
-.Em $BI,MW@-(B
-$B$OL5;k$5$l$^$9!#(B
-$B$9$J$o$A(B
-.Dq off
-$B$,%;%C%H$5$l$?$+$N$h$&$K$J$j$^$9!#(B
 .It set choked Op Ar timeout
 $B$3$l$O(B
 .Nm
@@ -3890,7 +4011,7 @@
 ISDN $B%G%P%$%9$ODL>o(B
 .Pa i4brbchX
 $B$H$$$&L>A0$G$"$j!"%7%j%"%k%G%P%$%9$ODL>o(B
-.Pa cuaaX
+.Pa cuaXX
 $B$H$$$&L>A0$G$9!#(B
 .Pp
 .Dq value
@@ -4034,7 +4155,7 @@
 $BNc$($P(B ($BFI$_0W$5$N$?$a$K@^$jJV$7$F$$$^$9(B);
 .Bd -literal -offset indent
 set login "TIMEOUT 5 \\"\\" \\"\\" login:--login: ppp \e
-word: ppp \\"!sh \\\\\\\\-c \\\\\\"echo \\\\\\\\-n label: >&2\\\\\\"\\" \e
+word: ppp \\"!sh \\\\-c \\\\\\"echo \\\\-n label: >&2\\\\\\"\\" \e
 \\"!/bin/echo in\\" HELLO"
 .Ed
 .Pp
@@ -4044,8 +4165,8 @@
 .Bd -literal -offset indent
 Dial attempt 1 of 1
 dial OK!
-Chat: Expecting: 
-Chat: Sending: 
+Chat: Expecting:
+Chat: Sending:
 Chat: Expecting: login:--login:
 Chat: Wait for (5): login:
 Chat: Sending: ppp
@@ -4056,7 +4177,7 @@
 Chat: Exec: sh -c "echo -n label: >&2"
 Chat: Wait for (5): !sh \\-c "echo \\-n label: >&2" --> label:
 Chat: Exec: /bin/echo in
-Chat: Sending: 
+Chat: Sending:
 Chat: Expecting: HELLO
 Chat: Wait for (5): HELLO
 login OK!
@@ -4308,6 +4429,25 @@
 .Nm
 $B$O%$%s%?%U%'!<%9$N(B IP $BHV9f$rJ]B8$7$F!"(B
 $B4{$K%P%$%s%I$5$l$F$$$k%=%1%C%H$,@5$7$$$^$^$G$"$k$h$&$K$7$^$9!#(B
+.It set ifqueue Ar packets
+$B$I$N%j%s%/$X$b%G!<%?$,Aw?.$G$-$J$$>uBV$N$H$-!"(B
+.Nm
+$B$,%H%s%M%k%$%s%?%U%'!<%9$+$iFI$_9~$`%Q%1%C%H?t$N:GBgCM$r(B
+$B;XDj$7$^$9!#(B
+.Nm ppp
+$B$,MxMQ$G$-$k%j%s%/$NB+$h$j$b%H%s%M%k%$%s%?%U%'!<%9$,$O$k$+$K(B
+$B9bB.$H$J$j$=$&$J>l9g$K!"Aw=P%G!<%?$N%U%m!<@)8f$N$?$a$K(B
+$B$3$N%-%e!<$N@)8B$OI,MW$K$J$j$^$9!#(B
+.Ar packets
+$B$K%j%s%/$N?t$h$j$b>.$5$JCM$r@_Dj$7$?>l9g!"(B
+$B$=$N@_Dj$K4X$o$i$:(B
+.Nm
+$B$O%j%s%/$N?t$^$G$OFI$_9~$_$^$9!#$3$l$K$h$j!"CY1d$NLdBj$,2sHr$5$l$^$9!#(B
+.Pp
+.Ar packets
+$B$N%G%U%)%k%H$NCM$O(B
+.Dq 30
+$B$G$9!#(B
 .It set ccpretry|ccpretries Oo Ar timeout
 .Op Ar reqtries Op Ar trmtries
 .Oc
@@ -4786,7 +4926,7 @@
 .Nm
 $B$O%"%$%I%k%"%&%H$7$^$;$s!#(B
 .It set urgent Xo
-.Op tcp|udp
+.Op tcp|udp|none
 .Oo Op +|- Ns
 .Ar port
 .Oc No ...
@@ -4828,6 +4968,11 @@
 $B$O%j%9%H$KDI2C$5$l!"%^%$%J%9$N%W%l%U%#%C%/%9IU$-$N(B
 .Ar port
 $B$O%j%9%H$+$i:o=|$5$l$^$9!#(B
+.Pp
+.Dq none
+$B$,;XDj$5$l$?>l9g!"M%@h%]!<%H%j%9%HA4BN$,L58z$K$J$j!"(B
+.Dv IPTOS_LOWDELAY
+$B%Q%1%C%H$bFCJL07$$$5$l$J$/$J$j$^$9!#(B
 .It set vj slotcomp on|off
 $B$3$N%3%^%s%I$O(B
 .Nm
@@ -4990,7 +5135,7 @@
 $B$K$F;XDj$5$l$^$9!#>\:Y$O(B
 .Xr syslog.conf 5
 $B$r;2>H$7$F$/$@$5$$!#(B
-.It Pa /var/spool/lock/LCK..* 
+.It Pa /var/spool/lock/LCK..*
 tty $B%]!<%H$r%m%C%/$9$k$?$a$N%U%!%$%k!#>\:Y$O(B
 .Xr uucplock 3
 $B$r;2>H$7$F$/$@$5$$!#(B
