From owner-man-jp-reviewer@jp.freebsd.org  Wed Jul  5 12:25:11 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA49520;
	Wed, 5 Jul 2000 12:25:11 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from smtp1.interramp.com (smtp1.interramp.com [38.8.45.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id MAA49507
	for <man-jp-reviewer@jp.freebsd.org>; Wed, 5 Jul 2000 12:25:03 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.210] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 139fnC-0007WZ-00; Tue, 4 Jul 2000 23:24:06 -0400
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Tue_Jul__4_21:41:53_2000_518)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000704232130Z.horikawa@psinet.com>
Date: Tue, 04 Jul 2000 23:21:30 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 13204
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 2673
Subject: [man-jp-reviewer 2673] 4.0-20000703-STABLE (man8)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: horikawa@psinet.com

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

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

 man8 $B$N(B 4.0-20000703-STABLE $B$X$N(B 4.0-RELEASE $B$+$i$N:9J,$G$9!#(B

 $BLu$7$?$H$3$m$O(B moused.8, nat.8, ipfw.8 $B$/$i$$$G$9!#(B
 ipfw.8 $B$O<1<T$K8+$F$$$?$@$-$?$/(B (gentle RED variant $B$H$$$&$N$,(B
$B%$%^%$%AM}2r$G$-$F$$$J$$(B)$B!#(B
 timed.8, ppp.8, vinum.8 $B$O(B 3.5-RELEASE $B$=$N$b$N(B (+ $FreeBSD:$ $B$N=$@5(B) 
$B$G$9!#(B


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

diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/Makefile man/man8/Makefile
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/Makefile	Wed Jun 14 22:42:11 2000
+++ man/man8/Makefile	Wed Jul  5 09:55:24 2000
@@ -152,25 +152,6 @@
 	nextboot.8\
 	nfsd.8\
 	nfsiod.8\
-	ng_UI.8\
-	ng_async.8\
-	ng_bpf.8\
-	ng_cisco.8\
-	ng_echo.8\
-	ng_ether.8\
-	ng_frame_relay.8\
-	ng_hole.8\
-	ng_iface.8\
-	ng_ksocket.8\
-	ng_lmi.8\
-	ng_ppp.8\
-	ng_pppoe.8\
-	ng_pptpgre.8\
-	ng_rfc1490.8\
-	ng_socket.8\
-	ng_tee.8\
-	ng_tty.8\
-	ng_vjc.8\
 	ngctl.8\
 	nghook.8\
 	nologin.8\
@@ -307,25 +288,40 @@
 	zdump.8\
 	zic.8
 
-MLINKS+= strfile.8 unstr.8
-MLINKS+=	makewhatis.local.8 catman.local.8
-MLINKS+=	bootpd.8 bootpgw.8
+MLINKS+=strfile.8 unstr.8
+MLINKS+=makewhatis.local.8 catman.local.8
+MLINKS+=bootpd.8 bootpgw.8
 MLINKS+=dump.8 rdump.8
-MLINKS+=	mount_std.8 mount_devfs.8 mount_std.8 mount_fdesc.8 \
-        mount_std.8 mount_kernfs.8 mount_std.8 mount_procfs.8
-MLINKS+=	newfs.8 mount_mfs.8 newfs.8 mfs.8 newfs.8 tmpfs.8
-MLINKS+=	reboot.8 halt.8 reboot.8 fastboot.8 reboot.8 fasthalt.8
-MLINKS+= boot_i386.8 boot.8
+MLINKS+=mount_std.8 mount_devfs.8
+MLINKS+=mount_std.8 mount_fdesc.8
+MLINKS+=mount_std.8 mount_kernfs.8
+MLINKS+=mount_std.8 mount_procfs.8
+MLINKS+=newfs.8 mount_mfs.8
+MLINKS+=newfs.8 mfs.8
+MLINKS+=newfs.8 tmpfs.8
+MLINKS+=reboot.8 halt.8
+MLINKS+=reboot.8 fastboot.8
+MLINKS+=reboot.8 fasthalt.8
+MLINKS+=boot_i386.8 boot.8
 MLINKS+=restore.8 rrestore.8
-MLINKS+=	slattach.8 slip.8
-MLINKS+= locate.updatedb.8 updatedb.8
-MLINKS+=		apm.8 zzz.8
-MLINKS+= apm.8 apmconf.8
-MLINKS+=	pstat.8 swapinfo.8
-MLINKS+=	quotaon.8 quotaoff.8
-MLINKS+=	vnconfig.8 swapfile.8
-MLINKS+= inetd.8 inetd.conf.5
-MLINKS+= pam.8 pam.conf.5 pam.8 pam.d.5
-MLINKS+= rtsold.8 rtsol.8
+MLINKS+=slattach.8 slip.8
+MLINKS+=locate.updatedb.8 updatedb.8
+MLINKS+=apm.8 zzz.8
+MLINKS+=apm.8 apmconf.8
+MLINKS+=pstat.8 swapinfo.8
+MLINKS+=quotaon.8 quotaoff.8
+MLINKS+=vnconfig.8 swapfile.8
+MLINKS+=inetd.8 inetd.conf.5
+MLINKS+=pam.8 pam.conf.5
+MLINKS+=pam.8 pam.d.5
+MLINKS+=rtsold.8 rtsol.8
+MLINKS+=rc.8 rc.atm.8
+MLINKS+=rc.8 rc.firewall.8
+MLINKS+=rc.8 rc.i386.8
+MLINKS+=rc.8 rc.local.8
+MLINKS+=rc.8 rc.network.8
+MLINKS+=rc.8 rc.pccard.8
+MLINKS+=rc.8 rc.serial.8
+MLINKS+=rc.8 rc.shutdown.8
 
 .include "bsd.prog.mk"
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/accton.8 man/man8/accton.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/accton.8	Tue Feb 15 23:34:58 2000
+++ man/man8/accton.8	Wed Jul  5 09:38:10 2000
@@ -1,6 +1,5 @@
-.\" %FreeBSD: src/usr.sbin/accton/accton.8,v 1.6 1999/08/28 23:20:35 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/accton/accton.8,v 1.6.2.1 2000/07/01 10:41:01 ps Exp %
 .\"
-.\" Original Revision: 1.5
 .\" jpman %Id: accton.8,v 1.3 1997/07/27 12:02:03 horikawa Stab %
 .Dd May 21, 1993
 .Dt ACCTON 8
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/amd.8 man/man8/amd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/amd.8	Wed Jun 14 22:42:11 2000
+++ man/man8/amd.8	Wed Jul  5 09:38:13 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.6 2000/03/01 10:48:31 nik Exp %
+.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.6.2.2 2000/05/28 13:17:25 asmodai Exp %
 .\"
 .\" jpman %Id: amd.8,v 1.2 1997/04/15 00:24:08 mutoh Stab %
 .\"
@@ -318,7 +318,6 @@
 .Xr amd.conf 5 ,
 .Xr mtab 5 ,
 .Xr amq 8 ,
-.Xr automount 8 , 
 .Xr mount 8 ,
 .Xr umount 8
 .Rs
@@ -333,7 +332,7 @@
 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 
 $B%U%!%$%k$K5-=R$5$l$F$$$^$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ancontrol.8 man/man8/ancontrol.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ancontrol.8	Wed Jun 14 10:57:30 2000
+++ man/man8/ancontrol.8	Wed Jul  5 09:38:15 2000
@@ -28,12 +28,12 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3 2000/03/02 14:53:33 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3.2.1 2000/04/23 16:43:17 mpp Exp %
 .\"
 .\" jpman %Id: ancontrol.8,v 1.3 2000/04/28 05:37:56 takaha Stab %
 .Dd September 10, 1999
 .Dt ANCONTROL 8
-.Os FreeBSD 3.0
+.Os FreeBSD 4.0
 .Sh $BL>>N(B
 .Nm ancontrol
 .Nd Aironet 4500/4800 $B%G%P%$%9$N@_Dj(B
@@ -320,7 +320,7 @@
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B 
-.Fx 3.0
+.Fx 4.0
 $B$G$O$8$a$FEP>l$7$^$7$?!#(B
 .Sh $B%P%0(B
 $BE}7W%+%&%s%?$O!"Aw<u?.%U%l!<%`$N9g7W$r!"A}2C$9$k$h$&$KI=<($7$J$$$h$&$G$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/boot_i386.8 man/man8/boot_i386.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/boot_i386.8	Wed Jun 14 22:42:11 2000
+++ man/man8/boot_i386.8	Wed Jul  5 09:38:17 2000
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23 2000/03/03 09:51:45 jkoshy Exp %
+.\" %FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.1 2000/05/13 14:43:14 hoek Exp %
 .\"
 .\" jpman %Id: boot_i386.8,v 1.5 1997/12/04 18:33:50 ken Exp %
 .\"
@@ -262,6 +262,7 @@
 .Sh $B4XO"9`L\(B
 .Xr ddb 4 ,
 .Xr ttys 5 ,
+.Xr boot0cfg 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
 .Xr disklabel 8 ,
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/burncd.8 man/man8/burncd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/burncd.8	Wed Jun 14 10:57:30 2000
+++ man/man8/burncd.8	Wed Jul  5 09:38:18 2000
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.6 2000/03/04 07:26:23 sos Exp %
+.\" %FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.6.2.1 2000/04/23 17:00:38 mpp Exp %
 .\" jpman %Id: burncd.8,v 1.3 2000/03/11 22:37:36 horikawa Stab %
 .\"
 .Dd January 6, 2000
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/camcontrol.8 man/man8/camcontrol.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/camcontrol.8	Wed Jun 14 22:42:11 2000
+++ man/man8/camcontrol.8	Wed Jul  5 09:38:22 2000
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998, 1999 Kenneth D. Merry.
+.\" Copyright (c) 1998, 1999, 2000 Kenneth D. Merry.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -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.19 2000/03/01 11:27:01 sheldonh Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19.2.4 2000/07/01 23:44:10 ken 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]
@@ -33,7 +33,7 @@
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
-.Os FreeBSD 3.0
+.Os
 .Sh $BL>>N(B
 .Nm camcontrol
 .Nd CAM $B%3%s%H%m!<%k%W%m%0%i%`(B
@@ -44,51 +44,51 @@
 .Op generic args
 .Op command args
 .Nm camcontrol
-devlist
+.Ic devlist
 .Op Fl v
 .Nm camcontrol
-periphlist
+.Ic periphlist
 .Op device id
 .Op Fl n Ar dev_name
 .Op Fl u Ar unit_number
 .Nm camcontrol
-tur
+.Ic tur
 .Op device id
 .Op generic args
 .Nm camcontrol
-inquiry 
+.Ic inquiry 
 .Op device id
 .Op generic args
 .Op Fl D
 .Op Fl S
 .Op Fl R
 .Nm camcontrol
-start
+.Ic start
 .Op device id
 .Op generic args
 .Nm camcontrol
-stop
+.Ic stop
 .Op device id
 .Op generic args
 .Nm camcontrol
-eject
+.Ic eject
 .Op device id
 .Op generic args
 .Nm camcontrol
-rescan
+.Ic rescan
 .Aq bus Ns Op :target:lun
 .Nm camcontrol
-reset
+.Ic reset
 .Aq bus Ns Op :target:lun
 .Nm camcontrol
-defects
+.Ic defects
 .Op device id
 .Op generic args
 .Aq Fl f Ar format
 .Op Fl P
 .Op Fl G
 .Nm camcontrol
-modepage
+.Ic modepage
 .Op device id
 .Op generic args
 .Aq Fl m Ar page
@@ -96,7 +96,7 @@
 .Op Fl e
 .Op Fl d
 .Nm camcontrol
-cmd
+.Ic cmd
 .Op device id
 .Op generic args
 .Aq Fl c Ar cmd Op args
@@ -105,21 +105,21 @@
 .Op Fl o Ar len Ar fmt Op args
 .Ek
 .Nm camcontrol
-debug
+.Ic debug
 .Op Fl I
 .Op Fl T
 .Op Fl S
 .Op Fl c
 .Aq all|off|bus Ns Op :target Ns Op :lun
 .Nm camcontrol
-tags
+.Ic tags
 .Op device id
 .Op generic args
 .Op Fl N Ar tags
 .Op Fl q
 .Op Fl v
 .Nm camcontrol
-negotiate
+.Ic negotiate
 .Op device id
 .Op generic args
 .Op Fl c
@@ -132,11 +132,18 @@
 .Op Fl W Ar bus_width
 .Op Fl v
 .Nm camcontrol
-help
+.Ic format
+.Op device id
+.Op generic args
+.Op Fl q
+.Op Fl w
+.Op Fl y
+.Nm camcontrol
+.Ic help
 .Sh $B2r@b(B
 .Nm camcontrol
 $B$O!"%f!<%6$,(B
-.Tn FreeBSD
+.Fx
 CAM $B%5%V%7%9%F%`$K%"%/%;%9$7@)8f$G$-$k$h$&$K$9$kJ}K!$rDs6!$9$k(B
 $B$?$a$K@_7W$5$l$?%f!<%F%#%j%F%#$G$9!#(B
 .Pp
@@ -202,9 +209,7 @@
 $B2s$C$F$$$J$$(B HDD $B$r2sE>$5$;$k$h$&$J;n$_$,DL>o$J$5$l$^$9!#%3%^%s%I$+$i(B
 $BJV$5$l$?%;%s%9%3!<%I$K$h$C$F$O!"B>$NA`:n$,9T$J$o$l$k$3$H$b$"$j$^$9!#(B
 .It Fl n Ar dev_name
-$BA`:n$r9T$J$&%G%P%$%9$N%?%$%W$r;XDj$7$^$9!#%G%U%)%k%H$O(B
-.Em da
-$B$G$9!#(B
+$BA`:n$r9T$J$&%G%P%$%9$N%?%$%W$r;XDj$7$^$9!#$3$l$ONc$($P(B "da", "ca" $B$G$9!#(B
 .It Fl t Ar timeout
 SCSI $B%3%^%s%I$N%?%$%`%"%&%H$rICC10L$G;XDj$7$^$9!#;XDj$7$?%3%^%s%I$N$9$Y$F$K(B
 $B$*$$$F!"$3$l$G;XDj$9$kCM$O%G%U%)%k%H$N%?%$%`%"%&%H$h$jM%@h$5$l$^$9!#(B
@@ -216,7 +221,7 @@
 .Pp
 $B<g%3%^%s%I5!G=$O<!$N$H$*$j$G$9!#(B
 .Bl -tag -width periphlist
-.It devlist
+.It Ic devlist
 CAM $B%5%V%7%9%F%`$K@\B3$5$l$?$9$Y$F$NJ*M}%G%P%$%9(B ($BO@M}%f%K%C%H(B) $B$N(B
 $B%j%9%H$rI=<($7$^$9!#$3$N%j%9%H$K$O3F%G%P%$%9$K@\B3$5$l$?<~JU%I%i%$%P$N(B
 $B0lMw$b4^$^$l$^$9!#(B
@@ -224,14 +229,14 @@
 .Fl v
 $B$r;XDj$9$k$H!"(BSCSI $B%P%9HV9f!"%"%@%W%?L>!"%f%K%C%HHV9f$b$"$o$;$F(B
 $BI=<($5$l$^$9!#(B
-.It periphlist
+.It Ic periphlist
 $B;XDj$7$?J*M}%G%P%$%9(B ($BO@M}%f%K%C%H(B) $B$K@\B3$5$l$?$9$Y$F$N<~JU%I%i%$%P$N(B
 $B%j%9%H$rI=<($7$^$9!#(B
-.It tur
+.It Ic tur
 $B;XDj$7$?%G%P%$%9$K(B SCSI test unit ready (0x00) $B%3%^%s%I$rAw?.$7$^$9!#(B
 .Nm camcontrol
 $B$O!"$=$N%G%P%$%9$,%l%G%#>uBV$G$"$k$+$I$&$+$rJs9p$7$^$9!#(B
-.It inquiry
+.It Ic inquiry
 $B%G%P%$%9$K(B SCSI inquiry (0x12) $B%3%^%s%I$rAw?.$7$^$9!#%G%U%)%k%H$G$O!"(B
 .Nm camcontrol
 $BI8=`$N(B inquiry $B%G!<%?!"%G%P%$%9$N%7%j%"%kHV9f!"E>Aw%l!<%H>pJs$rI=<($7$^$9!#(B
@@ -247,29 +252,29 @@
 .It Fl R
 $BE>Aw%l!<%H$N>pJs$rI=<($7$^$9!#(B
 .El
-.It start
+.It Ic start
 $B;XDj$7$?%G%P%$%9$K!"(Bstart $B%S%C%H$r%;%C%H$7$?(B SCSI Start/Stop Unit
 (0x1B) $B%3%^%s%I$rAw?.$7$^$9!#(B
-.It stop
+.It Ic stop
 $B;XDj$7$?%G%P%$%9$K!"(Bstart $B%S%C%H$r%/%j%"$7$?(B SCSI Start/Stop Unit
 (0x1B) $B%3%^%s%I$rAw?.$7$^$9!#(B
-.It eject
+.It Ic eject
 $B;XDj$7$?%G%P%$%9$K!"(Bstart $B%S%C%H$r%/%j%"$7(B eject $B%S%C%H$r%;%C%H$7$?(B
 SCSI Start/Stop Unit (0x1B) $B%3%^%s%I$rAw?.$7$^$9!#(B
-.It rescan
+.It Ic rescan
 $B%+!<%M%k$K;XDj$7$?%P%9(B (XPT_SCAN_BUS)$B!"$b$7$/$O(B bus:target:lun
 (XPT_SCAN_LUN) $B$r%9%-%c%s$5$;!"?75,$N%G%P%$%9$d30$5$l$?%G%P%$%9$r(B
 $BC5$5$;$^$9!#%f!<%6$,;XDj$G$-$k$N$O!"%9%-%c%s$9$k%P%9$b$7$/$O(B
 $BO@M}%f%K%C%HHV9f$@$1$G$9!#$"$k%?!<%2%C%H$N$9$Y$F$NO@M}%f%K%C%HHV9f$r(B
 $B%9%-%c%s$9$k$3$H$O%5%]!<%H$5$l$F$$$^$;$s!#(B
-.It reset
+.It Ic reset
 $B;XDj$7$?%P%9(B (XPT_RESET_BUS) $B$^$?$O;XDj$7$?(B bus:target:lun (XPT_RESET_DEV) $B$r!"(B
 $B%+!<%M%k$K%j%;%C%H$5$;$^$9!#(B
 $BA0<T$O!"%P%9$K(B SCSI $B%P%9%j%;%C%H$rH/9T$9$k$3$H$K$h$j9T$$$^$9!#(B
 $B8e<T$O!"E57?E*$K$OEv3:%G%P%$%9$K%3%M%/%H$7$?8e$K!"(B
 BUS DEVICE RESET $B%a%C%;!<%8$rH/9T$9$k$3$H$K$h$j9T$$$^$9!#(B
 $BK\%3%^%s%I$O%7%9%F%`$KGK2uE*$J1F6A$rM?$($k$3$H$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
-.It defects
+.It Ic defects
 $B;XDj$7$?%G%P%$%9$K!"(BSCSI READ DEFECT DATA (10) $B%3%^%s%I(B (0x37) $B$rAw?.$7!"(B
 $B%G%#%U%'%/%HAm?t!"=i4|%G%#%U%'%/%H%j%9%H(B (PLIST)$B!"A}J,%G%#%U%'%/%H%j%9%H(B
 (GLIST) $B$rAH$_9g$o$;$FI=<($7$^$9!#(B
@@ -307,9 +312,11 @@
 .Nm camcontrol
 $B$O!"%I%i%$%V$+$iJV$5$l$?(B READ DEFECT DATA $B%X%C%@$+$iF@$i$l$k%G%#%U%'%/%H?t$r(B
 $BI=<($7$^$9!#(B
-.It modepage
+.It Ic modepage
 SCSI $B%b!<%I%Z!<%8$rI=<($7$^$9!#$b$7$/$O!"%*%W%7%g%s;XDj$K$h$j(B
-$B%f!<%6$,%b!<%I%Z!<%8$rJT=8$G$-$k$h$&$K$7$^$9!#%b!<%I%Z!<%8$N=q<0$O(B
+$B%f!<%6$,%b!<%I%Z!<%8$rJT=8$G$-$k$h$&$K$7$^$9!#(B
+.Ic modepage
+$B$N=q<0$O(B
 .Pa /usr/share/misc/scsi_modes
 $B$K$"$j$^$9!#(B
 $B4D6-JQ?t(B
@@ -338,13 +345,14 @@
 $BJ]B8$5$l$?CM(B
 .El
 .El
-.It cmd
+.It Ic cmd
 $BG$0U$N%G%P%$%9$KG$0U$N(B SCSI CDB $B$rAw?.$9$k$?$a$KMQ$$$k$3$H$,$G$-$^$9!#(B
-cmd $B5!G=$O!"(BCDB $B$r;XDj$9$k$?$a$N(B
+.Ic cmd
+$B5!G=$O!"(BCDB $B$r;XDj$9$k$?$a$N(B
 .Fl c
 $B0z?t$,I,MW$G$9!#B>$N0z?t$O%*%W%7%g%s$G!"%3%^%s%I$N7?$K0MB8$7$^$9!#%3%^%s%I$H(B
 $B%G!<%?$r;XDj$9$kJ8K!$O!"(B
-.Xr cam 3
+.Xr cam_cdbparse 3 .
 $B$K5-=R$5$l$F$$$^$9!#(B
 $BCm(B: $B;XDj$7$?(B CDB $B$K$h$C$F!"BP>]$N(B SCSI $B%G%P%$%9$H$N%G!<%?Aw<u?.$,(B
 $BH/@8$9$k>l9g!"(B
@@ -370,7 +378,7 @@
 .Ar len
 $B%P%$%H$N%G!<%?$,I8=`F~NO$+$iFI$_9~$^$l%G%P%$%9$K=q$-=P$5$l$^$9!#(B
 .El
-.It debug
+.It Ic debug
 $B%+!<%M%k$N(B CAM $B%G%P%C%0MQ(B printf $B$r%*%s$K$7$^$9!#%+!<%M%k$N@_Dj(B
 $B%U%!%$%kCf$K(B CAMDEBUG $B%*%W%7%g%s$,;XDj$5$l$F$$$kI,MW$,$"$j$^$9!#(B
 $BCm0U(B: $B8=:_$N$H$3$m!"%G%P%C%0(B
@@ -379,7 +387,8 @@
 $B0lEY%G%P%C%0MQ(B printf $B$r%9%?!<%H$5$;$F$7$^$&$H!"Dd;_$5$;$k$N$OFq$7$$(B
 $B$G$7$g$&!#$H$$$&$N$O!"%+!<%M%k$O%a%C%;!<%8$rI=<($9$k$N$KK;$7$/$J$k$N$G!"(B
 $BB>$N%j%/%(%9%H$r$9$0$K%5!<%S%9$9$k$3$H$,$G$-$J$/$J$k$+$i$G$9!#(B
-$B%G%P%C%05!G=$O$$$/$D$+$N0z?t$r<h$j$^$9!#(B
+.Ic debug
+$B5!G=$O$$$/$D$+$N0z?t$r<h$j$^$9!#(B
 .Bl -tag -width 012345678901234567
 .It Fl I
 CAM_DEBUG_INFO printf $B$rM-8z$K$7$^$9!#(B
@@ -401,15 +410,15 @@
 $B%P%9$@$1$r;XDj$9$k$H!"$=$N%P%9$N$9$Y$F$N%G%P%$%9$K$D$$$F%G%P%C%0MQ(B
 printf $B$,M-8z$K$J$j$^$9!#(B)
 .El
-.It tags
-"tagged openings" $B$N?t$r!"I=<($^$?$O@_Dj$7$^$9!#(B
+.It Ic tags
+\&"tagged openings" $B$N?t$r!"I=<($^$?$O@_Dj$7$^$9!#(B
 $B$3$NCM$O!"FCDj$N%G%P%$%9$KBP$7$FF1;~$K%-%e!<%$%s%02DG=$J(B
 $B%H%i%s%6%/%7%g%s?t$G$9!#(B
 $B%G%U%)%k%H$G$O!"%3%^%s%I8GM-$N0z?t$,L5$$$H(B ($B0lHLE*$J0z?t$N$_$r;XDj$9$k$H(B)$B!"(B
-.Sq tags
+.Ic tags
 $B%3%^%s%I$O!"(B
 $BBP>]$N%G%P%$%9$K%-%e!<%$%s%02DG=$J%H%i%s%6%/%7%g%s?t$N(B
-"soft" $B:GBgCM$rI=<($7$^$9!#(B
+\&"soft" $B:GBgCM$rI=<($7$^$9!#(B
 $B$5$i$K>\:Y$J>pJs$rF@$k$K$O!"<!$K@bL@$9$k(B
 .Fl v
 $B0z?t$r;XDj$7$F$/$@$5$$!#(B
@@ -475,7 +484,7 @@
 $B%G%P%$%9$K$h$C$F$O$h$jBg$-$/$^$?$O$h$j>.$5$/@_Dj$5$lF@$^$9!#(B
 .El
 .El
-.It negotiate
+.It Ic negotiate
 $BMM!9$JDL?.%Q%i%a!<%?$r!"I=<($^$?$O%M%4%7%(!<%H$7$^$9!#(B
 $B%3%s%H%m!<%i$K$h$C$F$O!"FCDj$NCM$N@_Dj$dJQ99$r%5%]!<%H$7$^$;$s!#(B
 $BNc$($P(B Adaptec 174x $B%3%s%H%m!<%i$O!"(B
@@ -486,7 +495,7 @@
 $B%3%s%H%m!<%i$,%5%]!<%H$9$k$b$N$rD4$Y$k$K$O!"(B
 .Fl v
 $B%U%i%0$r;HMQ$7$^$9!#(B
-.Sq negotiate
+.Ic negotiate
 $B%3%^%s%I$G$N(B
 .Fl v
 $B%U%i%0$N0UL#$O8e=R$7$^$9!#(B
@@ -546,6 +555,75 @@
 .Fl a
 $B%9%$%C%A$O!"%M%4%7%(!<%7%g%s%Q%i%a!<%?$,8z2L$r$"$i$o$9$h$&$K$9$k$?$a!"(B
 $B<+F0E*$K(B Test Unit Ready $B$r%G%P%$%9$KAw$j$^$9!#(B
+.It Ic format
+SCSI FORMAT UNIT $B%3%^%s%I$r;XDj$7$?%G%P%$%9$KAw$j$^$9!#(B
+.Pp
+.Em $B7Y9p(B! $B7Y9p(B! $B7Y9p(B!
+.Pp
+$B%G%#%9%/$r%m!<%l%Y%k%U%)!<%^%C%H$9$k$H!"(B
+$B%G%#%9%/>e$N!V$9$Y$F!W$N%G!<%?$rGK2u$7$^$9!#(B
+$B$3$N%3%^%s%I$rH/9T$9$k$H$-$K$O!"Hs>o$KCm0U$7$F$/$@$5$$!#(B
+$BK\Ev$O%m!<%l%Y%k%U%)!<%^%C%H$,ITMW$J%G%#%9%/$KBP$7!"(B
+$BB?$/$N%f!<%6$,%m!<%l%Y%k%U%)!<%^%C%H$r9T$C$F$$$^$9!#(B
+$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$k>u67$O!"Hf3SE*>/$J$$$G$9!#(B
+$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$kM}M3$N$R$H$D$O!"(B
+$B%G%#%9%/$NJ*M}%;%/%?$NBg$-$5$rJQ$($?8e$G%G%#%9%/$r=i4|2=$9$k$?$a$G$9!#(B
+$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$kJL$NM}M3$O!"(B
+$B%G%#%9%/$X$NFI$_9~$_$^$?$O=q$-9~$_$NMW5a$KBP$7$F(B "medium format corrupted" 
+($B%a%G%#%"%U%)!<%^%C%H$,2u$l$F$$$k(B)
+$B%(%i!<$H$J$k>l9g$K!"$=$N%G%#%9%/$rI|3h$5$;$k$?$a$G$9!#(B
+.Pp
+$B%G%#%9%/$K$h$C$F$O!"(B
+$BB>$N%G%#%9%/$h$j$b%U%)!<%^%C%H$K;~4V$,$+$+$j$^$9!#(B
+$B%U%)!<%^%C%H$,40N;$9$k$?$a$K==J,$J%?%$%`%"%&%HCM$r!"(B
+$B%f!<%6$,;XDj$9$kI,MW$,$"$j$^$9!#(B
+$B%G%U%)%k%H$N%U%)!<%^%C%H%?%$%`%"%&%H$O(B 3 $B;~4V$G$9!#(B
+$B%O!<%I%G%#%9%/$K$h$C$F$O!"Hs>o$KC;$$4|4V(B (5 $BJ,0J2<$NC10L(B)
+$B$G%U%)!<%^%C%HA`:n$,40N;$7$^$9!#(B
+$B$3$N$h$&$J>l9g$N$[$H$s$I$O!"(B
+FORMAT UNIT $B%3%^%s%I$r%I%i%$%V$,<B:]$K$O%5%]!<%H$r$7$F$$$J$$$?$a!"(B
+$B$9$J$o$A%3%^%s%I$r<u$1IU$1$F?tJ,BT$C$F$+$iLa$k$@$1$G$"$k$?$a$G$9!#(B
+.Pp
+.Sq format
+$B%5%V%3%^%s%I$O$$$/$D$+$N0z?t$r<h$j!"%G%U%)%k%H$NF0:n$rJQ$($^$9!#(B
+.Fl q
+$B$*$h$S(B
+.Fl y
+$B$N0z?t$O!"%9%/%j%W%H$K$*$$$FM-MQ$G$9!#(B
+.Pp
+.Bl -tag -width 123456
+.It Fl q
+$B@E$+$K$J$j!">uBV%a%C%;!<%8$rI=<($7$^$;$s!#(B
+$B$7$+$7$J$,$i!"K\%*%W%7%g%s$O!"<ALd$OL58z2=$7$^$;$s!#(B
+$B<ALd$rL58z2=$9$k$K$O!"8e=R$N(B
+.Fl y
+$B0z?t$r;HMQ$7$F$/$@$5$$!#(B
+.It Fl w
+$BHsB(;~$N%U%)!<%^%C%H%3%^%s%I$rH/9T$7$^$9!#(B
+$B%G%U%)%k%H$G$O!"(B
+.Nm camcontrol
+$B$O(B FORMAT UNIT $B%3%^%s%I$rB(;~%S%C%H(B (immediate bit) $B$r%;%C%H$7$FH/9T$7$^$9!#(B
+$B$3$l$O!"%U%)!<%^%C%H$,<B:]$K40N;$9$kA0$K!"(B
+$BB(;~$K%U%)!<%^%C%H%3%^%s%I$rJV$9$h$&!"%G%P%$%9$K;X<($7$^$9!#(B
+$B$=$7$F(B
+.Nm camcontrol
+$B$,(B
+.Tn SCSI
+$B%;%s%9>pJs$rKhIC%G%P%$%9$+$i<}=8$7!"%U%)!<%^%C%H=hM}$N?JD=$rH=CG$7$^$9!#(B
+.Fl w
+$B0z?t$,;XDj$5$l$k$H!"(B
+.Nm camcontrol
+$B$OHsB(;~$N%U%)!<%^%C%H%3%^%s%I$rH/9T$7$^$9!#(B
+$B$3$N>l9g!"%G%#%9%/$N2?%Q!<%;%s%H$,%U%)!<%^%C%H$5$l$?$N$+$r(B
+$B%f!<%6$XCN$i$;$k$?$a$NI=<($O9T$o$l$^$;$s!#(B
+.It Fl y
+$B<ALd$r$7$^$;$s!#(B
+$B%G%U%)%k%H$G$O!"(B
+.Nm camcontrol
+$B$O%f!<%6$KBP$7!"BP>]$N%G%#%9%/$rK\Ev$K%U%)!<%^%C%H$7$?$$$N$+!"(B
+$B$=$7$F%U%)!<%^%C%H%3%^%s%I$N%G%U%)%k%H%?%$%`%"%&%H$GNI$$$+$r<ALd$7$^$9!#(B
+$B%?%$%`%"%&%H$r%3%^%s%I%i%$%s$G;XDj$7$?>l9g!"%?%$%`%"%&%H$O<ALd$5$l$^$;$s!#(B
+.El
 .It help
 $B>iD9$J!";HMQJ}K!$K4X$9$k>pJs$rI=<($7$^$9!#(B
 .El
@@ -575,7 +653,7 @@
 cd1 $B$+$i(B CD $B$r%$%8%'%/%H$7!"%3%^%s%I<B9T$K<:GT$7$?>l9g$O(B SCSI $B%;%s%9>pJs$r(B
 $B=PNO$7$^$9!#(B
 .Pp
-.Dl camcontrol tur
+.Dl camcontrol tur da0
 .Pp
 SCSI test unit ready $B%3%^%s%I$r(B da0 $B$KAw?.$7$^$9!#(B
 .Nm camcontrol
@@ -584,7 +662,7 @@
 $B%9%$%C%A$,;XDj$5$l$F$$$J$$$?$a!"%3%^%s%I<B9T$K<:GT$7$F$b%;%s%9>pJs$r(B
 $BI=<($7$^$;$s!#(B
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol tur da1 -E -C 4 -t 50 -v
 .Ed
 .Pp
@@ -596,7 +674,7 @@
 $B$$$k$N$G!"%G%#%9%/$,2sE>$7$F$$$J$$>l9g$O2sE>$5$;$i$l$^$9!#(B
 .Nm camcontrol
 $B$O%G%#%9%/$,%l%G%#>uBV$+$I$&$+$rJs9p$7$^$9!#(B
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e
 	-i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1"
 .Ed
@@ -605,7 +683,7 @@
 cd1 $B$N%-%c%C%7%e$N:G=i$N(B 10 $B%P%$%H$rI=<($7$^$9!#%3%^%s%I<B9T$K<:GT$7$?>l9g(B
 SCSI $B%;%s%9>pJs$rI=<($7$^$9!#(B
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e
 	-o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8
 .Ed
@@ -615,7 +693,7 @@
 $B%;%s%9>pJs$rI=<($7$^$9!#$3$N%3%^%s%I$K$O:Y?4$NCm0U$rJ'$C$F2<$5$$!#ITE,@Z$K(B
 $B;HMQ$7$?>l9g!"%G!<%?$,GK2u$5$l$k$+$b$7$l$^$;$s!#(B
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol modepage da3 -m 1 -e -P 3
 .Ed
 .Pp
@@ -636,52 +714,18 @@
 .Pp
 da5 $B$NF1;~%H%i%s%6%/%7%g%s?t$r(B 24 $B$K@_Dj$7$^$9!#(B
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol negotiate -n da -u 4 -T disable
 .Ed
 .Pp
 da4 $B$N%?%0IU$-%-%e!<%$%s%0$rL58z$K$7$^$9!#(B
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a
 .Ed
 .Pp
 $BF14|%l!<%H(B 20MHz $B$H%*%U%;%C%H(B 15 $B$r!"(Bda3 $B$H%M%4%7%(!<%H$7$^$9!#(B
 $B$=$N8e(B Test Unit Ready $B%3%^%s%I$rAw$j!"@_Dj$,8z2L$r$"$i$o$9$h$&$K$7$^$9!#(B
-.Pp
-.Bd -literal -offset foobar
-camcontrol cmd -n da -u 3 -v -t 7200 -c "4 0 0 0 0 0"
-.Ed
-.Pp
-FORMAT UNIT (0x04) $B%3%^%s%I$r(B da3 $B$KAw$j$^$9!#(B
-$B$3$l$O!"%G%#%9%/$r%m!<%l%Y%k(B (low-level) $B%U%)!<%^%C%H$7$^$9!#(B
-$B%3%^%s%I<:GT;~$K$O%;%s%9>pJs$rI=<($7$^$9!#(B
-$B$^$?!"%?%$%`%"%&%H$r(B 2 $B;~4V(B (7200 $BIC(B) $B$K@_Dj$7$^$9!#(B
-.Pp
-.Em $B7Y9p(B! $B7Y9p(B! $B7Y9p(B!
-.Pp
-$B%G%#%9%/$r%m!<%l%Y%k%U%)!<%^%C%H$9$k$H!"(B
-$B%G%#%9%/>e$N!V$9$Y$F!W$N%G!<%?$rGK2u$7$^$9!#(B
-$B$3$N%3%^%s%I$rH/9T$9$k$H$-$K$O!"Hs>o$KCm0U$7$F$/$@$5$$!#(B
-$BK\Ev$O%m!<%l%Y%k%U%)!<%^%C%H$,ITMW$J%G%#%9%/$KBP$7!"(B
-$BB?$/$N%f!<%6$,%m!<%l%Y%k%U%)!<%^%C%H$r9T$C$F$$$^$9!#(B
-$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$k>u67$O!"Hf3SE*>/$J$$$G$9!#(B
-$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$kM}M3$N$R$H$D$O!"(B
-$B%G%#%9%/$NJ*M}%;%/%?$NBg$-$5$rJQ$($k$?$a$G$9!#(B
-$B%m!<%l%Y%k%U%)!<%^%C%H$,I,MW$H$J$kJL$NM}M3$O!"(B
-$B%G%#%9%/$X$NFI$_9~$_$^$?$O=q$-9~$_$NMW5a$KBP$7$F(B "medium format corrupted" 
-($B%a%G%#%"%U%)!<%^%C%H$,2u$l$F$$$k(B)
-$B%(%i!<$H$J$k>l9g$K!"$=$N%G%#%9%/$rI|3h$5$;$k$?$a$G$9!#(B
-.Pp
-$B%G%#%9%/$K$h$C$F$O!"(B
-$BB>$N%G%#%9%/$h$j$b%U%)!<%^%C%H$K;~4V$,$+$+$j$^$9!#(B
-$B%U%)!<%^%C%H$,40N;$9$k$?$a$K==J,$J%?%$%`%"%&%HCM$r!"(B
-$B%f!<%6$,;XDj$9$kI,MW$,$"$j$^$9!#(B
-$B%O!<%I%G%#%9%/$K$h$C$F$O!"Hs>o$KC;$$4|4V(B (5 $BJ,0J2<$NC10L(B)
-$B$G%U%)!<%^%C%HA`:n$,40N;$7$^$9!#(B
-$B$3$N$h$&$J>l9g$N$[$H$s$I$O!"(B
-FORMAT UNIT $B%3%^%s%I$r%I%i%$%V$,<B:]$K$O%5%]!<%H$r$7$F$$$J$$$?$a!"(B
-$B$9$J$o$A%3%^%s%I$r<u$1IU$1$F?tJ,BT$C$F$+$iLa$k$@$1$G$"$k$?$a$G$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr cam 3 ,
 .Xr cam_cdbparse 3 ,
@@ -702,7 +746,7 @@
 $B%i%$%V%i%j$N$b$N$K4p$E$$$F$$$^$9!#(B
 .Xr scsi 8
 $B%W%m%0%i%`$,:G=i$K=P8=$7$?$N$O(B 386BSD 0.1.2.4 $B$G!"(B
-.Tn FreeBSD
+.Fx
 $B$G:G=i$K=P8=$7$?$N$O!"(B
 .Fx 2.0.5
 $B$G$9!#(B
@@ -711,7 +755,7 @@
 .Sh $B%P%0(B
 $B%3%^%s%I9T0z?t$r2r<a$9$k%3!<%I$O!"$I$N%5%V%3%^%s%I$,J#?t$N0z?t$r<h$k$+$r(B
 $BCN$j$^$;$s!#$G$9$+$i!"$?$H$($P!"(B
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
 .Ed
 .Pp
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/chkgrp.8 man/man8/chkgrp.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/chkgrp.8	Wed Jul  5 07:00:09 2000
+++ man/man8/chkgrp.8	Wed Jul  5 09:38:23 2000
@@ -24,12 +24,12 @@
 .\" (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.7 2000/03/01 14:07:53 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.7.2.1 2000/06/13 09:13:43 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
@@ -37,7 +37,8 @@
 .Nm chkgrp
 .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
@@ -46,8 +47,9 @@
 $B%A%'%C%/$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .El
-.Bl -tag -width /dev/null -compact
+.Bl -tag -width /dev/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 ,
@@ -58,16 +60,19 @@
 $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
 .Fx 3.0
 $B$GEP>l$7$^$7$?!#(B
 .Sh $B:n<T(B
-.Nm chkgrp
+.Nm
 $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
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/comcontrol.8 man/man8/comcontrol.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/comcontrol.8	Thu Feb 24 06:37:32 2000
+++ man/man8/comcontrol.8	Wed Jul  5 09:38:24 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.15 1999/08/28 00:12:57 peter Exp %
+.\" %FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.15.2.1 2000/05/04 16:49:22 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 /home/horikawa/CVS_CASTLE/man-jp/man/man8/dhclient-script.8 man/man8/dhclient-script.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/dhclient-script.8	Thu Feb 24 06:37:32 2000
+++ man/man8/dhclient-script.8	Wed Jul  5 09:38:27 2000
@@ -37,7 +37,7 @@
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
 .\"
-.\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5 2000/01/13 16:27:20 asmodai Exp %
+.\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5.2.1 2000/06/26 23:07:20 obrien Exp %
 .\"
 .\" jpman %Id: dhclient-script.8,v 1.4 1999/05/13 14:01:25 horikawa Stab %
 .TH dhclient-script 8
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/disklabel.8 man/man8/disklabel.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/disklabel.8	Wed Feb 16 00:06:16 2000
+++ man/man8/disklabel.8	Wed Jul  5 09:38:30 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15 1999/08/28 00:12:34 peter Exp %
+.\" %FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.1 2000/07/01 06:47:46 ps Exp %
 .\"
 .\" jpman %Id: disklabel.8,v 1.2 1997/03/31 14:09:16 horikawa Stab %
 .\"
@@ -146,13 +146,13 @@
 .if t $B!VA4BN!W$rI=$9%Q!<%F%#%7%g%s(B ($B$9$J$o$A(B ``c'')
 .if n $B!VA4BN!W$rI=$9%Q!<%F%#%7%g%s(B ($B$9$J$o$A(B "c")
 $B$H$O!"Nc$($P(B
-.Pa /dev/rda0c
+.Pa /dev/da0c
 $B$G$9!#(B
 .Nm
 $B$O(B
 .Pa da0
 $B$H$$$C$?>JN,7A$rFbIt$G(B
-.Pa /dev/rda0c
+.Pa /dev/da0c
 $B$KJQ49$9$k$?$a!">JN,7A$b;HMQ$G$-$^$9!#(B
 .Ss $B%G%#%9%/%i%Y%k$NFI$_9~$_(B
 .Pp
@@ -170,7 +170,7 @@
 $B$^$?(B
 .Pa da0
 $B$d(B
-.Pa /dev/rda0c
+.Pa /dev/da0c
 $B$N$h$&$J=q<0$G$b;XDj$9$k$3$H$,$G$-$^$9!#(B
 $B$3$l$K$h$C$F%I%i%$%V$K4X$9$k$9$Y$F$N%Q%i%a!<%?$H%Q!<%F%#%7%g%s$N%l%$%"%&%H$r(B
 $BI=<($7$^$9!#(B
@@ -406,9 +406,9 @@
 $B%"%9%-!<7A<0$N%i%Y%k$r;HMQ$7$^$9!#(B
 $B%U%)!<%^%C%H$O0J2<$N$H$*$j$G$9!#(B
 .Bd -literal -offset 4n
-# /dev/rda1c:
+# /dev/da1c:
 type: SCSI
-disk: sd0s1
+disk: da0s1
 label: 
 flags:
 bytes/sector: 512
@@ -514,7 +514,7 @@
 .Dl disklabel da0
 .Pp
 da0 $B$N%i%Y%k$H$7$F%+!<%M%kFb$N%3%T!<$r(B
-.Pa /dev/rda0c
+.Pa /dev/da0c
 $B$+$iF@$i$l$?$b$N$H$7$FI=<($7$^$9!#(B
 .Pp
 .Dl disklabel da0 > savedlabel
@@ -528,7 +528,7 @@
 .Fl R
 $B%U%i%0$rMQ$$$F%i%Y%k$rI|85$9$k:]$K;HMQ$G$-$^$9!#(B
 .Pp
-.Dl disklabel -w -r /dev/rda0c da2212 foo
+.Dl disklabel -w -r /dev/da0c da2212 foo
 .Pp
 .Pa /etc/disktab
 $B$K=q$+$l$F$$$k(B
@@ -568,7 +568,7 @@
 $B$G$9!#(B
 $B%G%#%9%/>e$N%i%Y%k$*$h$S%+!<%M%kFb%3%T!<$O1F6A$r<u$1$^$;$s!#(B
 .Pp
-.Dl disklabel -w -B /dev/rda0c -b newboot1 -s newboot da2212
+.Dl disklabel -w -B /dev/da0c -b newboot1 -s newboot da2212
 .Pp
 $B?7$?$J%i%Y%k$H%V!<%H%9%H%i%C%W%3!<%I$r=q$-9~$_$^$9!#(B
 .if t $B%i%Y%k$O(B disktab $B$N(B ``da2212'' $B$N>pJs$r;HMQ$7!"(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/dump.8 man/man8/dump.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/dump.8	Wed Jun 14 22:42:11 2000
+++ man/man8/dump.8	Wed Jul  5 09:38:32 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/dump/dump.8,v 1.27 2000/03/01 11:27:03 sheldonh Exp %
+.\" %FreeBSD: src/sbin/dump/dump.8,v 1.27.2.1 2000/07/01 06:47:47 ps Exp %
 .\"
 .\" jpman %Id: dump.8,v 1.2 1997/06/12 05:57:09 yugawa Stab %
 .Dd May 1, 1995
@@ -134,7 +134,7 @@
 $B=PNO@h%U%!%$%k$H$7$F$O!"(B
 .Pa /dev/rsa0
 ($B%F!<%W%I%i%$%V(B)$B$d(B
-.Pa /dev/rfd1
+.Pa /dev/fd1
 ($B%U%m%C%T!<%G%#%9%/%I%i%$%V(B)$B$N$h$&$J%G%P%$%9%U%!%$%k!"(B
 $BDL>o%U%!%$%k!"(B
 .Ql Fl
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/dumpon.8 man/man8/dumpon.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/dumpon.8	Tue Feb 15 23:34:59 2000
+++ man/man8/dumpon.8	Wed Jul  5 09:38:33 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/dumpon/dumpon.8,v 1.11 1999/08/28 00:12:44 peter Exp %
+.\" %FreeBSD: src/sbin/dumpon/dumpon.8,v 1.11.2.2 2000/03/28 15:56:22 sheldonh Exp %
 .\" jpman %Id: dumpon.8,v 1.3 1997/08/16 13:12:52 horikawa Stab %
 .\"
 .Dd May 12, 1995
@@ -72,16 +72,6 @@
 $BDL>o!"%7%9%F%`%9%o%C%W%G%P%$%9$N(B 1 $B$D$r%@%s%W%G%P%$%9$H$7$FA*Br$7$^$9!#(B
 $B$J$<$J$i!"%@%s%W;~$KI,MW$J9-$5$r;}$C$F$$$k$H9M$($i$l$k$b$N$,!"(B
 $B%9%o%C%W%G%P%$%9$G$"$k$+$i$G$9!#(B
-.Pp
-$B%@%s%W%P%$%9$N;XDj$H$7$F!"%+!<%M%k%3%s%Q%$%k;~$K(B
-.Dq dumps on
-$B@a$r%+!<%M%k@_Dj%U%!%$%k(B (
-.Xr config 8
-$B;2>H(B) $B$K5-=R$9$k$3$H$,$G$-$^$9!#(B
-$B$3$l$O!"%^%k%A%f!<%6%b!<%I$K0\9T$9$kA0$K%+!<%M%k$,%Q%K%C%/$9$k>l9g$KM-8z$G$9!#(B
-$B$=$N8e$K5/F0$9$k(B
-.Nm
-$B$O!"%3%s%Q%$%k;~$NCM$KM%@h$7$^$9!#(B
 .Pp
 .Nm
 $B%W%m%0%i%`$NF0:n$O!"(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/fdisk.8 man/man8/fdisk.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/fdisk.8	Wed Jun 14 22:42:11 2000
+++ man/man8/fdisk.8	Wed Jul  5 09:38:36 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17 2000/03/10 22:02:59 imp Exp %
+.\" %FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17.2.1 2000/03/20 12:33:15 peter Exp %
 .\"
 .\" jpman %Id: fdisk.8,v 1.4 1997/07/26 21:56:04 horikawa Stab %
 .Dd October 4, 1996
@@ -67,9 +67,6 @@
 $B$b$7(B
 .Fl f
 $B$,$J$1$l$P!"L5;k$5$l$^$9!#(B
-.It Fl I
-$BC10l$N(B FreeBSD $B%9%i%$%9$,%G%#%9%/A4BN$H$J$k$h$&$K!"(B
-$B%;%/%?(B 0 $B$NFbMF$r=i4|2=$7$^$9!#(B
 .It Fl f Ar configfile
 $B%Q!<%F%#%7%g%s$NCM$r%U%!%$%k(B
 .Ar configfile
@@ -103,6 +100,9 @@
 $B$,$J$1$l$P!"(B
 .Fl u
 $B$N0UL#$b4^$_$^$9!#(B
+.It Fl I
+$BC10l$N(B FreeBSD $B%9%i%$%9$,%G%#%9%/A4BN$H$J$k$h$&$K!"(B
+$B%;%/%?(B 0 $B$NFbMF$r=i4|2=$7$^$9!#(B
 .It Fl s
 $B%5%^%j>pJs$rI=<($7!"=*N;$7$^$9!#(B
 .It Fl t
@@ -298,7 +298,7 @@
 .Ic #
 .No Ar comment ...
 .Xc
-"#" $B$G3+;O$7$F$$$k9T$O%3%a%s%H$GL5;k$5$l$^$9!#(B
+\&"#" $B$G3+;O$7$F$$$k9T$O%3%a%s%H$GL5;k$5$l$^$9!#(B
 .It Xo
 .Ic g
 .No Ar spec1
@@ -374,13 +374,13 @@
 $B$r@_Dj$7$^$9!#(B
 .Pp
 $B$3$l$i$N9T$GL@<(E*$K8@5Z$5$l$?%Q!<%F%#%7%g%s$@$1$,JQ99$5$l$^$9(B;
-"p" $B9T$G;2>H$5$l$F$$$J$$%Q!<%F%#%7%g%s$OJQ99$5$l$^$;$s!#(B
+\&"p" $B9T$G;2>H$5$l$F$$$J$$%Q!<%F%#%7%g%s$OJQ99$5$l$^$;$s!#(B
 $B$7$+$7!"L58z$J%Q!<%F%#%7%g%s%F!<%V%k$,$"$k$+!"(B
 .Fl i
 $B%*%W%7%g%s$,;XDj$5$l$F$$$k$J$i!"(B
 $BB8:_$9$k%Q!<%F%#%7%g%s%(%s%H%j$OA4$F<h$j=|$+$l(B ($BL$;HMQ$N0u$,$D$1$i$l(B)$B!"(B
 $B%Q!<%F%#%7%g%s>pJs$rL@<(E*$K@_Dj$9$k$N$K!"(B
-"p" $B9T$,;H$o$l$J$1$l$P$J$j$^$;$s!#(B
+\&"p" $B9T$,;H$o$l$J$1$l$P$J$j$^$;$s!#(B
 $B$b$7J#?t$N%Q!<%F%#%7%g%s$r@_Dj$9$kI,MW$,$"$k$J$i!"(B
 $BJ#?t$N(B "p" $B9T$,;XDj$5$l$J$1$l$P$J$j$^$;$s(B;
 1 $B9T$G(B 1 $B8D$N%Q!<%F%#%7%g%s$r@_Dj$7$^$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/gifconfig.8 man/man8/gifconfig.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/gifconfig.8	Wed Jul  5 07:00:09 2000
+++ man/man8/gifconfig.8	Wed Jul  5 09:38:37 2000
@@ -26,13 +26,12 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     %Id: gifconfig.8,v 1.2 1999/10/07 04:25:54 itojun Exp %
-.\"	%FreeBSD: src/usr.sbin/gifconfig/gifconfig.8,v 1.1 1999/12/28 02:37:03 shin Exp %
+.\" %FreeBSD: src/usr.sbin/gifconfig/gifconfig.8,v 1.1.2.2 2000/05/06 14:22:13 phantom Exp %
 .\" jpman %Id: gifconfig.8,v 1.4 2000/05/10 13:44:39 takaha Stab %
 .\"
 .Dd May 17, 1998
 .Dt GIFCONFIG 8
-.Os KAME
-.\"
+.Os
 .Sh $BL>>N(B
 .Nm gifconfig
 .Nd $B0lHLE*$J(B IP $B%H%s%M%k$r@_Dj$9$k(B
@@ -44,7 +43,6 @@
 .Op Ar physsrc physdest
 .Nm gifconfig
 .Fl a
-.\"
 .Sh $B2r@b(B
 .Nm
 $B$O(B "gif0" $B$N$h$&$J0lHLE*$J(B IP $B%H%s%M%k%$%s%?%U%'!<%9$K(B
@@ -83,7 +81,6 @@
 $B$G%H%s%M%k$N@_Dj$r9T$&$H!"(B
 $B4JC1$KL58B%k!<%F%#%s%0%k!<%W$r:n$k$3$H$,$G$-$F$7$^$&$3$H$K(B
 $BCm0U$7$F$/$@$5$$!#(B
-.\"
 .Sh $B;HMQNc(B
 .Li 10.1.1.1
 $B$H(B
@@ -127,10 +124,8 @@
 $B$r(B
 .Li inet6
 $B$KCV$-49$($k$3$H$G30It$N%W%m%H%3%k$H$7$F(B IPv6 $B$r;HMQ$9$k$3$H$b2DG=$G$9!#(B
-.\"
 .Sh $BLa$jCM(B
 $B%3%^%s%I$O%(%i!<;~$K$O=*N;%9%F!<%?%9(B 1 $B$r!"@.8y;~$K$O(B 0 $B$rJV$7$^$9!#(B
-.\"
 .Sh $B4XO"9`L\(B
 .Xr gif 4 ,
 .Xr ifconfig 8
@@ -138,5 +133,8 @@
 .Nm
 $B%3%^%s%I$O(B WIDE Hydrangea IPv6 $B%W%m%H%3%k%9%?%C%/%-%C%H$G(B
 $B$O$8$a$FEP>l$7$^$7$?!#(B
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+KAME Project (http://www.kame.net/) $B%9%?%C%/$r4p$H$9$k(B
+IPv6 $B$*$h$S(B IPsec $B$N%5%]!<%H$O!"(B
+.Fx 4.0
+$B$G;O$a$FAH$_9~$^$l$^$7$?!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/hlfsd.8 man/man8/hlfsd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/hlfsd.8	Tue Feb 15 23:34:59 2000
+++ man/man8/hlfsd.8	Wed Jul  5 09:38:40 2000
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" %Id: hlfsd.8,v 1.2 1999/01/10 21:54:32 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.5 1999/09/15 05:45:15 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.5.2.1 2000/05/28 13:17:30 asmodai Exp %
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
@@ -304,7 +304,6 @@
 .Xr mtab 5 ,
 .Xr passwd 5 ,
 .Xr amd 8 ,
-.Xr automount 8 , 
 .Xr cron 8 , 
 .Xr mount 8 ,
 .Xr sendmail 8 ,
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ifmcstat.8 man/man8/ifmcstat.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ifmcstat.8	Wed Jul  5 07:00:09 2000
+++ man/man8/ifmcstat.8	Wed Jul  5 09:38:41 2000
@@ -12,7 +12,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.\"	%FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1 1999/12/28 02:37:05 shin Exp %
+.\"	%FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1.2.1 2000/04/20 15:22:16 phantom Exp %
 .\" jpman %Id: ifmcstat.8,v 1.3 2000/04/04 04:07:51 horikawa Stab %
 .\"
 .Dd May 21, 1998
@@ -25,7 +25,7 @@
 .Nm
 .\"
 .Sh $B2r@b(B
-.Nm ifmcstat
+.Nm
 $B$O%+!<%M%kFb$N%^%k%A%-%c%9%H%0%k!<%W>pJs$r=PNO$7$^$9!#(B
 .Pp
 $B%3%^%s%I%i%$%s%*%W%7%g%s$O$"$j$^$;$s!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ipfw.8 man/man8/ipfw.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ipfw.8	Wed Jul  5 07:00:10 2000
+++ man/man8/ipfw.8	Wed Jul  5 10:41:50 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63 2000/02/28 15:21:12 ru Exp %
+.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63.2.2 2000/06/12 09:47:20 ru Exp %
 .\"
 .\" jpman %Id: ipfw.8,v 1.4 1997/05/19 17:19:51 horikawa Stab %
 .Dd February 16, 2000
@@ -51,6 +51,16 @@
 .Es \&{ \&}
 .En Cm delete |list | show
 .Op Ar number ...
+.Nm ipfw
+.Cm queue
+.Ar number
+.Cm config
+.Ar queue-config-options
+.Nm ipfw
+.Cm queue
+.Es \&{ \&}
+.En Cm delete | list | show
+.Op Ar number ...
 .Sh $B2r@b(B
 .Nm
 $B$O!"(B
@@ -393,8 +403,8 @@
 .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
+.Sx $B%H%i%U%#%C%/%7%'%$%Q@_Dj(B
+$B$N@a$r;2>H$7$F$/$@$5$$!#(B
 $B8!:w$O=*N;$7$^$9!#(B
 $B$7$+$7!"%Q%$%W$+$iH4$1$?$H$-$K(B
 .Xr sysctl 8
@@ -402,6 +412,12 @@
 .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 Cm queue Ar queue_nr
+$B%Q%1%C%H$r(B
+.Xr dummynet 4
+.Dq queue
+$B$XEO$7$^$9(B
+(WF2Q $B$r;H$C$?%P%s%II}@)8BMQ(B)$B!#(B
 .It Cm skipto Ar number
 .Ar number
 $B$h$j>.$5$JHV9f$N%k!<%k$rHt$S1[$7$F!"(B
@@ -420,14 +436,18 @@
 $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?t$r<u?.$7$?8e!"%a%C%;!<%8$NI=<($rCf;_$7!"(B
+.Em net.inet.ip.fw.verbose_limit
+$B$,$=$N?t$K@_Dj$5$l$^$9!#(B
 $B$7$+$7(B
 .Cm logamount Ar number
 $B$,;HMQ$5$l$?>l9g!"(B
-.Dv IPFIREWALL_VERBOSE_LIMIT
+.Em net.inet.ip.fw.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$,%G%U%)%k%H$N%m%0@)8B$K$J$j!"CM(B
+.Dq 0
+$B$r;XDj$9$k$H!"%m%.%s%0$N@)8B$O<h$j=|$+$l$^$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
@@ -715,29 +735,84 @@
 $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%7%'%$%Q$O!"%f!<%6$,;XDj$7$?%^%9%/$r(B IP $B%X%C%@$N0[$J$C$?%U%#!<%k%I$K(B
+$BE,MQ$9$k$3$H$K$h$j!"%Q%1%C%H$r(B
+.Em $B%U%m!<(B
+(flow) $B$KJ,3d$7$^$9!#(B
+$BF1$8%U%m!<$KB0$9$k%Q%1%C%H$O(B 2 $B$D$N0[$J$C$?%*%V%8%'%/%H$XEO$5$l$^$9!#(B
+$B$=$l$O(B
+.Em $B%Q%$%W(B
+(pipe) $B$^$?$O(B
+.Em $B%-%e!<(B
+(queue) $B$H8F$P$l$k$b$N$G$9!#(B
+.Em $B%Q%$%W(B
+$B$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
+$B$3$N%Q%i%a!<%?$K=>$$!"%Q%1%C%H$O%Q%$%WCf$rA+0\$7$^$9!#(B
+.Pp
+.Em $B%-%e!<(B
+$B$O!"(BWF2Q+ $B%]%j%7$r<BAu$9$k$?$a$K;HMQ$9$kCj>]2=$G$9!#(B
+$B%-%e!<$O!"3F%U%m!<$KBP$7!"=E$_$H;2>H%Q%$%W$r4XO"IU$1$^$9!#(B
+$B$=$l$+$i!"F1$8%Q%$%W$K7k$SIU$1$i$l$?$9$Y$F$N%U%m!<$O!"(B
+WF2Q+ $B%]%j%7$K=>$$!"(B
+$B%Q%$%W$K$h$C$F8GDj$5$l$?%l!<%H$G%9%1%8%e!<%k$5$l$^$9!#(B
+.Pp
 .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 | device
+.Op Cm delay Ar ms-delay
+.Oo
 .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
+.Oo
+.Cm red | gred
+.Sm off
+.Ar w_q No / Xo
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Xc
+.Sm on
+.Oc
+.Ed
+.Pp
+.Nm
+$B%-%e!<@_Dj=q<0$O<!$NDL$j$G$9!#(B
+.Bd -ragged
+.Cm queue Ar number Cm config
+.Op Cm pipe Ar pipe_nr
+.Op Cm weight Ar weight
+.Oo
+.Cm queue
+.Es \&{ \&}
+.En Ar slots | size
+.Oc
+.Op Cm plr Ar loss-probability
+.Op Cm mask Ar mask-specifier
+.Op Cm buckets Ar hash-table-size
+.Oo
+.Cm red | gred
+.Sm off
+.Ar w_q No / Xo
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Xc
+.Sm on
+.Oc
 .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
+.It Cm bw Ar bandwidth | device
 $B%P%s%II}$G$"$j!"C10L$O(B
 .Sm off
 .Oo
@@ -749,9 +824,17 @@
 $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
+$BC10L$O?tCM$ND>8e$KB3$1$F=q$/I,MW$,$"$j!"<!$N$h$&$K$7$^$9!#(B
+.Pp
 .Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
-$B$N$h$&$K$7$^$9!#(B
+.Pp
+$B?tCM$NBe$j$K%G%P%$%9L>$,;XDj$5$l$?>l9g!"(B
+$BAw?.%/%m%C%/$O;XDj$7$?%G%P%$%9$+$iM?$($i$l$^$9!#(B
+$B8=:_$N$H$3$m!"(B
+.Xr tun 4
+$B%G%P%$%9$N$_$,(B
+.Xr ppp 8
+$B$HAH$_9g$o$;$F;HMQ$9$k$?$a$K!"$3$N5!G=$rDs6!$7$F$$$^$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
@@ -783,7 +866,7 @@
 $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$G$O!"%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
@@ -797,6 +880,13 @@
 $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
+.Ar pipe
+$B@_DjCf$G;HMQ$5$l$k>l9g!"(B
+$B3F%U%m!<$K$O%Q%$%W$N%l!<%H$KEy$7$$%l!<%H$,3d$jEv$F$i$l$^$9!#(B
+.Ar queue
+$B@_DjCf$G;HMQ$5$l$k>l9g!"(B
+$B3F%U%m!<$K$O%-%e!<$N=E$_$KEy$7$$=E$_$,3d$jEv$F$i$l!"(B
+$BF1$8%Q%$%W$r9=@.$9$k%-%e!<$O=E$_$KHfNc$7$F%P%s%II}$r6&M-$7$^$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
@@ -804,6 +894,49 @@
 $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
+.It Cm pipe Ar pipe_nr
+$B%-%e!<$r;XDj$7$?%Q%$%W$K@\B3$7$^$9!#(B
+$BJ#?t$N%-%e!<(B ($BDL>o$O0[$J$C$?=E$_(B) $B$rF10l$N%Q%$%W$K@\B32DG=$G$9!#(B
+$B$3$N>l9g!"$3$N%-%e!<=89g$KBP$9$k=8Ls%l!<%H$r!"$3$N%Q%$%W$,;XDj$7$^$9!#(B
+.It Cm weight Ar weight
+$B$3$N%-%e!<$KE,9g$9$k%U%m!<$K;HMQ$9$k=E$_$r;XDj$7$^$9!#(B
+$B=E$_$O(B 1..100 $B$NHO0O$G$"$k$3$H$,I,MW$G$"$j!"%G%U%)%k%H$O(B 1 $B$G$9!#(B
+.It Cm red | gred Xo
+.Sm off
+.Ar w_q No /
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Sm on
+.Xc
+RED $B%-%e!<4IM}%"%k%4%j%:%`$r;HMQ$7$^$9!#(B
+.Ar w_q
+$B$H(B
+.Ar max_p
+$B$O(B 0 $B$+$i(B 1 (0 $B$r4^$_$^$;$s(B) $B$NHO0O$NIbF0>.?tE@?t$G$"$j!"(B
+.Ar min_th
+$B$H(B
+.Ar max_th
+$B$O%-%e!<4IM}MQ$NogCM$r;XDj$9$k@0?t$G$9(B
+($B%-%e!<$,%P%$%H?t$G;XDj$5$l$?>l9g$OogCM$O%P%$%H$G7W;;$5$l!"(B
+$B$=$&$G$J$$>l9g$O%9%m%C%H?t$G7W;;$5$l$^$9(B)$B!#(B
+.Xr dummynet 4
+$B$b$^$?4K$d$+$J(B (gentle) RED $BJQ7?(B (gred) $B$r%5%]!<%H$7$^$9!#(B
+RED $B$NF0:n$r@)8f$9$k$?$a$K!"(B3 $B8D$N(B
+.Xr sysctl 8
+$BJQ?t$r;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
+.It Em net.inet.ip.dummynet.red_lookup_depth
+$B%j%s%/$,%"%$%I%k$N;~$N!"J?6Q%-%e!<$N7W;;@:EY$r;XDj$7$^$9(B
+($B%G%U%)%k%H$O(B 256 $B$G$"$j!"(B0 $B$h$jBg$-$$I,MW$,$"$j$^$9(B)
+.It Em net.inet.ip.dummynet.red_avg_pkt_size
+$B%Q%1%C%H%5%$%:$NJ?6Q$N4|BTCM$r;XDj$7$^$9(B
+($B%G%U%)%k%H$O(B 512 $B$G$"$j!"(B0 $B$h$jBg$-$$I,MW$,$"$j$^$9(B)
+.It Em net.inet.ip.dummynet.red_max_pkt_size
+$B%Q%1%C%H%5%$%:$N:GBgCM$N4|BTCM$r;XDj$7$^$9!#(B
+$B%-%e!<$NogCM$,%P%$%H$N>l9g$N$_;HMQ$5$l$^$9(B
+($B%G%U%)%k%H$O(B 1500 $B$G$"$j!"(B0 $B$h$jBg$-$$I,MW$,$"$j$^$9(B)
+.El
 .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
@@ -1020,6 +1153,12 @@
 $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
+RED $B%-%e!<4IM}%"%k%4%j%:%`$r;HMQ$7$F%M%C%H%o!<%/@-G=$r8!>Z$9$k$K$O!"(B
+$B<!$N$h$&$K$7$^$9(B:
+.Pp
+.Dl "ipfw add pipe 1 ip from any to any"
+.Dl "ipfw pipe 1 config bw 500Kbit/s queue 100 red 0.002/30/80/0.1"
 .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
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/jail.8 man/man8/jail.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/jail.8	Wed Jun 14 10:57:30 2000
+++ man/man8/jail.8	Wed Jul  5 09:38:48 2000
@@ -31,7 +31,7 @@
 .\"this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\"----------------------------------------------------------------------------
 .\"
-.\"%FreeBSD: src/usr.sbin/jail/jail.8,v 1.13 2000/03/01 14:07:56 sheldonh Exp %
+.\"%FreeBSD: src/usr.sbin/jail/jail.8,v 1.13.2.1 2000/04/23 17:05:30 mpp Exp %
 .\"
 .Dd April 28, 1999
 .\" jpman %Id: jail.8,v 1.3 2000/05/22 03:23:14 takamune Stab %
@@ -95,7 +95,9 @@
 $B%[%9%H%7%9%F%`$N(B IP $B%5!<%S%9$G!"(B
 $BA4%m!<%+%k(B IP $B%"%I%l%9$KBP$7$F%5!<%S%9$r(B listen $B$7$F$$$k$b$N$r!"(B
 $BL58z2=$9$k$3$H$G$9!#(B
-$B$3$l$O!"(Binetd $B$r=$@5$7$F!"E,@Z$J(B IP $B%"%I%l%9$N$_(B listen $B$5$;$k$H$$$C$?(B
+$B$3$l$O!"(B
+.Xr inetd 8
+$B$r=$@5$7$F!"E,@Z$J(B IP $B%"%I%l%9$N$_(B listen $B$5$;$k$H$$$C$?(B
 $B$3$H$r0UL#$7$^$9!#(B
 $B<!$N@_Dj$r!"%[%9%H4D6-$N(B
 .Pa /etc/rc.conf
@@ -318,7 +320,9 @@
 .Fx 4.0
 $B$G$O$8$a$FEP>l$7$^$7$?!#(B
 .Sh $B:n<T(B
-jail $B$N5!G=$O(B Poul-Henning Kamp $B$K$h$C$F(B
+jail $B$N5!G=$O(B
+.An Poul-Henning Kamp
+$B$K$h$C$F(B
 R&D Associates
 .Dq Li http://www.rndassociates.com/
 $B$N$?$a$K=q$+$l!"(B
@@ -341,4 +345,6 @@
 $B%[%9%H%G!<%b%s$,IiC4$r$+$1$J$$!"0BA4$J%[%9%H4D6-$r9=C[2DG=$H$7$^$9!#(B
 $B8=:_$N$H$3$m!"(B
 $B:G$bC1=c$JEz$($O%[%9%H>e$GDs6!$9$k%5!<%S%9$r:G>.2=$9$k$3$H$G$"$j!"(B
-$B$*$=$i$/4JC1$K@_Dj2DG=$J(B inetd $B$+$iDs6!$5$l$k$b$N$K8BDj$9$k$3$H$G$7$g$&!#(B
+$B$*$=$i$/4JC1$K@_Dj2DG=$J(B
+.Xr inetd 8
+$B$+$iDs6!$5$l$k$b$N$K8BDj$9$k$3$H$G$7$g$&!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/kldstat.8 man/man8/kldstat.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/kldstat.8	Tue Feb 15 23:34:59 2000
+++ man/man8/kldstat.8	Wed Jul  5 09:38:49 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/kldstat/kldstat.8,v 1.7 1999/09/03 16:40:23 chris Exp %
+.\" %FreeBSD: src/sbin/kldstat/kldstat.8,v 1.7.2.2 2000/07/01 07:56:00 ps Exp %
 .\" jpman %Id: kldstat.8,v 1.3 1998/10/08 15:19:42 horikawa Stab %
 .\"
 .Dd April 25, 1997
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/locate.updatedb.8 man/man8/locate.updatedb.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/locate.updatedb.8	Tue Feb 15 23:34:58 2000
+++ man/man8/locate.updatedb.8	Wed Jul  5 09:38:51 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7 1999/08/28 01:03:00 peter Exp %
+.\" %FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7.2.1 2000/06/14 17:45:17 alex Exp %
 .\"
 .\" Original Revision: 1.3.2.1
 .\" jpman %Id: locate.updatedb.8,v 1.3 1997/09/04 16:39:10 horikawa Stab %
@@ -46,7 +46,7 @@
 .Xr locate 1
 $B$G;HMQ$5$l$k%G!<%?%Y!<%9$N99?7$r9T$$$^$9!#(B
 $BDL>o$O!"(B
-.Pa /etc/weekly
+.Pa /etc/periodic/weekly/310.locate
 $B%9%/%j%W%H(B
 $B$K$h$j=5$K0lEY<B9T$5$l$^$9!#(B
 .Pp
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mailwrapper.8 man/man8/mailwrapper.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mailwrapper.8	Wed Jun 14 10:57:30 2000
+++ man/man8/mailwrapper.8	Wed Jul  5 09:38:52 2000
@@ -1,6 +1,6 @@
 .\" jpman %Id: mailwrapper.8,v 1.3 2000/05/14 14:36:34 yt-kage Stab %
 .\"     %NetBSD: mailwrapper.8,v 1.6 1999/03/25 16:40:17 is Exp %
-.\" %FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.4 2000/03/01 14:07:59 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.4.2.2 2000/07/01 10:21:34 ps Exp %
 .\"
 .\" Copyright (c) 1998
 .\"     Perry E. Metzger.  All rights reserved.
@@ -49,14 +49,15 @@
 .Xr sendmail 8
 $B$,4|BT$9$k%Q%9$H8F$S=P$75,B'$r;}$C$F$$$^$7$?!#(B
 .Pp
-$B$7$+$7;~Be$OJQ$o$j$^$7$?!#8=:_$N%7%9%F%`$K$*$$$F!"4IM}<T$O(B
-.Nx
+$B$7$+$7;~Be$OJQ$o$j$^$7$?!#8=:_$N(B
+.Ux
+$B%7%9%F%`$K$*$$$F$O!"4IM}<T$O(B
 $B$$$/$D$+F~<j2DG=$J(B MTA $B$N$J$+$+$i9%$-$J$b$N$r;H$$$?$$$H;W$&$+$b$7$l$^$;$s!#(B
 .Pp
 $B$7$+$7!"%7%9%F%`$GDL>o;H$o$l$F$$$k(B MUA $B%=%U%H%&%'%"$rA4$F=$@5$9$k$N$O(B
 $B:$Fq$G$7$g$&!#(B
-$B$=$3$G!"BeBX(B MTA $B$N$[$H$s$I$O%U%m%s%H%(%s%I%a%C(B
-$B%;!<%8Ds<(%W%m%0%i%`$rMQ0U$7$F$$$^$9!#$3$l$K$h$jBeBX(B MTA $B$O(B
+$B$=$3$G!"BeBX(B MTA $B$N$[$H$s$I$O%U%m%s%H%(%s%I(B
+$B%a%C%;!<%8Ds<(%W%m%0%i%`$rMQ0U$7$F$$$^$9!#$3$l$K$h$jBeBX(B MTA $B$O(B
 .Xr sendmail 8
 $B$HF1$88F$S=P$75,B'$r;H$$!"(B
 .Pa /usr/sbin/sendmail
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mknod.8 man/man8/mknod.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mknod.8	Wed Jun 14 22:42:12 2000
+++ man/man8/mknod.8	Wed Jul  5 09:38:54 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.11 2000/03/01 11:27:10 sheldonh Exp %
+.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.11.2.1 2000/04/23 16:59:28 mpp Exp %
 .\"
 .\" jpman %Id: mknod.8,v 1.2 1997/03/31 13:37:12 horikawa Stab %
 .\"
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount.8 man/man8/mount.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount.8	Wed Jun 14 22:42:12 2000
+++ man/man8/mount.8	Wed Jul  5 09:38:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" %FreeBSD: src/sbin/mount/mount.8,v 1.31 2000/03/01 11:27:12 sheldonh Exp %
+.\" %FreeBSD: src/sbin/mount/mount.8,v 1.31.2.1 2000/07/01 07:39:53 ps Exp %
 .\"
 .\" jpman %Id: mount.8,v 1.2 1997/05/03 11:26:50 horikawa Stab %
 .\"
@@ -362,7 +362,6 @@
 .Xr mount_devfs 8 ,
 .Xr mount_fdesc 8 ,
 .Xr mount_kernfs 8 ,
-.Xr mount_lfs 8 ,
 .Xr mount_mfs 8 ,
 .Xr mount_msdos 8 ,
 .Xr mount_nfs 8 ,
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount_null.8 man/man8/mount_null.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount_null.8	Tue Feb 15 23:35:02 2000
+++ man/man8/mount_null.8	Wed Jul  5 09:38:58 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11 1999/08/28 00:13:33 peter Exp %
+.\" %FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11.2.1 2000/05/15 14:56:13 hoek Exp %
 .\" jpman %Id: mount_null.8,v 1.2 1997/03/31 13:38:01 horikawa Stab %
 .\"
 .Dd May 1, 1995
@@ -129,13 +129,14 @@
 .Em vop_getattr , 
 .Em vop_inactive ,
 .Em vop_reclaim ,
-$B$d(B
 .Em vop_print
 $B$O%P%$%Q%9$7$^$;$s!#(B
 .Em vop_getattr
 $B$OLa$jCM$N(B fsid $B$rBX$($J$1$l$P$J$j$^$;$s!#(B
 .Em vop_inactive
-$B$H(B vop_reclaim $B$O!"(Bnull $BAXFCM-$N%G!<%?$r2rJ|$9$k$?$a$K%P%$%Q%9$7$^$;$s!#(B
+$B$H(B
+.Em vop_reclaim
+$B$O!"(Bnull $BAXFCM-$N%G!<%?$r2rJ|$9$k$?$a$K%P%$%Q%9$7$^$;$s!#(B
 .Em vop_print
 $B$O2aEY$N%G%P%C%0>pJs$rHr$1$k$?$a$K%P%$%Q%9$7$^$;$s!#(B
 .\"
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount_std.8 man/man8/mount_std.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mount_std.8	Tue Feb 15 23:35:02 2000
+++ man/man8/mount_std.8	Wed Jul  5 09:38:59 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp %
+.\" %FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp %
 .\" jpman %Id: mount_std.8,v 1.3 1997/09/23 16:40:39 horikawa Stab %
 .\"
 .Dd May 13, 1996
@@ -45,6 +45,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd ``$BI8=`(B'' $B%U%!%$%k%7%9%F%`$r%^%&%s%H$9$k(B
 .Sh $B=q<0(B
@@ -60,6 +61,7 @@
 .Nm devfs , 
 .Nm fdesc ,
 .Nm kernfs ,
+.Nm linprocfs ,
 .Nm procfs
 $B!#(B
 ``$BI8=`(B'' $B%U%!%$%k%7%9%F%`$O(B:
@@ -115,6 +117,7 @@
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
 .Xr kernfs 5 ,
+.Nm linprocfs ,
 .Xr procfs 5
 $B!#(B
 .Sh $B?GCG(B
@@ -139,6 +142,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh $BCm0U(B
@@ -160,4 +164,8 @@
 .Dq devfs
 $B%U%!%$%k%7%9%F%`%?%$%W$O(B
 .Fx 2.2
+$B$+$iEP>l$7$^$7$?!#(B
+.Dq linprocfs
+$B%U%!%$%k%7%9%F%`%?%$%W$O(B
+.Fx 4.0
 $B$+$iEP>l$7$^$7$?!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mountd.8 man/man8/mountd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mountd.8	Tue Feb 15 23:35:03 2000
+++ man/man8/mountd.8	Wed Jul  5 09:39:01 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" %FreeBSD: src/sbin/mountd/mountd.8,v 1.16 1999/08/28 00:13:44 peter Exp %
+.\" %FreeBSD: src/sbin/mountd/mountd.8,v 1.16.2.1 2000/05/24 13:25:52 mpp Exp %
 .\"
 .\" jpman %Id: mountd.8,v 1.3 1997/05/19 17:06:05 horikawa Stab %
 .\"
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/moused.8 man/man8/moused.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/moused.8	Wed Jun 14 22:42:12 2000
+++ man/man8/moused.8	Wed Jul  5 09:39:04 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.27 2000/03/01 14:08:06 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.27.2.2 2000/04/21 14:21:12 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
+$BBh(B 3 $B%\%?%s%(%_%e%l!<%7%g%s(B
+.Pq $BA0=R(B
+$B$,M-8z$J$H$-!"(B2 $B$D$N%\%?%s$,F1;~$K2!$5$l$?$+$rH=Dj$9$kA0$K(B
+.Nm
+$B%G!<%b%s$O:GD9(B
+.Ar timeout
+$B%_%jICBT$A$^$9!#(B
+$B%G%U%)%k%H$N%?%$%`%"%&%H$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
@@ -340,6 +350,38 @@
 .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
+$B2>A[%\%?%s(B
+.Ar N1
+$B$*$h$S(B
+.Ar N2
+$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
+.It Ar N1 N2 N3 N4
+2 $B8D$N%[%$!<%k$,$"$j(B
+2 $BHVL\$N%[%$!<%k$,?eJ?%9%/%m!<%kF0:n$r@8@.$9$k$?$a$K;HMQ$5$l$k%^%&%9!"(B
+$B$*$h$S%f!<%6$,2C$($??eJ?$NNO$r8!CN$9$k%N%V$^$?$O%9%F%#%C%/IU$-$N%^%&%9$G(B
+$BM-MQ$G$9!#(B
+.Pp
+2 $BHVL\$N%[%$!<%k$NF0$-$O!"Ii$N8~$-$,(B
+.Ar N3
+$B$K%^%C%W$5$l!"@5$N8~$-$,(B
+.Ar N4
+$B$K%^%C%W$5$l$^$9!#(B
+$B%\%?%s(B
+.Ar N3
+$B$*$h$S(B
+.Ar N4
+$B$,%^%&%9$K<B:_$9$k>l9g!"$3$N%"%/%7%g%s$O8!=P$5$l$^$;$s!#(B
+.Pp
+$B?eJ?0\F0$d(B 2 $BHVL\$N%m!<%i(B/$B%[%$!<%k$NF0$-$O>o$K8!=P$5$l$k$o$1$G$O$J$$$3$H$K(B
+$BCm0U$7$F$/$@$5$$!#(B
+$B$J$<$J$i!"(B
+$B$3$l$i$r%(%s%3!<%I$9$k$?$a$N<u$1F~$l$i$l$?I8=`$,L5$$$h$&$K8+$($k$+$i$G$9!#(B
+.Pp
+$B$^$?!"?eJ?J}8~$K$*$$$F!":8$,Ii$G$"$k$H9M$($k%^%&%9$b$$$l$P!"(B
+$B5U$@$H9M$($k%^%&%9$b$$$k$3$H$K$bCm0U$7$F$/$@$5$$!#(B
+$B99$K!"(B2 $B8D$N%[%$!<%k$,N>J}$H$b?bD>$KEc:\$5$l$F$*$j!"(B
+$B0lJ}$NJ}8~$,$,$b$&0lJ}$NJ}8~$H$O%^%C%A$7$J$$$b$N$b$"$j$^$9!#(B
 .El
 .El
 .Ss $B%^%&%9%G!<%b%s$N9=@.(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/mtree.8 man/man8/mtree.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/mtree.8	Tue Feb 15 23:35:03 2000
+++ man/man8/mtree.8	Wed Jul  5 09:39:06 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16 1999/12/09 20:38:35 joe Exp %
+.\" %FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16.2.3 2000/06/30 09:54:06 ps Exp %
 .\" jpman %Id: mtree.8,v 1.3 1997/08/16 13:31:00 horikawa Stab %
 .\"
 .Dd February 26, 1999
@@ -47,6 +47,7 @@
 .Op Fl k Ar keywords
 .Op Fl p Ar path
 .Op Fl s Ar seed
+.Op Fl X Ar exclude-list
 .Sh $B2r@b(B
 .Nm
 $B$O!"%+%l%s%H%G%#%l%/%H%j$r%k!<%H$H$9$k%U%!%$%k3,AX$r!"(B
@@ -120,6 +121,19 @@
 $B%9%F!<%?%9(B 2 $B$rJV$7$^$9!#(B
 .It Fl x
 $B%U%!%$%k3,AXCf$N%^%&%s%H%]%$%s%H0J2<$K9_2<$7$^$;$s!#(B
+.It Fl X Ar exclude-list
+$B;XDj$5$l$?%U%!%$%k$O(B
+.Xr fnmatch 3
+$B%Q%?!<%s$r4^$_$^$9!#(B
+$B$3$l$K%^%C%A$9$k%U%!%$%k$O%U%!%$%k3,AX5-=R$+$i=|30$5$l$^$9!#(B
+1 $B9T$K(B 1 $B8D$:$D5-=R$7$^$9!#(B
+$B%Q%?!<%s$K(B
+.Ql \&/
+$BJ8;z$,4^$^$l$k>l9g!"(B
+($B3+;O$7$?%G%#%l%/%H%j$H$NAjBP$G(B) $B%Q%9L>A4BN$KBP$7$F%^%C%A$,<h$i$l$^$9!#(B
+$B$=$&$G$J$$>l9g!"%Y!<%9L>$KBP$7$F$N$_%^%C%A$,<h$i$l$^$9!#(B
+.Ar exclude-list
+$B%U%!%$%k$K$O%3%a%s%H$O5v$5$l$^$;$s!#(B
 .El
 .Pp
 $B%U%!%$%k3,AX5-=R$OB?$/$N>l9g!"!V%-!<%o!<%I!W$D$^$j(B
@@ -281,7 +295,7 @@
 $B%G%#%l%/%H%j3,AX$r:n@.$9$k$N$KMQ$$$k$3$H$,$G$-$^$9!#(B
 .Pa /etc/mtree
 $B$KCV$+$l$?%U%!%$%k72$O!"$3$N(B
-.Tn FreeBSD
+.Fx
 $BG[I[$N$[$H$s$IA4$F$N%G%#%l%/%H%j$r:n@.$9$k$N$KMQ$$$i$l$^$7$?!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/mtree -compact
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/natd.8 man/man8/natd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/natd.8	Wed Jun 14 22:42:12 2000
+++ man/man8/natd.8	Wed Jul  5 09:39:09 2000
@@ -1,57 +1,50 @@
 .\" manual page [] for natd 1.4
-.\" %FreeBSD: src/sbin/natd/natd.8,v 1.27 2000/03/01 11:27:22 sheldonh Exp %
+.\" %FreeBSD: src/sbin/natd/natd.8,v 1.27.2.4 2000/06/29 10:06:27 ru Exp %
 .\" jpman %Id%
-.Dd 15 April 1997
-.Os FreeBSD
+.Dd June 27, 2000
 .Dt NATD 8
+.Os FreeBSD
 .Sh $BL>>N(B
 .Nm natd
-.Nd
-$B%M%C%H%o!<%/%"%I%l%9JQ49%G!<%b%s(B
+.Nd $B%M%C%H%o!<%/%"%I%l%9JQ49%G!<%b%s(B
 .Sh $B=q<0(B
-.Nm
-.Op Fl ldsmvu
+.Nm natd
+.Op Fl unregistered_only | u
+.Op Fl log | l
+.Op Fl proxy_only
+.Op Fl reverse
+.Op Fl deny_incoming | d
+.Op Fl use_sockets | s
+.Op Fl same_ports | m
+.Op Fl verbose | v
 .Op Fl dynamic
-.Op Fl i Ar inport
-.Op Fl o Ar outport
-.Op Fl p Ar port
-.Op Fl a Ar address
-.Op Fl n Ar interface
-.Op Fl f Ar configfile
-
-.Nm
-.Op Fl log
-.Op Fl deny_incoming
+.Op Fl in_port | i Ar port
+.Op Fl out_port | o Ar port
+.Op Fl port | p Ar port
+.Op Fl alias_address | a Ar address
+.Op Fl target_address | t Ar address
+.Op Fl interface | n Ar interface
+.Op Fl proxy_rule Ar proxyspec
+.Op Fl redirect_port Ar linkspec
+.Op Fl redirect_proto Ar linkspec
+.Op Fl redirect_address Ar linkspec
+.Op Fl config | f Ar configfile
 .Op Fl log_denied
-.Op Fl use_sockets
-.Op Fl same_ports
-.Op Fl verbose
 .Op Fl log_facility Ar facility_name
-.Op Fl unregistered_only
-.Op Fl dynamic
-.Op Fl inport Ar inport
-.Op Fl outport Ar outport
-.Op Fl port Ar port
-.Op Fl alias_address Ar address
-.Op Fl interface Ar interface
-.Op Fl config Ar configfile
-.Op Fl redirect_port Ar linkspec
-.Op Fl redirect_address Ar localIP publicIP
-.Op Fl reverse
-.Op Fl proxy_only
-.Op Fl proxy_rule Ar proxyspec
-.Op Fl pptpalias Ar localIP
-
+.Op Fl punch_fw Ar firewall_range
 .Sh $B2r@b(B
-$B$3$N%W%m%0%i%`$O!"(BFreeBSD $B$K$*$1$k(B 
+$B$3$N%W%m%0%i%`$O!"(B
+.Fx
+$B$K$*$1$k(B 
 .Xr divert 4
 $B%=%1%C%H$H6&$KMQ$$$k$3$H$K$h$C$F!"%M%C%H%o!<%/%"%I%l%9$NJQ49$r(B
 $B9T$$$^$9!#(B
 $B$3$N%W%m%0%i%`$O!"J#?t$N(B NIC $B$H$H$b$K;HMQ$9$k$3$H$r0U?^$7$F$$$^$9(B -
 PPP $B%j%s%/>e$G(B NAT $B$r9T$$$?$$>l9g!"(B
 .Xr ppp 8
-$B$N(B -nat $B%9%$%C%A$r;HMQ$7$F$/$@$5$$!#(B
-
+$B$N(B
+.Fl nat
+$B%9%$%C%A$r;HMQ$7$F$/$@$5$$!#(B
 .Pp
 .Nm natd
 $B$ODL>o!"%G!<%b%s$H$7$F%P%C%/%0%i%&%s%I$G<B9T$7$^$9!#(B
@@ -59,7 +52,6 @@
 $B$O%^%7%s$KF~$C$F$/$k%Q%1%C%H!"$^$?$O%^%7%s$+$i=P$F9T$/%Q%1%C%H$r(B
 $B@8(B (raw) $B$N$^$^07$$!">l9g$K$h$j(B IP $B%Q%1%C%H%9%H%j!<%`$K(B
 $B:F$SAw$j=P$9A0$K<j$r2C$($^$9!#(B
-
 .Pp
 .Nm natd
 $B$OB>$N%[%9%H$X8~$+$&$9$Y$F$N%Q%1%C%H$K$D$$$F!"H/?.85(B IP $B%"%I%l%9$r(B
@@ -72,106 +64,199 @@
 $B$3$NFbIt%F!<%V%k$,%A%'%C%/$5$l$^$9!#(B
 $B%(%s%H%j$,8+$D$+$k$H!"%Q%1%C%H$K@5$7$$BP>](B IP $B%"%I%l%9$H%]!<%HHV9f$r(B
 $BF~$l$k$N$KMxMQ$5$l$^$9!#(B
-
 .Pp
 $B0J2<$N%3%^%s%I%i%$%s%*%W%7%g%s$,MxMQ$G$-$^$9!#(B
 .Bl -tag -width Fl
-
 .It Fl log | l
-$BMM!9$J(B alias $B$NE}7W$d>pJs$r%U%!%$%k(B
+$BMM!9$J%(%$%j%"%9$NE}7W$d>pJs$r%U%!%$%k(B
 .Pa /var/log/alias.log
-$B$K5-O?$7$^$9!#$3$N%U%!%$%k$O(B natd $B$,5/F0$5$l$k$?$S$K@Z$j$D$a$i$l$^$9!#(B
-
+$B$K5-O?$7$^$9!#$3$N%U%!%$%k$O(B
+.Nm
+$B$,5/F0$5$l$k$?$S$K@Z$j$D$a$i$l$^$9!#(B
 .It Fl deny_incoming | d
 $B8=:_$N(B IP $B%"%I%l%9$X8~$+$&%Q%1%C%H$N$&$A!"FbItJQ49%F!<%V%k$K(B
-$B%(%s%H%j$NL5$$$b$N$r5qH]$7$^$9!#(B
-
+$B%(%s%H%j$NL5$$$b$N$rEO$7$^$;$s!#(B
 .It Fl log_denied
-$B5qH]$7$?F~NO%Q%1%C%H$r(B syslog $B$r2p$7$F%m%0$7$^$9(B
-(log_facility $B$r;2>H$7$F$/$@$5$$(B)$B!#(B
-
+$B5qH]$7$?F~NO%Q%1%C%H$r(B
+.Xr syslog 3
+$B$r2p$7$F%m%0$7$^$9(B
+.Po
+.Fl log_facility
+$B$r;2>H$7$F$/$@$5$$(B
+.Pc
+$B!#(B
 .It Fl log_facility Ar facility_name
-syslog $B$r2p$7$F>pJs$r%m%0$9$k$H$-$K!";XDj$7$?%m%0%U%!%7%j%F%#$r;HMQ$7$^$9!#(B
-$B%U%!%7%j%F%#L>$O(B
+.Xr syslog 3
+$B$r2p$7$F>pJs$r%m%0$9$k$H$-$K!";XDj$7$?%m%0%U%!%7%j%F%#$r;HMQ$7$^$9!#(B
+$B0z?t(B
+.Ar facility_name
+$B$O(B
 .Xr syslog.conf 5
-$B$K$"$kDL$j$G$9!#(B
-
+$B$K5-=R$5$l$F$$$k%-!<%o!<%I$N$&$A$N$R$H$D$G$9!#(B
 .It Fl use_sockets | s
 FTP data $B%3%M%/%7%g%s$d(B IRC DCC send $B%3%M%/%7%g%s$r3NN)$9$k$N$K(B
 .Xr socket 2
 $B$r3d$jEv$F$^$9!#$3$N%*%W%7%g%s$O$h$j%7%9%F%`%j%=!<%9$r>CHq$7$^$9$,!"(B
 $B%]!<%HHV9f$,>WFM$9$k>l9g$G$b%3%M%/%7%g%s$,@.8y$9$k$3$H$rJ]>Z$7$^$9!#(B
-
 .It Fl same_ports | m
 $B=P$F9T$/%Q%1%C%H$rJQ49$9$k;~$K!"$G$-$k$@$1%]!<%HHV9f$rF1$8$^$^(B
 $BJ]$D$h$&$K$7$^$9!#$3$N%*%W%7%g%s$K$h$j!"(BRPC $B$N$h$&$J%W%m%H%3%k$,(B
 $B$&$^$/F/$/2DG=@-$,$"$,$j$^$9!#%]!<%HHV9f$r0];}$9$k$3$H$,$G$-$J$$;~$K$O!"(B
 $B0EL[$N$&$A$KDL>o$HF1$8J}K!$GJQ49$5$l$^$9!#(B
-
 .It Fl verbose | v
 $B5/F0;~$K(B
-.Xr fork 2
-$B$d(B
 .Xr daemon 3
 $B$r8F$S=P$7$^$;$s!#$h$C$F!"@)8fC<Kv$+$i@Z$jN%$5$l$:$K!"I8=`=PNO$K(B
 $B$9$Y$F$N%Q%1%C%HJQ49$rI=<($7$^$9!#$3$N%*%W%7%g%s$O%G%P%C%0$NL\E*$K(B
 $B$N$_MQ$$$k$Y$-$G$9!#(B
-
 .It Fl unregistered_only | u
-$BEPO?$5$l$F$$$J$$H/?.85%"%I%l%9$rH<$&=P$F9T$/%Q%1%C%H$N$_$rJQ49$7$^$9!#(B
-rfc 1918 $B$K$h$l$P!"EPO?$5$l$F$$$J$$H/?.85%"%I%l%9$O(B 10.0.0.0/8 $B$H(B
+.Em $BEPO?$5$l$F$$$J$$(B
+$BH/?.85%"%I%l%9$rH<$&=P$F9T$/%Q%1%C%H$N$_$rJQ49$7$^$9!#(B
+RFC 1918 $B$K$h$l$P!"EPO?$5$l$F$$$J$$H/?.85%"%I%l%9$O(B 10.0.0.0/8 $B$H(B
 172.16.0.0/12 $B$H(B 192.168.0.0/16 $B$H$J$C$F$$$^$9!#(B
-
-.It Fl redirect_port Ar proto targetIP:targetPORT[-targetPORT] [aliasIP:]aliasPORT[-aliasPORT] [remoteIP[:remotePORT[-remotePORT]]]
+.It Fl redirect_port Ar proto Xo
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Op - Ns Ar targetPORT Xc
+.Op Ar aliasIP Ns : Ns Xo
+.Ar aliasPORT Ns Op - Ns Ar aliasPORT Xc
+.Oo Ar remoteIP Ns Oo : Ns
+.Ar remotePORT Ns Op - Ns Ar remotePORT
+.Oc Oc
+.Xc
 $B;XDj$5$l$?%]!<%H$KF~$C$F$/$k%3%M%/%7%g%s$rJL$N%[%9%H$H%]!<%H$K(B
 $B%j%@%$%l%/%H$7$^$9!#(B
-proto $B$O(B tcp $B$^$?$O(B udp$B!"(B
-targetPORT $B$O4uK>$9$kBP>]%]!<%HHV9f$+HO0O!"(B
-aliasPORT $B$O(B ($B%/%i%$%"%s%H$,(B) $BMW5a$9$k%]!<%HHV9f$+HO0O!"(B
-aliasIP $B$O(B alias $B$r9T$&%"%I%l%9$G$9!#(B
-remoteIP $B$H(B remotePORT $B$O!"I,MW$J>l9g$K$h$j@53N$J%3%M%/%7%g%s$r(B
+$B0z?t(B
+.Ar proto
+$B$O(B
+.Ar tcp
+$B$^$?$O(B
+.Ar udp
+$B!"(B
+.Ar targetIP
+$B$O4uK>$9$kBP>](B IP $BHV9f!"(B
+.Ar targetPORT
+$B$O4uK>$9$kBP>]%]!<%HHV9f$+HO0O!"(B
+.Ar aliasPORT
+$B$OMW5a$9$k%]!<%HHV9f$+HO0O!"(B
+.Ar aliasIP
+$B$O%(%$%j%"%9$r9T$&%"%I%l%9$G$9!#(B
+$B0z?t(B
+.Ar remoteIP
+$B$H(B
+.Ar remotePORT
+$B$O!"I,MW$J>l9g$K$h$j@53N$J%3%M%/%7%g%s$r(B
 $B;XDj$9$k$N$KMxMQ$G$-$^$9!#(B
-targetPORT $B$H(B aliasPORT $B$O?tCME*$KF1$8$G$"$kI,MW$O$"$j$^$;$s$,!"(B
+.Ar targetPORT
+$B$H(B
+.Ar aliasPORT
+$B$O?tCME*$KF1$8$G$"$kI,MW$O$"$j$^$;$s$,!"(B
 $BBg$-$5$OF1$8$G$"$k$3$H$,I,MW$G$9!#(B
-remotePORT $B$,;XDj$5$l$J$$$H!"A4%]!<%H$,2>Dj$5$l$^$9!#(B
-remotePORT $B$,;XDj$5$l$k$H!"(BtargetPORT $B$NBg$-$5$KE,9g$9$k$+!"(B
+.Ar remotePORT
+$B$,;XDj$5$l$J$$$H!"A4%]!<%H$,2>Dj$5$l$^$9!#(B
+.Ar remotePORT
+$B$,;XDj$5$l$k$H!"(B
+.Ar targetPORT
+$B$NBg$-$5$KE,9g$9$k$+!"(B
 0 ($BA4%]!<%H(B) $B$G$"$k$3$H$,I,MW$G$9!#(B
 $BNc$($P!"(B
-
+.Pp
 .Dl Ar tcp inside1:telnet 6666
-
+.Pp
 $B$H$$$&0z?t$O!"$3$N%^%7%s$N%]!<%H(B 6666 $B$K8~$1$i$l$?(B tcp $B%Q%1%C%H$,(B
 $B%^%7%s(B inside1 $B$N(B telnet $B%]!<%H$KAw$i$l$k$3$H$r<($7$F$$$^$9!#(B
-
+.Pp
 .Dl Ar tcp inside2:2300-2399 3300-3399
-
+.Pp
 $B$O!"(B
 $B%[%9%H(B inside2 $B$N%]!<%H(B 2300-2399 $B$K8~$1$i$l$?F~NO%3%M%/%7%g%s$r(B
 $B%]!<%H(B 3300-3399 $B$X%j%@%$%l%/%H$7$^$9!#(B
-
+.It Fl redirect_proto Ar proto localIP Oo
+.Ar publicIP Op Ar remoteIP
+.Oc
+.Ar publicIP
+$B$K8~$1$i$l$?%W%m%H%3%k(B
+.Ar proto
+.Po Xr protocols 5
+$B$r;2>H(B
+.Pc
+$B$NF~NO(B IP $B%Q%1%C%H$r!"(B
+.Ar localIP
+$B%"%I%l%9$X%j%@%$%l%/%H$7!"$=$N5U$b9T$$$^$9!#(B
+.Pp
+.Ar publicIP
+$B$,;XDj$5$l$J$$$H!"%G%U%)%k%H$N%(%$%j%"%9%"%I%l%9$,;HMQ$5$l$^$9!#(B
+.Ar remoteIP
+$B$,;XDj$5$l$k$H!"(B
+.Ar remoteIP
+$B$+$i(B/$B$X8~$1$FE~Ce$7$?%Q%1%C%H$N$_$,%k!<%k$K%^%C%A$7$^$9!#(B
 .It Fl redirect_address Ar localIP publicIP
 $B8x<0$J(B IP $B%"%I%l%9$X$N%Q%1%C%H$NN.$l$r!"%m!<%+%k%M%C%H%o!<%/Fb$N(B
-$B%^%7%s$K%j%@%$%l%/%H$7$^$9!#$3$N5!G=$O(B "$B@EE*(B NAT (static NAT)" $B$H(B
+$B%^%7%s$K%j%@%$%l%/%H$7$^$9!#$3$N5!G=$O(B
+.Em $B@EE*(B NAT (static NAT)
+$B$H(B
 $B8F$P$l$F$$$^$9!#(B
 $B@EE*(B NAT $B$O$"$J$?$N(B ISP $B$,(B IP $B%"%I%l%9$N>.$5$J%V%m%C%/$r$"$J$?$K(B
 $B3d$jEv$F$?;~$K!"C10l$N%"%I%l%9$H$7$FMQ$$$k$N$K$bMxMQ$G$-$^$9(B:
-
+.Pp
   redirect_address 10.0.0.8 0.0.0.0
-
+.Pp
 $B>e5-$N%3%^%s%I$OF~$C$F$/$9$Y$F$N%Q%1%C%H$r%^%7%s(B 10.0.0.8 $B$K(B
 $B%j%@%$%l%/%H$7$^$9!#(B
-
-$B2<5-$N$h$&$K!"$$$/$D$+$N%"%I%l%9(B alias $B$,F10l$N8x<0%"%I%l%9$r(B
+.Pp
+$B2<5-$N$h$&$K!"$$$/$D$+$N%"%I%l%9%(%$%j%"%9$,F10l$N8x<0%"%I%l%9$r(B
 $B<($9$h$&$K;XDj$9$k$H!"(B
-
-  redirect_address 192.168.0.2 public_addr
-  redirect_address 192.168.0.3 public_addr
-  redirect_address 192.168.0.4 public_addr
-  
+.Pp
+.Bd -literal -offset indent
+.Ar redirect_address 192.168.0.2 public_addr
+.Ar redirect_address 192.168.0.3 public_addr
+.Ar redirect_address 192.168.0.4 public_addr
+.Ed
+.Pp  
 $BF~$C$F$/$k%Q%1%C%H$NN.$l$O:G8e$KJQ49$5$l$?%m!<%+%k%"%I%l%9(B 
-(192.168.0.4) $B$K8~$1$i$l$^$9$,!":G=i$NFs$D$N%"%I%l%9$N=P$F9T$/(B
-$B%Q%1%C%H$NN.$l$O;XDj$5$l$?8x<0%"%I%l%9$X$N(B alias $B$N$^$^$K$J$j$^$9!#(B
-
+(192.168.0.4) $B$K8~$1$i$l$^$9$,!":G=i$NFs$D$N%"%I%l%9$X$N=PNO(B
+$B%Q%1%C%H$NN.$l$O!";XDj$5$l$?(B
+.Ar public_addr
+$B$+$i$N%(%$%j%"%9$N$^$^$K$J$j$^$9!#(B
+.It Fl redirect_port Ar proto Xo
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Oo , Ns
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Oo , Ns
+.Ar ...
+.Oc Oc
+.Xc
+.Xc
+.Op Ar aliasIP Ns : Ns Xo
+.Ar aliasPORT
+.Xc
+.Oo Ar remoteIP Ns
+.Op : Ns Ar remotePORT
+.Oc
+.Xc
+.It Fl redirect_address Xo
+.Ar localIP Ns Oo , Ns
+.Ar localIP Ns Oo , Ns
+.Ar ...
+.Oc Oc
+.Ar publicIP
+.Xc
+$B=q<0(B
+.Fl redirect_port
+$B$*$h$S(B
+.Fl redirect_address
+$B$O!"C10l%5!<%P$N%M%C%H%o!<%/Ii2Y$r%*%U%m!<%I$7!"(B
+$BIi2Y$r%5!<%P%W!<%k$XJ,;6$7$^$9!#(B
+$B$3$N5!G=$O(B
+.Em LSNAT
+(RFC 2391) $B$H$7$FCN$i$l$F$$$^$9!#(B
+$BNc$($P!"0z?t(B
+.Pp
+.Dl Ar tcp www1:http,www2:http,www3:http www:http
+.Pp
+$B$O!"%[%9%H(B www $B$X$NF~NO(B HTTP $BMW5a$r!"(B
+www1, www2, www3 $B$N$$$:$l$+$X!"F)2aE*$K%j%@%$%l%/%H$7$^$9!#(B
+$B$3$3$G!"%[%9%H$NA*Br$O!"%M%C%H$NIi2Y$K$+$+$o$i$:!"(B
+$BC1=c$K%i%&%s%I%m%S%s$G9T$o$l$^$9!#(B
 .It Fl dynamic
 .Fl n
 $B%*%W%7%g%s$d(B
@@ -192,23 +277,20 @@
 .\" $B$A$g$C$HD>$7$F$_$?$1$I$^$@ITK~!#(B
 $B%$%s%?%U%'!<%9$N(B IP $B%"%I%l%9$,JQ2=$9$k$H!"(B
 .Nm
-$B$O(B alias $B%"%I%l%9$rF0E*$KJQ99$7$^$9!#(B
-
-.It Fl i | inport Ar inport
+$B$O%(%$%j%"%9%"%I%l%9$rF0E*$KJQ99$7$^$9!#(B
+.It Fl in_port | i Ar port
 $B$9$Y$F$N%Q%1%C%H$r%^%7%s$KF~$C$F$/$k$b$N$H$7$F07$$!"(B
-.Ar inport
+.Ar port
 $B$+$iFI$_9~$_!"(B
-.Ar inport
+.Ar port
 $B$X=q$-=P$7$^$9!#(B
-
-.It Fl o | outport Ar outport
+.It Fl out_port | o Ar port
 $B$9$Y$F$N%Q%1%C%H$r%^%7%s$+$i=P$F9T$/$b$N$H$7$F07$$!"(B
-.Ar outport
+.Ar port
 $B$+$iFI$_9~$_!"(B
-.Ar outport
+.Ar port
 $B$X=q$-=P$7$^$9!#(B
-
-.It Fl p | port Ar port
+.It Fl port | p Ar port
 .Xr divert 4
 $B$K$h$C$F;XDj$5$l$?%k!<%k$rMQ$$$F%Q%1%C%H$r<1JL$7!"F~$C$F$/$k%Q%1%C%H$r(B
 .Ar port
@@ -216,24 +298,14 @@
 .Ar port
 $B$X=q$-=P$7$^$9!#(B
 .Ar port
-$B$,?t;z$G$J$$>l9g!"4X?t(B
-.Xr getservbyname 3
-$B$rMQ$$$F(B
-.Pa /etc/services
+$B$,?t;z$G$J$$>l9g!"(B
 $B%G!<%?%Y!<%9$,8!:w$5$l$^$9!#(B
-$B$3$N%U%i%0$,;XDj$5$l$J$$;~$K$O!"%G%U%)%k%H$H$7$F(B natd $B$H$$$&L>A0$N(B
+$B$3$N%U%i%0$,;XDj$5$l$J$$;~$K$O!"%G%U%)%k%H$H$7$F(B
+.Em natd
+$B$H$$$&L>A0$N(B
 divert $B%]!<%H$,MQ$$$i$l$^$9!#(B
-.Pa /etc/services
-$B%G!<%?%Y!<%9$N%(%s%H%j$NNc$H$7$F$O0J2<$N$h$&$K$J$j$^$9(B:
-
-  natd   8668/divert  # Network Address Translation socket
-
-$B$h$j>\$7$$@bL@$O!"(B
-.Xr services 5
-$B$r;2>H$7$F$/$@$5$$!#(B
-
-.It Fl a | alias_address Ar address
-alias $B%"%I%l%9$H$7$F(B
+.It Fl alias_address | a Ar address
+$B%(%$%j%"%9%"%I%l%9$H$7$F(B
 .Ar address
 $B$rMQ$$$^$9!#$3$N%*%W%7%g%s$,;XDj$5$l$J$$>l9g$O!"(B
 .Fl n
@@ -244,53 +316,82 @@
 $B8x3+$5$l$?%M%C%H%o!<%/%$%s%?%U%'!<%9$K3dEv$F$i$l$?%"%I%l%9$G$"$k(B
 $BI,MW$,$"$j$^$9!#(B
 .Pp
-$B$3$N%"%I%l%9$N%$%s%?%U%'!<%9$rDL$C$F=P$kA4%G!<%?$N%=!<%9%"%I%l%9$O(B
+.Em $B=PNO$5$l$k(B
+$BA4%G!<%?$N%=!<%9%"%I%l%9$O(B
 .Ar address
 $B$K=q49$($i$l$^$9!#(B
-$B30It$+$i$3$N%$%s%?%U%'!<%9$KE~Ce$9$kA4%G!<%?$O!"(B
-$B4{$K(B alias $B$5$l$?308~$1@\B3$K%^%C%A$9$k$+$I$&$+%A%'%C%/$5$l$^$9!#(B
+.Em $BE~Ce$9$k(B
+$BA4%G!<%?$O!"(B
+$B4{$K%(%$%j%"%9$5$l$?308~$1@\B3$K%^%C%A$9$k$+$I$&$+%A%'%C%/$5$l$^$9!#(B
 $B%^%C%A$9$k>l9g!"%Q%1%C%H$O$=$l$>$lJQ49$5$l$^$9!#(B
 $B%^%C%A$7$J$$>l9g!"(B
-.Fl redirect_port
-$B$H(B
+.Fl redirect_port ,
+.Fl redirect_proto ,
 .Fl redirect_address
 $B$N3d$jEv$F$r%A%'%C%/$7$=$l$>$l$NF0:n$r9T$$$^$9!#(B
 $BB>$NF0:n$,9T$($J$$>l9g$+$D(B
 .Fl deny_incoming
 $B$,;XDj$5$l$F$$$J$$>l9g!"(B
-$B%Q%1%C%H$K;XDj$5$l$?DL$j$K(B
+$B%Q%1%C%H$K;XDj$5$l$?DL$j$KL5=$@5$G(B
 $B%Q%1%C%H$O%m!<%+%k$N%^%7%s$N%]!<%H$KG[Aw$5$l$^$9!#(B
-.It Fl n | interface Ar interface
-alias $B%"%I%l%9$r7h$a$k$N$K!"(B
+$B8e=R$N(B
+.Fl target_address
+$B%*%W%7%g%s$r;2>H$7$F$/$@$5$$!#(B
+.It Fl t | target_address Ar address
+$BBP>]%"%I%l%9$r@_Dj$7$^$9!#(B
+$B4{B8$N%j%s%/$H$O4XO"IU$1$i$l$F$$$J$$F~NO%Q%1%C%H$,%[%9%H%^%7%s$KE~Ce$7$?;~!"(B
+$B$=$N%Q%1%C%H$O;XDj$5$l$?(B
+.Ar address
+$B$XAw$i$l$^$9!#(B
+.Pp
+$BBP>]%"%I%l%9$O(B
+.Ar 255.255.255.255
+$B$K@_Dj2DG=$G$9!#(B
+$B$3$N>l9g!"$9$Y$F$N?75,F~NO%Q%1%C%H$O!"(B
+.Fl alias_address
+$B$^$?$O(B
+.Fl interface
+$B$G@_Dj$5$l$k%(%$%j%"%9%"%I%l%9$X9T$-$^$9!#(B
+.Pp
+$B$3$N%*%W%7%g%s$r;HMQ$7$J$$>l9g!"$^$?$O0z?t(B
+.Ar 0.0.0.0
+$B$G8F$P$l$?>l9g!"(B
+$B$9$Y$F$N?75,F~NO%Q%1%C%H$O%Q%1%C%HCf$G;XDj$5$l$k%"%I%l%9$X9T$-$^$9!#(B
+$B$3$l$K$h$j!"%Q%1%C%H$N7PO)$,2DG=$J>l9g$K$O!"(B
+$B30It$N%^%7%s$,FbIt$N%^%7%s$HD>@\DL?.2DG=$K$J$j$^$9!#(B
+.It Fl interface | n Ar interface
+$B%(%$%j%"%9%"%I%l%9$r7h$a$k$N$K!"(B
 .Ar interface
 $B$rMQ$$$^$9!#(B
 .Ar interface
 $B$K4XO"$E$1$i$l$?(B IP $B%"%I%l%9$,JQ2=$9$k2DG=@-$,$"$k>l9g$K$O!"(B
 .Fl dynamic
-$B%U%i%0$b;XDj$5$l$k$Y$-$G$9!#(B
+$B%*%W%7%g%s$b;XDj$5$l$k$Y$-$G$9!#(B
+$B$3$N%*%W%7%g%s$,;XDj$5$l$J$$>l9g!"(B
+.Fl alias_address
+$B%*%W%7%g%s$r;HMQ$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 $B;XDj$5$l$?(B
 .Ar interface
-$B$O8x3+$5$l$?%M%C%H%o!<%/%$%s%?%U%'!<%9$G$"$kI,MW$,$"$j$^$9!#(B
-
-.It Fl f | config Ar configfile
-.Ar configfile
+$B$O!"DL>o!"8x3+$5$l$?%M%C%H%o!<%/%$%s%?%U%'!<%9$G$9!#(B
+.It Fl config | f Ar file
+.Ar file
 $B$+$i@_Dj$rFI$_9~$_$^$9!#(B
-.Ar configfile
+.Ar file
 $B$O%*%W%7%g%s$N%j%9%H$r4^$_!">e5-$N%3%^%s%I%i%$%s%U%i%0$ND9$$I=5-$H(B
 $BF1$8J*$,(B 1 $B9T$:$DF~$j$^$9!#Nc$($P!"(B
-
-  alias_address 158.152.17.1
-
-$B$H$$$&9T$O(B alias $B%"%I%l%9$K(B 158.152.17.1 $B$r;XDj$7$^$9!#(B
+.Pp
+.Dl alias_address 158.152.17.1
+.Pp
+$B$H$$$&9T$O%(%$%j%"%9%"%I%l%9$K(B 158.152.17.1 $B$r;XDj$7$^$9!#(B
 $B@_Dj%U%!%$%kFb$G$O!"0z?t$r;}$?$J$$%*%W%7%g%s$O(B
 .Ar yes
 $B$+(B
 .Ar no
 $B$rH<$C$F;XDj$5$l$^$9!#Nc$($P!"(B
-
-  log yes
-
+.Pp
+.Dl log yes
+.Pp
 $B$O(B
 .Fl log
 $B$HF1$80UL#$K$J$j$^$9!#(B
@@ -298,82 +399,80 @@
 $B8eB3$9$k6uGr$H6u9T$OL5;k$5$l$^$9!#(B
 .Ql \&#
 $B5-9f$O!"9T$N;D$j$,%3%a%s%H$G$"$k0u$G$9!#(B
-
 .It Fl reverse
-natd $B$N5UA`:n$G$9!#(B
+$B$3$N%*%W%7%g%s$r;XDj$9$k$H(B
+.Nm
+$B$OF~NO%Q%1%C%H$H=PNO%Q%1%C%H$r5U$K07$$!"(B
+$B30It%$%s%?%U%'!<%9$NBe$j$KFbIt%$%s%?%U%'!<%9>e$GF0:n$7$^$9!#(B
+.Pp
 $B=PNO%H%i%U%#%C%/$,%m!<%+%k%^%7%s$K%j%@%$%l%/%H$5$l!"(B
-natd $B$,F~NO%$%s%?%U%'!<%9$GAv9T$7$F$$$k(B ($BDL>o$O=PNO%$%s%?%U%'!<%9$GAv9T$7$^$9(B) 
+.Nm
+$B$,F~NO%$%s%?%U%'!<%9$GAv9T$7$F$$$k(B ($BDL>o$O=PNO%$%s%?%U%'!<%9$GAv9T$7$^$9(B) 
 $B$H$$$C$?!"F)2a%W%m%-%7$r<B9T$7$F$$$k>u67$GM-MQ$J>l9g$,$"$j$^$9!#(B
-
 .It Fl proxy_only
-natd $B$,F)2a%W%m%-%7$N$_$r<B9T$9$k$h$&6/@)$7$^$9!#(B
+.Nm
+$B$,F)2a%W%m%-%7$N$_$r<B9T$9$k$h$&6/@)$7$^$9!#(B
 $BDL>o$N%"%I%l%9JQ49$O<B9T$5$l$^$;$s!#(B
-
-.It Fl proxy_rule Ar [type encode_ip_hdr|encode_tcp_stream] port xxxx server a.b.c.d:yyyy
+.It Fl proxy_rule Xo
+.Op Ar type encode_ip_hdr | encode_tcp_stream
+.Ar port xxxx
+.Ar server a.b.c.d:yyyy
+.Xc
 $BF)2a%W%m%-%7$rM-8z$K$7$^$9!#(B
-$B;XDj$7$?%]!<%H$N%Q%1%C%H$G$3$N%[%9%H$+$iB>$N%[%9%H$X8~$+$&$b$N$O!"(B
+$B;XDj$7$?%]!<%H$N%Q%1%C%H$G$3$N%[%9%H$+$iB>$N%[%9%H$X8~$+$&=PNO(B TCP $B%Q%1%C%H$O!"(B
 $B;XDj$7$?%5!<%P$N%]!<%H$X%j%@%$%l%/%H$5$l$^$9!#(B
 $B%*%W%7%g%s$H$7$F!"85$N08@h%"%I%l%9$,%Q%1%C%H$K%(%s%3!<%I$5$l$^$9!#(B
-.Dq encode_ip_hdr
+.Ar encode_ip_hdr
 $B$O!"$3$N>pJs$r(B IP $B%*%W%7%g%s%U%#!<%k%I$KCV$-$^$9!#(B
-.Dq encode_tcp_stream
+.Ar encode_tcp_stream
 $B$O!"$3$N%G!<%?$r(B TCP $B%9%H%j!<%`$N@hF,$KA^F~$7$^$9!#(B
-
-.It Fl pptpalias Ar localIP
-PPTP $B%Q%1%C%H$,;XDj$7$?(B localIP $B%"%I%l%9$K9T$/$3$H$r5v2D$7$^$9!#(B
-PPTP $B$O!"(BVPN $B$^$?$O0BA4$J(B IP $B%H%s%M%k5;=Q$G$"$j!"(B
-$B:G=i$K(B Microsoft $B$,3+H/$7$^$7$?!#(B
-$B0E9f2=$7$?%H%i%U%#%C%/MQ$K!"(B
-GRE (47) $B$H8F$P$l$k8E$$(B IP $B%+%W%;%k2=%W%m%H%3%k$r;HMQ$7$^$9!#(B
-$B$3$N(B natd $B%*%W%7%g%s$O!"(B
-$B$3$N%W%m%H%3%k$N$9$Y$F$N%H%i%U%#%C%/$rC10l$N;XDj$7$?(B IP $B%"%I%l%9$KJQ49$7$^$9!#(B
-$B$3$l$K$h$j!"(B
-$BC10l$N%/%i%$%"%s%H$^$?$OC10l$N%5!<%P$KBP$9$k%5!<%S%9$r(B natd $B$,5v2D$7$^$9!#(B
-$B%5!<%P$r@_Dj$9$k>l9g!"(B
-PPTP $B@_Dj$N(B TCP $B%H%i%U%#%C%/$r5v$9$3$H$rK:$l$J$$$G$/$@$5$$!#(B
-$B%U%!%$%"%&%)!<%k%j%9%H$,M-8z$J$i$P!"(B
-$B%/%i%$%"%s%H$^$?$O%5!<%P$N$?$a$K(B GRE (protocol 47) $B$r5v2D$9$kI,MW$,$"$j$^$9!#(B
-
+.It Fl punch_fw Xo
+.Ar basenumber Ns : Ns Ar count
+.Xc
+$B$3$N%*%W%7%g%s$O!"(BFTP/IRC DCC $B%3%M%/%7%g%sMQ$K!"(B
+.Xr ipfirewall 4
+$B%Y!<%9$NKI2PJI$K7j$r3+$1$k$h$&!"(B
+.Nm
+$B$K;X<($7$^$9!#(B
+$B$3$l$O!"(B
+$BFCDj$N%3%M%/%7%g%s(B ($B$3$N%3%M%/%7%g%s$N$_(B) $B$NKI2PJI$NDL$jH4$1$r5v$9$H$$$&!"(B
+$B0l;~E*$JKI2PJI%k!<%k$r!"F0E*$K%$%s%9%H!<%k$9$k$3$H$G<B8=$5$l$^$9!#(B
+$B$3$N%k!<%k$O!"BP1~$9$k%3%M%/%7%g%s$,=*N;$9$k$H!"<+F0E*$K:o=|$5$l$^$9!#(B
+.Pp
+.Ar basenumber
+$B$+$i3+;O$9$k:GBg(B
+.Ar count
+$B8D$N%k!<%k$,;HMQ$5$l!"KI2PJI$K7j$r3+$1$^$9!#(B
+$B$9$Y$F$N%k!<%k$KBP$9$kHO0O$O!"5/F0;~$K%/%j%"$5$l$^$9!#(B
 .El
-
 .Sh NATD $B$N<B9T(B
 .Nm natd
 $B$rAv$i$;$h$&$H$9$kA0$K$O0J2<$N<j=g$,I,MW$H$J$j$^$9(B:
-
 .Bl -enum
 .It
-$B%P!<%8%g%s(B 2.2 $B$+$=$l0J>e$N(B FreeBSD $B$r<j$KF~$l$k!#$3$l$h$jA0$N(B
-$B%P!<%8%g%s$O(B
-.Xr divert 4
-$B%=%1%C%H$r%5%]!<%H$7$F$$$^$;$s!#(B
-
-.It
 $B<+J,$N%+!<%M%k$r0J2<$N%*%W%7%g%s$rIU$1$F9=C[$7$^$9(B:
-
-  options IPFIREWALL
-  options IPDIVERT
-
+.Bd -literal -offset indent
+options IPFIREWALL
+options IPDIVERT
+.Ed
+.Pp
 $B<+J,$N%+!<%M%k$r9=C[$9$kJ}K!$K$D$$$F$O!"%O%s%I%V%C%/$K>\$7$$@bL@$,(B
 $B$"$k$N$G$=$A$i$r;2>H$7$F$/$@$5$$!#(B
-
 .It
 $B$"$J$?$N%^%7%s$,%2!<%H%&%'%$$H$7$FF/$/$h$&$K$7$^$9!#$3$l$O(B
 .Pa /etc/rc.conf
 $B$K(B
-
-  gateway_enable=YES
-
+.Pp
+.Dl gateway_enable=YES
+.Pp
 $B$H;XDj$9$k$+!"(B
-
-  sysctl -w net.inet.ip.forwarding=1
-
+.Pp
+.Dl sysctl -w net.inet.ip.forwarding=1
+.Pp
 $B$H$$$&%3%^%s%I$rMQ$$$k$3$H$G5!G=$9$k$h$&$K$J$j$^$9!#(B
-
 .It
-.Fl n
-$B%U%i%0$d(B
 .Fl interface
-$B%U%i%0$r;H$$$?$$>l9g$O!"$=$N%$%s%?%U%'!<%9$,$9$G$K@_Dj:Q$_$H$J$k$h$&$K(B
+$B%*%W%7%g%s$r;H$$$?$$>l9g$O!"$=$N%$%s%?%U%'!<%9$,$9$G$K@_Dj:Q$_$H$J$k$h$&$K(B
 $B$7$^$9!#Nc$($P!"(B
 .Ar interface
 $B$H$7$F(B tun0 $B$r;XDj$7$h$&$H$7!"$=$N%$%s%?%U%'!<%9$G(B
@@ -383,47 +482,41 @@
 $B$r5/F0$9$kA0$K(B
 .Nm ppp
 $B$r5/F0$9$k$h$&$K$7$J$1$l$P$J$j$^$;$s!#(B
-
-.It
-.Pa /etc/services
-$B$K%(%s%H%j(B:
-
-  natd		 8668/divert  # Network Address Translation socket
-
-$B$r:n@.$7$^$9!#$3$l$O(B
-.Fl p
-$B%U%i%0$d(B
-.Fl port
-$B%U%i%0$N%G%U%)%k%H$NCM$H$J$j$^$9!#(B
-
 .El
 .Pp
 .Nm
 $B$N<B9T$O;j$C$F4JC1$G$9!#(B
-
-  natd -interface ed0
-
+.Pp
+.Dl natd -interface ed0
+.Pp
 $B$H$$$&9T$G$[$H$s$I$N>l9g=<J,$G$9(B ($B@5$7$$%$%s%?%U%'!<%9L>$KCV$-49$($F(B
 $B$/$@$5$$(B)$B!#(B
 .Nm
-$B$,5/F0$5$l$?$i!"%Q%1%C%H$NN.$l$NJ}8~$,(B natd $B$NJ}$KJQ$o$k(B 
+$B$,5/F0$5$l$?$i!"%Q%1%C%H$NN.$l$NJ}8~$,(B
+.Nm natd
+$B$NJ}$KJQ$o$k(B 
 (divert $B$5$l$k(B) $B$h$&$K$7$J$1$l$P$J$j$^$;$s(B:
-
 .Bl -enum
 .It
 .Pa /etc/rc.firewall
 $B%9%/%j%W%H$r$&$^$/D4@0$9$kI,MW$,$"$j$^$9!#KI2PJI(B (firewall) $B$K(B
 $B6=L#$,L5$1$l$P!"0J2<$N$h$&$K$9$l$PNI$$$G$7$g$&(B:
-
-  /sbin/ipfw -f flush
-  /sbin/ipfw add divert natd all from any to any via ed0
-  /sbin/ipfw add pass all from any to any
-
+.Bd -literal -offset indent
+/sbin/ipfw -f flush
+/sbin/ipfw add divert natd all from any to any via ed0
+/sbin/ipfw add pass all from any to any
+.Ed
+.Pp
 2 $BHVL\$N9T$O$"$J$?$N%$%s%?%U%'!<%9$K0M$j$^$9(B (ed0 $B$rE,@Z$K(B
 $BJQ99$7$F$/$@$5$$(B)$B!#(B
-$B$^$?!"A09`$N$h$&$K(B
-.Pa /etc/services
-$B$K(B natd $B$N%(%s%H%j$,F~$k$h$&$K99?7$5$l$F$$$k$H2>Dj$7$^$9!#(B
+.Pp
+$B$3$NKI2PJI$N@_Dj$G$O!"(B
+$B%m!<%+%k%M%C%H%o!<%/>e$NC/$b$,%=!<%9%"%I%l%9$r$"$J$?$N%[%9%H$K(B
+$B56Au2DG=$G$"$k$3$H$rG'<1$7$F$/$@$5$$!#(B
+$B%m!<%+%k%M%C%H%o!<%/>e$KB>$K%[%9%H$,$"$k>l9g!"(B
+$B?.Mj$9$k%[%9%H$X(B/$B$+$i$N%H%i%U%#%C%/$N$_$r5v2D$9$kKI2PJI%k!<%k$r:n@.$9$k$3$H$r(B
+$B6/$/4+$a$^$9!#(B
+.Pp
 $BK\J*$NKI2PJI%k!<%k$r;XDj$9$k>l9g!"%9%/%j%W%H$N@hF,$G>e5-$N(B 2 $B9TL\$r(B
 $B;XDj$9$k$HNI$$$G$7$g$&!#(B
 $B$=$&$9$k$3$H$K$h$C$F!"KI2PJI$K$h$jGS=|$5$l$F$7$^$&A0$K!"(B
@@ -434,13 +527,12 @@
 $B$NJQ498e!"E>49$r@8$8$5$;$?%k!<%kHV9f$N<!$N%k!<%kHV9f$+$i!"(B
 $B%Q%1%C%H$OKI2PJI$K:FF~$7$^$9(B
 ($BF1$8HV9f$KJ#?t$N%k!<%k$,$"$k>l9g$K$O!"<!$N%k!<%k$+$i$K$O$J$j$^$;$s(B)$B!#(B
-
 .It
 .Pa /etc/rc.conf
 $B$G(B
-
-  firewall_enable=YES
-
+.Pp
+.Dl firewall_enable=YES
+.Pp
 $B$H@_Dj$7!"KI2PJI$r:nF0$5$;$^$9!#$3$l$O%7%9%F%`$N5/F0;~$N%9%/%j%W%H$K(B
 .Pa /etc/rc.firewall
 $B%9%/%j%W%H$r<B9T$9$k$h$&$KEA$($^$9!#(B
@@ -452,28 +544,27 @@
 .Pa /etc/rc.firewall
 $B$N<B9T$O;_$^$C$F$7$^$$$^$9!#%9%/%j%W%H$r%P%C%/%0%i%&%s%I$G<B9T$9$l$P!"(B
 $B$3$N:R32$rHr$1$k$3$H$,$G$-$^$9!#(B
-
 .El
-
 .Sh $B4XO"9`L\(B
-.Xr socket 2 ,
-.Xr getservbyname 3 ,
 .Xr divert 4 ,
+.Xr protocols 5 ,
+.Xr rc.conf 5 ,
 .Xr services 5 ,
-.Xr ipfw 8
-
+.Xr syslog.conf 5 ,
+.Xr ipfw 8 ,
+.Xr ppp 8
 .Sh $B:n<T(B
 $B$3$N%W%m%0%i%`$O!"B?$/$N?M!9$N:Y@Z$l$NEXNO$N7k2L$G$9(B:
-
+.Pp
 .An Archie Cobbs Aq archie@whistle.com
 (divert $B%=%1%C%H(B)
-.An Charles Mott Aq cmott@srv.net
+.An Charles Mott Aq cmott@scientech.com
 ($B%Q%1%C%H%(%$%j%"%9(B)
 .An Eivind Eklund Aq perhaps@yes.no
 (IRC $B%5%]!<%H$H$=$NB>$NDI2C(B)
 .An Ari Suutari Aq suutari@iki.fi
 (natd)
 .An Dru Nelson Aq dnelson@redwoodsoft.com
-(PPTP $B%5%]!<%H(B)
+($B=i4|$N(B PPTP $B%5%]!<%H(B)
 .An Brian Somers Aq brian@awfulhak.org
 ($B$^$H$aLr(B)
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ndc.8 man/man8/ndc.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ndc.8	Tue Feb 15 23:35:04 2000
+++ man/man8/ndc.8	Wed Jul  5 09:39:10 2000
@@ -129,7 +129,7 @@
 $B%3%^%s%I$OL5$/!"(B
 .Ar restart
 $B%3%^%s%I$OC1$K%M!<%`%5!<%P$KBP$7$F<+8J$r(B
-.Xr execvp 2
+.Xr execvp 3
 $B$9$k$h$&DLCN$7$^$9!#(B
 .Sh $B:n<T(B
 Paul Vixie (Internet Software Consortium)
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ndp.8 man/man8/ndp.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ndp.8	Wed Jul  5 07:00:10 2000
+++ man/man8/ndp.8	Wed Jul  5 09:39:11 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     %Id: ndp.8,v 1.2 1999/10/07 05:26:13 itojun Exp %
-.\"     %FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.1 2000/01/06 12:40:40 shin Exp %
+.\"     %FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.1.2.1 2000/04/20 15:24:40 phantom Exp %
 .\" jpman %Id: ndp.8,v 1.4 2000/05/10 13:44:35 takaha Stab %
 .\"
 .\" WORD: neighbor discovery  $B6a@\C5:w(B
@@ -126,7 +126,7 @@
 .El
 .\"
 .Sh $BLa$jCM(B
-.Nm ndp
+.Nm
 $B$O@.8y;~$K(B 0 $B$r!"%(%i!<;~$K(B 0 $B0J30$rJV$7$^$9!#(B
 .\"
 .Sh $B4XO"9`L\(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/newfs_msdos.8 man/man8/newfs_msdos.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/newfs_msdos.8	Wed Jun 14 22:42:12 2000
+++ man/man8/newfs_msdos.8	Wed Jul  5 09:39:13 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.7 2000/03/01 11:27:25 sheldonh Exp %
+.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.7.2.2 2000/07/01 11:33:40 ps Exp %
 .\" jpman %Id: newfs_msdos.8,v 1.3 1998/10/10 09:07:02 yohta Stab %
 .\" 
 .Dd July 6, 1998
@@ -84,7 +84,7 @@
 .It Fl O Ar OEM
 OEM $BJ8;zNs(B (8 $BJ8;z$^$G(B)$B!#(B
 $B%G%U%)%k%H$O(B
-"BSD  4.4"
+\&"BSD  4.4"
 $B$G$9!#(B
 .It Fl S Ar sector-size
 $B%;%/%?$"$?$j$N%P%$%H?t!#<u$1IU$1$kCM$O!"(B128 $B$+$i(B 32768 $B$^$G$N!"(B2 $B$N$Y$->h$G$9!#(B
@@ -101,7 +101,7 @@
 .It Fl f Ar format
 $BI8=`(B ($B%U%m%C%T%G%#%9%/(B) $B%U%)!<%^%C%H$r;XDj$7$^$9!#(B
 $BI8=`%U%)!<%^%C%H$O(B 8 $B$D$"$j!"(B($B$=$l$>$l%-%m%P%$%H$G$NMFNL$GI=8=$7$F(B)
-160, 180, 320, 360, 720, 1200, 1440, 2880 $B$N$$$:$l$+$G$9!#(B
+160, 180, 320, 360, 640, 720, 1200, 1232, 1440, 2880 $B$N$$$:$l$+$G$9!#(B
 .It Fl h Ar heads
 $B%I%i%$%V$N%X%C%I?t!#(B
 .It Fl i Ar info
@@ -155,13 +155,13 @@
 .Ed
 .Sh $B;HMQNc(B
 
-	newfs_msdos /dev/rwd0s1
+	newfs_msdos /dev/ad0s1
 
-$B%G%U%)%k%H%Q%i%a!<%?$r;HMQ$7!"(B/dev/rwd0s1 $B$K%U%!%$%k%7%9%F%`$r:n@.$7$^$9!#(B
+$B%G%U%)%k%H%Q%i%a!<%?$r;HMQ$7!"(B/dev/ad0s1 $B$K%U%!%$%k%7%9%F%`$r:n@.$7$^$9!#(B
 
 	newfs_msdos -f 1440 -L foo fd0
 
-$BI8=`(B 1.44M $B%U%!%$%k%7%9%F%`$r!"%\%j%e!<%`%i%Y%k(B "foo" $B$K$F!"(B/dev/rfd0 $B$K(B
+$BI8=`(B 1.44M $B%U%!%$%k%7%9%F%`$r!"%\%j%e!<%`%i%Y%k(B "foo" $B$K$F!"(B/dev/fd0 $B$K(B
 $B:n@.$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr disktab 5 ,
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/newsyslog.8 man/man8/newsyslog.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/newsyslog.8	Wed Jun 14 22:42:12 2000
+++ man/man8/newsyslog.8	Wed Jul  5 09:39:16 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.23 2000/03/01 14:08:09 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.23.2.1 2000/05/19 09:21:30 des Exp %
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -18,7 +18,7 @@
 .\" provided "as is" without express or implied warranty.
 .\"
 .\" jpman %Id: newsyslog.8,v 1.3 1997/08/16 13:33:00 horikawa Stab %
-.Dd January 27, 1999
+.Dd April 4, 2000
 .Dt NEWSYSLOG 8
 .Os
 .Sh $BL>>N(B
@@ -28,6 +28,7 @@
 .Nm newsyslog
 .Op Fl Fnrv
 .Op Fl f Ar config_file
+.Op Ar
 .Sh $B2r@b(B
 .Nm
 $B$O(B
@@ -57,6 +58,7 @@
 .It
 $B%m%0F~$lBX$($r9T$&;XDj;~4V$G$"$k!#(B
 .El
+.Pp
 .Nm
 $B$NN3EY$O!"$3$N%3%^%s%I$,(B
 .Xr cron 8
@@ -124,6 +126,12 @@
 $B5-9f$H@)8B$5$l$?(B
 .Tn ISO 8601
 $B%U%)!<%^%C%H$G;~9o$rB3$1$k$3$H$,$G$-$^$9!#(B
+$B$^$?$O!"(B
+.So Li \&$ Sc
+$B5-9f$H;~9o$N;XDj$K$h$j!"(B
+$BF|$K(B 1 $B2s!"=5$K(B 1 $B2s!"7n$K(B 1 $B2s$N$$$:$l$+$N8GDj;~9o$K(B
+$B%m%0%U%!%$%k$rF~$lBX$($^$9!#(B
+.Pp
 $B;~9o$r;XDj$9$k$H!";XDj$7$?;~9o$N(B 1 $B;~4V0JFb$K(B
 .Nm
 $B$,<B9T$5$l$?>l9g$N$_!"%m%0%U%!%$%k$rF~$lBX$($^$9!#(B
@@ -132,7 +140,19 @@
 $B;~9o$H%$%s%?!<%P%k$NN>J}$,;XDj$5$l$?>l9g!"F~$lBX$($,<B9T$5$l$k$K$O!"(B
 $BN>J}$N>r7o$,K~$?$5$l$k$3$H$,I,MW$G$9!#(B
 .Pp
-$B;~9o$N%U%)!<%^%C%H$O(B
+$B%?%$%`%>!<%s$O;XDj$G$-$^$;$s!#(B
+$B8=:_$N<BAu$G$O!"L@3N$KJ,$dIC$NItJ,$r;XDj$9$k$3$H$O!"$[$H$s$I$G$-$^$;$s!#(B
+$B!V(B1 $B;~4V0JFb!W$G$"$k$3$H$N$_!"Hf3S$9$k$+$i$G$9!#(B
+.Pp
+.Em ISO 8601 $B@)8BIU;~9o%U%)!<%^%C%H(B
+.Pp
+$B@)8BIU(B
+.Tn ISO 8601
+$B;~9o$N@h9TJ8;z$O(B
+.So Li \&@ Sc
+$B5-9f$G$9!#@)LsIU(B
+.Tn ISO 8601
+$B%U%)!<%^%C%H$G$NFCDj$N;~9o$N;XDj$O<!$NDL$j$G$9(B:
 .Sm off
 .Oo
 .Oo
@@ -188,9 +208,62 @@
 .Sq Li \&
 .El
 .Pp
-$B%?%$%`%>!<%s$O;XDj$G$-$^$;$s!#(B
-$B8=:_$N<BAu$G$O!"L@3N$KJ,$dIC$NItJ,$r;XDj$9$k$3$H$O!"$[$H$s$I$G$-$^$;$s!#(B
-$B!V(B1 $B;~4V0JFb!W$G$"$k$3$H$N$_!"Hf3S$9$k$+$i$G$9!#(B
+.Em $BF|!&=5!&7n$N;~9o%U%)!<%^%C%H(B
+.Pp
+$BF|!&=5!&7n$N;~9o%U%)!<%^%C%H$N@h9TJ8;z$O(B
+.So Li \&$ Sc
+$B5-9f$G$9!#(B
+$BF|!&=5!&7n$N;XDj$NFCDj$N%U%)!<%^%C%H$O$=$l$>$l<!$NDL$j$G$9(B:
+.Sm off
+.Oo
+.Va D\&hh
+.Oc ,
+.Oo
+.Va W\&w
+.Oo
+.Va D\&hh
+.Oc
+.Oc 
+.Oo
+.Va M\&dd
+.Oo
+.Va D\&hh
+.Oc
+.Oc
+.Sm on
+$B%*%W%7%g%s$N;~9o%U%#!<%k%I$N%G%U%)%k%H$O!"?<Lk$G$9!#(B
+$BF|$H;~4V$N;XDj$NHO0O$O<!$NDL$j$G$9(B:
+.Pp
+.Bl -tag -width Ds -compact -offset indent
+.It Ar hh
+$B;~4V$G$"$j!"(B0 $B$+$i(B 23 $B$NHO0O(B
+.It Ar w
+$BMKF|$G$"$j!"(B0 $B$+$i(B 6 $B$NHO0O$G!"(B0 $B$,F|MKF|(B
+.It Ar dd
+$BF|$G$"$j!"(B1 $B$+$i(B 31 $B$NHO0O$+!":G=*F|$r;XDj$9$k$?$a$NJ8;z(B
+day of month, range 1 ... 31, or the letter
+.Em L
+$B$^$?$O(B
+.Em l
+.El
+.Pp
+$B0J2<$KNc$r<($7$^$9(B:
+.Pp
+.Bl -tag -width Ds -compact -offset indent
+.It Ar $D0
+$BKhHU?<Lk$KF~$lBX$($^$9(B
+.It Ar $D23
+$BKhHU(B 23:00 $B$KF~$lBX$($^$9(B
+.It Ar $W0D23
+$BKh=5F|MKF|$N(B 23:00 $B$KF~$lBX$($^$9(B
+.It Ar $W5D16
+$BKh=56bMKF|$N(B 16:00 $B$KF~$lBX$($^$9(B
+.It Ar $MLD0
+$BKh7n:G=*F|$N?<Lk$KF~$lBX$($^$9(B
+.It Ar $M5D6
+$BKh7n(B 5 $BF|$N(B 6:00 $B$KF~$lBX$($^$9(B
+.El
+.Pp
 .It Ar flags
 $B$3$N%U%#!<%k%I$O%*%W%7%g%s$G$"$j!"(B
 $BJ]B8$K:]$7$F%m%0%U%!%$%k$KFCJL$J=hM}$r9T$&$+$I$&$+$r;XDj$7$^$9!#(B
@@ -233,6 +306,22 @@
 $B$KBe$($F(B
 .Ar config_file
 $B$r;HMQ$7$^$9!#(B
+.It Fl a Ar directory
+$B%"!<%+%$%V$7$?%m%0%U%!%$%k$r=q$-9~$`(B
+.Ar directory
+$B$r;XDj$7$^$9!#(B
+$BAjBP%Q%9$r;XDj$7$?>l9g!"(B
+$B$3$l$r3F%m%0%U%!%$%k$N%Q%9$K8eCV$7$?%G%#%l%/%H%j$K!"(B
+$B$3$N%m%0%U%!%$%k$N%"!<%+%$%V%m%0$r=q$-9~$_$^$9!#(B
+$B@dBP%Q%9$r;XDj$7$?>l9g!"(B
+$B$9$Y$F$N%"!<%+%$%V%m%0$O;XDj$7$?(B
+.Ar directory
+$B$K=q$-9~$^$l$^$9!#(B
+$B%Q%9(B
+.Ar directory
+$B$N%3%s%]!<%M%s%H$,B8:_$7$J$$>l9g!"(B
+.Nm
+$B$,<B9T$5$l$k$H$-$K@8@.$5$l$^$9!#(B
 .It Fl v
 .Nm
 $B$r>\:Y>pJs=PNO%b!<%I$K$7$^$9!#(B
@@ -258,6 +347,11 @@
 $B$3$N%*%W%7%g%s$N;HMQ$K$h$j!"(B
 $BLdBj$N$_$r4^$`?7$7$$%m%0$rDs6!$G$-$k$N$GM-MQ$G$9!#(B
 .El
+.Pp
+$BDI2C$N%3%^%s%I9T0z?t$r;XDj$9$k$H!"(B
+.Nm
+$B$O$3$l$i$N0z?t$K%^%C%A$9$k%m%0%U%!%$%k$N$_$r8!::$7$^$9!#(B
+$B$=$&$G$J$$>l9g!"@_Dj%U%!%$%k$KNs5s$5$l$?A4%U%!%$%k$r8!::$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/newsyslog.confxxxx -compact
 .It Pa /etc/newsyslog.conf
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_UI.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_async.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_bpf.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_cisco.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_echo.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_ether.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_frame_relay.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_hole.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_iface.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_ksocket.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_lmi.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_ppp.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_pppoe.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_pptpgre.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_rfc1490.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_socket.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_tee.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_tty.8
Only in /home/horikawa/CVS_CASTLE/man-jp/man/man8: ng_vjc.8
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpd.8 man/man8/ntpd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpd.8	Wed Jun 14 10:57:30 2000
+++ man/man8/ntpd.8	Wed Jul  5 09:39:18 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.4 2000/02/10 13:15:47 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.4.2.1 2000/06/22 08:47:34 sheldonh Exp %
 .\"
 .Dd January 10, 2000
 .\" jpman %Id: ntpd.8,v 1.4 2000/06/02 11:03:54 takamune Stab %
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpdate.8 man/man8/ntpdate.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpdate.8	Wed Jul  5 07:00:10 2000
+++ man/man8/ntpdate.8	Wed Jul  5 09:39:20 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.1 2000/01/12 14:40:59 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.1.2.1 2000/06/22 08:48:03 sheldonh Exp %
 .\"
 .Dd January 6, 2000
 .\" jpman %Id: ntpdate.8,v 1.4 2000/06/02 11:05:22 takamune Stab %
@@ -181,7 +181,7 @@
 $B$3$N5!G=$O<g$K(B
 .Xr cron 8
 $B%9%/%j%W%H$G$NMxJX@-$r9M$($F:n$i$l$^$7$?!#(B
-.It Fl t timeout
+.It Fl t Ar timeout
 $B%5!<%P$N1~Ez$rBT$D:GBg;~4V$r(B
 .Ar timeout
 $B$KIC?t(B ($B>.?t$b2D(B) $B$G;XDj$7$^$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpdc.8 man/man8/ntpdc.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpdc.8	Wed Jul  5 07:00:10 2000
+++ man/man8/ntpdc.8	Wed Jul  5 09:39:23 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.2 2000/01/13 09:59:54 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.2.2.2 2000/05/15 11:53:05 sheldonh Exp %
 .\"
 .Dd January 7, 2000
 .\" jpman %Id: ntpdc.8,v 1.4 2000/06/02 11:05:53 takamune Stab %
@@ -503,7 +503,9 @@
 .Qo
 $B;2>H%/%m%C%/%I%i%$%P(B
 .Qc
-$B$N%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
+$B$N%Z!<%8$r;2>H$7$F$/$@$5$$(B (
+.Pa /usr/share/doc/ntp
+$B$K$"$k(B HTML $BJ8=q$N0lIt$H$7$F;2>H2DG=$G$9(B)$B!#(B
 $B%G%U%)%k%H$G$OM-8z$K$J$C$F$$$^$9!#(B
 .\" .Ic -> .It $B$NJQ99(B (send-pr docs/17500)
 .It pps
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpq.8 man/man8/ntpq.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntpq.8	Wed Jun 14 10:57:30 2000
+++ man/man8/ntpq.8	Wed Jul  5 09:39:25 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.3 2000/03/01 14:09:17 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.3.2.2 2000/05/15 11:44:03 sheldonh Exp %
 .\"
 .Dd January 7, 2000
 .\" jpman %Id: ntpq.8,v 1.4 2000/06/02 11:06:08 takamune Stab %
@@ -192,7 +192,9 @@
 $B%G%3!<%I$5$l$F$$$J$$$b$N$K$O!"$=$N8e$K(B
 .Qq ?
 $B$,IU$1$i$l$^$9!#(B
-.It Ic debug Ar more | Ar less | Ar off
+.It Ic debug Xo
+.Ar more | Ar less | Ar off
+.Xc
 $BFbIt$NLd$$9g$o$;%W%m%0%i%`$N%G%P%C%0$r%*%s$^$?$O%*%U$K$7$^$9!#(B
 .It Ic delay Ar milliseconds
 $BG'>Z$r5a$a$k%j%/%(%9%H$K4^$^$l$k%?%$%`%9%?%s%W$K2C$($i$l$k;~4V4V3V$r(B
@@ -221,7 +223,10 @@
 $B$3$N%3%^%s%I$G!"G'>Z@_Dj%j%/%(%9%H$K;H$o$l$k80HV9f$r;XDj$G$-$^$9!#(B
 $B$3$NHV9f$O!"%5!<%P$,G'>Z$N$?$a$K;H$&$h$&@_Dj$7$?80HV9f$KBP1~$7$F(B
 $B$$$J$1$l$P$J$j$^$;$s!#(B
-.It Ic ntpversion Ar 1 | Ar 2 | Ar 3 | Ar 4
+.It Ic ntpversion Xo
+.Ar 1 | Ar 2 |
+.Ar 3 | Ar 4
+.Xc
 .Nm
 $B$,%Q%1%C%H$NCf$G<+>N$9$k(B NTP $B$N%P!<%8%g%sHV9f$r%;%C%H$7$^$9!#(B
 $B%G%U%)%k%H$G$O(B 3 $B$K$J$j$^$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntptrace.8 man/man8/ntptrace.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ntptrace.8	Wed Jul  5 07:00:10 2000
+++ man/man8/ntptrace.8	Wed Jul  5 09:39:26 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.1 2000/01/12 14:41:00 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.1.2.1 2000/05/09 13:01:56 sheldonh Exp %
 .\" jpman %Id: ntptrace.8,v 1.4 2000/05/18 11:21:27 takamune Stab %
 .\"
 .Dd January 6, 2000
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/pccardd.8 man/man8/pccardd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/pccardd.8	Wed Jun 14 22:42:13 2000
+++ man/man8/pccardd.8	Wed Jul  5 09:39:28 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.17 2000/03/01 14:09:19 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.17.2.1 2000/04/15 10:56:21 iwasaki Exp %
 .\"
 .\" jpman %Id: pccardd.8,v 1.4 1997/07/26 22:04:06 horikawa Stab %
 .\"
@@ -46,9 +46,12 @@
 .Pp
 $B<B9T$5$l$k$H!"(B
 .Nm
-$B$O(B ($B%G%U%)%k%HL>$,(B
-.Pa /etc/pccard.conf 
-$B$N(B) $B@_Dj%U%!%$%k$rFI$_9~$_!"%+!<%I$N$?$a$KMxMQ2DG=$J(B PC-CARD $B%9%m%C%H(B
+$B$O@_Dj%U%!%$%k(B ($B%G%U%)%k%HL>$O(B
+.Pa /etc/defaults/pccard.conf
+$B$G$"$j!"$3$l$,%f!<%6@_Dj%U%!%$%k(B
+.Pa /etc/pccard.conf
+$B$r%$%s%/%k!<%I$7$^$9(B)
+$B$rFI$_9~$_!"%+!<%I$N$?$a$KMxMQ2DG=$J(B PC-CARD $B%9%m%C%H(B
 $B$r%9%-%c%s$7$^$9!#(B
 .Nm
 $B$O!"$=$N8e!"Nc$($P?7$7$$%+!<%I$NA^F~$d%+!<%I$N<h$j30$7$N$h$&$J!"(B
@@ -110,6 +113,10 @@
 $B$3$l$O!"FI$_9~$_2DG=%+!<%M%k%b%8%e!<%k$,%5%]!<%H$5$l$?;~$KBg$-$/JQ$o(B
 $B$k$G$7$g$&!#(B
 .Pp
+SIGHUP $B$O!"(B
+.Nm
+$B$K@_Dj%U%!%$%k$r:FFI$_9~$_$5$;$^$9!#(B
+.Pp
 .Nm
 $B$,M}2r$9$k<B9T;~%*%W%7%g%s$O0J2<$NDL$j$G$9!#(B
 .Bl -tag -width Ds
@@ -123,6 +130,8 @@
 $B%+!<%I$,%W%m!<%V$5$l$F%"%?%C%A$5$l$k8e$^$GCY$i$;$^$9!#(B
 .It Fl i Ar IRQ
 $BMxMQ2DG=$J(B IRQ $B$r@_Dj$7$^$9!#(B
+.Pa /etc/defaults/pccard.conf
+$B$*$h$S(B
 .Pa /etc/pccard.conf
 $B$N(B "irq" $B9T$KM%@h$7$^$9!#(B
 .It Fl f Ar configfile
@@ -138,8 +147,15 @@
 $B%G%P%$%9$K$D$$$F$b>\:Y$K=q$+$l$F$$$^$9!#(B
 .Pp
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /etc/pccard.conf -compact
+.Bl -tag -width /etc/defaults/pccard.conf -compact
+.It Pa /etc/defaults/pccard.conf
+$B%G%U%)%k%H$N@_Dj%U%!%$%k(B
 .It Pa /etc/pccard.conf
+$B%f!<%6$N@_Dj%U%!%$%k(B
+.It Pa /var/run/pccardd.pid
+$B8=:_<B9TCf$N(B
+.Nm
+$B$N%W%m%;%9(B ID
 .El
 .Sh $B4XO"9`L\(B
 .Xr pccard.conf 5 ,
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ping6.8 man/man8/ping6.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ping6.8	Wed Jun 14 10:57:30 2000
+++ man/man8/ping6.8	Wed Jul  5 09:39:30 2000
@@ -26,14 +26,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     %Id: ping6.8,v 1.4 1999/10/07 05:29:03 itojun Exp %
-.\"	%FreeBSD: src/sbin/ping6/ping6.8,v 1.3 2000/03/02 14:53:26 sheldonh Exp %
+.\"	%FreeBSD: src/sbin/ping6/ping6.8,v 1.3.2.2 2000/05/06 14:22:21 phantom Exp %
 .\" jpman %Id: ping6.8,v 1.3 2000/05/14 14:35:41 yt-kage Stab %
 .\"
 .\" WORD: ICMPv6 Node Information Node Addresses = ICMPv6 $B%N!<%I>pJs(B($B%"%I%l%9(B)$BLd$$9g$o$;(B
 .\" WORD: ICMPv6 Node Information FQDN query = ICMPv6 $B%N!<%I>pJs(B(FQDN)$BLd$$9g$o$;(B
 .Dd May 17, 1998
 .Dt PING6 8
-.Os KAME
+.Os
 .Sh $BL>>N(B
 .Nm ping6
 .Nd $B%M%C%H%o!<%/%[%9%H$KBP$7$F(B
@@ -316,8 +316,8 @@
 .Sh $B4XO"9`L\(B
 .Xr netstat 1 ,
 .Xr ifconfig 8 ,
-.Xr routed 8 ,
 .Xr ping 8 ,
+.Xr routed 8 ,
 .Xr traceroute 8 ,
 .Xr traceroute6 8
 .Sh $BNr;K(B
@@ -326,7 +326,10 @@
 .Bx 4.3 
 $B$GEP>l$7$^$7$?!#(B
 IPv6 $B$r%5%]!<%H$7$?(B
-.Nm ping6
+.Nm
 $B%3%^%s%I$O(B KAME IPv6 $B%W%m%H%3%k%9%?%C%/%-%C%H$G$O$8$a$FEP>l$7$^$7$?!#(B
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+KAME Project (http://www.kame.net/) $B%9%?%C%/$r4p$H$9$k(B
+IPv6 $B$*$h$S(B IPsec $B$N%5%]!<%H$O!"(B
+.Fx 4.0
+$B$G;O$a$FAH$_9~$^$l$^$7$?!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ppp.8 man/man8/ppp.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ppp.8	Wed Jun 14 22:42:13 2000
+++ man/man8/ppp.8	Wed Jul  5 09:39:44 2000
@@ -1,7 +1,8 @@
-.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209 2000/03/02 14:53:35 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209.2.8 2000/06/30 09:54:06 ps 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 +484,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 +1109,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 +1172,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
@@ -1904,21 +1907,21 @@
 .It
 $B%?%$%`%"%&%H$r(B 15 $BIC$K%;%C%H$7$^$9!#(B
 .It
-"login:" $B$N<u?.BT$A$r9T$$$^$9!#$b$7<u?.$G$-$J$1$l$P(B
+\&"login:" $B$N<u?.BT$A$r9T$$$^$9!#$b$7<u?.$G$-$J$1$l$P(B
 $BI|2~J8;z$rAw?.$7$F!":F$S(B "login:" $B$N<u?.BT$A$r9T$$$^$9!#(B
 .It
-"awfulhak" $B$rAw?.$7$^$9!#(B
+\&"awfulhak" $B$rAw?.$7$^$9!#(B
 .It
-"word:" ("Password:" $B%W%m%s%W%H$NKvHx(B) $B$N<u?.BT$A$r9T$$$^$9!#(B
+\&"word:" ("Password:" $B%W%m%s%W%H$NKvHx(B) $B$N<u?.BT$A$r9T$$$^$9!#(B
 .It
 .Ar authkey
 $B$K8=:_@_Dj$5$l$F$$$kCM$rAw?.$7$^$9!#(B
 .It
-"ocol:" ("Protocol:" $B%W%m%s%W%H$NKvHx(B) $B$N<u?.BT$A$r9T$$$^$9!#(B
+\&"ocol:" ("Protocol:" $B%W%m%s%W%H$NKvHx(B) $B$N<u?.BT$A$r9T$$$^$9!#(B
 .It
-"PPP" $B$rAw?.$7$^$9!#(B
+\&"PPP" $B$rAw?.$7$^$9!#(B
 .It
-"HELLO" $B$N<u?.BT$A$r9T$$$^$9!#(B
+\&"HELLO" $B$N<u?.BT$A$r9T$$$^$9!#(B
 .El
 .Pp
 .Dq set authkey
@@ -1947,8 +1950,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 +2038,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 +2088,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 +2553,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 +2754,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
@@ -2886,18 +2906,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 +3042,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
@@ -3065,29 +3086,6 @@
 $B$3$N%*%W%7%g%s$OM-MQ$G$9!#(B
 $B$7$+$7!"Aw?.85%[%9%H$H08@h%]!<%H$K$D$-(B
 $BFbIt%^%7%s(B 1 $BBf$N$_$K@\B32DG=$H$$$&@)8B$,$"$j$^$9!#(B
-.It nat pptp Op Ar addr
-$B$9$Y$F$N(B
-.Em G Ns No eneral
-.Em R Ns No outing
-.Em E Ns No encapsulated
-.Pq Dv IPPROTO_GRE
-$B%Q%1%C%H$r!"%m!<%+%k%$%s%?%U%'!<%9%"%I%l%9$G$O$J$/(B
-.Ar addr
-$B$r;HMQ$9$k$3$H$K$h$j!"(B
-.Nm
-$B$KJQ49$5$;$^$9!#(B
-$B$3$l$O!"%^%7%s$NFbIt%M%C%H%o!<%/>e$G(B
-.Em P Ns No oint
-to
-.Em P Ns No oint
-.Em T Ns No unneling
-.Em P Ns No rotocol
-$B$N;HMQ$r5v$7$^$9!#(B
-.Pp
-.Ar addr
-$B$r;XDj$7$J$$$H!"(B
-.Dv PPTP
-$B%"%I%l%9JQ49$OL58z$K$J$j$^$9!#(B
 .It "nat proxy cmd" Ar arg Ns No ...
 $B$3$N%3%^%s%I$O!"(B
 .Nm
@@ -3106,6 +3104,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 +3175,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 +3508,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
@@ -3763,51 +3842,51 @@
 .It set cd Oo
 .No off| Ns Ar seconds Ns Op \&!
 .Oc
-$BDL>o!"(B
+$BDL>o!"%*!<%W%s$7$?%G%P%$%9$N%?%$%W$K$h$j!"(B
 .Nm
-$B$O%*!<%W%s$7$?%G%P%$%9$K0MB8$7$F!"%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9(B:
+$B$O%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9!#(B
 .Bl -tag -width XXX -offset XXX
 .It $BC<Kv%G%P%$%9(B
-$B%m%0%$%s%9%/%j%W%H40N;$N(B 1 $BIC8e$K!"%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9!#(B
-$B%-%c%j%"$,@_Dj$5$l$F$$$J$$$H!"(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$O2>Dj$7!"$3$N;v<B$r%m%0$K<h$C$F!"%-%c%j%"$N%A%'%C%/$r;_$a$^$9!#(B
 .Pp
-ptys $B$O(B TIOCMGET ioctl $B$r%5%]!<%H$7$J$$$?$a!"(B
-tty $B%G%P%$%9$O!"%G%P%$%9$,(B pty $B$G$"$k$H8!=P$7$?$H$-!"(B
-$BA4%-%c%j%"8!=P$r%*%U$K$7$^$9!#(B
+$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$K(B 1 $B2s!"%-%c%j%"$,%A%'%C%/$5$l$^$9!#(B
-6 $BIC8e$K@_Dj$5$l$F$$$J$$>l9g!"@\B3;n9T$O<:GT$7$?$H$_$J$5$l!"(B
-$B%G%P%$%9$,JD$8$i$l$^$9!#(B
-i4b $B%G%P%$%9$G$O!"%-%c%j%"$O>o$KI,MW$G$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$K(B 1 $B2s!"%-%c%j%"$,%A%'%C%/$5$l$^$9!#(B
-5 $BIC8e$K@_Dj$5$l$F$$$J$$>l9g!"@\B3;n9T$O<:GT$7$?$H$_$J$5$l!"(B
-$B%G%P%$%9$,JD$8$i$l$^$9!#(B
-PPPoE $B%G%P%$%9$G$O!"%-%c%j%"$O>o$KI,MW$G$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$^$;$s!#(B
-$B%-%c%j%"CM$r@_Dj$9$k$H!"%G%P%$%9%*!<%W%s;~$K7Y9p$,=P$^$9!#(B
+$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!"(B
-$B@\B38e(B 1 $BIC0J>e7P2a$7$F$+$i%-%c%j%"?.9f$r=P$9$b$N$,$"$j$^$9!#(B
-$BCY1d$rA}$d$5$J$$$H!"(B
-$B%j%s%/$,Mn$A$?$H$-$r(B
-.Nm ppp
-$B$O8!CN$G$-$J$/$J$j$^$9!#(B
+$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%"F0:n$KM%@h$7$^$9!#(B
+$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:GBgIC?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
@@ -3817,12 +3896,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$3$NIC?t$,7P2a$7$?;~E@$G!"(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$7$J$$$b$N$H2>Dj$7$^$9!#(B
+$B$O%G%P%$%9$,%-%c%j%"$r@_Dj$G$-$J$$$HA[Dj$7$^$9!#(B
 .Pp
-$B0z?t$r;XDj$7$J$$$H!"%-%c%j%"@_Dj$O%G%U%)%k%HCM$KLa$j$^$9!#(B
+$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
@@ -4061,8 +4141,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
@@ -4073,7 +4153,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!
@@ -4081,7 +4161,7 @@
 .Pp
 $BJ#?t%l%Y%k$N%M%9%H$K$D$$$F!"(B
 $B%(%9%1!<%WJ8;z$N;HMQJ}K!$K(B ($B:FEY(B) $BCm0U$7$F$/$@$5$$!#(B
-$B$3$3$G$O!"(B4 $B$D$N%Q!<%6$,F0:n$7$F$$$^$9!#(B
+$B$3$3$G$O!"(B4 $B$D$N%Q!<%6$,F0:n$7$F$^$9!#(B
 1 $BHVL\$O!"%*%j%8%J%k$N9T$r%Q!<%:$7!"(B3 $B$D$N0z?t$H$7$FFI$_$^$9!#(B
 2 $BHVL\$O!"Bh(B 3 $B0z?t$r(B 11 $B8D$N0z?t$H$7$FFI$_$^$9!#(B
 $B$3$3$G!"(B
@@ -4325,6 +4405,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
@@ -4803,7 +4902,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 ...
@@ -4845,6 +4944,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
@@ -5007,7 +5111,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
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/prefix.8 man/man8/prefix.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/prefix.8	Wed Jun 14 10:57:30 2000
+++ man/man8/prefix.8	Wed Jul  5 09:39:46 2000
@@ -26,12 +26,12 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     %Id: prefix.8,v 1.1.1.1 1999/08/08 23:31:13 itojun Exp %
-.\"	%FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2 2000/03/12 19:50:11 shin Exp %
+.\"	%FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2.2.1 2000/05/06 14:04:21 phantom Exp %
 .\"
 .\" jpman %Id: prefix.8,v 1.3 2000/04/28 05:42:18 takaha Stab %
 .Dd October 10, 1998
 .Dt PREFIX 8
-.Os KAME
+.Os
 .Sh $BL>>N(B
 .Nm prefix
 .Nd $B%M%C%H%o!<%/%$%s%?%U%'!<%9$N%W%l%U%#%C%/%9$r@_Dj$9$k(B
@@ -39,7 +39,7 @@
 .Nm prefix
 .Ar interface prefix
 .Op Ar parameters
-.Op Cm set|delete
+.Op Cm set | delete
 .Nm prefix
 .Ar interface
 .Cm matchpr
@@ -51,7 +51,7 @@
 .Cm up_uselen
 .Ar use_prefix_len
 .Op Ar parameters
-.Op Cm add|change|setglobal
+.Op Cm add | change | setglobal
 .Nm prefix
 .Fl a
 .Op Fl d
@@ -65,7 +65,7 @@
 .Cm up_uselen
 .Ar use_prefix_uselen
 .Op Ar parameters
-.Op Cm add|change|setglobal
+.Op Cm add | change | setglobal
 .Sh $B2r@b(B
 .Nm
 $B$O!"%M%C%H%o!<%/%$%s%?%U%'!<%9$K%W%l%U%#%C%/%9$r3d$jEv$F$?$j!"(B
@@ -84,7 +84,9 @@
 .Dl % sysctl -w net.inet6.ip6.forwarding=1
 net.inet6.ip6.forwarding $B$,(B 0 $B$K@_Dj$5$l$F$$$k$H!"(B
 .Nm
-$B%3%^%s%I$O(B EPERM $B%(%i!<$G<:GT$7$^$9!#(B
+$B%3%^%s%I$O(B
+.Er EPERM
+$B%(%i!<$G<:GT$7$^$9!#(B
 .Pp
 $B<!$N%*%W%7%g%s$,;HMQ2DG=$G$9(B:
 .Bl -tag -width indent
@@ -114,7 +116,7 @@
 $B8=:_$N(B IPv6 $B3d$jEv$F5,B'2<$G$O!"$3$NCM$O$[$\>o$K(B 64 $B$G$9!#(B
 $BK\%Q%i%a!<%?$,>JN,$5$l$?>l9g!"(B64 $B$,;HMQ$5$l$^$9!#(B
 .It Cm matchpr Ar match_prefix
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 $B%3%^%s%IE,MQBP>]$N3d$jEv$F:Q$_%W%l%U%#%C%/%9$H$N%^%C%A%s%0$K;HMQ$5$l$k!"(B
 .Ar match_prefix
 $B$r;XDj$7$^$9!#(B
@@ -127,22 +129,22 @@
 $B$H%^%C%A2DG=$J%W%l%U%#%C%/%9$N:GC;D9$r!"(B10 $B?J?t$N%S%C%H?t$G;XDj$7$^$9!#(B
 .Ar match_prefix_minlen
 $B$h$j$bC;$$%W%l%U%#%C%/%9D9$N3d$jEv$F:Q%W%l%U%#%C%/%9$KBP$7$F$O!"(B
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 $B$OE,MQ$5$l$^$;$s!#(B
 .It Cm mp_maxlen Ar match_prefix_maxlen
 .Ar match_prefix
 $B$H%^%C%A2DG=$J%W%l%U%#%C%/%9$N:GBgD9$r!"(B10 $B?J?t$N%S%C%H?t$G;XDj$7$^$9!#(B
 .Ar match_prefix_manlen
 $B$h$j$bD9$$%W%l%U%#%C%/%9D9$N3d$jEv$F:Q%W%l%U%#%C%/%9$KBP$7$F$O!"(B
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 $B$OE,MQ$5$l$^$;$s!#(B
 .It Cm usepr Ar use_prefix
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 $B%3%^%s%I$GDI2C$5$l$k%W%l%U%#%C%/%9$H$7$F;HMQ$5$l$k(B
 .Ar use_prefix
 $B$r;XDj$7$^$9!#(B
 .It Cm up_uselen Ar use_prefix_uselen
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 $B%3%^%s%I$GDI2C$5$l$k%W%l%U%#%C%/%9$N3+;OItJ,$K%3%T!<$5$l$k(B
 .Ar use_prefix
 $B$N3+;OItJ,$r!"(B10 $B?J?t$N%S%C%H?t$G;XDj$7$^$9!#(B
@@ -198,19 +200,22 @@
 $BMW5a$5$l$?%W%l%U%#%C%/%9$,L$CN$G$"$k$3$H!"(B
 $BFC8"$NL5$$%f!<%6$,%$%s%?%U%'!<%9@_Dj$rJQ$($h$&$H$7$?$3$H$N$$$:$l$+$r<($7$^$9!#(B
 .Sh $B4XO"9`L\(B
-M. Crawford,
-Router Renumbering for IPv6,
-internet-draft,
-draft-ietf-ipngwg-router-renum-05.txt
-.Pp
-.Xr ifconfig 8 ,
 .Xr netstat 1 ,
 .Xr netintro 4 ,
+.Xr ifconfig 8 ,
 .Xr rc 8 ,
 .Xr routed 8
+.Rs
+.%A M. Crawford
+.%T Router Renumbering for IPv6
+.%R internet-draft
+.%N draft-ietf-ipngwg-router-renum-05.txt
+.Re
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B WIDE/KAME IPv6 $B%W%m%H%3%k%9%?%C%/%-%C%H$G$O$8$a$FEP>l$7$^$7$?!#(B
-.\"
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+KAME Project (http://www.kame.net/) $B%9%?%C%/$r4p$H$9$k(B
+IPv6 $B$*$h$S(B IPsec $B$N%5%]!<%H$O!"(B
+.Fx 4.0
+$B$G;O$a$FAH$_9~$^$l$^$7$?!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/rc.8 man/man8/rc.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/rc.8	Wed Jun 14 22:42:13 2000
+++ man/man8/rc.8	Wed Jul  5 09:39:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/share/man/man8/rc.8,v 1.9 2000/03/03 14:05:02 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man8/rc.8,v 1.9.2.1 2000/06/20 10:32:11 alex Exp %
 .\" jpman %Id: rc.8,v 1.3 1997/08/16 13:37:00 horikawa Stab %
 .\"
 .Dd December 11, 1993
@@ -155,11 +155,10 @@
 $B$,5/F0$5$l$k$N$O!">e5-%9%/%j%W%H$N8e$G$9$,!";D$j$N(B
 .Nm rc
 $B%U%!%$%k$,40N;$9$kA0$G$9!#(B
-$B8=:_!"(B
+$B%G%U%)%k%H%$%s%9%H!<%k$G$O!"(B
 .Nm rc.local
-$B$,$9$k$3$H$O!"%P!<%8%g%s>pJs$r(B
-.Pa /etc/motd
-$B$K@_Dj$9$k$3$H$@$1$G$9!#(B
+$B$OB8:_$7$^$;$s$,!"%7%9%F%`4IM}<T$,$3$N%U%!%$%k$r@8@.$9$l$P!"(B
+$B$=$NFbMF$,<B9T$5$l$^$9!#(B
 .Pp
 $BEAE}$K=>$$!"%9%?!<%H%"%C%W%U%!%$%k$O(B
 .Pa /etc
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/restore.8 man/man8/restore.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/restore.8	Wed Jun 14 22:42:13 2000
+++ man/man8/restore.8	Wed Jul  5 09:39:50 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/restore/restore.8,v 1.20 2000/03/01 11:27:37 sheldonh Exp %
+.\" %FreeBSD: src/sbin/restore/restore.8,v 1.20.2.1 2000/07/01 08:10:59 ps Exp %
 .\"
 .\" jpman %Id: restore.8,v 1.2 1997/03/31 14:58:10 horikawa Stab %
 .Dd May 1, 1995
@@ -190,11 +190,11 @@
 $BB;32$rM?$($k$3$H$,$"$j$^$9(B ($B%G%#%9%/$O8@$&$K5Z$P$:!"@:?@E*$K$b(B)$B!#(B
 $B<!$N$h$&$K<B9T$7$^$9(B:
 .Bd -literal -offset indent
-newfs /dev/rrp0g eagle
-mount /dev/rp0g /mnt
+newfs /dev/da0s1a
+mount /dev/da0s1a /mnt
 cd /mnt
 
-restore rf /dev/rst8
+restore rf /dev/rsa0
 .Ed
 .Pp
 .Nm restore
@@ -253,9 +253,9 @@
 $B$+$iFI$_9~$_$^$9(B;
 .Ar file
 $B$O!"(B
-.Pa /dev/rmt12
+.Pa /dev/rsa0
 ($B%F!<%W%I%i%$%V(B) $B$d(B
-.Pa /dev/rda1c
+.Pa /dev/da1c
 ($B%G%#%9%/%I%i%$%V(B) $B$H$$$C$?%9%Z%7%c%k%G%P%$%9%U%!%$%k!"(B
 $BDL>o$N%U%!%$%k!"(B
 .Ql Fl
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/rexecd.8 man/man8/rexecd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/rexecd.8	Wed Jun 14 22:42:13 2000
+++ man/man8/rexecd.8	Wed Jul  5 09:39:51 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/libexec/rexecd/rexecd.8,v 1.9 1999/08/28 00:09:49 peter Exp %
+.\" %FreeBSD: src/libexec/rexecd/rexecd.8,v 1.9.2.1 2000/06/30 16:49:41 nsayer Exp %
 .\" jpman %Id: rexecd.8,v 1.2 1997/05/28 07:05:49 yugawa Stab %
 .\"
 .Dd September 23, 1994
@@ -41,6 +41,7 @@
 .Nd $B%j%b!<%H<B9T%5!<%P(B
 .Sh $B=q<0(B
 .Nm rexecd
+.Op Fl i
 .Sh $B2r@b(B
 .Nm
 $B$O!"(B
@@ -92,7 +93,14 @@
 .El
 .Sh $B7Y9p(B
 .Nm
-$B$O(B root $B$N%m%0%$%s!"(B
+$B$O(B root $B$N%m%0%$%s$r5v2D$7$^$;$s!#(B
+$B$?$@$7(B
+.Fl i
+$B%*%W%7%g%s$,%3%^%s%I9T(B ($BE57?E*$K$O(B
+.Pa /etc/inetd.conf
+) $B$G;XDj$5$l$?>l9g$O=|$-$^$9!#(B
+.Nm
+$B$O$^$?(B
 .Pa /etc/ftpusers
 $B$K%j%9%H$5$l$?%f!<%6$G$N%"%/%;%9!"(B
 $B%Q%9%o!<%I$NL5$$%f!<%6$N%"%/%;%9$r5v2D$7$^$;$s!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/setkey.8 man/man8/setkey.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/setkey.8	Wed Jun 14 10:57:30 2000
+++ man/man8/setkey.8	Wed Jul  5 09:39:54 2000
@@ -27,16 +27,14 @@
 .\"
 .\"     %Id: setkey.8,v 1.14 1999/10/27 17:08:58 sakane Exp %
 .\" jpman %Id: setkey.8,v 1.3 2000/06/05 09:10:56 okazaki Stab %
-.\"     %FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4 2000/03/13 01:38:46 shin Exp %
+.\"     %FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4.2.3 2000/05/15 14:16:49 hoek Exp %
 .\"
 .Dd May 17, 1998
 .Dt SETKEY 8
-.Os KAME
-.\" 
+.Os
 .Sh $BL>>N(B
 .Nm setkey
 .Nd $B<jF0$G(B SA/SP $B%G!<%?%Y!<%9$rA`:n$9$k(B
-.\" 
 .Sh $B=q<0(B
 .Nm setkey
 .Op Fl dv
@@ -264,8 +262,6 @@
 .It Fl E Ar ealgo Ar key
 $B0E9f2=%"%k%4%j%:%`$r;XDj$7$^$9!#(B
 .It Fl A Ar aalgo Ar key
-.\" $BLuCm(B: ealgo $B$O86J8$N(B typo$B!#(BFreeBSD $B$G$O(B rev. 1.7 $B$G=$@5:Q$_!#(B(docs/18547)
-.\" 2000/05/15 okazaki@be.to
 $BG'>Z%"%k%4%j%:%`$r;XDj$7$^$9!#(B
 .Fl A
 $B$,(B esp $BMQ$K;HMQ$5$l$k$H!"0E9f%Z%$%m!<%I$N(B
@@ -556,5 +552,8 @@
 $B%3%^%s%I$O(B WIDE Hydrangea IPv6 $B%W%m%H%3%k%9%?%C%/%-%C%H$G(B
 $B$O$8$a$FEP>l$7$^$7$?!#(B
 $BK\%3%^%s%I$O(B 1998 $BG/(B 6 $B7n$K!"40A4$K:F%G%6%$%s$5$l$^$7$?!#(B
-.\"
-.\" .Sh BUGS
+.Pp
+KAME Project (http://www.kame.net/) $B%9%?%C%/$r4p$H$9$k(B
+IPv6 $B$*$h$S(B IPsec $B$N%5%]!<%H$O!"(B
+.Fx 4.0
+$B$G;O$a$FAH$_9~$^$l$^$7$?!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/spppcontrol.8 man/man8/spppcontrol.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/spppcontrol.8	Wed Jun 14 22:42:13 2000
+++ man/man8/spppcontrol.8	Wed Jul  5 09:39:55 2000
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6 2000/03/01 11:27:41 sheldonh Exp %
+.\" %FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6.2.1 2000/05/10 09:53:31 sheldonh Exp %
 .\"
 .Dd October 11, 1997
 .Os
@@ -207,7 +207,8 @@
 .Xr sppp 4 ,
 .Xr ifconfig 8
 .Rs
-.%A B. Lloyd,  W. Simpson
+.%A B. Lloyd
+.%A W. Simpson
 .%T "PPP Authentication Protocols"
 .%O RFC 1334
 .Re
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/telnetd.8 man/man8/telnetd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/telnetd.8	Thu Feb 24 06:37:33 2000
+++ man/man8/telnetd.8	Wed Jul  5 09:39:58 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\" %FreeBSD: src/libexec/telnetd/telnetd.8,v 1.16 2000/01/25 14:52:00 shin Exp %
+.\" %FreeBSD: src/libexec/telnetd/telnetd.8,v 1.16.2.1 2000/05/24 13:19:43 mpp Exp %
 .\"
 .\" jpman %Id: telnetd.8,v 1.2 1997/05/12 08:14:57 yugawa Stab %
 .\"
@@ -505,7 +505,7 @@
 $B$^$?$O(B
 .Em \&if
 $B$K;XDj$5$l$k>pJs$O!"%3%s%=!<%k$H%j%b!<%H%m%0%$%s$NN>J}$GI=<($5$l$^$9!#(B
-.Sh $B4D6-JQ?t(B
+.\" .Sh $B4D6-JQ?t(B
 .Sh $B%U%!%$%k(B
 .Bl -tag -width /usr/ucb/bftp -compact
 .It Pa /etc/services
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/timed.8 man/man8/timed.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/timed.8	Tue Feb 15 23:35:08 2000
+++ man/man8/timed.8	Wed Jul  5 09:40:00 2000
@@ -30,9 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timed.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.7 1999/08/28 01:20:19 peter Exp %
+.\" %FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.7.2.1 2000/03/14 10:54:57 sheldonh Exp %
 .\"
-.\" Original Revision: 1.5
 .\" jpman %Id: timed.8,v 1.2 1997/05/17 16:08:46 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -43,15 +42,14 @@
 .Nd $B%?%$%`%5!<%P%G!<%b%s(B
 .Sh $B=q<0(B
 .Nm timed
-.Op Fl M
-.Op Fl t
-.Op Fl d
+.Op Fl dtM
 .Op Fl i Ar network
 .Op Fl n Ar network
 .Op Fl F Ar host1 host2 ...
 .Sh $B2r@b(B
-$BK\%3%^%s%I$O!"%?%$%`%5!<%P%G!<%b%s$G$"$j!"DL>o$O%V!<%H;~$K(B
-.Xr rc 8
+.Nm
+$B%G!<%b%s$O!"%?%$%`%5!<%P%G!<%b%s$G$"$j!"DL>o$O%V!<%H;~$K(B
+.Xr rc.network 8
 $B%U%!%$%kFb$N5-=R$K=>$C$F5/F0$5$l$^$9!#K\%3%^%s%I$K$h$j!"%[%9%H$H!"(B
 .Nm
 $B$r<B9T$7$F$$$k%m!<%+%k%M%C%H%o!<%/>e$N%^%7%s$H$N;~9o$NF14|$r<h$j$^$9!#(B
@@ -62,6 +60,72 @@
 $B%?%$%`%9%?%s%W%j%/%(%9%H%a%C%;!<%8$rMQ$$$k$3$H$G!"(B
 $B%^%7%s4V$N;~9o:9J,$r7WB,$7!"%M%C%H%o!<%/J?6Q;~4V$r7W;;$7$^$9!#(B
 .Pp
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
+.It Fl d
+$B%G%P%C%0%b!<%I$rM-8z$K$7$^$9!#(B
+$BC<Kv$+$i@Z$jN%$5$J$$$h$&$K$7$^$9!#(B
+.It Fl i Ar network
+$BL5;k$9$Y$-%M%C%H%o!<%/%j%9%H$K(B
+.Ar network
+$B$rDI2C$7$^$9!#(B
+$BB>$N!"D>@\%^%7%s$K@\B3$5$l$F$$$k%M%C%H%o!<%/$r(B
+.Nm
+$B$O;HMQ$7$^$9!#(B
+$BJ#?t$N%M%C%H%o!<%/$r%j%9%H$KDI2C$9$k$?$a$K!"K\%*%W%7%g%s$rJ#?t2s;XDj2DG=$G$9!#(B
+.It Fl F Ar host ...
+$B?.Mj$9$k%[%9%H$N%j%9%H$r:n@.$7$^$9!#(B
+.Nm
+$B$O?.Mj$9$k%[%9%H$N$_$r%^%9%?$H$7$F<u$1IU$1$^$9!#(B
+$B?.Mj$7$F$$$J$$%[%9%H$,%^%9%?$G$"$k$H<gD%$7$F$$$k$H!"(B
+.Nm
+$B$O$=$N%[%9%H$+$i$NF~NO%a%C%;!<%8$rM^@)$7!"?75,$KA*Br$r9T$$$^$9!#(B
+$BK\%*%W%7%g%s$O!"0EL[E*$K(B
+.Fl M
+$B%*%W%7%g%s$r;XDj$7$^$9!#(B
+$BK\%*%W%7%g%s$r;XDj$7$J$$$H!"(B
+$B%M%C%H%o!<%/$K@\B3$5$l$F$$$kA4%[%9%H$r?.Mj$7$^$;$s!#(B
+.It Fl M
+$BI,MW$J$i$P!"%[%9%H$,(B
+.Nm
+$B%^%9%?$K$J$k$3$H$r5v$7$^$9!#(B
+.It Fl n Ar network
+.Ar network
+$B$r5v2D$5$l$?%M%C%H%o!<%/$N%j%9%H$KDI2C$7$^$9!#(B
+$BB>$N(B
+$BB>$N!"D>@\%^%7%s$K@\B3$5$l$F$$$k%M%C%H%o!<%/$r(B
+.Nm
+$B$OL5;k$7$^$9!#(B
+$BJ#?t$N%M%C%H%o!<%/$r%j%9%H$KDI2C$9$k$?$a$K!"K\%*%W%7%g%s$rJ#?t2s;XDj2DG=$G$9!#(B
+.It Fl t
+$B<u?.%a%C%;!<%8$N%H%l!<%7%s%0$rM-8z$K$7!"%U%!%$%k(B
+.It Pa /var/log/timed.log
+$B$X%m%0$7$^$9!#(B
+.Xr timedc 8
+$B%f!<%F%#%j%F%#$K$h$j!"(B
+.Nm
+$B<B9TCf$K!"%H%l!<%7%s%0$N%*%s$H%*%U$r@Z$jBX$(2DG=$G$9!#(B
+.El
+.Pp
+.Fl n 
+$B$H(B
+.Fl i
+$B$OGSB>$G$"$j!"%[%9%H$,<B:]$K@\B3$5$l$F$$$k%M%C%H%o!<%/$r0z?t$H$7$FMW5a$7$^$9(B (
+.Xr networks 5
+$B$r;2>H$7$F$/$@$5$$(B)$B!#(B
+$B$I$A$i$N%U%i%0$b;XDj$7$J$$$H!"A4%M%C%H%o!<%/$KBP$7$FBT5!$7$^$9!#(B
+.Pp
+.Fl M 
+$B$H(B
+.Fl F 
+$B$N$I$A$i$N%U%i%0$b;XDj$;$:$K<B9TCf$N(B
+.Nm
+$B$O!"%9%l!<%V$N$^$^$G$9!#(B
+.Fl F 
+$B%U%i%0$r;XDj$7$J$$$H!"(B
+.Nm
+$B$OA4%^%7%s$r?.Mj$G$-$J$$$b$N$H$7$^$9!#(B
+.Pp
 .Nm
 $B$K$h$C$FDs6!$5$l$k%5!<%S%9$O!"%^%9%?!]%9%l!<%V9=B$$K4p$E$$$F9=@.$5$l$F$$$^$9!#(B
 .Nm
@@ -78,74 +142,36 @@
 $B$HDL?.$7!"(Btimed $B@)8f%W%m%0%i%`$G$"$k(B
 .Xr timedc 8
 $B$HDL?.$7$^$9!#(B
-$B%^%9%?%5!<%P$,Av9T$7$F$$$k%[%9%H$,%/%i%C%7%e$7$?>l9g!"(B
-$B%9%l!<%V%^%7%s$i$O!"(B
-.Fl M
-$B%U%i%0IU$-$GF0:n$7$F$$$k%9%l!<%V$NFb$+$i?7$?$J%^%9%?%5!<%P$rA*$S$^$9!#(B
+$B%^%9%?$r<B9T$7$F$$$k%^%7%s$KE~C#IT2DG=$K$J$k$H!"(B
+$B%9%l!<%V$O!">/$J$/$H$b(B
 .Fl M
-$B$d(B
+$B$H(B
 .Fl F
-$B%*%W%7%g%s$rIU2C$7$J$$$GF0:n$7$F$$$k(B
-.Nm
-$B$O!"%9%l!<%V$N$^$^$G$9!#(B
-.Fl t
-$B%U%i%0$O!"(B
+$B$N%U%i%0$N$I$A$i$+$r;}$D%9%l!<%V$NCf$+$i?75,$K%^%9%?$rA*Br$7$^$9!#(B
+.Pp
+$BDL>o!"5/F0;~$K(B
 .Nm
-$B$,<u?.$9$k%a%C%;!<%8$r(B 
-.Pa /var/log/timed.log
-$B$X5-O?$9$k$h$&$K$7$^$9!#$3$N%H%l!<%95!G=$O!"(B
-.Xr timedc 8
-$B$rMQ$$$F%*%s(B/$B%*%U$rJQ99$G$-$^$9!#(B
-.Fl d
-$B%U%i%0$O!"%G!<%b%s$N%G%P%C%0$N$?$a$N%*%W%7%g%s$G$9!#(B
-$BK\%*%W%7%g%s$O!"%W%m%0%i%`$r%P%C%/%0%i%&%s%I<B9T$7$J$$$h$&$K$7$^$9!#(B
-.Pp
-$BDL>o!"(B
-.Nm
-$B$O!"@\B3$5$l$F$$$k%M%C%H%o!<%/>e$N%^%9%?%?%$%`%5!<%P$r%A%'%C%/$7$^$9$,!"(B
-$B0J2<$K5-=R$N$"$k%*%W%7%g%s$r;XDj$7$FF0:n$rJQ99$7$?>l9g$K$O$3$N8B$j$G$O(B
-$B$"$j$^$;$s!#(B
-$B:G=i$KH/8+$7$?%^%9%?%?%$%`%5!<%P$KBP$7F14|%5!<%S%9$rMW5a$7$^$9!#(B
-.Fl M
-$B%*%W%7%g%s$,M-8z$J>l9g!"(B
-$B@\B3$5$l$F$$$k%M%C%H%o!<%/$K$F%^%9%?%5!<%P$,B8:_$7$J$$;~$K$O!"(B
-$BF14|%5!<%S%9$rB>$N%^%7%s$KDs6!$7$^$9!#(B
-$B$=$N>l9g!"%5!<%P$O%H%C%W%l%Y%k%^%9%?$K$h$C$F7W;;$5$l$?;~9o$r<hF@$7!"(B
-$BB>$N%^%7%s$KDLCN$7$^$9!#(B
-.Fl n
-$B%U%i%0$H6&$KEv%[%9%H$,@\B3$5$l$?%M%C%H%o!<%/L>(B
-(
-.Xr networks 5
-$B$r;2>H(B)$B$r;XDj$9$k$H!"(B
-$B%M%C%H%o!<%/%"%I%l%9$K4X$9$kEv%W%m%0%i%`$N%G%U%)%k%HA*Br$rL58z$K$7$^$9!#(B
-.Fl n
-$B%U%i%0$,;XDj$5$l$k$4$H$K!"%M%C%H%o!<%/L>$O@5Ev$J%M%C%H%o!<%/L>$N%j%9%H$K(B
-$BDI2C$5$l$^$9!#B>$N$9$Y$F$N%M%C%H%o!<%/$OL5;k$5$l$^$9!#(B
-.Fl i
-$B%U%i%0$H6&$KEv%[%9%H$,@\B3$5$l$?%M%C%H%o!<%/L>(B
-(
-.Xr networks 5
-$B$r;2>H(B)$B$r;XDj$9$k$H!"(B
-$B%M%C%H%o!<%/%"%I%l%9$K4X$9$kEv%W%m%0%i%`$N%G%U%)%k%HA*Br$rL58z$K$7$^$9!#(B
-.Fl i
-$B%U%i%0$,;XDj$5$l$k$4$H$KL5;k$9$Y$-%M%C%H%o!<%/L>$N%j%9%H$K(B
-$BEv3:%M%C%H%o!<%/L>$,DI2C$5$l$^$9!#(B
-$BB>$N$9$Y$F$N%M%C%H%o!<%/$O%G!<%b%s$,;HMQ$7$^$9!#(B
+$B$O!"@\B3$5$l$F$$$k3F%M%C%H%o!<%/>e$N%^%9%?%?%$%`%5!<%P$r%A%'%C%/$7$^$9!#(B
+$B$?$@$7!">e=R$N(B
 .Fl n
 $B$H(B
 .Fl i
-$B$O!"F1;~$K;HMQ$G$-$^$;$s!#(B
-.Pp
+$B$N%*%W%7%g%s$r;XDj$5$l$?>l9g$OJL$G$9!#(B
+$BK\%W%m%0%i%`$O!":G=i$K8+IU$1$?%5!<%P$KF14|%5!<%S%9$rMW5a$7$^$9!#(B
+.Fl M
+$B$^$?$O(B
+.Fl F
+$B$N%U%i%0$K$h$j5v$5$l$k>l9g!"(B
+$B@\B3$5$l$F$$$k%M%C%H%o!<%/>e$G!"(B
+$B?.Mj$G$-$k%^%9%?%5!<%P$r8!=P$G$-$J$+$C$?$N$b$KBP$7!"(B
+$BF14|%5!<%S%9$rDs6!$7$^$9!#(B
+$B$=$N>l9g!"%5!<%P$O%H%C%W%l%Y%k%^%9%?$K$h$C$F7W;;$5$l$?;~9o$r<hF@$7!"(B
+$BB>$N%^%7%s$KDLCN$7$^$9!#(B
 .Nm
-$B$O!"@\B3$5$l$F$$$k%M%C%H%o!<%/>e$N%^%9%?%?%$%`%5!<%P$r%A%'%C%/$7$^$9!#$7$+$7!"(B 
-.Fl n
-$B$d(B
-.Fl i
-$B%*%W%7%g%s$K$h$C$F$=$NF0:n$,JQ99$5$l$F$$$k>l9g$K$O$=$N8B$j$G$O$"$j$^$;$s!#(B
-$BJ#?t$N%^%9%?%?%$%`%5!<%P$,J#?t$N%M%C%H%o!<%/>e$KB8:_$9$k>l9g!"%G!<%b%s$O(B
-$B!H%9%l!<%V!I(B $B$K$J$k$?$a$N%M%C%H%o!<%/$r(B 1$B$DA*$S!"(B
-$B%^%9%?%5!<%P$,8+$D$+$i$J$/$J$C$?>l9g$N$?$a$K!"(B
-$BDj4|E*$KB>$N%M%C%H%o!<%/$r%A%'%C%/$7$^$9!#(B
+$B$O!"%9%l!<%V$H$7$FF0:nCf$N%M%C%H%o!<%/$KBP$7!"(B
+$BDj4|E*$K%^%9%?$NB8:_$r%A%'%C%/$7$^$9!#(B
+$B$=$N%M%C%H%o!<%/$K?.Mj$G$-$k%^%9%?$,B8:_$7$J$/$J$C$?>l9g!"(B
+$B$=$N%M%C%H%o!<%/>e$GA*Br=hM}$r3+;O$7$^$9!#(B
 .Pp
 $B%^%7%s72$NF14|$r$H$k$?$a$N(B 1$B$D$NJ}K!$H$7$F!"(B
 .Tn NTP
@@ -207,6 +233,7 @@
 .Xr adjtime 2 ,
 .Xr gettimeofday 2 ,
 .Xr icmp 4 ,
+.Xr networks 5 ,
 .Xr timedc 8
 .Rs
 .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/traceroute6.8 man/man8/traceroute6.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/traceroute6.8	Wed Jul  5 07:00:11 2000
+++ man/man8/traceroute6.8	Wed Jul  5 09:40:01 2000
@@ -26,13 +26,12 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     %Id: traceroute6.8,v 1.1.1.1 1999/08/08 23:32:38 itojun Exp %
-.\"	%FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.1 1999/12/28 02:37:14 shin Exp %
+.\"	%FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.1.2.3 2000/05/09 14:12:53 sheldonh Exp %
 .\" jpman %Id: traceroute6.8,v 1.4 2000/05/10 13:44:47 takaha Stab %
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
-.Os KAME
-.\"
+.Os
 .Sh $BL>>N(B
 .Nm traceroute6
 .Nd IPv6 $B%Q%1%C%H$,=*E@$^$G$K$?$I$k7PO)$rI=<($9$k(B
@@ -82,8 +81,8 @@
 .El
 .\"
 .Sh $BLa$jCM(B
-.Nm traceroute6
-$B$O@.8y;~$K(B 0 $B$r!"%(%i!<;~$K(B 0 $B0J30$rJV$7$^$9!#(B
+.Nm
+$B%3%^%s%I$O!"@.8y;~$K(B 0 $B$r!"%(%i!<;~$K(B 0 $B0J30$rJV$7$^$9!#(B
 .\"
 .Sh $B4XO"9`L\(B
 .Xr ping 8 ,
@@ -94,6 +93,9 @@
 .Nm
 $B%3%^%s%I$O(B WIDE Hydrangea IPv6 $B%W%m%H%3%k%9%?%C%/%-%C%H$G(B
 $B$O$8$a$FEP>l$7$^$7$?!#(B
-.\"
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+KAME Project (http://www.kame.net/) $B%9%?%C%/$r4p$H$9$k(B
+IPv6 $B$*$h$S(B IPsec $B$N%5%]!<%H$O!"(B
+.Fx 4.0
+$B$G;O$a$FAH$_9~$^$l$^$7$?!#(B
+
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/usbd.8 man/man8/usbd.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/usbd.8	Wed Jun 14 22:42:14 2000
+++ man/man8/usbd.8	Wed Jul  5 09:40:02 2000
@@ -32,8 +32,8 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (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/usbd/usbd.8,v 1.9 2000/03/01 14:08:37 sheldonh Exp %
 .\"
+.\" %FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.9.2.1 2000/04/02 21:14:13 n_hibma Exp %
 .\"
 .Dd July 12, 1998
 .Dt USBD 8
@@ -63,6 +63,11 @@
 .Fl f Ar device
 $B%3%^%s%I9T%*%W%7%g%s$O!"$I$N%3%s%H%m!<%i$r=hM}$9$k$+$r;XDj$7$^$9!#(B
 $BDL>oK\%*%W%7%g%s$OITMW$G$9!#(B
+.Pp
+.Dq usb ,
+.Dq ohci ,
+.Dq uhci
+$B$N%b%8%e!<%k$,%m!<%I$5$l$F$$$J$$>l9g!"$3$l$i$O<+F0E*$K%m!<%I$5$l$^$9!#(B
 .Pp
 $BBh(B 2 $B$NItJ,$O!"(BUSB $B%G%P%$%9$NCeC&$G$9!#(B
 $B%G%P%$%9(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/vinum.8 man/man8/vinum.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/vinum.8	Wed Jun 14 22:42:14 2000
+++ man/man8/vinum.8	Wed Jul  5 09:40:10 2000
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" %Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog %
-.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.33 2000/03/01 07:22:10 grog Exp %
+.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.33.2.3 2000/06/08 07:27:35 grog Exp %
 .\"
 .\" jpman %Id: vinum.8,v 1.3 1999/01/05 15:15:53 horikawa Stab %
 .\" WORD: attach	$B7k9g(B ($B$9$k(B)
@@ -56,9 +56,10 @@
 .in +1i
 $B%W%l%C%/%9$r%\%j%e!<%`$K!"$^$?$O%5%V%G%#%9%/$r%W%l%C%/%9$K7k9g$7$^$9!#(B
 .in
-.Cd checkparity Ar plex
+.Cd checkparity Ar plex Op Fl f 
+.Op Fl v
 .in +1i
-RAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r8!::$7$^$9!#(B
+RAID-4 $B$^$?$O(B RAID-5 $B$N%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r8!::$7$^$9!#(B
 .in
 .Nm concat
 .Op Fl f
@@ -90,14 +91,20 @@
 .in +1i
 $B7k9g$5$l$F$$$?%\%j%e!<%`$d%W%l%C%/%9$+$i!"%W%l%C%/%9$d%5%V%G%#%9%/$rJ,N%$7$^$9!#(B
 .in
+.Cd dumpconfig
+.Op Ar drive ...
+.in +1i
+$B;XDj$5$l$?%I%i%$%V$K3JG<$5$l$F$$$k@_Dj>pJs$rI=<($7$^$9!#(B
+$B%I%i%$%VL>$r;XDj$7$J$$$H!"%7%9%F%`$NA4%I%i%$%V$N>pJs$rI=<($7$^$9!#(B
+.in
 .Cd info
+.Op Fl v
 .Op Fl V
 .in +1i
 $B%\%j%e!<%`%^%M!<%8%c$N>uBV$rI=<($7$^$9!#(B
 .in
 .Cd init
 .Op Fl S Ar size
-.Op Fl v
 .Op Fl w
 .Ar plex | subdisk
 .in +1i
@@ -223,9 +230,11 @@
 .in
 ..
 .in
-.Cd rebuildparity Ar plex
+.Cd rebuildparity Ar plex Op Fl f
+.Op Fl v 
+.Op Fl V
 .in +1i
-RAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r:F9=C[$7$^$9!#(B
+RAID-4 $B$^$?$O(B RAID-5 $B$N%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r:F9=C[$7$^$9!#(B
 .in
 .Cd resetconfig
 .in +1i
@@ -279,6 +288,7 @@
 $BA4(B vinum $B%I%i%$%V$+$i@_Dj$rFI$_9~$_$^$9!#(B
 .in
 .Cd start
+.Op Fl i Ar interval
 .Op Fl S Ar size
 .Op Fl w
 volume | plex | subdisk
@@ -348,6 +358,16 @@
 .Ar myvolume
 $B$,%*!<%W%s$5$l$F$$$?$H$7$F$b:o=|$7$^$9!#0J9_!"$3$N%\%j%e!<%`$K(B
 $B%"%/%;%9$9$k$H!"$[$\3N<B$K%Q%K%C%/$r5/$3$7$^$9!#(B
+.It Fl i Ar millisecs
+.Nm init
+$B$^$?$O(B
+.Nm start
+$B$N%3%^%s%I$r<B9T;~!"3F%V%m%C%/$N%3%T!<$N4V$K(B
+.Ar millisecs
+$B%_%jICBT$A$^$9!#(B
+commands, wait
+.Ar millisecs
+$B$3$l$K$h$j!"%7%9%F%`Ii2Y$r7Z8:$G$-$^$9!#(B
 .It Fl n Ar name
 $B%\%j%e!<%`L>$r;XDj$9$k$?$a$K(B
 .Fl n
@@ -374,7 +394,7 @@
 .if n ("statistics: $BE}7W(B")
 $B%*%W%7%g%s$OI=<(7O$N%3%^%s%I$GE}7W>pJs$rI=<($9$k$?$a$K;H$$$^$9!#(B
 .Nm mirror
-$B%3%^%s%I$b$3$N%U%i%0$r;HMQ$7!"(B
+$B%3%^%s%I$b$3$N%*%W%7%g%s$r;HMQ$7!"(B
 $B%9%H%i%$%W2=%W%l%C%/%9$r:n@.$9$Y$-$3$H$r<($7$^$9!#(B
 .It Fl S Ar size
 .Fl S
@@ -390,7 +410,6 @@
 $B%*%W%7%g%s$O!"(B
 $B$5$i$K>\:Y$J>pJs$rMW5a$9$k$?$a$K;HMQ$7$^$9!#(B
 .It Fl V
-The
 .Fl V
 .if t (``Very verbose: $B$H$F$b>iD9(B'')
 .if n ("Very verbose: $B$H$F$b>iD9(B")
@@ -469,6 +488,28 @@
 3 $BHVL\$O(B 512k $B$K!"$J$I$H$J$j$^$9!#(B
 $B$3$N7W;;$G$O!"(BRAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$OL5;k$5$l$^$9!#(B
 .El
+.It Nm checkparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Pp
+$B;XDj$7$?(B RAID-4 $B$^$?$O(B RAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r%A%'%C%/$7$^$9!#(B
+$B$3$NA`:n$O%W%l%C%/%9Cf$N%]%$%s%?$r0];}$7$^$9$N$G!"(B
+$BK>$`$J$i$P!"0l;~Dd;_$7$F8e$GF1$8>l=j$+$i:F3+2DG=$G$9!#(B
+$B$5$i$K!"$3$N%]%$%s%?$O(B
+.Nm rebuildparity
+$B%3%^%s%I$b;HMQ$7$^$9!#(B
+$B:G=i$K%Q%j%F%#$NLdBj$,8!=P$5$l$?2U=j$+$i!"(B
+$B%Q%j%F%#%V%m%C%/$N:F9=C[$r3+;O2DG=$G$9!#(B
+.Pp
+.Fl f
+$B%U%i%0$,;XDj$5$l$k$H!"(B
+.Nm checkparity
+$B$O%W%l%C%/%9$N@hF,$+$i%A%'%C%/$r3+;O$7$^$9!#(B
+.Fl v
+$B%U%i%0$,;XDj$5$l$k$H!"(B
+.Nm checkparity
+$B$O?JD=Js9p$rI=<($7$^$9!#(B
 .It Nm concat
 .Op Fl f
 .Op Fl n Ar name
@@ -797,7 +838,7 @@
 .El
 .\" XXX
 .It Nm init Op Fl S 
-.Ar size Op Fl v 
+.Ar size
 .Op Fl w
 .Ar plex | subdisk
 .Pp
@@ -819,8 +860,6 @@
 .Fl S
 $B%*%W%7%g%s$G%G%U%)%k%HCM$N(B 16 kB $B$H0[$J$k%5%$%:$N=q$-9~$_%V%m%C%/$r(B
 $B;XDj$G$-$^$9!#(B
-.Fl v
-$B%*%W%7%g%s$G=i4|2=$,@5$7$/9T$J$o$l$?$+3NG'$7$^$9!#(B
 .Nm
 $B$O=i4|2=$,40N;$9$k$H%3%s%=!<%k%a%C%;!<%8$r=PNO$7$^$9!#(B
 .It Nm label
@@ -1048,8 +1087,36 @@
 $B$H(B
 .Nm saveconfig
 $B$N%3%^%s%I$r;HMQ$7$F$/$@$5$$!#(B
-$B%G!<%b%s%*%W%7%g%s%^%9%/$N%S%C%H(B 4 $B$r%j%;%C%H$7$F!"(B
+$B%G!<%b%s%*%W%7%g%s%^%9%/$N%S%C%H(B 2 $B$r%j%;%C%H$7$F!"(B
 $B@_DjJ]B8$r:FEYM-8z$K$7$F$/$@$5$$!#(B
+.It Nm rebuildparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Op Fl V
+.Pp
+$B;XDj$7$?(B RAID-4 $B$^$?$O(B RAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$r:F9=C[$7$^$9!#(B
+$B$3$NA`:n$O%W%l%C%/%9Cf$N%]%$%s%?$r0];}$7$^$9$N$G!"(B
+$BK>$`$J$i$P!"0l;~Dd;_$7$F8e$GF1$8>l=j$+$i:F3+2DG=$G$9!#(B
+$B$5$i$K!"$3$N%]%$%s%?$O(B
+.Nm checkparity
+$B%3%^%s%I$b;HMQ$7$^$9!#(B
+$B:G=i$K%Q%j%F%#$NLdBj$,8!=P$5$l$?2U=j$+$i!"(B
+$B%Q%j%F%#%V%m%C%/$N:F9=C[$r3+;O2DG=$G$9!#(B
+.Pp
+.Fl f
+$B%U%i%0$,;XDj$5$l$k$H!"(B
+.Nm rebuildparity
+$B$O%W%l%C%/%9$N@hF,$+$i:F9=C[$r3+;O$7$^$9!#(B
+.Fl v
+$B%U%i%0$,;XDj$5$l$k$H!"(B
+.Nm rebuildparity
+$B$O$^$:4{B8$N%Q%j%F%#%V%m%C%/$r%A%'%C%/$7!"(B
+$B:F9=C[A0$K!"IT@09g>pJs$rI=<($7$^$9!#(B
+.Fl V
+$B%U%i%0$,;XDj$5$l$k$H!"(B
+.Nm rebuildparity
+$B$O?JD=Js9p$rI=<($7$^$9!#(B
 .It Nm rename
 .Op Fl r
 .Ar [ drive | subdisk | plex | volume ]
@@ -1304,11 +1371,10 @@
 $B%5%V%G%#%9%/$,B0$92DG=@-$N$"$k%W%l%C%/%9$H%\%j%e!<%`$N>uBV$r%A%'%C%/$7!"(B
 $B$3$l$i$N>uBV$rE,@Z$K99?7$7$^$9!#(B
 .Pp
-$B%*%V%8%'%/%H$,%\%j%e!<%`$^$?$O%W%l%C%/%9$N>l9g!"(B
+$B%*%V%8%'%/%H$,%W%l%C%/%9$N>l9g!"(B
 .Nm start
-$B$O8=:_$N$H$3$m8z2L$,$"$j$^$;$s(B:
-$B2<0L$N%5%V%G%#%9%/$N(B ($B%\%j%e!<%`$N>l9g$K$O$3$l$K2C$($F%W%l%C%/%9$N(B) $B>uBV$r(B
-$B%A%'%C%/$7!"$3$l$K=>$C$F%*%V%8%'%/%H$N>uBV$r@_Dj$7$^$9!#(B
+$B$O2<0L$N%5%V%G%#%9%/$N(B ($B%\%j%e!<%`$N>l9g$K$O$3$l$K2C$($F%W%l%C%/%9$N(B) $B>uBV$r(B
+$B%A%'%C%/$7!"5/F02DG=$J%5%V%G%#%9%/$r5/F0$7$^$9!#(B
 .Pp
 $B%^%k%A%W%l%C%/%9%\%j%e!<%`$NCf$N(B 1 $B$D$N%W%l%C%/%9$r5/F0$9$k$K$O!"(B
 $B%\%j%e!<%`Cf$NB>$N%W%l%C%/%9$+$i%G!<%?$r%3%T!<$9$kI,MW$,$"$j$^$9!#(B
@@ -1316,16 +1382,15 @@
 $B$3$NA`:n$,40N;$9$k$3$H$rBT$A$?$$>l9g(B
 ($BNc$($P!"$3$NA`:n$r%9%/%j%W%HCf$G<B9T$7$F$$$k>l9g(B)$B!"(B
 .Fl w
-$B%U%i%0$r;HMQ$7$F$/$@$5$$!#(B
+$B%*%W%7%g%s$r;HMQ$7$F$/$@$5$$!#(B
 .Pp
 $B%G!<%?$N%3%T!<$K$O$?$$$7$F;~4V$,$+$+$j$^$;$s!#$=$l$O!"$5$i$K=EBg$JIi2Y$r(B
 $B%7%9%F%`$K$+$1F@$^$9!#(B
 .Fl S
-$B%U%i%0$GE>Aw%5%$%:$r;XDj$9$k$3$H$,$G$-$^$9!#(B
-$B>-Mh(B
-.Nm
-$B$,JQ99$5$l!"%7%9%F%`Ii2Y$r8:$i$9$?$a$K!"3F%V%m%C%/4V$G0l;~(B
-$BCfCG$G$-$k$h$&$K$J$k$G$7$g$&!#(B
+$B%*%W%7%g%s$GE>Aw%5%$%:$r!"(B
+.Fl i
+$B%*%W%7%g%s$G3F%V%m%C%/$rE>Aw$9$k4V3V$r(B ($B%_%jIC$G(B) $B;XDj2DG=$G$9!#(B
+$B$I$A$i$b%7%9%F%`Ii2Y$r7Z8:$7$^$9!#(B
 .It Nm stop
 .Op Fl f
 .Op volume | plex | subdisk
@@ -1340,7 +1405,7 @@
 $B3hF0>uBV$N%*%V%8%'%/%H$,B8:_$7$J$$>l9g$N$_!"9T$&$3$H$,2DG=$G$9!#(B
 $BFC$K!"(B
 .Fl f
-$B%U%i%0$O$3$NMW5a$KM%@h$7$^$;$s!#(B
+$B%*%W%7%g%s$O$3$NMW5a$KM%@h$7$^$;$s!#(B
 $BDL>o!"(B
 .Nm stop
 $B%3%^%s%I$O!"=*N;A0$K8=:_$N@_Dj$r%G%#%9%/$X=q$-La$7$^$9!#(B
@@ -1350,7 +1415,7 @@
 $B$ODd;_$7$^$;$s!#(B
 $B$3$l$r>e=q$-$9$k$K$O(B
 .Fl f
-$B%U%i%0$r;XDj$7$^$9!#(B
+$B%*%W%7%g%s$r;XDj$7$^$9!#(B
 .Pp
 .Nm stop
 $B%3%^%s%I$O(B
@@ -1371,7 +1436,7 @@
 .Fl r
 $B$H(B
 .Fl f
-$B$N%U%i%0$,;XDj$5$l$F$$$k$3$H$,I,MW$G$9!#(B
+$B$N%*%W%7%g%s$,;XDj$5$l$F$$$k$3$H$,I,MW$G$9!#(B
 $B$3$N%3%^%s%I$O!"%*%V%8%'%/%H$r@_Dj$+$i<h$j=|$-$^$;$s!#(B
 .Nm start
 $B%3%^%s%I$N8e$G:FEY%"%/%;%9$,$G$-$k$h$&$K$J$j$^$9!#(B
@@ -2361,6 +2426,10 @@
 $BBg$-$J%G%#%9%/$G$N%9%H%i%$%W$NBg$-$5$r(B 2 $B$^$?$O(B 4 MB $B$KA}$5$J$$(B
 $BL@3N$JM}M3$O$"$j$^$;$s!#(B
 .Pp
+$B%9%H%i%$%W%5%$%:$rA*Br$9$k$H$-$K$O!"(B
+$B:G?7$N(B UFS $B%U%!%$%k%7%9%F%`$N%7%j%@%0%k!<%W$NBg$-$5$O(B 32 MB $B$G$"$k$3$H$r(B
+$BG'<1$7$F$$$F$/$@$5$$!#(B
+.Pp
 $BJ#?t%"%/%;%9%7%9%F%`$G$NE>Aw$N%$%s%Q%/%H$r9M$($k$?$a$N$b$C$H$bMF0W$JJ}K!$O!"(B
 $B@x:_E*$J%\%H%k%M%C%/!"$9$J$o$A%G%#%9%/%5%V%7%9%F%`$N4QE@$+$i8+$k$3$H$G$9(B:
 $B$D$^$j!"E>Aw$KMW$9$k%G%#%9%/;~4V$NAm7W$O$$$/$i$+!)$G$9!#(B
@@ -2473,7 +2542,6 @@
 $B%\%j%e!<%`>e$K%U%!%$%k%7%9%F%`$r:n@.$9$kA0$K(B
 .Nm disklabel
 $B$r<B9T$9$kI,MW$O$"$j$^$;$s!#(B
-raw $B%G%P%$%9$KBP$7$F(B
 .Nm newfs
 $B$@$1$r<B9T$7$F$/$@$5$$!#(B
 .Fl v
@@ -2483,12 +2551,9 @@
 .Pa mirror
 $B>e$K%U%!%$%k%7%9%F%`$r:n@.$9$k$K$O!"<!$N%3%^%s%I$rF~NO$7$^$9(B:
 .Bd -literal -offset 4n
-# newfs -v /dev/vinum/rmirror
+# newfs -v /dev/vinum/mirror
 .Ed
 .Pp
-.Pa rmirror
-$B$H$$$&L>A0$,(B raw $B%G%P%$%9$r;2>H$7$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B
-.Ss $B$=$NB>$N$3$H$,$i(B
 .Nm
 $B$N@_Dj$K4X78$9$k?t8D$N$=$NB>$N$3$H$,$i$,$"$j$^$9(B:
 .Bl -bullet
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/vnconfig.8 man/man8/vnconfig.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/vnconfig.8	Wed Jun 14 22:42:14 2000
+++ man/man8/vnconfig.8	Wed Jul  5 09:40:13 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14 2000/02/17 02:54:36 gsutter Exp %
+.\" %FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14.2.1 2000/06/29 23:49:34 ps Exp %
 .\"
 .\" jpman %Id: vnconfig.8,v 1.2 1997/05/03 13:45:51 horikawa Stab %
 .\"
@@ -261,7 +261,7 @@
 .Pp
 .Dl vnconfig -e -s labels,reserve -S 400m vn1
 .Dl disklabel -r -w vn1 auto
-.Dl newfs /dev/rvn1c
+.Dl newfs /dev/vn1c
 .Dl mount /dev/vn1c /usr/obj
 .Pp
 $B%9%o%C%W$rMQ$$$?(B VN $B%G%#%9%/$N@_DjNc$G$9!#(B
diff -ur /home/horikawa/CVS_CASTLE/man-jp/man/man8/ypserv.8 man/man8/ypserv.8
--- /home/horikawa/CVS_CASTLE/man-jp/man/man8/ypserv.8	Wed Jun 14 22:42:14 2000
+++ man/man8/ypserv.8	Wed Jul  5 09:40:15 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22 2000/03/02 14:53:40 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22.2.1 2000/06/30 08:43:45 ps Exp %
 .\"
 .\" jpman %Id: ypserv.8,v 1.3 1997/05/19 17:11:16 horikawa Stab %
 .\"
@@ -129,7 +129,7 @@
 $B$O(B
 .Pa master.passwd.byname
 $B$H(B
-.Pa master.basswd.byuid
+.Pa master.passwd.byuid
 $B$N%^%C%W$rFCJL$JJ}K!$G07$$$^$9!#(B
 $B%5!<%P$,$3$l$i(B 2 $B$D$N%^%C%W$X$N%"%/%;%9MW5a$r<u$1IU$1$k$H!"(B
 $BMW5a85$N(B TCP $B%]!<%H$r%A%'%C%/$7!"%]!<%HHV9f$,(B 1023 $B$h$jBg$-$$>l9g$K$O(B

----Next_Part(Tue_Jul__4_21:41:53_2000_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_4.0-20000703-STABLE_8
Content-Disposition: attachment; filename=diff_4.0-20000703-STABLE_8

diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/accton.8 man8/accton.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/accton.8	Tue Mar 21 06:31:48 2000
+++ man8/accton.8	Mon Jul  3 19:52:50 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/accton/accton.8,v 1.6 1999/08/28 23:20:35 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/accton/accton.8,v 1.6.2.1 2000/07/01 10:41:01 ps Exp $
 .\"
 .Dd May 21, 1993
 .Dt ACCTON 8
@@ -28,7 +28,7 @@
 .Sh FILES
 .Bl -tag -width /var/account/acct
 .It Pa /var/account/acct
-Default accounting file.
+default accounting file
 .El
 .Sh SEE ALSO
 .Xr lastcomm 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/amd.8 man8/amd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/amd.8	Tue Mar 21 06:31:49 2000
+++ man8/amd.8	Mon Jul  3 19:52:52 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.6 2000/03/01 10:48:31 nik Exp $
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.6.2.2 2000/05/28 13:17:25 asmodai Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -321,7 +321,6 @@
 .Xr amd.conf 5 ,
 .Xr mtab 5 ,
 .Xr amq 8 ,
-.Xr automount 8 , 
 .Xr mount 8 ,
 .Xr umount 8
 .Rs
@@ -335,8 +334,8 @@
 Department of Computer Science, Columbia University,
 New York, USA.
 .Pp
-.An Other authors and contributors to am-utils are listed in the
-.Nm AUTHORS 
+Other authors and contributors to am-utils are listed in the
+.Pa AUTHORS 
 file distributed with am-utils.
 .Sh HISTORY
 The
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ancontrol.8 man8/ancontrol.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ancontrol.8	Tue Mar 21 06:31:54 2000
+++ man8/ancontrol.8	Mon Jul  3 19:52:56 2000
@@ -28,11 +28,11 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3 2000/03/02 14:53:33 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3.2.1 2000/04/23 16:43:17 mpp Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
-.Os FreeBSD 3.0
+.Os FreeBSD 4.0
 .Sh NAME
 .Nm ancontrol
 .Nd configure Aironet 4500/4800 devices
@@ -354,7 +354,7 @@
 The
 .Nm
 command first appeared in
-.Fx 3.0 .
+.Fx 4.0 .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
 and received frames as increasing.
@@ -365,7 +365,7 @@
 802.11/ethernet encapsulation itself.
 .Pp
 Setting the channel does not seem to have any effect.
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 command was written by
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/boot.8 man8/boot.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/boot.8	Tue Mar 21 06:30:16 2000
+++ man8/boot.8	Mon Jul  3 19:51:08 2000
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23 2000/03/03 09:51:45 jkoshy Exp $
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.1 2000/05/13 14:43:14 hoek Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
@@ -254,6 +254,7 @@
 .Sh SEE ALSO
 .Xr ddb 4 ,
 .Xr ttys 5 ,
+.Xr boot0cfg 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
 .Xr disklabel 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/boot_i386.8 man8/boot_i386.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/boot_i386.8	Tue Mar 21 06:30:16 2000
+++ man8/boot_i386.8	Mon Jul  3 19:51:08 2000
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23 2000/03/03 09:51:45 jkoshy Exp $
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.1 2000/05/13 14:43:14 hoek Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
@@ -254,6 +254,7 @@
 .Sh SEE ALSO
 .Xr ddb 4 ,
 .Xr ttys 5 ,
+.Xr boot0cfg 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
 .Xr disklabel 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/burncd.8 man8/burncd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/burncd.8	Tue Mar 21 06:31:55 2000
+++ man8/burncd.8	Mon Jul  3 19:53:00 2000
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.6 2000/03/04 07:26:23 sos Exp $
+.\" $FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.6.2.1 2000/04/23 17:00:38 mpp Exp $
 .\"
 .Dd January 6, 2000
 .Os
@@ -59,9 +59,9 @@
 .It Fl p
 use preemphasis on audio tracks.
 .It Fl q
-quiet, dont print progress messages.
+quiet, do not print progress messages.
 .It Fl t
-test write, dont actually wirte on the media.
+test write, do not actually write on the media.
 .El
 .Pp
 .Ar command 
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/camcontrol.8	Tue Mar 21 06:30:07 2000
+++ man8/camcontrol.8	Mon Jul  3 19:50:52 2000
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998, 1999 Kenneth D. Merry.
+.\" Copyright (c) 1998, 1999, 2000 Kenneth D. Merry.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,66 +25,66 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19 2000/03/01 11:27:01 sheldonh Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19.2.4 2000/07/01 23:44:10 ken Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
-.Os FreeBSD 3.0
+.Os
 .Sh NAME
 .Nm camcontrol
 .Nd CAM control program
 .Sh SYNOPSIS
 .Nm camcontrol
-.Aq command
+.Aq Ar command
 .Op device id
 .Op generic args
 .Op command args
 .Nm camcontrol
-devlist
+.Ic devlist
 .Op Fl v
 .Nm camcontrol
-periphlist
+.Ic periphlist
 .Op device id
 .Op Fl n Ar dev_name
 .Op Fl u Ar unit_number
 .Nm camcontrol
-tur
+.Ic tur
 .Op device id
 .Op generic args
 .Nm camcontrol
-inquiry 
+.Ic inquiry 
 .Op device id
 .Op generic args
 .Op Fl D
 .Op Fl S
 .Op Fl R
 .Nm camcontrol
-start
+.Ic start
 .Op device id
 .Op generic args
 .Nm camcontrol
-stop
+.Ic stop
 .Op device id
 .Op generic args
 .Nm camcontrol
-eject
+.Ic eject
 .Op device id
 .Op generic args
 .Nm camcontrol
-rescan
+.Ic rescan
 .Aq bus Ns Op :target:lun
 .Nm camcontrol
-reset
+.Ic reset
 .Aq bus Ns Op :target:lun
 .Nm camcontrol
-defects
+.Ic defects
 .Op device id
 .Op generic args
 .Aq Fl f Ar format
 .Op Fl P
 .Op Fl G
 .Nm camcontrol
-modepage
+.Ic modepage
 .Op device id
 .Op generic args
 .Aq Fl m Ar page
@@ -92,7 +92,7 @@
 .Op Fl e
 .Op Fl d
 .Nm camcontrol
-cmd
+.Ic cmd
 .Op device id
 .Op generic args
 .Aq Fl c Ar cmd Op args
@@ -101,21 +101,21 @@
 .Op Fl o Ar len Ar fmt Op args
 .Ek
 .Nm camcontrol
-debug
+.Ic debug
 .Op Fl I
 .Op Fl T
 .Op Fl S
 .Op Fl c
 .Aq all|off|bus Ns Op :target Ns Op :lun
 .Nm camcontrol
-tags
+.Ic tags
 .Op device id
 .Op generic args
 .Op Fl N Ar tags
 .Op Fl q
 .Op Fl v
 .Nm camcontrol
-negotiate
+.Ic negotiate
 .Op device id
 .Op generic args
 .Op Fl c
@@ -128,11 +128,18 @@
 .Op Fl W Ar bus_width
 .Op Fl v
 .Nm camcontrol
-help
+.Ic format
+.Op device id
+.Op generic args
+.Op Fl q
+.Op Fl w
+.Op Fl y
+.Nm camcontrol
+.Ic help
 .Sh DESCRIPTION
 .Nm camcontrol
 is a utility designed to provide a way for users to access and control the
-.Tn FreeBSD
+.Fx
 CAM subsystem.
 .Pp
 .Nm camcontrol
@@ -172,7 +179,7 @@
 .Fl u
 arguments will
 .Em not
-override a specified bus:target or bus:target:lun, howevever.
+override a specified bus:target or bus:target:lun, however.
 .Pp
 Most of the
 .Nm camcontrol
@@ -195,34 +202,33 @@
 It may take some other actions, depending upon the sense code returned from
 the command.
 .It Fl n Ar dev_name
-Specify the device type to operate on.  The default is
-.Em da .
+Specify the device type to operate on, e.g. "da", "cd".
 .It Fl t Ar timeout
 SCSI command timeout in seconds.  This overrides the default timeout for
 any given command.
 .It Fl u Ar unit_number
-Specify the device unit number.  The default is 0.
+Specify the device unit number, e.g. "1", "5".
 .It Fl v
 Be verbose, print out sense information for failed SCSI commands.
 .El
 .Pp
 Primary command functions:
 .Bl -tag -width periphlist
-.It devlist
+.It Ic devlist
 List all physical devices (logical units) attached to the CAM subsystem.
 This also includes a list of peripheral drivers attached to each device.
 With the
 .Fl v
 argument, SCSI bus number, adapter name and unit numbers are printed as
 well.
-.It periphlist
+.It Ic periphlist
 List all peripheral drivers attached to a given physical device (logical
 unit).
-.It tur
+.It Ic tur
 Send the SCSI test unit ready (0x00) command to the given device.
 .Nm camcontrol
 will report whether the device is ready or not.
-.It inquiry
+.It Ic inquiry
 Send a SCSI inquiry command (0x12) to a device.  By default,
 .Nm camcontrol
 will print out the standard inquiry data, device serial number, and
@@ -239,28 +245,28 @@
 .It Fl R
 Print out transfer rate information.
 .El
-.It start
+.It Ic start
 Send the SCSI Start/Stop Unit (0x1B) command to the given device with the
 start bit set.
-.It stop
+.It Ic stop
 Send the SCSI Start/Stop Unit (0x1B) command to the given device with the
 start bit cleared.
-.It eject
+.It Ic eject
 Send the SCSI Start/Stop Unit (0x1B) command to the given device with the
 start bit cleared and the eject bit set.
-.It rescan
+.It Ic rescan
 Tell the kernel to scan the given bus (XPT_SCAN_BUS), or bus:target:lun
 (XPT_SCAN_LUN) for new devices or devices that have gone away.  The user
 may only specify a bus to scan, or a lun.  Scanning all luns on a target
 isn't supported.
-.It reset
+.It Ic reset
 Tell the kernel to reset the given bus (XPT_RESET_BUS) by issuing a SCSI bus
 reset for that bus, or to reset the given bus:target:lun
 (XPT_RESET_DEV), typically by issuing a BUS DEVICE RESET message after
 connecting to that device.
 Note that this can have a destructive impact
 on the system.
-.It defects
+.It Ic defects
 Send the SCSI READ DEFECT DATA (10) command (0x37) to the given device, and
 print out any combination of: the total number of defects, the primary
 defect list (PLIST), and the grown defect list (GLIST).
@@ -298,13 +304,16 @@
 .Nm camcontrol
 will print out the number of defects given in the READ DEFECT DATA header
 returned from the drive.
-.It modepage
+.It Ic modepage
 Allows the user to display and optionally edit a SCSI mode page.  The mode
 page formats are located in
 .Pa /usr/share/misc/scsi_modes .
 This can be overridden by specifying a different file in the
 .Ev SCSI_MODES
-environment variable.  The modepage command takes several arguments:
+environment variable.
+The
+.Ic modepage
+command takes several arguments:
 .Bl -tag -width 012345678901
 .It Fl d
 Disable block descriptors for mode sense.
@@ -326,14 +335,16 @@
 Saved values
 .El
 .El
-.It cmd
-Allows the user to send an arbitrary SCSI CDB to any device.  The cmd
+.It Ic cmd
+Allows the user to send an arbitrary SCSI CDB to any device.
+The
+.Ic cmd
 function requires the
 .Fl c
 argument to specify the CDB.  Other arguments are optional, depending on
 the command type.  The command and data specification syntax is documented
 in
-.Xr cam 3 .
+.Xr cam_cdbparse 3 .
 NOTE:  If the CDB specified causes data to be transfered to or from the
 SCSI device in question, you MUST specify either
 .Fl i
@@ -355,13 +366,15 @@
 .Ar len
 bytes of data will be read from standard input and written to the device.
 .El
-.It debug
+.It Ic debug
 Turn on CAM debugging printfs in the kernel.  This requires options CAMDEBUG 
 in your kernel config file.  WARNING:  enabling debugging printfs currently
 causes an EXTREME number of kernel printfs.  You may have difficulty
 turning off the debugging printfs once they start, since the kernel will be
 busy printing messages and unable to service other requests quickly.
-The debug function takes a number of arguments:
+The
+.Ic debug
+function takes a number of arguments:
 .Bl -tag -width 012345678901234567
 .It Fl I
 Enable CAM_DEBUG_INFO printfs.
@@ -381,10 +394,10 @@
 and lun are not specified, they are wildcarded.  (i.e., just specifying a
 bus turns on debugging printfs for all devices on that bus.)
 .El
-.It tags
+.It Ic tags
 Show or set the number of "tagged openings" or simultaneous transactions
 we attempt to queue to a particular device.  By default, the
-.Sq tags
+.Ic tags
 command, with no command-specific arguments (i.e. only generic arguments)
 prints out the "soft" maximum number of transactions that can be queued to
 the device in question.  For more detailed information, use the
@@ -448,7 +461,7 @@
 is 255, although it may be set higher or lower for various devices.
 .El
 .El
-.It negotiate
+.It Ic negotiate
 Show or negotiate various communication parameters.  Some controllers may
 not support setting or changing some of these values.  For instance, the
 Adaptec 174x controllers do not support changing a device's sync rate or
@@ -461,7 +474,7 @@
 flag.  The meaning of the
 .Fl v
 flag for the
-.Sq negotiate
+.Ic negotiate
 command is described below.  Also, some controller drivers don't support
 setting negotiation parameters, even if the underlying controller supports
 negotiation changes.  Some controllers, such as the Advansys wide
@@ -493,7 +506,7 @@
 current negotiation settings.
 .It Fl v
 The verbose switch has special meaning for the
-.Sq negotiate
+.Ic negotiate
 subcommand.  It causes
 .Nm camcontrol
 to print out the contents of a Path Inquiry (XPT_PATH_INQ) CCB sent to the
@@ -510,7 +523,71 @@
 .Fl a
 switch above will automatically send a Test Unit Ready to the device so
 negotiation parameters will take effect.
-.It help
+.It Ic format
+Issue the
+.Tn SCSI
+FORMAT UNIT command to the named device.
+.Pp
+.Em WARNING! WARNING! WARNING!
+.Pp
+Low level formatting a disk will destroy ALL data on the disk.  Use
+extreme caution when issuing this command.  Many users low-level format
+disks that do not really need to be low-level formatted.  There are
+relatively few scenarios that call for low-level formatting a disk.
+One reason for
+low-level formatting a disk is to initialize the disk after changing
+its physical sector size.  Another reason for low-level formatting a disk
+is to revive the disk if you are getting "medium format corrupted" errors
+from the disk in response to read and write requests.
+.Pp
+Some disks take longer than others to format.  Users should specify a
+timeout long enough to allow the format to complete.  The default format
+timeout is 3 hours, which should be long enough for most disks.  Some hard
+disks will complete a format operation in a very short period of time
+(on the order of 5 minutes or less).  This is often because the drive
+doesn't really support the FORMAT UNIT command -- it just accepts the
+command, waits a few minutes and then returns it.
+.Pp
+The
+.Sq format
+subcommand takes several arguments that modify its default behavior.  The
+.Fl q
+and
+.Fl y
+arguments can be useful for scripts.
+.Pp
+.Bl -tag -width 123456
+.It Fl q
+Be quiet, don't print any status messages.  This option will not disable
+the questions, however.  To disable questions, use the
+.Fl y
+argument, below.
+.It Fl w
+Issue a non-immediate format command.  By default,
+.Nm camcontrol
+issues the FORMAT UNIT command with the immediate bit set.  This tells the
+device to immediately return the format command, before the format has
+actually completed.  Then,
+.Nm camcontrol
+gathers
+.Tn SCSI
+sense information from the device every second to determine how far along
+in the format process it is.  If the
+.Fl w
+argument is specified,
+.Nm camcontrol
+will issue a non-immediate format command, and will be unable to print any
+information to let the user know what percentage of the disk has been
+formatted.
+.It Fl y
+Don't ask any questions.  By default,
+.Nm camcontrol
+will ask the user if he/she really wants to format the disk in question,
+and also if the default format command timeout is acceptable.  The user
+will not be asked about the timeout if a timeout is specified on the
+command line.
+.El
+.It Ic help
 Print out verbose usage information.
 .El
 .Sh ENVIRONMENT
@@ -538,7 +615,7 @@
 Eject the CD from cd1, and print SCSI sense information if the command
 fails.
 .Pp
-.Dl camcontrol tur
+.Dl camcontrol tur da0
 .Pp
 Send the SCSI test unit ready command to da0.
 .Nm camcontrol
@@ -547,7 +624,7 @@
 .Fl v
 switch was not specified.
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol tur da1 -E -C 4 -t 50 -v
 .Ed
 .Pp
@@ -559,7 +636,7 @@
 disk will be spun up if it is not currently spinning.
 .Nm camcontrol
 will report whether the disk is ready.
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e
 	-i 0xe "s1 i3 i1 i1 i1 i1 i1 i1 i1 i1 i1 i1"
 .Ed
@@ -568,7 +645,7 @@
 and display the first 10 bytes from the cache on cd1.  Display SCSI sense
 information if the command fails.
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n cd -u 1 -v -c "3B 00 00 00 00 00 00 00 0e 00" \e
 	-o 14 "00 00 00 00 1 2 3 4 5 6 v v v v" 7 8 9 8
 .Ed
@@ -578,7 +655,7 @@
 the command fails.  Be very careful with this command, improper use may
 cause data corruption.
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol modepage da3 -m 1 -e -P 3
 .Ed
 .Pp
@@ -599,45 +676,18 @@
 .Pp
 Set the number of concurrent transactions for da5 to 24.
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol negotiate -n da -u 4 -T disable
 .Ed
 .Pp
 Disable tagged queueing for da4.
 .Pp
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol negotiate -n da -u 3 -R 20.000 -O 15 -a
 .Ed
 .Pp
 Negotiate a sync rate of 20MHz and an offset of 15 with da3.  Then send a
 Test Unit Ready command to make the settings take effect.
-.Pp
-.Bd -literal -offset foobar
-camcontrol cmd -n da -u 3 -v -t 7200 -c "4 0 0 0 0 0"
-.Ed
-.Pp
-Send the FORMAT UNIT (0x04) command to da3.  This will low-level format the
-disk.  Print sense information if the command fails, and set the timeout to
-two hours (or 7200 seconds).
-.Pp
-.Em WARNING! WARNING! WARNING!
-.Pp
-Low level formatting a disk will destroy ALL data on the disk.  Use
-extreme caution when issuing this command.  Many users low-level format
-disks that do not really need to be low-level formatted.  There are
-relatively few scenarios that call for low-level formatting a disk.
-One reason for
-low-level formatting a disk is if you want to change the physical sector
-size of the disk.  Another reason for low-level formatting a disk is to
-revive the disk if you are getting "medium format corrupted" errors from the
-disk in response to read and write requests.
-.Pp
-Some disks take longer than others to format.  Users should specify a
-timeout long enough to allow the format to complete.  Some hard disks
-will complete a format operation in a very short period of time (on the
-order of 5 minutes or less).  This is often because the drive doesn't
-really support the FORMAT UNIT command -- it just accepts the command,
-waits a few minutes and then returns it.
 .Sh SEE ALSO
 .Xr cam 3 ,
 .Xr cam_cdbparse 3 ,
@@ -658,7 +708,7 @@
 library, written by Julian Elischer and Peter Dufault.  The
 .Xr scsi 8
 program first appeared in 386BSD 0.1.2.4, and first appeared in 
-.Tn FreeBSD
+.Fx
 in
 .Fx 2.0.5 .
 .Sh AUTHORS
@@ -667,7 +717,7 @@
 The code that parses the generic command line arguments doesn't know that
 some of the subcommands take multiple arguments.  So if, for instance, you
 tried something like this:
-.Bd -literal -offset foobar
+.Bd -literal -offset indent
 camcontrol cmd -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
 .Ed
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/chkgrp.8 man8/chkgrp.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/chkgrp.8	Tue Mar 21 06:31:55 2000
+++ man8/chkgrp.8	Mon Jul  3 19:53:01 2000
@@ -24,19 +24,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.7 2000/03/01 14:07:53 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.7.2.1 2000/06/13 09:13:43 ru Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
-.Os
+.Os FreeBSD
 .Sh NAME
 .Nm chkgrp
 .Nd check the syntax of the group file
 .Sh SYNOPSIS
-.Nm chkgrp
+.Nm
 .Op Ar groupfile
 .Sh DESCRIPTION
-.Nm Chkgrp
+The
+.Nm
+utility
 scans the given file or, failing that, the system-wide group file for
 errors.
 Specifically, it checks that every non-blank, non-comment
@@ -44,8 +46,9 @@
 contains whitespace, and that the third field (the group ID) is
 numeric.
 .Sh FILES
-.Bl -tag -width /dev/null -compact
+.Bl -tag -width /etc/group -compact
 .It Pa /etc/group
+group database file
 .El
 .Sh SEE ALSO
 .Xr getgrent 3 ,
@@ -58,18 +61,24 @@
 Otherwise no
 output is produced.
 .Pp
-.Nm Chkgrp
-returns EX_DATAERR if errors were found in the group file, and EX_OK
+The
+.Nm
+utility returns
+.Dv EX_DATAERR
+if errors were found in the group file,
+and
+.Dv EX_OK
 otherwise.
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Fx 3.0
+utility appeared in
+.Fx 3.0 .
 .Sh AUTHORS
-.Nm Chkgrp
-and this manual page were written by
+The
+.Nm
+utility and this manual page were written by
 .An Dag-Erling Co$B}E(Ban Sm$B(Bgav Aq des@FreeBSD.org .
 .Sh BUGS
-Should check fields more thoroughly for allowed / disallowed
+Should check fields more thoroughly for allowed/disallowed
 characters, and the range of the group ID.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/comcontrol.8 man8/comcontrol.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/comcontrol.8	Tue Mar 21 06:30:08 2000
+++ man8/comcontrol.8	Mon Jul  3 19:50:53 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.15 1999/08/28 00:12:57 peter Exp $
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.15.2.1 2000/05/04 16:49:22 phantom Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
@@ -52,10 +52,6 @@
 dialout devices
 .Sh AUTHORS
 .An Christopher G. Demetriou
-.Sh BUGS
-.Nm Comcontrol
-should be named
-.Nm siocontrol .
 .Sh HISTORY
 Originally part of cgd's com package patches, version 0.2.1, to 386BSD 0.1.
 Once controlled bidirectional capabilities.  Little is left to control now
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/dhclient-script.8 man8/dhclient-script.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/dhclient-script.8	Tue Mar 21 06:30:08 2000
+++ man8/dhclient-script.8	Mon Jul  3 19:50:53 2000
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5 2000/01/13 16:27:20 asmodai Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5.2.1 2000/06/26 23:07:20 obrien Exp $
 .\"
 .TH dhclient-script 8
 .SH NAME
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/disklabel.8 man8/disklabel.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/disklabel.8	Tue Mar 21 06:30:08 2000
+++ man8/disklabel.8	Mon Jul  3 19:50:54 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15 1999/08/28 00:12:34 peter Exp $
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.1 2000/07/01 06:47:46 ps Exp $
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
@@ -119,12 +119,12 @@
 .if t ``complete'' (or ``c'')
 .if n "complete" (or "c")
 partition, for example
-.Pa /dev/rda0c .
+.Pa /dev/da0c .
 .Nm
 understands the abbreviation
 .Pa da0 ,
 which it converts internally to
-.Pa /dev/rda0c .
+.Pa /dev/da0c .
 .Ss Reading the disk label
 .Pp
 To examine or save the label on a disk drive, use
@@ -139,7 +139,7 @@
 represents the raw disk in question, and may be in the form
 .Pa da0
 or
-.Pa /dev/rda0c .
+.Pa /dev/da0c .
 It will display all of the parameters associated with the drive and its
 partition layout.  Unless the
 .Fl r
@@ -354,9 +354,9 @@
 uses an ASCII version of the label when examining, editing or restoring a disk
 label.  The format is:
 .Bd -literal -offset 4n
-# /dev/rda1c:
+# /dev/da1c:
 type: SCSI
-disk: sd0s1
+disk: da0s1
 label: 
 flags:
 bytes/sector: 512
@@ -447,7 +447,7 @@
 Display the in-core label for 
 .Pa da0
 as obtained via
-.Pa /dev/rda0c .
+.Pa /dev/da0c .
 .Pp
 .Dl disklabel da0 > savedlabel
 .Pp
@@ -459,7 +459,7 @@
 .Fl R
 flag to restore the label at a later date.
 .Pp
-.Dl disklabel -w -r /dev/rda0c da2212 foo
+.Dl disklabel -w -r /dev/da0c da2212 foo
 .Pp
 Create a label for 
 .Pa da0
@@ -501,7 +501,7 @@
 .Pa /boot/boot2 .
 On-disk and in-core labels are unchanged.
 .Pp
-.Dl disklabel -w -B /dev/rda0c -b newboot1 -s newboot da2212
+.Dl disklabel -w -B /dev/da0c -b newboot1 -s newboot da2212
 .Pp
 Install a new label and bootstrap.
 .if t The label is derived from disktab information for ``da2212'' and
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/dump.8 man8/dump.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/dump.8	Tue Mar 21 06:30:08 2000
+++ man8/dump.8	Mon Jul  3 19:50:55 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27 2000/03/01 11:27:03 sheldonh Exp $
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27.2.1 2000/07/01 06:47:47 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
@@ -141,7 +141,7 @@
 like
 .Pa /dev/rsa0
 (a tape drive),
-.Pa /dev/rfd1
+.Pa /dev/fd1
 (a floppy disk drive),
 an ordinary file,
 or
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/dumpon.8 man8/dumpon.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/dumpon.8	Tue Mar 21 06:30:09 2000
+++ man8/dumpon.8	Mon Jul  3 19:50:55 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.11 1999/08/28 00:12:44 peter Exp $
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.11.2.2 2000/03/28 15:56:22 sheldonh Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
@@ -70,16 +70,6 @@
 .Sh NOTES
 One of the system swap devices is usually chosen as the dump device, as
 swap devices are the most likely to have the required space at dump time.
-.Pp
-The dump device can also be specified at kernel compile time using
-the
-.Dq dumps on
-clause in the kernel configuration file (see
-.Xr config 8 ).  
-This is useful when the kernel panics before multi-user mode 
-is reached.  Subsequent successful invocations of 
-.Nm
-will override the compiled in value.
 .Pp
 The 
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/faithd.8 man8/faithd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/faithd.8	Tue Mar 21 06:32:01 2000
+++ man8/faithd.8	Mon Jul  3 19:53:04 2000
@@ -26,33 +26,30 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: faithd.8,v 1.3 1999/10/07 04:22:14 itojun Exp $
-.\"	$FreeBSD: src/usr.sbin/faithd/faithd.8,v 1.2 2000/02/10 19:42:41 shin Exp $
+.\"	$FreeBSD: src/usr.sbin/faithd/faithd.8,v 1.2.2.1 2000/05/06 13:56:08 phantom Exp $
 .\"
 .Dd January 27, 2000
 .Dt FAITHD 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm faithd
 .Nd FAITH IPv6/v4 translator daemon
 .Sh SYNOPSIS
-.Nm faithd
+.Nm
 .Op Fl dp
-.Oo
-.Ar service
-.Oo
-.Ar serverpath
-.Op Ar serverargs
-.Oc
-.Oc
+.Op Ar service Op Ar serverpath Op Ar serverargs
 .Sh DESCRIPTION
 .Nm
 provides IPv6/v4 TCP relay for the specified
 .Ar service .
 .Pp
 .Nm
-must be invoked on IPv4/v6 dual stack router.
+must be invoked on IPv4/v6
+dual stack router.
 The router must be configured to capture all the TCP traffic
-toward reserved IPv6 address prefix, by using
+toward reserved
+.Tn IPv6
+address prefix, by using
 .Xr route 8
 and
 .Xr sysctl 8
@@ -61,20 +58,32 @@
 will daemonize itself on invocation.
 .Pp
 .Nm
-will listen to TCPv6 port
+will listen to
+.Tn TCPv6
+port
 .Ar service .
-If TCPv6 traffic to port
+If
+.Tn TCPv6
+traffic to port
 .Ar service
 is found,
 .Nm
-will relay the TCPv6 traffic to TCPv4.
-Destination for relayed TCPv4 connection will be determined by the
-last 4 octets of the original IPv6 destination.
+will relay the
+.Tn TCPv6
+traffic to
+.Tn TCPv4 .
+Destination for relayed
+.Tn TCPv4
+connection will be determined by the last 4 octets of the original
+.Tn IPv6
+destination.
 For example, if
 .Li 3ffe:0501:4819:ffff::
 is reserved for
-.Nm faithd ,
-and the TCPv6 destination address is
+.Nm Ns ,
+and the
+.Tn TCPv6
+destination address is
 .Li 3ffe:0501:4819:ffff::0a01:0101 ,
 the traffic will be relayed to IPv4 destination
 .Li 10.1.1.1 .
@@ -106,7 +115,7 @@
 By specifying
 .Ar serverpath
 to
-.Nm faithd ,
+.Nm Ns ,
 you can run local daemons on the router.
 .Nm
 will invoke local daemon at
@@ -177,13 +186,10 @@
 Inactive sessions will be disconnected in 30 minutes,
 to avoid stale sessions from chewing up resources.
 This may be inappropriate for some of the services
-.Po
-should this be configurable?
-.Pc .
-.\"
+.Pq should this be configurable? .
 .Sh EXAMPLES
 Before invoking
-.Nm faithd ,
+.Nm Ns ,
 .Xr faith 4
 interface has to be configured properly.
 .Pp
@@ -200,24 +206,23 @@
 If you would like to provide local telnet service via
 .Xr telnetd 8
 on
-.Pa /usr/local/v6/libexec/telnetd ,
+.Pa /usr/libexec/telnetd ,
 user the following command line:
 .Bd -literal -offset
-# faithd telnet /usr/local/v6/libexec/telnetd telnetd
+# faithd telnet /usr/libexec/telnetd telnetd
 .Ed
 .Pp
 If you would like to pass extra arguments to the local daemon:
 .Bd -literal -offset
-# faithd ftpd /usr/local/v6/libexec/ftpd ftpd -l
+# faithd ftpd /usr/libexec/ftpd ftpd -l
 .Ed
 .Pp
 Here are some other examples:
 .Bd -literal -offset
-# faithd login /usr/local/v6/libexec/rlogin rlogind
-# faithd shell /usr/local/v6/libexec/rshd rshd
+# faithd login /usr/libexec/rlogin rlogind
+# faithd shell /usr/libexec/rshd rshd
 # faithd sshd
 .Ed
-.\"
 .Sh RETURN VALUES
 .Nm
 exits with
@@ -227,7 +232,6 @@
 .Dv EXIT_FAILURE
 .Pq 1
 on error.
-.\"
 .Sh SEE ALSO
 .Xr faith 4 ,
 .Xr route 8 ,
@@ -240,17 +244,17 @@
 .%N draft-ietf-ngtrans-tcpudp-relay-00.txt
 .%O work in progress material
 .Re
-.\"
 .Sh SECURITY NOTICE
 It is very insecure to use
 .Xr rhosts 5
 and other IP-address based authentication, for connections relayed by
 .Nm
-.Po
-and any other TCP relaying services
-.Pc .
-.\"
+.Pq and any other TCP relaying services .
 .Sh HISTORY
 The
 .Nm
 command first appeared in WIDE Hydrangea IPv6 protocol stack kit.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/fdisk.8 man8/fdisk.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/fdisk.8	Tue Mar 21 06:30:22 2000
+++ man8/fdisk.8	Mon Jul  3 19:51:12 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17 2000/03/10 22:02:59 imp Exp $
+.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17.2.1 2000/03/20 12:33:15 peter Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
@@ -62,8 +62,6 @@
 if
 .Fl f
 is given.
-.It Fl I
-Initialize the contents of sector 0 with one FreeBSD slice covering the entire disk.
 .It Fl f Ar configfile
 Set partition values using the file
 .Ar configfile .
@@ -93,6 +91,11 @@
 unless
 .Fl f
 is given.
+.It Fl I
+Initialize the contents of sector 0
+with one
+.Fx
+slice covering the entire disk.
 .It Fl s
 Print summary information and exit.
 .It Fl t
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/gifconfig.8 man8/gifconfig.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/gifconfig.8	Tue Mar 21 06:32:02 2000
+++ man8/gifconfig.8	Mon Jul  3 19:53:04 2000
@@ -26,16 +26,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: gifconfig.8,v 1.2 1999/10/07 04:25:54 itojun Exp $
-.\"	$FreeBSD: src/usr.sbin/gifconfig/gifconfig.8,v 1.1 1999/12/28 02:37:03 shin Exp $
+.\" $FreeBSD: src/usr.sbin/gifconfig/gifconfig.8,v 1.1.2.2 2000/05/06 14:22:13 phantom Exp $
 .\"
 .Dd May 17, 1998
 .Dt GIFCONFIG 8
-.Os KAME
-.\"
+.Os
 .Sh NAME
 .Nm gifconfig
 .Nd configure generic IP tunnel
-.\"
 .Sh SYNOPSIS
 .Nm
 .Ar interface
@@ -43,7 +41,6 @@
 .Op Ar physsrc physdest
 .Nm gifconfig
 .Fl a
-.\"
 .Sh DESCRIPTION
 .Nm
 configures the physical address for the generic IP tunnel
@@ -81,7 +78,6 @@
 .Po
 e.g. IPv4-over-IPv4
 .Pc .
-.\"
 .Sh EXAMPLES
 If you would like to configure IPv6 over IPv4
 .Pq aka IPv6 in IPv4
@@ -125,10 +121,8 @@
 to
 .Li inet6 ,
 and IPv4 addresses to some appropriate IPv6 addresses in above example.
-.\"
 .Sh RETURN VALUES
 The command exits with exit status of 1 on errors, 0 on success.
-.\"
 .Sh SEE ALSO
 .Xr gif 4 ,
 .Xr ifconfig 8
@@ -136,5 +130,7 @@
 The
 .Nm
 command first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/hlfsd.8 man8/hlfsd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/hlfsd.8	Tue Mar 21 06:31:53 2000
+++ man8/hlfsd.8	Mon Jul  3 19:52:54 2000
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hlfsd.8,v 1.2 1999/01/10 21:54:32 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.5 1999/09/15 05:45:15 obrien Exp $
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.5.2.1 2000/05/28 13:17:30 asmodai Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
@@ -294,7 +294,6 @@
 .Xr mtab 5 ,
 .Xr passwd 5 ,
 .Xr amd 8 ,
-.Xr automount 8 , 
 .Xr cron 8 , 
 .Xr mount 8 ,
 .Xr sendmail 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ifmcstat.8 man8/ifmcstat.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ifmcstat.8	Tue Mar 21 06:32:02 2000
+++ man8/ifmcstat.8	Mon Jul  3 19:53:04 2000
@@ -12,7 +12,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.\"	$FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1 1999/12/28 02:37:05 shin Exp $
+.\"	$FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1.2.1 2000/04/20 15:22:16 phantom Exp $
 .\"
 .Dd May 21, 1998
 .Dt IFMCSTAT 8
@@ -25,8 +25,8 @@
 .\"
 .Sh DESCRIPTION
 The
-.Nm Ifmcstat
-dumps multicast group information in the kernel.
+.Nm
+command dumps multicast group information in the kernel.
 .Pp
 There are no command-line options.
 .\"
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ip6fw.8 man8/ip6fw.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ip6fw.8	Tue Mar 21 06:30:10 2000
+++ man8/ip6fw.8	Mon Jul  3 19:50:57 2000
@@ -1,8 +1,8 @@
 .\"
-.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3 2000/03/01 11:27:07 sheldonh Exp $
+.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3.2.1 2000/05/04 17:35:17 phantom Exp $
 .\"
-.Dd July 20, 1996
-.Dt IP6FW 8 SMM
+.Dd March 13, 2000
+.Dt IP6FW 8
 .Os FreeBSD
 .Sh NAME
 .Nm ip6fw
@@ -11,16 +11,10 @@
 .Nm
 .Ar file
 .Nm ip6fw
-.Oo
-.Fl f
-|
-.Fl q
-.Oc
+.Op Fl f | Fl q
 flush
 .Nm ip6fw
-.Oo
-.Fl q
-.Oc
+.Op Fl q
 zero
 .Op Ar number ...
 .Nm ip6fw
@@ -31,15 +25,11 @@
 list
 .Op Ar number ...
 .Nm ip6fw
-.Oo
-.Fl ftN
-.Oc
+.Op Fl ftN
 show
 .Op Ar number ...
 .Nm ip6fw
-.Oo
-.Fl q
-.Oc
+.Op Fl q
 add
 .Op Ar number
 .Ar action
@@ -66,7 +56,9 @@
 a byte count.
 These counters are updated when a packet matches the rule.
 .Pp
-The rules are ordered by a ``line-number'' from 1 to 65534 that is used
+The rules are ordered by a
+.Dq line-number
+from 1 to 65534 that is used
 to order and delete rules.
 Rules are tried in increasing order, and the
 first rule that matches a packet applies.
@@ -91,7 +83,9 @@
 .Pp
 The flush operation removes all rules.
 .Pp
-Any command beginning with a '#', or being all blank, is ignored.
+Any command beginning with a
+.Sq # ,
+or being all blank, is ignored.
 .Pp
 One rule is always present:
 .Bd -literal -offset center
@@ -105,7 +99,9 @@
 The following options are available:
 .Bl -tag -width flag
 .It Fl a
-While listing, show counter values.  See also ``show'' command.
+While listing, show counter values.  See also
+.Dq show
+command.
 .It Fl f
 Don't ask for confirmation for commands that can cause problems if misused
 (ie; flush).
@@ -165,7 +161,7 @@
 Discard packets that match this rule,
 and try to send a TCP reset (RST) notice.
 The search terminates
-.Em (not working yet).
+.Em (not working yet) .
 .It Ar count
 Update counters for all packets that match rule.
 The search continues with the next rule.
@@ -179,7 +175,8 @@
 .Pp
 If the kernel was compiled with
 .Dv IP6FIREWALL_VERBOSE ,
-then when a packet matches a rule with the ``log''
+then when a packet matches a rule with the
+.Dq log
 keyword a message will be printed on the console.
 If the kernel was compiled with the
 .Dv IP6FIREWALL_VERBOSE_LIMIT
@@ -225,13 +222,16 @@
 may be specified as:
 .Bl -hang -offset flag -width 1234567890123456
 .It Ar ipv6no
-An ipv6number of the form fec0::1:2:3:4.
+An ipv6number of the form
+.Li fec0::1:2:3:4.
 .It Ar ipv6no/prefixlen
-An ipv6number with a prefix length of the form fec0::1:2:3:4/112.
+An ipv6number with a prefix length of the form
+.Li fec0::1:2:3:4/112.
 .El
 .Pp
 The sense of the match can be inverted by preceding an address with the
-``not'' modifier, causing all other addresses to be matched instead.
+.Dq not
+modifier, causing all other addresses to be matched instead.
 This
 does not affect the selection of port numbers.
 .Pp
@@ -360,7 +360,8 @@
 .Ar opts
 (destination options header).
 The absence of a particular option may be denoted
-with a ``!''
+with a
+.Dq !
 .Em (not working yet).
 .It established
 Matches packets that have the RST or ACK bits set.
@@ -381,7 +382,8 @@
 and
 .Ar urg .
 The absence of a particular flag may be denoted
-with a ``!''.
+with a
+.Dq ! .
 A rule which contains a
 .Ar tcpflags
 specification can never match a fragmented packet which has
@@ -413,13 +415,13 @@
 This is a valid packet, but it only has one use, to try to circumvent
 firewalls.
 .Pp
-If you are logged in over a network, loading the LKM version of
+If you are logged in over a network, loading the KLD version of
 .Nm
 is probably not as straightforward as you would think
 .Em (not supported).
 I recommend this command line:
 .Bd -literal -offset center
-modload /lkm/ip6fw_mod.o && \e
+kldload /modules/ip6fw_mod.o && \e
 ip6fw add 32000 allow all from any to any
 .Ed
 .Pp
@@ -460,8 +462,8 @@
 .Xr protocols 5 ,
 .Xr services 5 ,
 .Xr reboot 8 ,
-.Xr syslogd 8 ,
-.Xr sysctl 8
+.Xr sysctl 8 ,
+.Xr syslogd 8
 .Sh BUGS
 .Pp
 .Em WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!
@@ -476,11 +478,13 @@
 When manipulating/adding chain entries, service and protocol names are
 not accepted.
 .Sh AUTHORS
-Ugen J. S. Antsilevich,
-Poul-Henning Kamp,
-Alex Nash,
-Archie Cobbs.
-API based upon code written by Daniel Boulet for BSDI.
+.An Ugen J. S. Antsilevich ,
+.An Poul-Henning Kamp ,
+.An Alex Nash ,
+.An Archie Cobbs .
+API based upon code written by
+.An Daniel Boulet
+for BSDI.
 .Sh HISTORY
 .Nm
 first appeared in
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ipfw.8 man8/ipfw.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ipfw.8	Tue Mar 21 06:30:10 2000
+++ man8/ipfw.8	Mon Jul  3 19:50:58 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63 2000/02/28 15:21:12 ru Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63.2.2 2000/06/12 09:47:20 ru Exp $
 .\"
 .Dd February 16, 2000
 .Dt IPFW 8
@@ -50,6 +50,16 @@
 .Es \&{ \&}
 .En Cm delete | list | show
 .Op Ar number ...
+.Nm ipfw
+.Cm queue
+.Ar number
+.Cm config
+.Ar queue-config-options
+.Nm ipfw
+.Cm queue
+.Es \&{ \&}
+.En Cm delete | list | show
+.Op Ar number ...
 .Sh DESCRIPTION
 .Nm
 is the user interface for controlling the
@@ -396,8 +406,8 @@
 .Dq pipe
 (for bandwidth limitation, delay, etc.).
 See the
-.Xr dummynet 4
-manpage for further information.
+.Sx TRAFFIC SHAPER CONFIGURATION
+section for further information.
 The search terminates; however, on exit from the pipe and if
 the
 .Xr sysctl 8
@@ -405,6 +415,11 @@
 .Em net.inet.ip.fw.one_pass
 is not set, the packet is passed again to the firewall code
 starting from the next rule.
+.It Cm queue Ar queue_nr
+Pass packet to a
+.Xr dummynet 4
+.Dq queue
+(for bandwidth limitation using WF2Q).
 .It Cm skipto Ar number
 Skip all subsequent rules numbered less than
 .Ar number .
@@ -422,13 +437,18 @@
 .Dv IPFIREWALL_VERBOSE_LIMIT
 option, then by default logging will cease after the number
 of packets specified by the option are received for that
-particular chain entry.
+particular chain entry, and
+.Em net.inet.ip.fw.verbose_limit
+will be set to that number.
 However, if
 .Cm logamount Ar number
 is used, that
 .Ar number
-will be the default logging limit rather than
-.Dv IPFIREWALL_VERBOSE_LIMIT .
+will be the logging limit rather than
+.Em net.inet.ip.fw.verbose_limit ,
+where the value
+.Dq 0
+removes the logging limit.
 Logging may then be re-enabled by clearing the logging counter
 or the packet counter for that entry.
 .Pp
@@ -719,30 +739,86 @@
 utility is also the user interface for the
 .Xr dummynet 4
 traffic shaper.
-The shaper operates by passing packets to objects called
-.Em pipes ,
-which emulate a link with given bandwidth, propagation delay,
+The shaper operates by dividing packets into
+.Em flows
+according to a user-specified mask on different fields
+of the IP header.
+Packets belonging to the same flow are then passed to two
+different objects, named
+.Em pipe
+or
+.Em queue .
+.Pp
+A
+.Em pipe
+emulates a link with given bandwidth, propagation delay,
 queue size and packet loss rate.
+Packets transit through the pipe according to its parameters.
+.Pp
+A
+.Em queue
+is an abstraction used to implement the WF2Q+ policy.
+The queue associates to each flow a weight and a reference pipe.
+Then, all flows linked to the same pipe are scheduled at the
+rate fixed by the pipe according to the WF2Q+ policy.
+.Pp
 The
 .Nm
 pipe configuration format is the following:
 .Bd -ragged
 .Cm pipe Ar number Cm config
-.Op Cm bw Ar bandwidth
+.Op Cm bw Ar bandwidth | device
+.Op Cm delay Ar ms-delay
 .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
+.Oo
+.Cm red | gred
+.Sm off
+.Ar w_q No / Xo
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Xc
+.Sm on
+.Oc
+.Ed
+.Pp
+The
+.Nm
+queue configuration format is the following:
+.Bd -ragged
+.Cm queue Ar number Cm config
+.Op Cm pipe Ar pipe_nr
+.Op Cm weight Ar weight
+.Oo
+.Cm queue
+.Es \&{ \&}
+.En Ar slots | size
+.Oc
+.Op Cm plr Ar loss-probability
+.Op Cm mask Ar mask-specifier
+.Op Cm buckets Ar hash-table-size
+.Oo
+.Cm red | gred
+.Sm off
+.Ar w_q No / Xo
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Xc
+.Sm on
+.Oc
 .Ed
 .Pp
 The following parameters can be configured for a pipe:
 .Bl -tag -width indent
-.It Cm bw Ar bandwidth
+.It Cm bw Ar bandwidth | device
 Bandwidth, measured in
 .Sm off
 .Oo
@@ -754,7 +830,17 @@
 .Pp
 A value of 0 (default) means unlimited bandwidth.
 The unit must follow immediately the number, as in
+.Pp
 .Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
+.Pp
+If a device name is specified instead of a numeric
+value, then the transmit clock is supplied by the specified
+device.
+At the moment only the
+.Xr tun 4
+device supports this
+functionality, for use in conjunction with
+.Xr ppp 8 .
 .It Cm delay Ar ms-delay
 Propagation delay, measured in milliseconds.
 The value is rounded to the next multiple of the clock tick
@@ -792,8 +878,7 @@
 .It Cm mask Ar mask-specifier
 The
 .Xr dummynet 4
-allows you to generate per-flow queues using a single pipe
-specification.
+lets you to create per-flow queues.
 A flow identifier is constructed by masking the IP addresses,
 ports and protocol types as specified in the pipe configuration.
 Packets with the same identifier after masking fall into the
@@ -807,6 +892,15 @@
 or
 .Cm all ,
 where the latter means all bits in all fields are significant.
+When used within a
+.Ar pipe
+configuration, each flow is assigned a rate equal
+to the rate of the pipe.
+When used within a
+.Ar queue
+configuration, each flow is assigned a weight equal to the
+weight of the queue, and all flows insisting on the same pipe
+share bandwidth proportionally to their weight.
 .It Cm buckets Ar hash-table-size
 Specifies the size of the hash table used for storing the
 various queues.
@@ -815,6 +909,51 @@
 variable
 .Em net.inet.ip.dummynet.hash_size ,
 allowed range is 16 to 1024.
+.It Cm pipe Ar pipe_nr
+Connects a queue to the specified pipe.
+Multiple queues (usually
+with different weights) can be connected to the same pipe, which
+specifies the aggregate rate for the set of queues.
+.It Cm weight Ar weight
+Specifies the weight to be used for flows matching this queue.
+The weight must be in the range 1..100, and defaults to 1.
+.It Cm red | gred Xo
+.Sm off
+.Ar w_q No /
+.Ar min_th No /
+.Ar max_th No /
+.Ar max_p
+.Sm on
+.Xc
+Make use of the RED queue management algorithm.
+.Ar w_q
+and
+.Ar max_p
+are floating
+point numbers between 0 and 1 (0 not included), while
+.Ar min_th
+and
+.Ar max_th
+are integer numbers specifying thresholds for queue management
+(thresholds are computed in bytes if the queue has been defined
+in bytes, in slots otherwise).
+The
+.Xr dummynet 4
+also supports the gentle RED variant (gred).
+Three
+.Xr sysctl 8
+variables can be used to control the RED behaviour:
+.Bl -tag -width indent
+.It Em net.inet.ip.dummynet.red_lookup_depth
+specifies the accuracy in computing the average queue
+when the link is idle (defaults to 256, must be greater than zero)
+.It Em net.inet.ip.dummynet.red_avg_pkt_size
+specifies the expected average packet size (defaults to 512, must be
+greater than zero)
+.It Em net.inet.ip.dummynet.red_max_pkt_size
+specifies the expected maximum packet size, only used when queue
+thresholds are in bytes (defaults to 1500, must be greater than zero).
+.El
 .El
 .Sh CHECKLIST
 Here are some important points to consider when designing your
@@ -1045,6 +1184,12 @@
 Ethernet, IRDA).
 It is not necessary that both pipes have the same configuration,
 so we can also simulate asymmetric links.
+.Pp
+Should we like to verify network performance with the RED queue
+management algorithm:
+.Pp
+.Dl "ipfw add pipe 1 ip from any to any"
+.Dl "ipfw pipe 1 config bw 500Kbit/s queue 100 red 0.002/30/80/0.1"
 .Pp
 Another typical application of the traffic shaper is to
 introduce some delay in the communication.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/jail.8 man8/jail.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/jail.8	Tue Mar 21 06:32:03 2000
+++ man8/jail.8	Mon Jul  3 19:53:06 2000
@@ -31,7 +31,7 @@
 .\"this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\"----------------------------------------------------------------------------
 .\"
-.\"$FreeBSD: src/usr.sbin/jail/jail.8,v 1.13 2000/03/01 14:07:56 sheldonh Exp $
+.\"$FreeBSD: src/usr.sbin/jail/jail.8,v 1.13.2.1 2000/04/23 17:05:30 mpp Exp $
 .\"
 .Dd April 28, 1999
 .Dt JAIL 8
@@ -49,7 +49,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-command imprisons a process and all future decendants.
+command imprisons a process and all future descendants.
 .Pp
 Please see the
 .Xr jail 2
@@ -89,7 +89,9 @@
 .Dq jail environment.
 Because jail is implemented using IP aliases, one of the first things to do
 is to disable IP services on the host system that listen on all local
-IP addresses for a service.  This means changing inetd to only listen on the
+IP addresses for a service.  This means changing
+.Xr inetd 8
+to only listen on the
 appropriate IP address, and so forth.  Add the following to
 .Pa /etc/rc.conf
 in the host environment:
@@ -224,7 +226,7 @@
 .Dq J
 flag appearing beside jailed processes.  You should also be able to
 telnet to the hostname or IP address of the jailed environment, and log
-in using the acounts you created previously.
+in using the accounts you created previously.
 .Ss Managing the jail
 Normal machine shutdown commands, such as
 .Xr halt 8 ,
@@ -302,8 +304,9 @@
 function call appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-The jail feature was written by Poul-Henning Kamp for
-R&D Associates
+The jail feature was written by
+.An Poul-Henning Kamp
+for R&D Associates
 .Dq Li http://www.rndassociates.com/
 who contributed it to FreeBSD.
 .Pp
@@ -321,5 +324,6 @@
 will not bind on that address, which would facilitate building a safe
 host environment such that host daemons do not impose on services offered
 from within jails.  Currently, the simplist answer is to minimize services
-offered on the host, possibly limiting it to services offered from inetd
+offered on the host, possibly limiting it to services offered from
+.Xr inetd 8
 which is easily configurable.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/kldstat.8 man8/kldstat.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/kldstat.8	Tue Mar 21 06:30:11 2000
+++ man8/kldstat.8	Mon Jul  3 19:50:59 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.7 1999/09/03 16:40:23 chris Exp $
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.7.2.2 2000/07/01 07:56:00 ps Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/locate.updatedb.8 man8/locate.updatedb.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/locate.updatedb.8	Tue Mar 21 06:31:24 2000
+++ man8/locate.updatedb.8	Mon Jul  3 19:52:23 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7 1999/08/28 01:03:00 peter Exp $
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7.2.1 2000/06/14 17:45:17 alex Exp $
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
@@ -43,7 +43,7 @@
 updates the database used by
 .Xr locate 1 .
 It is typically run once a week by the
-.Pa /etc/weekly
+.Pa /etc/periodic/weekly/310.locate
 script.
 .Pp
 The contents of the newly built database can be controlled by the
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mailwrapper.8 man8/mailwrapper.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mailwrapper.8	Tue Mar 21 06:32:06 2000
+++ man8/mailwrapper.8	Mon Jul  3 19:53:36 2000
@@ -1,5 +1,5 @@
 .\"	$NetBSD: mailwrapper.8,v 1.6 1999/03/25 16:40:17 is Exp $
-.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.4 2000/03/01 14:07:59 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.4.2.2 2000/07/01 10:21:34 ps Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -52,7 +52,7 @@
 .Pp
 Times have changed, however.
 On a modern
-.Nx
+.Ux
 system, the administrator may wish to use one of several
 available MTAs.
 .Pp
@@ -118,7 +118,7 @@
 is kept in
 .Pa /etc/mail/mailer.conf .
 .Pa /usr/sbin/sendmail 
-is typically set up as a symlink to
+is typically set up as a symbolic link to
 .Nm
 which is not usually invoked on its own.
 .Sh DIAGNOSTICS
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mknod.8 man8/mknod.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mknod.8	Tue Mar 21 06:30:12 2000
+++ man8/mknod.8	Mon Jul  3 19:51:03 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.11 2000/03/01 11:27:10 sheldonh Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.11.2.1 2000/04/23 16:59:28 mpp Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
@@ -106,7 +106,7 @@
 The
 .Ar group
 may be either a numeric group ID or a group name.
-Simular to the user name, 
+Similar to the user name, 
 if a group name is also a numeric group ID, the operand is used as a
 group name.
 .El
Only in man8: mlxcontrol.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount.8 man8/mount.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount.8	Tue Mar 21 06:30:12 2000
+++ man8/mount.8	Mon Jul  3 19:51:03 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.31 2000/03/01 11:27:12 sheldonh Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.31.2.1 2000/07/01 07:39:53 ps Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
@@ -355,7 +355,6 @@
 .Xr mount_devfs 8 ,
 .Xr mount_fdesc 8 ,
 .Xr mount_kernfs 8 ,
-.Xr mount_lfs 8 ,
 .Xr mount_mfs 8 ,
 .Xr mount_msdos 8 ,
 .Xr mount_nfs 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_devfs.8 man8/mount_devfs.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_devfs.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_devfs.8	Mon Jul  3 19:51:05 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp $
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -44,6 +44,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd mount ``standard'' filesystems
 .Sh SYNOPSIS
@@ -60,7 +61,8 @@
 command currently supports the following filesystems: 
 .Nm devfs , 
 .Nm fdesc ,
-.Nm kernfs 
+.Nm kernfs ,
+.Nm linprocfs 
 and 
 .Nm procfs .
 A ``standard'' filesystem is one which:
@@ -120,7 +122,8 @@
 on these file system:
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
-.Xr kernfs 5 
+.Xr kernfs 5 ,
+.Xr linprocfs 5 
 and
 .Xr procfs 5 .
 .Sh DIAGNOSTICS
@@ -145,6 +148,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
@@ -166,4 +170,8 @@
 the
 .Dq devfs
 filesystem type first appeared in
-.Fx 2.2 .
+.Fx 2.2 ;
+the
+.Dq linprocfs
+filesystem type first appeared in
+.Fx 4.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_fdesc.8 man8/mount_fdesc.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_fdesc.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_fdesc.8	Mon Jul  3 19:51:05 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp $
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -44,6 +44,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd mount ``standard'' filesystems
 .Sh SYNOPSIS
@@ -60,7 +61,8 @@
 command currently supports the following filesystems: 
 .Nm devfs , 
 .Nm fdesc ,
-.Nm kernfs 
+.Nm kernfs ,
+.Nm linprocfs 
 and 
 .Nm procfs .
 A ``standard'' filesystem is one which:
@@ -120,7 +122,8 @@
 on these file system:
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
-.Xr kernfs 5 
+.Xr kernfs 5 ,
+.Xr linprocfs 5 
 and
 .Xr procfs 5 .
 .Sh DIAGNOSTICS
@@ -145,6 +148,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
@@ -166,4 +170,8 @@
 the
 .Dq devfs
 filesystem type first appeared in
-.Fx 2.2 .
+.Fx 2.2 ;
+the
+.Dq linprocfs
+filesystem type first appeared in
+.Fx 4.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_kernfs.8 man8/mount_kernfs.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_kernfs.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_kernfs.8	Mon Jul  3 19:51:05 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp $
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -44,6 +44,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd mount ``standard'' filesystems
 .Sh SYNOPSIS
@@ -60,7 +61,8 @@
 command currently supports the following filesystems: 
 .Nm devfs , 
 .Nm fdesc ,
-.Nm kernfs 
+.Nm kernfs ,
+.Nm linprocfs 
 and 
 .Nm procfs .
 A ``standard'' filesystem is one which:
@@ -120,7 +122,8 @@
 on these file system:
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
-.Xr kernfs 5 
+.Xr kernfs 5 ,
+.Xr linprocfs 5 
 and
 .Xr procfs 5 .
 .Sh DIAGNOSTICS
@@ -145,6 +148,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
@@ -166,4 +170,8 @@
 the
 .Dq devfs
 filesystem type first appeared in
-.Fx 2.2 .
+.Fx 2.2 ;
+the
+.Dq linprocfs
+filesystem type first appeared in
+.Fx 4.0 .
Only in man8: mount_linprocfs.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_null.8 man8/mount_null.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_null.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_null.8	Mon Jul  3 19:51:04 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11 1999/08/28 00:13:33 peter Exp $
+.\" $FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11.2.1 2000/05/15 14:56:13 hoek Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULL 8
@@ -96,7 +96,7 @@
 which is slightly more than nothing.)
 Second, the null layer can serve as a prototype layer.
 Since it provides all necessary layer framework,
-new file system layers can be created very easily be starting
+new file system layers can be created very easily by starting
 with a null layer.
 .Pp
 The remainder of this man page examines the null layer as a basis
@@ -118,7 +118,7 @@
 The null layer is the minimum file system layer,
 simply bypassing all possible operations to the lower layer
 for processing there.  The majority of its activity centers
-on the bypass routine, though which nearly all vnode operations
+on the bypass routine, through which nearly all vnode operations
 pass.
 .Pp
 The bypass routine accepts arbitrary vnode operations for
@@ -139,7 +139,9 @@
 .Em Vop_getattr
 must change the fsid being returned.
 .Em Vop_inactive
-and vop_reclaim are not bypassed so that
+and
+.Em vop_reclaim
+are not bypassed so that
 they can handle freeing null-layer specific data.
 .Em Vop_print
 is not bypassed to avoid excessive debugging
@@ -204,23 +206,24 @@
 is appropriate in different situations.  In both cases,
 it is the responsibility of the aliasing layer to make
 the operation arguments "correct" for the lower layer
-by mapping an vnode arguments to the lower layer.
+by mapping a vnode argument to the lower layer.
 .Pp
 The first approach is to call the aliasing layer's bypass routine.
 This method is most suitable when you wish to invoke the operation
-currently being handled on the lower layer.  It has the advantage
+currently being handled on the lower layer.
+It has the advantage that
 the bypass routine already must do argument mapping.
 An example of this is 
 .Em null_getattrs
 in the null layer.
 .Pp
-A second approach is to directly invoked vnode operations on
+A second approach is to directly invoke vnode operations on
 the lower layer with the
 .Em VOP_OPERATIONNAME
 interface.
 The advantage of this method is that it is easy to invoke
 arbitrary operations on the lower layer.  The disadvantage
-is that vnodes arguments must be manually mapped.
+is that vnode arguments must be manually mapped.
 .\"
 .\"
 .Sh SEE ALSO
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_procfs.8 man8/mount_procfs.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_procfs.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_procfs.8	Mon Jul  3 19:51:05 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp $
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -44,6 +44,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd mount ``standard'' filesystems
 .Sh SYNOPSIS
@@ -60,7 +61,8 @@
 command currently supports the following filesystems: 
 .Nm devfs , 
 .Nm fdesc ,
-.Nm kernfs 
+.Nm kernfs ,
+.Nm linprocfs 
 and 
 .Nm procfs .
 A ``standard'' filesystem is one which:
@@ -120,7 +122,8 @@
 on these file system:
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
-.Xr kernfs 5 
+.Xr kernfs 5 ,
+.Xr linprocfs 5 
 and
 .Xr procfs 5 .
 .Sh DIAGNOSTICS
@@ -145,6 +148,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
@@ -166,4 +170,8 @@
 the
 .Dq devfs
 filesystem type first appeared in
-.Fx 2.2 .
+.Fx 2.2 ;
+the
+.Dq linprocfs
+filesystem type first appeared in
+.Fx 4.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_std.8 man8/mount_std.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mount_std.8	Tue Mar 21 06:30:13 2000
+++ man8/mount_std.8	Mon Jul  3 19:51:05 2000
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9 1999/08/28 00:13:39 peter Exp $
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.9.2.1 2000/03/25 13:47:45 des Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
@@ -44,6 +44,7 @@
 .Nm mount_devfs ,
 .Nm mount_fdesc ,
 .Nm mount_kernfs ,
+.Nm mount_linprocfs ,
 .Nm mount_procfs
 .Nd mount ``standard'' filesystems
 .Sh SYNOPSIS
@@ -60,7 +61,8 @@
 command currently supports the following filesystems: 
 .Nm devfs , 
 .Nm fdesc ,
-.Nm kernfs 
+.Nm kernfs ,
+.Nm linprocfs 
 and 
 .Nm procfs .
 A ``standard'' filesystem is one which:
@@ -120,7 +122,8 @@
 on these file system:
 .Xr devfs 5 ,
 .Xr fdesc 5 ,
-.Xr kernfs 5 
+.Xr kernfs 5 ,
+.Xr linprocfs 5 
 and
 .Xr procfs 5 .
 .Sh DIAGNOSTICS
@@ -145,6 +148,7 @@
 .Xr fdesc 5 ,
 .Xr fstab 5 ,
 .Xr kernfs 5 ,
+.Xr linprocfs 5 ,
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
@@ -166,4 +170,8 @@
 the
 .Dq devfs
 filesystem type first appeared in
-.Fx 2.2 .
+.Fx 2.2 ;
+the
+.Dq linprocfs
+filesystem type first appeared in
+.Fx 4.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mountd.8 man8/mountd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mountd.8	Tue Mar 21 06:30:14 2000
+++ man8/mountd.8	Mon Jul  3 19:51:05 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" $FreeBSD: src/sbin/mountd/mountd.8,v 1.16 1999/08/28 00:13:44 peter Exp $
+.\" $FreeBSD: src/sbin/mountd/mountd.8,v 1.16.2.1 2000/05/24 13:25:52 mpp Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
@@ -96,7 +96,9 @@
 .Nm
 is started,
 it loads the export host addresses and options into the kernel
-using the mount(2) system call.
+using the
+.Xr mount 2
+system call.
 After changing the exports file,
 a hangup signal should be sent to the
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/moused.8 man8/moused.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/moused.8	Tue Mar 21 06:32:07 2000
+++ man8/moused.8	Mon Jul  3 19:53:07 2000
@@ -28,9 +28,9 @@
 .\" 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.27 2000/03/01 14:08:06 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.27.2.2 2000/04/21 14:21:12 yokota Exp $
 .\"
-.Dd December 3, 1997
+.Dd April 1, 2000
 .Dt MOUSED 8
 .Os FreeBSD
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nd pass mouse data to the console driver
 .Sh SYNOPSIS
 .Nm
-.Op Fl 3DPRcdfs
+.Op Fl DPRcdfs
 .Op Fl I Ar file
 .Op Fl F Ar rate
 .Op Fl r Ar resolution
@@ -48,6 +48,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
@@ -99,7 +100,7 @@
 The user program which is reading mouse data
 via 
 .Xr sysmouse 4
-won't be affected.
+will not be affected.
 .It Fl D
 Lower DTR on the serial port. 
 This option is valid only if 
@@ -109,6 +110,16 @@
 to operate in the
 .Ar mousesystems
 mode.
+.It Fl E Ar timeout
+When the third button emulation is enabled
+.Pq see above ,
+the
+.Nm
+daemon waits
+.Ar timeout
+msec at most before deciding whether two buttons are being pressed
+simultaneously.
+The default timeout is 100 msec.
 .It Fl F Ar rate
 Set the report rate (reports/sec) of the device if supported.
 .It Fl I Ar file
@@ -124,7 +135,7 @@
 .Fl i
 option, the
 .Nm
-command won't be able to print useful information for the serial mouse.
+command will not be able to print useful information for the serial mouse.
 .It Fl R
 Lower RTS on the serial port.
 This option is valid only if 
@@ -144,7 +155,7 @@
 Not all serial mice support this option.
 .It Fl c
 Some mice report middle button down events
-as if the left and right buttons are pressed.
+as if the left and right buttons are being pressed.
 This option handles this.
 .It Fl d
 Enable debugging messages.
@@ -328,18 +339,51 @@
 .It Ar y
 X or Y axis movement will be reported when the Z axis movement is detected.
 .It Ar N
-Report the virtual buttons
+Report down events for the virtual buttons
 .Ar N 
 and 
 .Ar N+1 
-down events respectively when negative and positive Z axis movement 
+respectively when negative and positive Z axis movement 
 is detected.
-There doesn't need to be physical buttons 
+There do not need to be physical buttons 
 .Ar N
 and 
 .Ar N+1 .
 Note that mapping to logical buttons is carried out after mapping
 from the Z axis movement to the virtual buttons is done.
+.It Ar N1 N2
+Report down events for the virtual buttons
+.Ar N1
+and 
+.Ar N2
+respectively when negative and positive Z axis movement 
+is detected.
+.It Ar N1 N2 N3 N4
+This is useful for the mouse with two wheels of which
+the second wheel is used to generate horizontal scroll action,
+and for the mouse which has a knob or a stick which can detect
+the horizontal force applied by the user.
+.Pp
+The motion of the second wheel will be mapped to the buttons
+.Ar N3 ,
+for the negative direction, and
+.Ar N4 ,
+for the positive direction.
+If the buttons
+.Ar N3
+and
+.Ar N4
+actually exist in this mouse, their actions will not be detected.
+.Pp
+Note that horizontal movement or second roller/wheel movement may not
+always be detected,
+because there appears to be no accepted standard as to how it is encoded.
+.Pp
+Note also that some mice think left is the negative horizontal direction, 
+others may think otherwise.  
+Moreover, there are some mice whose two wheels are both mounted vertically,
+and the direction of the second vertical wheel does not match the
+first one's.
 .El
 .El
 .Ss Configuring Mouse Daemon
@@ -436,10 +480,10 @@
 3-button serial mice may work with the
 .Ar mousesystems
 protocol.
-If it doesn't, it may work with the 
+If it does not, it may work with the 
 .Ar microsoft
 protocol although 
-the third (middle) button won't function.
+the third (middle) button will not function.
 3-button serial mice may also work with the
 .Ar mouseman
 protocol under which the third button may function as expected.
@@ -486,7 +530,7 @@
 .Xr sysmouse ,
 then the application program will always see mouse data from either mice. 
 When the serial mouse is not attached, the corresponding mouse daemon
-won't detect any movement or button state change and the application
+will not detect any movement or button state change and the application
 program will only see mouse data coming from the daemon for the
 PS/2 mouse.
 In contrast when both mice are attached and both of them
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/mtree.8 man8/mtree.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/mtree.8	Tue Mar 21 06:32:08 2000
+++ man8/mtree.8	Mon Jul  3 19:53:09 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16 1999/12/09 20:38:35 joe Exp $
+.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16.2.3 2000/06/30 09:54:06 ps Exp $
 .\"
 .Dd February 26, 1999
 .Dt MTREE 8
@@ -46,9 +46,10 @@
 .Op Fl k Ar keywords
 .Op Fl p Ar path
 .Op Fl s Ar seed
+.Op Fl X Ar exclude-list
 .Sh DESCRIPTION
 The utility
-.Nm mtree
+.Nm
 compares the file hierarchy rooted in the current directory against a
 specification read from the standard input.
 Messages are written to the standard output for any files whose
@@ -108,7 +109,7 @@
 the specification and create any missing directories.
 User, group, and permissions must all be specified for missing directories
 to be created.
-Exit with a status of 0 on success, 1 if any error occurred,
+Exit with a status of 0 on success, 1 if any error occurred;
 a mismatch is not considered an error if it was corrected.
 .It Fl u
 Same as
@@ -117,6 +118,19 @@
 the specification.
 .It Fl x
 Don't descend below mount points in the file hierarchy.
+.It Fl X Ar exclude-list
+The specified file contains
+.Xr fnmatch 3
+patterns matching files to be excluded from
+the specification, one to a line.
+If the pattern contains a
+.Ql \&/
+character, it will be matched against entire pathnames (relative to
+the starting directory); otherwise,
+it will be matched against basenames only.  No comments are allowed in
+the
+.Ar exclude-list
+file.
 .El
 .Pp
 Specifications are mostly composed of ``keywords'', i.e. strings that
@@ -281,7 +295,7 @@
 for distributions and other such things; the files in
 .Pa /etc/mtree
 were used to create almost all directories in this
-.Tn FreeBSD
+.Fx
 distribution.
 .Sh FILES
 .Bl -tag -width /etc/mtree -compact
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/natd.8 man8/natd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/natd.8	Tue Mar 21 06:30:14 2000
+++ man8/natd.8	Mon Jul  3 19:51:05 2000
@@ -1,169 +1,257 @@
-.\" manual page [] for natd 1.4
-.\" $FreeBSD: src/sbin/natd/natd.8,v 1.27 2000/03/01 11:27:22 sheldonh Exp $
-.Dd 15 April 1997
-.Os FreeBSD
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.27.2.4 2000/06/29 10:06:27 ru Exp $
+.Dd June 27, 2000
 .Dt NATD 8
+.Os FreeBSD
 .Sh NAME
 .Nm natd
-.Nd
-Network Address Translation Daemon
+.Nd Network Address Translation Daemon
 .Sh SYNOPSIS
-.Nm
-.Op Fl ldsmvu
+.Nm natd
+.Op Fl unregistered_only | u
+.Op Fl log | l
+.Op Fl proxy_only
+.Op Fl reverse
+.Op Fl deny_incoming | d
+.Op Fl use_sockets | s
+.Op Fl same_ports | m
+.Op Fl verbose | v
 .Op Fl dynamic
-.Op Fl i Ar inport
-.Op Fl o Ar outport
-.Op Fl p Ar port
-.Op Fl a Ar address
-.Op Fl n Ar interface
-.Op Fl f Ar configfile
-
-.Nm
-.Op Fl log
-.Op Fl deny_incoming
+.Op Fl in_port | i Ar port
+.Op Fl out_port | o Ar port
+.Op Fl port | p Ar port
+.Op Fl alias_address | a Ar address
+.Op Fl target_address | t Ar address
+.Op Fl interface | n Ar interface
+.Op Fl proxy_rule Ar proxyspec
+.Op Fl redirect_port Ar linkspec
+.Op Fl redirect_proto Ar linkspec
+.Op Fl redirect_address Ar linkspec
+.Op Fl config | f Ar configfile
 .Op Fl log_denied
-.Op Fl use_sockets
-.Op Fl same_ports
-.Op Fl verbose
 .Op Fl log_facility Ar facility_name
-.Op Fl unregistered_only
-.Op Fl dynamic
-.Op Fl inport Ar inport
-.Op Fl outport Ar outport
-.Op Fl port Ar port
-.Op Fl alias_address Ar address
-.Op Fl interface Ar interface
-.Op Fl config Ar configfile
-.Op Fl redirect_port Ar linkspec
-.Op Fl redirect_address Ar localIP publicIP
-.Op Fl reverse
-.Op Fl proxy_only
-.Op Fl proxy_rule Ar proxyspec
-.Op Fl pptpalias Ar localIP
-
+.Op Fl punch_fw Ar firewall_range
 .Sh DESCRIPTION
 This program provides a Network Address Translation facility for use
 with
 .Xr divert 4
-sockets under FreeBSD.  It is intended for use with NICs - if you want
-to do NAT on a PPP link, use the -nat switch to
+sockets under
+.Fx .
+It is intended for use with NICs - if you want to do NAT on a PPP link,
+use the
+.Fl nat
+switch to
 .Xr ppp 8 .
-
 .Pp
-.Nm Natd
-normally runs in the background as a daemon.  It is passed raw IP packets
-as they travel into and out of the machine, and will possibly change these
-before re-injecting them back into the IP packet stream.
-
-.Pp
-.Nm Natd
-changes all packets destined for another host so that their source
-IP number is that of the current machine.  For each packet changed
-in this manner, an internal table entry is created to record this
-fact.  The source port number is also changed to indicate the
-table entry applying to the packet.  Packets that are received with
-a target IP of the current host are checked against this internal
-table.  If an entry is found, it is used to determine the correct
-target IP number and port to place in the packet.
-
+The
+.Nm
+normally runs in the background as a daemon.
+It is passed raw IP packets as they travel into and out of the machine,
+and will possibly change these before re-injecting them back into the
+IP packet stream.
+.Pp
+It changes all packets destined for another host so that their source
+IP number is that of the current machine.
+For each packet changed in this manner, an internal table entry is
+created to record this fact.
+The source port number is also changed to indicate the table entry
+applying to the packet.
+Packets that are received with a target IP of the current host are
+checked against this internal table.
+If an entry is found, it is used to determine the correct target IP
+number and port to place in the packet.
 .Pp
 The following command line options are available.
 .Bl -tag -width Fl
-
 .It Fl log | l
 Log various aliasing statistics and information to the file
 .Pa /var/log/alias.log .
-This file is truncated each time natd is started.
-
+This file is truncated each time
+.Nm
+is started.
 .It Fl deny_incoming | d
-Reject packets destined for the current IP number that have no entry
-in the internal translation table.
-
+Do not pass packets destined for the current IP number that have no
+entry in the internal translation table.
 .It Fl log_denied
-Log denied incoming packets via syslog (see also log_facility)
-
+Log denied incoming packets via
+.Xr syslog 3
+.Po
+see also
+.Fl log_facility
+.Pc .
 .It Fl log_facility Ar facility_name
-Use specified log facility when logging information via syslog.
-Facility names are as in
-.Xr syslog.conf 5
-
+Use specified log facility when logging information via
+.Xr syslog 3 .
+Argument
+.Ar facility_name
+is one of the keywords specified in
+.Xr syslog.conf 5 .
 .It Fl use_sockets | s
 Allocate a
 .Xr socket 2
-in order to establish an FTP data or IRC DCC send connection.  This
-option uses more system resources, but guarantees successful connections
-when port numbers conflict.
-
+in order to establish an FTP data or IRC DCC send connection.
+This option uses more system resources, but guarantees successful
+connections when port numbers conflict.
 .It Fl same_ports | m
 Try to keep the same port number when altering outgoing packets.
 With this option, protocols such as RPC will have a better chance
-of working.  If it is not possible to maintain the port number, it
-will be silently changed as per normal.
-
+of working.
+If it is not possible to maintain the port number, it will be silently
+changed as per normal.
 .It Fl verbose | v
-Don't call
-.Xr fork 2
-or
+Do not call
 .Xr daemon 3
-on startup.  Instead, stay attached to the controling terminal and
-display all packet alterations to the standard output.  This option
-should only be used for debugging purposes.
-
+on startup.
+Instead, stay attached to the controling terminal and display all packet
+alterations to the standard output.
+This option should only be used for debugging purposes.
 .It Fl unregistered_only | u
-Only alter outgoing packets with an unregistered source address.
-According to rfc 1918, unregistered source addresses are 10.0.0.0/8,
+Only alter outgoing packets with an
+.Em unregistered
+source address.
+According to RFC 1918, unregistered source addresses are 10.0.0.0/8,
 172.16.0.0/12 and 192.168.0.0/16.
-
-.It Fl redirect_port Ar proto targetIP:targetPORT[-targetPORT] [aliasIP:]aliasPORT[-aliasPORT] [remoteIP[:remotePORT[-remotePORT]]]
+.It Fl redirect_port Ar proto Xo
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Op - Ns Ar targetPORT Xc
+.Op Ar aliasIP Ns : Ns Xo
+.Ar aliasPORT Ns Op - Ns Ar aliasPORT Xc
+.Oo Ar remoteIP Ns Oo : Ns
+.Ar remotePORT Ns Op - Ns Ar remotePORT
+.Oc Oc
+.Xc
 Redirect incoming connections arriving to given port(s) to another host
 and port(s).
-Proto is either tcp or udp, targetIP is the desired target IP
-number, targetPORT is the desired target PORT number or range, aliasPORT
-is the requested PORT number or range, and aliasIP is the aliasing address.
-RemoteIP and remotePORT can be used to specify the connection
-more accurately if necessary.
-The targetPORT range and aliasPORT range need not be the same numerically,
-but must have the same size.
-If remotePORT is not specified, it is assumed to be all ports.
-If remotePORT is specified, it must match the size of targetPORT, or be 0
-(all ports).
+Argument
+.Ar proto
+is either
+.Ar tcp
+or
+.Ar udp ,
+.Ar targetIP
+is the desired target IP number,
+.Ar targetPORT
+is the desired target port number or range,
+.Ar aliasPORT
+is the requested port number or range, and
+.Ar aliasIP
+is the aliasing address.
+Arguments
+.Ar remoteIP
+and
+.Ar remotePORT
+can be used to specify the connection more accurately if necessary.
+The
+.Ar targetPORT
+range and
+.Ar aliasPORT
+range need not be the same numerically, but must have the same size.
+If
+.Ar remotePORT
+is not specified, it is assumed to be all ports.
+If
+.Ar remotePORT
+is specified, it must match the size of
+.Ar targetPORT ,
+or be 0 (all ports).
 For example, the argument
-
+.Pp
 .Dl Ar tcp inside1:telnet 6666
-
-means that incoming tcp packets destined for port 6666 on this machine will
-be sent to the telnet port on the inside1 machine.
-
+.Pp
+means that incoming TCP packets destined for port 6666 on this machine
+will be sent to the telnet port on the inside1 machine.
+.Pp
 .Dl Ar tcp inside2:2300-2399 3300-3399
-
+.Pp
 will redirect incoming connections on ports 3300-3399 to host
 inside2, ports 2300-2399.
 The mapping is 1:1 meaning port 3300 maps to 2300, 3301 maps to 2301, etc.
-
+.It Fl redirect_proto Ar proto localIP Oo
+.Ar publicIP Op Ar remoteIP
+.Oc
+Redirect incoming IP packets of protocol
+.Ar proto
+.Po see Xr protocols 5
+.Pc
+destined for
+.Ar publicIP
+address to a
+.Ar localIP
+address and vice versa.
+.Pp
+If
+.Ar publicIP
+is not specified, then the default aliasing address is used.
+If
+.Ar remoteIP
+is specified, then only packets coming from/to
+.Ar remoteIP
+will match the rule.
 .It Fl redirect_address Ar localIP publicIP
 Redirect traffic for public IP address to a machine on the local
 network.
-This function is known as "static NAT". Normally static NAT
-is useful if your ISP has allocated a small block of IP addresses to you,
-but it can even be used in the case of single address:
-
-  redirect_address 10.0.0.8 0.0.0.0
-
+This function is known as
+.Em static NAT .
+Normally static NAT is useful if your ISP has allocated a small block
+of IP addresses to you, but it can even be used in the case of single
+address:
+.Pp
+.Dl Ar redirect_address 10.0.0.8 0.0.0.0
+.Pp
 The above command would redirect all incoming traffic
 to machine 10.0.0.8.
-
+.Pp
 If several address aliases specify the same public address
 as follows
-
-  redirect_address 192.168.0.2 public_addr
-  redirect_address 192.168.0.3 public_addr
-  redirect_address 192.168.0.4 public_addr
-  
+.Bd -literal -offset indent
+.Ar redirect_address 192.168.0.2 public_addr
+.Ar redirect_address 192.168.0.3 public_addr
+.Ar redirect_address 192.168.0.4 public_addr
+.Ed
+.Pp
 the incoming traffic will be directed to the last
 translated local address (192.168.0.4), but outgoing
-traffic to the first two addresses will still be aliased
-to specified public address.
-
+traffic from the first two addresses will still be aliased
+to appear from the specified
+.Ar public_addr .
+.It Fl redirect_port Ar proto Xo
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Oo , Ns
+.Ar targetIP Ns : Ns Xo
+.Ar targetPORT Ns Oo , Ns
+.Ar ...
+.Oc Oc
+.Xc
+.Xc
+.Op Ar aliasIP Ns : Ns Xo
+.Ar aliasPORT
+.Xc
+.Oo Ar remoteIP Ns
+.Op : Ns Ar remotePORT
+.Oc
+.Xc
+.It Fl redirect_address Xo
+.Ar localIP Ns Oo , Ns
+.Ar localIP Ns Oo , Ns
+.Ar ...
+.Oc Oc
+.Ar publicIP
+.Xc
+These forms of
+.Fl redirect_port
+and
+.Fl redirect_address
+are used to transparently offload network load on a single server and
+distribute the load across a pool of servers.
+This function is known as
+.Em LSNAT
+(RFC 2391).
+For example, the argument
+.Pp
+.Dl Ar tcp www1:http,www2:http,www3:http www:http
+.Pp
+means that incoming HTTP requests for host www will be transparently
+redirected to one of the www1, www2 or www3, where a host is selected
+simply on a round-robin basis, without regard to load on the net.
 .It Fl dynamic
 If the
 .Fl n
@@ -173,236 +261,255 @@
 .Nm
 will monitor the routing socket for alterations to the
 .Ar interface
-passed.  If the interfaces IP number is changed,
+passed.
+If the interface's IP number is changed,
 .Nm
 will dynamically alter its concept of the alias address.
-
-.It Fl i | inport Ar inport
+.It Fl in_port | i Ar port
 Read from and write to
-.Ar inport ,
+.Ar port ,
 treating all packets as packets coming into the machine.
-
-.It Fl o | outport Ar outport
+.It Fl out_port | o Ar port
 Read from and write to
-.Ar outport ,
+.Ar port ,
 treating all packets as packets going out of the machine.
-
-.It Fl p | port Ar port
+.It Fl port | p Ar port
 Read from and write to
 .Ar port ,
-distinguishing packets as incoming our outgoing using the rules specified in
+distinguishing packets as incoming our outgoing using the rules
+specified in
 .Xr divert 4 .
 If
 .Ar port
 is not numeric, it is searched for in the
-.Pa /etc/services
-database using the
-.Xr getservbyname 3
-function.  If this flag is not specified, the divert port named natd will
-be used as a default.  An example entry in the
-.Pa /etc/services
-database would be:
-
-  natd   8668/divert  # Network Address Translation socket
-
-Refer to
 .Xr services 5
-for further details.
-
-.It Fl a | alias_address Ar address
+database.
+If this option is not specified, the divert port named
+.Em natd
+will be used as a default.
+.It Fl alias_address | a Ar address
 Use
 .Ar address
-as the alias address.  If this option is not specified, the
-.Fl n
-or
+as the aliasing address.
+If this option is not specified, the
 .Fl interface
-option must be used.  The specified address should be the address assigned
-to the public network interface.
+option must be used.
+The specified address is usually the address assigned to the
+public network interface.
 .Pp
-All data passing out through this addresses interface will be rewritten
-with a source address equal to
+All data passing
+.Em out
+will be rewritten with a source address equal to
 .Ar address .
-All data arriving at the interface from outside will be checked to
-see if it matches any already-aliased outgoing connection.  If it does,
-the packet is altered accordingly.  If not, all
-.Fl redirect_port
+All data coming
+.Em in
+will be checked to see if it matches any already-aliased outgoing
+connection.
+If it does, the packet is altered accordingly.
+If not, all
+.Fl redirect_port ,
+.Fl redirect_proto
 and
 .Fl redirect_address
-assignments are checked and actioned.  If no other action can be made,
-and if
+assignments are checked and actioned.
+If no other action can be made and if
 .Fl deny_incoming
-is not specified, the packet is delivered to the local machine and port
-as specified in the packet.
-
-.It Fl n | interface Ar interface
+is not specified, the packet is delivered unaltered to the local
+machine and port as specified in the packet, but see the
+.Fl target_address
+option below.
+.It Fl t | target_address Ar address
+Set the target address.
+When an incoming packet not associated with any pre-existing link
+arrives at the host machine, it will be sent to the specified
+.Ar address .
+.Pp
+The target address may be set to
+.Ar 255.255.255.255 ,
+in which case all new incoming packets go to the alias address set by
+.Fl alias_address
+or
+.Fl interface .
+.Pp
+If this option is not used, or called with the argument
+.Ar 0.0.0.0 ,
+then all new incoming packets go to the address specified in
+the packet.
+This allows external machines to talk directly to internal machines if
+they can route packets to the machine in question.
+.It Fl interface | n Ar interface
 Use
 .Ar interface
-to determine the alias address.  If there is a possibility that the
-IP number associated with
+to determine the aliasing address.
+If there is a possibility that the IP number associated with
 .Ar interface
 may change, the
 .Fl dynamic
-flag should also be used.  If this option is not specified, the
-.Fl a
-or
+option should also be used.
+If this option is not specified, the
 .Fl alias_address
-flag must be used.
+option must be used.
 .Pp
 The specified
 .Ar interface
-must be the public network interface.
-.It Fl f | config Ar configfile
+is usually the public network interface.
+.It Fl config | f Ar file
 Read configuration from
-.Ar configfile .
-.Ar Configfile
-contains a list of options, one per line in the same form as the
-long form of the above command line flags.  For example, the line
-
-  alias_address 158.152.17.1
-
-would specify an alias address of 158.152.17.1.  Options that don't
-take an argument are specified with an option of
+.Ar file .
+A
+.Ar file
+should contain a list of options, one per line, in the same form
+as the long form of the above command line options.
+For example, the line
+.Pp
+.Dl alias_address 158.152.17.1
+.Pp
+would specify an alias address of 158.152.17.1.
+Options that do not take an argument are specified with an option of
 .Ar yes
 or
 .Ar no
-in the configuration file.  For example, the line
-
-  log yes
-
-is synonomous with
+in the configuration file.
+For example, the line
+.Pp
+.Dl log yes
+.Pp
+is synonymous with
 .Fl log .
 .Pp
 Trailing spaces and empty lines are ignored.
 A
 .Ql \&#
 sign will mark the rest of the line as a comment.
-
 .It Fl reverse
-Reverse operation of natd.
-This can be useful in some 
-transparent proxying situations when outgoing traffic
-is redirected to the local machine and natd is running on the
-incoming interface (it usually runs on the outgoing interface).
-
+This option makes
+.Nm
+reverse the way it handles incoming and outgoing packets,
+allowing it to operate on the internal interface rather than
+the external one.
+.Pp
+This can be useful in some transparent proxying situations
+when outgoing traffic is redirected to the local machine
+and
+.Nm
+is running on the internal interface (it usually runs on the
+external interface).
 .It Fl proxy_only
-Force natd to perform transparent proxying
-only.
+Force
+.Nm
+to perform transparent proxying only.
 Normal address translation is not performed.
-
-.It Fl proxy_rule Ar [type encode_ip_hdr|encode_tcp_stream] port xxxx server a.b.c.d:yyyy
+.It Fl proxy_rule Xo
+.Op Ar type encode_ip_hdr | encode_tcp_stream
+.Ar port xxxx
+.Ar server a.b.c.d:yyyy
+.Xc
 Enable transparent proxying.
-Packets with the given port going through this
+Outgoing TCP packets with the given port going through this
 host to any other host are redirected to the given server and port.
 Optionally, the original target address can be encoded into the packet.
-Use 
-.Dq encode_ip_hdr
+Use
+.Ar encode_ip_hdr
 to put this information into the IP option field or
-.Dq encode_tcp_stream
+.Ar encode_tcp_stream
 to inject the data into the beginning of the TCP stream.
-
-.It Fl pptpalias Ar localIP
-Allow PPTP packets to go to the defined localIP address.
-PPTP is a VPN or secure
-IP tunneling technology being developed primarily by Microsoft.
-For its encrypted traffic,
-it uses an old IP encapsulation protocol called GRE (47).
-This natd option will translate any traffic of this protocol to a
-single, specified IP address.
-This would allow either one client or one server 
-to be serviced with natd.
-If you are setting up a server, don't forget to allow the TCP traffic
-for the PPTP setup.
-For a client or server,
-you must allow GRE (protocol 47) if you have firewall lists active.
-
+.It Fl punch_fw Xo
+.Ar basenumber Ns : Ns Ar count
+.Xc
+This option directs
+.Nm
+to
+.Dq punch holes
+in an
+.Xr ipfirewall 4
+based firewall for FTP/IRC DCC connections.
+This is done dynamically by installing temporary firewall rules which
+allow a particular connection (and only that connection) to go through
+the firewall.
+The rules are removed once the corresponding connection terminates.
+.Pp
+A maximum of
+.Ar count
+rules starting from the rule number
+.Ar basenumber
+will be used for punching firewall holes.
+The range will be cleared for all rules on startup.
 .El
-
 .Sh RUNNING NATD
 The following steps are necessary before attempting to run
 .Nm natd :
-
 .Bl -enum
 .It
-Get FreeBSD version 2.2 or higher.  Versions before this do not support
-.Xr divert 4
-sockets.
-
-.It
 Build a custom kernel with the following options:
-
-  options IPFIREWALL
-  options IPDIVERT
-
+.Bd -literal -offset indent
+options IPFIREWALL
+options IPDIVERT
+.Ed
+.Pp
 Refer to the handbook for detailed instructions on building a custom
 kernel.
-
 .It
-Ensure that your machine is acting as a gateway.  This can be done by
-specifying the line
-
-  gateway_enable=YES
-
-in
-.Pa /etc/rc.conf ,
-or using the command
-
-  sysctl -w net.inet.ip.forwarding=1
-
+Ensure that your machine is acting as a gateway.
+This can be done by specifying the line
+.Pp
+.Dl gateway_enable=YES
+.Pp
+in the
+.Pa /etc/rc.conf
+file or using the command
+.Pp
+.Dl sysctl -w net.inet.ip.forwarding=1
+.Pp
 .It
-If you wish to use the
-.Fl n
-or
+If you use the
 .Fl interface
-flags, make sure that your interface is already configured.  If, for
-example, you wish to specify tun0 as your
+option, make sure that your interface is already configured.
+If, for example, you wish to specify tun0 as your
 .Ar interface ,
-and you're using
+and you are using
 .Xr ppp 8
 on that interface, you must make sure that you start
 .Nm ppp
 prior to starting
 .Nm natd .
-
-.It
-Create an entry in
-.Pa /etc/services :
-
-  natd          8668/divert  # Network Address Translation socket
-
-This gives a default for the
-.Fl p
-or
-.Fl port
-flag.
-
 .El
 .Pp
 Running
 .Nm
-is fairly straight forward.  The line
-
-  natd -interface ed0
-
-should suffice in most cases (substituting the correct interface name).  Once
+is fairly straight forward.
+The line
+.Pp
+.Dl natd -interface ed0
+.Pp
+should suffice in most cases (substituting the correct interface name).
+Once
 .Nm
-is running, you must ensure that traffic is diverted to natd:
-
+is running, you must ensure that traffic is diverted to
+.Nm natd :
 .Bl -enum
 .It
 You will need to adjust the
 .Pa /etc/rc.firewall
-script to taste.  If you're not interested in having a firewall, the
+script to taste.
+If you are not interested in having a firewall, the
 following lines will do:
-
-  /sbin/ipfw -f flush
-  /sbin/ipfw add divert natd all from any to any via ed0
-  /sbin/ipfw add pass all from any to any
-
-The second line depends on your interface (change ed0 as appropriate)
-and assumes that you've updated
-.Pa /etc/services
-with the natd entry as above.  If you specify real firewall rules, it's
-best to specify line 2 at the start of the script so that
+.Bd -literal -offset indent
+/sbin/ipfw -f flush
+/sbin/ipfw add divert natd all from any to any via ed0
+/sbin/ipfw add pass all from any to any
+.Ed
+.Pp
+The second line depends on your interface (change ed0 as appropriate).
+.Pp
+You should be aware of the fact that, with these firewall settings,
+everyone on your local network can fake his source-address using your
+host as gateway.
+If there are other hosts on your local network, you are strongly
+encouraged to create firewall rules that only allow traffic to and
+from trusted hosts.
+.Pp
+If you specify real firewall rules, it is best to specify line 2 at
+the start of the script so that
 .Nm
 sees all packets before they are dropped by the firewall.
 .Pp
@@ -411,46 +518,46 @@
 packets re-enter the firewall at the rule number following the rule number
 that caused the diversion (not the next rule if there are several at the
 same number).
-
 .It
 Enable your firewall by setting
-
-  firewall_enable=YES
-
+.Pp
+.Dl firewall_enable=YES
+.Pp
 in
 .Pa /etc/rc.conf .
 This tells the system startup scripts to run the
 .Pa /etc/rc.firewall
-script.  If you don't wish to reboot now, just run this by hand from the
-console.  NEVER run this from a virtual session unless you put it into
-the background.  If you do, you'll lock yourself out after the flush
-takes place, and execution of
+script.
+If you do not wish to reboot now, just run this by hand from the console.
+NEVER run this from a remote session unless you put it into the background.
+If you do, you will lock yourself out after the flush takes place, and
+execution of
 .Pa /etc/rc.firewall
-will stop at this point - blocking all accesses permanently.  Running
-the script in the background should be enough to prevent this disaster.
-
+will stop at this point - blocking all accesses permanently.
+Running the script in the background should be enough to prevent this
+disaster.
 .El
-
 .Sh SEE ALSO
-.Xr socket 2 ,
-.Xr getservbyname 3 ,
 .Xr divert 4 ,
+.Xr protocols 5 ,
+.Xr rc.conf 5 ,
 .Xr services 5 ,
-.Xr ipfw 8
-
+.Xr syslog.conf 5 ,
+.Xr ipfw 8 ,
+.Xr ppp 8 .
 .Sh AUTHORS
 This program is the result of the efforts of many people at different
 times:
-
+.Pp
 .An Archie Cobbs Aq archie@whistle.com
 (divert sockets)
-.An Charles Mott Aq cmott@srv.net
+.An Charles Mott Aq cmott@scientech.com
 (packet aliasing)
 .An Eivind Eklund Aq perhaps@yes.no
 (IRC support & misc additions)
 .An Ari Suutari Aq suutari@iki.fi
 (natd)
 .An Dru Nelson Aq dnelson@redwoodsoft.com
-(PPTP support)
+(early PPTP support)
 .An Brian Somers Aq brian@awfulhak.org
 (glue)
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ndc.8 man8/ndc.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ndc.8	Tue Mar 21 06:32:25 2000
+++ man8/ndc.8	Mon Jul  3 19:53:32 2000
@@ -125,7 +125,7 @@
 command and the
 .Ar restart
 command just tells the name server to
-.Xr execvp 2
+.Xr execvp 3
 itself.
 .Sh AUTHOR
 Paul Vixie (Internet Software Consortium)
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ndp.8 man8/ndp.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ndp.8	Tue Mar 21 06:32:08 2000
+++ man8/ndp.8	Mon Jul  3 19:53:09 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: ndp.8,v 1.2 1999/10/07 05:26:13 itojun Exp $
-.\"     $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.1 2000/01/06 12:40:40 shin Exp $
+.\"     $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.1.2.1 2000/04/20 15:24:40 phantom Exp $
 .\"
 .Dd May 17, 1998
 .Dt NDP 8
@@ -34,7 +34,7 @@
 .\"
 .Sh NAME
 .Nm ndp
-.Nd control/diagnose  IPv6 neighbor discovery protocol
+.Nd control/diagnose IPv6 neighbor discovery protocol
 .\"
 .Sh SYNOPSIS
 .Nm ndp
@@ -75,6 +75,7 @@
 .Op temp
 .\"
 .Sh DESCRIPTION
+The
 .Nm
 command manipulates the address mapping table
 used by Neighbor Discovery Protocol (NDP).
@@ -123,8 +124,9 @@
 .El
 .\"
 .Sh RETURN VALUES
-.Nm Ndp
-will exit with 0 on success, and non-zero on errors.
+The
+.Nm
+command will exit with 0 on success, and non-zero on errors.
 .\"
 .Sh SEE ALSO
 .Xr arp 8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/newfs_msdos.8 man8/newfs_msdos.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/newfs_msdos.8	Tue Mar 21 06:30:14 2000
+++ man8/newfs_msdos.8	Mon Jul  3 19:51:06 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.7 2000/03/01 11:27:25 sheldonh Exp $
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.7.2.2 2000/07/01 11:33:40 ps Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
@@ -98,8 +98,8 @@
 Number of root directory entries (FAT12 and FAT16 only).
 .It Fl f Ar format
 Specify a standard (floppy disk) format.  The eight standard formats
-are (capacities in kilobytes): 160, 180, 320, 360, 720, 1200, 1440,
-2880.
+are (capacities in kilobytes): 160, 180, 320, 360, 640, 720, 1200,
+1232, 1440, 2880.
 .It Fl h Ar heads
 Number of drive heads.
 .It Fl i Ar info
@@ -155,14 +155,14 @@
 .Ed
 .Sh EXAMPLES
 
-	newfs_msdos /dev/rwd0s1
+	newfs_msdos /dev/ad0s1
 
-Create a file system, using default parameters, on /dev/rwd0s1.
+Create a file system, using default parameters, on /dev/ad0s1.
 
 	newfs_msdos -f 1440 -L foo fd0
 
 Create a standard 1.44M file system, with volume label "foo", on
-/dev/rfd0.
+/dev/fd0.
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr disklabel 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/newsyslog.8 man8/newsyslog.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/newsyslog.8	Tue Mar 21 06:32:08 2000
+++ man8/newsyslog.8	Mon Jul  3 19:53:09 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.23 2000/03/01 14:08:09 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.23.2.1 2000/05/19 09:21:30 des Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -17,7 +17,7 @@
 .\" the suitability of this software for any purpose.  It is
 .\" provided "as is" without express or implied warranty.
 .\"
-.Dd January 27, 1999
+.Dd April 4, 2000
 .Dt NEWSYSLOG 8
 .Os
 .Sh NAME
@@ -27,6 +27,8 @@
 .Nm newsyslog
 .Op Fl Fnrv
 .Op Fl f Ar config_file
+.Op Fl a Ar directory
+.Op Ar
 .Sh DESCRIPTION
 .Nm Newsyslog
 is a program that should be scheduled to run periodically by
@@ -56,6 +58,7 @@
 .It
 This is the specific configured hour for rotation of the log.
 .El
+.Pp
 The granularity of
 .Nm
 is dependent on how often it is scheduled to run by
@@ -72,7 +75,7 @@
 .Pa /etc/newsyslog.conf .
 Each line of the file contains information about a particular log file
 that should be handled by
-.Nm Ns .
+.Nm newsyslog .
 Each line has five mandatory fields and four optional fields, with a
 whitespace separating each field.  Blank lines or lines beginning with
 ``#'' are ignored.  The fields of the configuration file are as
@@ -124,8 +127,12 @@
 .So Li \&@ Sc Ns No -sign
 and a time in a restricted
 .Tn ISO 8601
-format.  If a time is specified, the log file will only be trimmed
-if
+format or by an 
+.So Li \&$ Sc Ns No -sign
+and a time specification for logfile rotation at a fixed time once 
+per day, per week or per month.
+.Pp
+If a time is specified, the log file will only be trimmed if
 .Nm
 is run within one hour of the specified time.  If an 
 interval is specified, the log file will be trimmed if that many hours have
@@ -133,7 +140,21 @@
 specified, both conditions must be satisfied for the rotation to take
 place.
 .Pp
-The particular format of the time is
+There is no provision for specification of a timezone.  There is
+little point in specifying an explicit minutes or seconds component in
+the current implementation, since the only comparison is `within the
+hour'.
+.Pp
+.Em ISO 8601 restricted time format
+.Pp
+The lead-in character for a restricted
+.Tn ISO 8601
+time is
+an
+.So Li \&@ Sc Ns No -sign .
+The particular format of the time in restricted
+.Tn ISO 8601
+is:
 .Sm off
 .Oo
 .Oo
@@ -190,10 +211,63 @@
 .Sq Li \&
 .El
 .Pp
-There is no provision for specification of a timezone.  There is
-little point in specifying an explicit minutes or seconds component in
-the current implementation, since the only comparison is `within the
-hour'.
+.Em Day, week and month time format
+.Pp
+The lead-in character for day, week and month specification is a
+.So Li \&$ Sc Ns No -sign .
+The particular format of day, week and month specification is:
+.Sm off
+.Oo
+.Va D\&hh
+.Oc ,
+.Oo
+.Va W\&w
+.Oo
+.Va D\&hh
+.Oc
+.Oc 
+and
+.Oo
+.Va M\&dd
+.Oo
+.Va D\&hh
+.Oc
+.Oc
+.Sm on
+respectively.
+Optional time fields default to midnight. 
+The ranges for day and hour secifications are:
+.Pp
+.Bl -tag -width Ds -compact -offset indent
+.It Ar hh
+hours, range 0 ... 23
+.It Ar w
+day of week, range 0 ... 6, 0 = Sunday
+.It Ar dd
+day of month, range 1 ... 31, or the letter
+.Em L
+or
+.Em l
+to specify the last day of the month.
+.El
+.Pp
+Some examples:
+.Pp
+.Bl -tag -width Ds -compact -offset indent
+.It Ar $D0
+rotate every night at midnight
+.It Ar $D23
+rotate every day at 23:00 hr
+.It Ar $W0D23
+rotate every week on Sunday at 23:00 hr
+.It Ar $W5D16
+rotate every week on Friday at 16:00 hr
+.It Ar $MLD0
+rotate at the last day of every month at midnight
+.It Ar $M5D6
+rotate on every 5th day of month at 6:00 hr
+.El
+.Pp
 .It Ar flags
 This optional field specifies if the archive should have any
 special processing done to the archived log files.
@@ -240,6 +314,23 @@
 instead of
 .Pa /etc/newsyslog.conf
 for its configuration file.
+.It Fl a Ar directory
+Specify a
+.Ar directory
+into which archived log files will be written.
+If a relative path is given,
+it is appended to the path of each log file
+and the resulting path is used as the directory
+into which the archived log for that log file will be written.
+If an absolute path is given,
+all archived logs are written into the given
+.Ar directory .
+If any component of the path
+.Ar directory
+does not exist,
+it will be created when
+.Nm
+is run.
 .It Fl v
 Place 
 .Nm
@@ -265,6 +356,11 @@
 option is useful for diagnosing system problems by providing you with
 fresh logs that contain only the problems.
 .El
+.Pp
+If additional command line arguments are given,
+.Nm
+will only examine log files that match those arguments; otherwise, it
+will examine all files listed in the configuration file.
 .Sh FILES
 .Bl -tag -width /etc/newsyslog.confxxxx -compact
 .It Pa /etc/newsyslog.conf
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_UI.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_async.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_bpf.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_cisco.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_echo.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_ether.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_frame_relay.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_hole.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_iface.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_ksocket.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_lmi.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_ppp.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_pppoe.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_pptpgre.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_rfc1490.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_socket.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_tee.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_tty.8
Only in /home/horikawa/man-jp/work/fbsd-400r/man/man8: ng_vjc.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpd.8 man8/ntpd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpd.8	Tue Mar 21 06:32:09 2000
+++ man8/ntpd.8	Mon Jul  3 19:53:10 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.4 2000/02/10 13:15:47 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.4.2.1 2000/06/22 08:47:34 sheldonh Exp $
 .\"
 .Dd January 10, 2000
 .Dt NTPD 8
@@ -163,7 +163,8 @@
 can be examined with
 .Xr ntpdc 8
 (mode 7 messages) and
-.Xr ntpq 8 (mode 6 messages).
+.Xr ntpq 8
+(mode 6 messages).
 Currently, very few variables can be modified via mode 6 messages.
 These variables are either created with the
 .Ic setvar
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpdate.8 man8/ntpdate.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpdate.8	Tue Mar 21 06:32:09 2000
+++ man8/ntpdate.8	Mon Jul  3 19:53:10 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.1 2000/01/12 14:40:59 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.1.2.1 2000/06/22 08:48:03 sheldonh Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPDATE 8
@@ -183,7 +183,7 @@
 This is designed primarily for convenience of
 .Xr cron 8
 scripts.
-.It Fl t timeout
+.It Fl t Ar timeout
 Specify the maximum time waiting for a server response
 as the value
 .Ar timeout ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpdc.8 man8/ntpdc.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpdc.8	Tue Mar 21 06:32:09 2000
+++ man8/ntpdc.8	Mon Jul  3 19:53:10 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.2 2000/01/13 09:59:54 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.2.2.2 2000/05/15 11:53:05 sheldonh Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPDC 8
@@ -536,7 +536,7 @@
 .Xc
 These commands operate in the same way as the
 .Qq enable
-and   
+and
 .Qq disable
 configuration file commands of
 .Xr ntpd 8 .
@@ -558,33 +558,12 @@
 .Qq mutlicastclient
 configuration option with default address.
 The default for this flag is disable.
-.It pll
-Enables
-the server to adjust its local clock by means of NTP.
-If disabled,
-the local clock free-runs at its intrinsic time and frequency
-offset.
-This flag is useful in case the local clock is controlled by
-some other device or protocol and
-NTP is used only to provide
-synchronization to other clients.
-In this case, the local clock driver is used.
-See the
-.Qo
-Reference Clock Drivers
-.Qc
-page
-(available as part of the HTML documentation
-provided in
-.Pa /usr/share/doc/ntp )
-for further information.
-The default for this flag is enable.
 .It monitor
 Enables the monitoring facility for the
 .Ic monlist
 command.
 The default for this flag is enable.
-.Ic pll
+.It pll
 Enables the server to adjust its local clock by means of NTP.
 If disabled,
 the local clock free-runs at its intrinsic time and frequency offset.
@@ -597,9 +576,13 @@
 .Qo
 Reference Clock Drivers
 .Qc
-page for further information.
+page
+(available as part of the HTML documentation
+provided in
+.Pa /usr/share/doc/ntp )
+for further information.
 The default for this flag is enable.
-.Ic pps
+.It pps
 Enables the pulse-per-second (PPS) signal
 when frequency and time is disciplined
 by the precision time kernel modifications.
@@ -610,7 +593,7 @@
 page
 for further information.
 The default for this flag is disable.
-.Ic stats
+.It stats
 Enables the statistics facility.
 See the
 .Qq Monitoring Support
@@ -619,11 +602,11 @@
 page
 for further information.
 The default for this flag is enable.
-.Ic pll_kernel
+.It pll_kernel
 When the precision time kernel modifications are installed,
 this indicates the kernel controls the clock discipline;
 otherwise, the daemon controls the clock discipline.
-.Ic pps_kernel
+.It pps_kernel
 When the precision time kernel modifications are installed
 and a pulse-per-second (PPS) signal is available,
 this indicates the PPS signal controls the clock discipline;
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpq.8 man8/ntpq.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntpq.8	Tue Mar 21 06:32:09 2000
+++ man8/ntpq.8	Mon Jul  3 19:53:10 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.3 2000/03/01 14:09:17 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.3.2.2 2000/05/15 11:44:03 sheldonh Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPQ 8
@@ -189,7 +189,9 @@
 thinks should have a decodeable value but didn't are marked with a
 trailing
 .Qq ? Ns .
-.It Ic debug Ar more | Ar less | Ar off
+.It Ic debug Xo
+.Ar more | Ar less | Ar off
+.Xc
 Turn internal query program debugging on and off.
 .It Ic delay Ar milliseconds
 Specify a time interval to be added to timestamps included in requests
@@ -226,7 +228,10 @@
 authenticate configuration requests.
 This must correspond to a key
 number the server has been configured to use for this purpose.
-.It Ic ntpversion Ar 1 | Ar 2 | Ar 3 | Ar 4
+.It Ic ntpversion Xo
+.Ar 1 | Ar 2 |
+.Ar 3 | Ar 4
+.Xc
 Set the NTP version number which
 .Nm
 claims in packets.
@@ -293,7 +298,7 @@
 returned by the server and the third the status word for the peer.
 This is followed by a number of columns
 containing data decoded from the status word.
-Note that the data returned by the 
+Note that the data returned by the
 .Ic associations
 command is cached internally in
 .Nm Ns .
@@ -333,7 +338,7 @@
 will show the variables of a particular clock.
 Omitting the variable list
 will cause the server to return a default variable display.
-.It Ic lassocations
+.It Ic lassociations
 Obtains and prints a list of association identifiers and peer statuses
 for all associations for which the server is maintaining state.
 This command differs from the
@@ -445,7 +450,7 @@
 .Pq selected
 The peer is a survivor,
 but not among the first six peers sorted by synchronization distance.
-If the assocation is ephemeral,
+If the association is ephemeral,
 it may be demobilized to conserve resources.
 .It *
 .Pq sys.peer
@@ -552,7 +557,7 @@
 .Pf [ Aq variable_name Ns
 .Op = Ns Aq value Ns
 .Op ,...]
-.Xc 
+.Xc
 Requests that the values of the specified variables be returned by the
 server by sending a read variables request.
 If the association ID is
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntptrace.8 man8/ntptrace.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ntptrace.8	Tue Mar 21 06:32:09 2000
+++ man8/ntptrace.8	Mon Jul  3 19:53:10 2000
@@ -1,12 +1,12 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.1 2000/01/12 14:41:00 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.1.2.1 2000/05/09 13:01:56 sheldonh Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPTRACE 8
 .Os
 .Sh NAME
 .Nm ntptrace
-.Nd trace a chain of NTP servers back to the primary source
+.Nd "trace a chain of NTP servers back to the primary source"
 .Sh SYNOPSIS
 .Nm ntptrace
 .Op Fl vdn
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/pccardd.8 man8/pccardd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/pccardd.8	Tue Mar 21 06:32:11 2000
+++ man8/pccardd.8	Mon Jul  3 19:53:13 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.17 2000/03/01 14:09:19 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.17.2.1 2000/04/15 10:56:21 iwasaki Exp $
 .\"
 .Dd November 1, 1994
 .Dt PCCARDD 8
@@ -46,7 +46,10 @@
 When started,
 .Nm
 will read the configuration file (default name
-.Pa /etc/pccard.conf )
+.Pa /etc/defaults/pccard.conf
+which includes
+.Pa /etc/pccard.conf
+as the user configuration file)
 and scans the available PC-CARD slots for cards.
 .Nm Pccardd
 then waits for
@@ -116,6 +119,10 @@
 This will change significantly when loadable kernel
 modules are supported.
 .Pp
+SIGHUP causes
+.Nm
+to reload the configuration files.
+.Pp
 The start options understood by
 .Nm
 are:
@@ -130,11 +137,13 @@
 Delays running as a daemon until after the cards have been probed and attached.
 .It Fl i Ar IRQ
 Configures an available IRQ.  It overrides the "irq" line in
+.Pa /etc/defaults/pccard.conf
+and
 .Pa /etc/pccard.conf .
 .It Fl f Ar configfile
 Specifies a different configuration file to be used
 in placed of the default file
-.Pa /etc/pccard.conf .
+.Pa /etc/defaults/pccard.conf .
 The file format is detailed in
 .Xr pccard.conf 5 ,
 and lists the PC-CARD cards recognized by
@@ -143,8 +152,14 @@
 interface to the card.
 .Pp
 .Sh FILES
-.Bl -tag -width /etc/pccard.conf -compact
+.Bl -tag -width /etc/defaults/pccard.conf -compact
+.It Pa /etc/defaults/pccard.conf
+default configuration file
 .It Pa /etc/pccard.conf
+user configuration file
+.It Pa /var/run/pccardd.pid
+process id of of the currently running
+.Nm
 .El
 .Sh SEE ALSO
 .Xr pccard.conf 5 ,
Only in man8: picobsd.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/pim6dd.8 man8/pim6dd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/pim6dd.8	Tue Mar 21 06:32:12 2000
+++ man8/pim6dd.8	Mon Jul  3 19:53:13 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6dd.8,v 1.3 1999/08/13 09:20:43 jinmei Exp $
-.\"	$FreeBSD: src/usr.sbin/pim6dd/pim6dd.8,v 1.3 2000/03/01 14:08:13 sheldonh Exp $
+.\"	$FreeBSD: src/usr.sbin/pim6dd/pim6dd.8,v 1.3.2.2 2000/05/06 14:22:20 phantom Exp $
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6dd
 .Nd PIM for IPv6 dense mode daemon
@@ -45,7 +45,7 @@
 for IPv6.
 .Pp
 Options supported by
-.Nm pim6dd :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl c Ar configfile
 Specify alternate location,
@@ -75,7 +75,11 @@
 To override the default configuration,
 configuration commands may be placed in
 .Pa /etc/pim6dd.conf
-(or an alternative file, specified by the "\-c" option).
+.Po
+or an alternative file, specified by the 
+.Sq Fl c
+option
+.Pc .
 .\"
 .Sh FILES
 .Bl -tag -width /etc/pim6dd.conf -compact
@@ -101,6 +105,10 @@
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
 .\"
 .Sh BUGS
 .Nm Pim6dd
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/pim6sd.8 man8/pim6sd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/pim6sd.8	Tue Mar 21 06:32:12 2000
+++ man8/pim6sd.8	Mon Jul  3 19:53:14 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6sd.8,v 1.4 1999/12/16 05:38:06 jinmei Exp $
-.\"	$FreeBSD: src/usr.sbin/pim6sd/pim6sd.8,v 1.3 2000/03/01 14:08:15 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/pim6sd/pim6sd.8,v 1.3.2.2 2000/05/06 14:22:21 phantom Exp $
 .\"
 .Dd June 10, 1999
 .Dt PIM6SD 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6sd
 .Nd PIM for IPv6 sparse mode daemon
@@ -46,7 +46,7 @@
 for IPv6.
 .Pp
 Options supported by
-.Nm pim6sd :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl c Ar configfile
 Specify alternate location,
@@ -84,12 +84,18 @@
 To override the default configuration,
 configuration commands may be placed in
 .Pa /etc/pim6sd.conf
-(or an alternative file, specified by the "\-c" option).
+.Po
+or an alternative file, specified by the
+.Sq Fl c
+option
+.Pc .
 .Pp
 The
 .Nm
 program dumps its current routing information to a dump file when
-it receives a SIGUSR1 signal.
+it receives a
+.Dv SIGUSR1
+signal.
 The information includes a list of PIM neighbors,
 .Nm
 internal multicast routing table, and
@@ -105,7 +111,7 @@
 The
 .Nm
 program puts its logs to a separate file
-.Pa (/var/log/pim6sd.log).
+.Pa Pq /var/log/pim6sd.log .
 The log level can be configured by the
 .Fl d
 command line option or the configuration file.
@@ -140,6 +146,10 @@
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
 .\"
 .Sh BUGS
 .Nm Pim6sd
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ping6.8 man8/ping6.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ping6.8	Tue Mar 21 06:30:15 2000
+++ man8/ping6.8	Mon Jul  3 19:51:07 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: ping6.8,v 1.4 1999/10/07 05:29:03 itojun Exp $
-.\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.3 2000/03/02 14:53:26 sheldonh Exp $
+.\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.3.2.2 2000/05/06 14:22:21 phantom Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm ping6
 .Nd send
@@ -322,8 +322,8 @@
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr ifconfig 8 ,
-.Xr routed 8 ,
 .Xr ping 8 ,
+.Xr routed 8 ,
 .Xr traceroute 8 ,
 .Xr traceroute6 8
 .Sh HISTORY
@@ -331,8 +331,11 @@
 .Nm ping
 command appeared in
 .Bx 4.3 .
-.Nm Ping6
+The
+.Nm
 command with IPv6 support first appeared in WIDE Hydrangea IPv6 protocol stack
 kit.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ppp.8 man8/ppp.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ppp.8	Tue Mar 21 07:54:32 2000
+++ man8/ppp.8	Mon Jul  3 20:23:18 2000
@@ -1,11 +1,11 @@
-.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209 2000/03/02 14:53:35 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209.2.8 2000/06/30 09:54:06 ps Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
 .Dt PPP 8
 .Sh NAME
 .Nm ppp
-.Nd Point to Point Protocol (a.k.a. user-ppp) 
+.Nd Point to Point Protocol (a.k.a. user-ppp)
 .Sh SYNOPSIS
 .Nm
 .Op Fl Va mode
@@ -17,9 +17,10 @@
 .Sh DESCRIPTION
 This is a user process
 .Em PPP
-software package.  Normally,
+software package.
+Normally,
 .Em PPP
-is implemented as a part of the kernel (e.g. as managed by
+is implemented as a part of the kernel (e.g., as managed by
 .Xr pppd 8 )
 and it's thus somewhat hard to debug and/or modify its behaviour.
 However, in this implementation
@@ -34,11 +35,13 @@
 flag for backwards compatability) does the equivalent of a
 .Dq nat enable yes ,
 enabling
-.Nm ppp Ns No s
-network address translation features.  This allows
-.Nm ppp
-to act as a NAT or masquerading engine for all machines on an internal 
-LAN.  Refer to
+.Nm Ns No 's
+network address translation features.
+This allows
+.Nm
+to act as a NAT or masquerading engine for all machines on an internal
+LAN.
+Refer to
 .Xr libalias 3
 for details.
 .Pp
@@ -61,7 +64,8 @@
 .Ar N ,
 and keep trying to open a tunnel device by incrementing the value of
 .Ar N
-by one each time until it succeeds.  If it fails three times in a row
+by one each time until it succeeds.
+If it fails three times in a row
 because the device file is missing, it gives up.
 .Pp
 The following
@@ -75,11 +79,12 @@
 The link isn't brought up until outgoing data is detected on the tun
 interface at which point
 .Nm
-attempts to bring up the link.  Packets received (including the first one)
-while
+attempts to bring up the link.
+Packets received (including the first one) while
 .Nm
 is trying to bring the link up will remain queued for a default of
-2 minutes.  See the
+2 minutes.
+See the
 .Dq set choked
 command below.
 .Pp
@@ -90,9 +95,11 @@
 must be given on the command line (see below) and a
 .Dq set ifaddr
 must be done in the system profile that specifies a peer IP address to
-use when configuring the interface.  Something like
+use when configuring the interface.
+Something like
 .Dq 10.0.0.1/0
-is usually appropriate.  See the
+is usually appropriate.
+See the
 .Dq pmdemand
 system in
 .Pa /usr/share/examples/ppp/ppp.conf.sample
@@ -100,20 +107,22 @@
 .It Fl background
 Here,
 .Nm
-attempts to establish a connection with the peer immediately.  If it
-succeeds,
+attempts to establish a connection with the peer immediately.
+If it succeeds,
 .Nm
 goes into the background and the parent process returns an exit code
-of 0.  If it fails,
+of 0.
+If it fails,
 .Nm
 exits with a non-zero result.
 .It Fl foreground
 In foreground mode,
 .Nm
 attempts to establish a connection with the peer immediately, but never
-becomes a daemon.  The link is created in background mode.  This is useful
-if you wish to control
-.Nm ppp Ns No s
+becomes a daemon.
+The link is created in background mode.
+This is useful if you wish to control
+.Nm Ns No 's
 invocation from another process.
 .It Fl direct
 This is used for receiving incoming connections.
@@ -161,16 +170,17 @@
 .It Provides an interactive user interface.
 Using its command mode, the user can
 easily enter commands to establish the connection with the remote end, check
-the status of connection and close the connection.  All functions can
-also be optionally password protected for security.
+the status of connection and close the connection.
+All functions can also be optionally password protected for security.
 .It Supports both manual and automatic dialing.
 Interactive mode has a
 .Dq term
-command which enables you to talk to the device directly.  When you
-are connected to the remote peer and it starts to talk
+command which enables you to talk to the device directly.
+When you are connected to the remote peer and it starts to talk
 .Em PPP ,
 .Nm
-detects it and switches to packet mode automatically.  Once you have
+detects it and switches to packet mode automatically.
+Once you have
 determined the proper sequence for connecting with the remote host, you
 can write a chat script to define the necessary dialing and login
 procedure for later convenience.
@@ -181,23 +191,27 @@
 .Nm
 will act as a daemon and wait for a packet to be sent over the
 .Em PPP
-link.  When this happens, the daemon automatically dials and establishes the
+link.
+When this happens, the daemon automatically dials and establishes the
 connection.
 In almost the same manner
 .Fl ddial
 mode (direct-dial mode) also automatically dials and establishes the
-connection.  However, it differs in that it will dial the remote site
+connection.
+However, it differs in that it will dial the remote site
 any time it detects the link is down, even if there are no packets to be
-sent.  This mode is useful for full-time connections where we worry less
+sent.
+This mode is useful for full-time connections where we worry less
 about line charges and more about being connected full time.
 A third
 .Fl dedicated
-mode is also available.  This mode is targeted at a dedicated link
-between two machines.
+mode is also available.
+This mode is targeted at a dedicated link between two machines.
 .Nm
 will never voluntarily quit from dedicated mode - you must send it the
 .Dq quit all
-command via its diagnostic socket.  A
+command via its diagnostic socket.
+A
 .Dv SIGHUP
 will force an LCP renegotiation, and a
 .Dv SIGTERM
@@ -208,16 +222,19 @@
 CallBack Control Protocol (ftp://ftp.microsoft.com/developr/rfc/cbcp.txt).
 .It Supports NAT or packet aliasing.
 Packet aliasing (a.k.a. IP masquerading) allows computers on a
-private, unregistered network to access the Internet.  The
+private, unregistered network to access the Internet.
+The
 .Em PPP
-host acts as a masquerading gateway.  IP addresses as well as TCP and
+host acts as a masquerading gateway.
+IP addresses as well as TCP and
 UDP port numbers are aliased for outgoing packets and de-aliased for
 returning packets.
 .It Supports background PPP connections.
 In background mode, if
 .Nm
 successfully establishes the connection, it will become a daemon.
-Otherwise, it will exit with an error.  This allows the setup of
+Otherwise, it will exit with an error.
+This allows the setup of
 scripts that wish to execute certain commands only if the connection
 is successfully established.
 .It Supports server-side PPP connections.
@@ -231,8 +248,8 @@
 .Xr login 1
 procedure, and use the
 .Em PPP
-protocol for authentication instead.  If the peer requests Microsoft
-CHAP authentication and
+protocol for authentication instead.
+If the peer requests Microsoft CHAP authentication and
 .Nm
 is compiled with DES support, an appropriate MD4/DES response will be
 made.
@@ -246,7 +263,8 @@
 .Em \&S Ns No ervice
 allows authentication information to be stored in a central or
 distributed database along with various per-user framed connection
-characteristics.  If
+characteristics.
+If
 .Pa libradius
 is available at compile time,
 .Nm
@@ -256,7 +274,8 @@
 .It Supports Proxy Arp.
 .Nm
 can be configured to make one or more proxy arp entries on behalf of
-the peer.  This allows routing from the peer to the LAN without
+the peer.
+This allows routing from the peer to the LAN without
 configuring each machine on that LAN.
 .It Supports packet filtering.
 User can define four kinds of filters: the
@@ -282,7 +301,8 @@
 .Xc
 .Nm
 will open a TCP or UDP connection for transporting data rather than using a
-conventional serial device.  UDP connections force
+conventional serial device.
+UDP connections force
 .Nm
 into synchronous mode.
 .It Supports PPP over ISDN.
@@ -313,13 +333,13 @@
 .It "Supports IETF draft Predictor-1 (rfc 1978) and DEFLATE (rfc 1979) compression."
 .Nm
 supports not only VJ-compression but also Predictor-1 and DEFLATE compression.
-Normally, a modem has built-in compression (e.g. v42.bis) and the system
+Normally, a modem has built-in compression (e.g., v42.bis) and the system
 may receive higher data rates from it as a result of such compression.
 While this is generally a good thing in most other situations, this
 higher speed data imposes a penalty on the system by increasing the
 number of serial interrupts the system has to process in talking to the
-modem and also increases latency.  Unlike VJ-compression, Predictor-1 and
-DEFLATE compression pre-compresses
+modem and also increases latency.
+Unlike VJ-compression, Predictor-1 and DEFLATE compression pre-compresses
 .Em all
 network traffic flowing through the link, thus reducing overheads to a
 minimum.
@@ -327,7 +347,7 @@
 Name Server Addresses and NetBIOS Name Server Addresses can be negotiated
 with clients using the Microsoft
 .Em PPP
-stack (ie. Win95, WinNT)
+stack (i.e., Win95, WinNT)
 .It Supports Multi-link PPP (rfc 1990)
 It is possible to configure
 .Nm
@@ -342,18 +362,18 @@
 .Dv network ,
 with permissions
 .Dv 04554 .
-By default, 
+By default,
 .Nm
-will not run if the invoking user id is not zero.  This may be overridden
-by using the
+will not run if the invoking user id is not zero.
+This may be overridden by using the
 .Dq allow users
 command in
 .Pa /etc/ppp/ppp.conf .
 When running as a normal user,
 .Nm
 switches to user id 0 in order to alter the system routing table, set up
-system lock files and read the ppp configuration files.  All
-external commands (executed via the "shell" or "!bg" commands) are executed
+system lock files and read the ppp configuration files.
+All external commands (executed via the "shell" or "!bg" commands) are executed
 as the user id that invoked
 .Nm ppp .
 Refer to the
@@ -367,7 +387,8 @@
 .Bl -bullet
 .It
 Your kernel must include a tunnel device (the GENERIC kernel includes
-one by default).  If it doesn't, or if you require more than one tun
+one by default).
+If it doesn't, or if you require more than one tun
 interface, you'll need to rebuild your kernel with the following line in
 your kernel configuration file:
 .Pp
@@ -394,21 +415,22 @@
 .Dq network
 in the
 .Pa /etc/group
-file and that that group contains the names of all users expected to use
+file and that the group contains the names of all users expected to use
 .Nm ppp .
 Refer to the
 .Xr group 5
-manual page for details.  Each of these users must also be given access
-using the
+manual page for details.
+Each of these users must also be given access using the
 .Dq allow users
 command in
 .Pa /etc/ppp/ppp.conf .
 .It
 Create a log file.
 .Nm
-uses 
+uses
 .Xr syslog 3
-to log information.  A common log file name is
+to log information.
+A common log file name is
 .Pa /var/log/ppp.log .
 To make output go to this file, put the following lines in the
 .Pa /etc/syslog.conf
@@ -443,7 +465,7 @@
 .Pa /etc/syslog.conf .
 .It
 Although not strictly relevant to
-.Nm ppp Ns No s
+.Nm Ns No 's
 operation, you should configure your resolver so that it works correctly.
 This can be done by configuring a local DNS
 .Pq using Xr named 8
@@ -460,9 +482,12 @@
 can be configured to ask the peer for the nameserver address(es) and to
 update
 .Pa /etc/resolv.conf
-automatically.  Refer to the
+automatically.
+Refer to the
 .Dq enable dns
-command below for details.
+and
+.Dq resolv
+commands below for details.
 .El
 .Sh MANUAL DIALING
 In the following examples, we assume that your machine name is
@@ -478,10 +503,11 @@
 .Pp
 The
 .Sq ON
-part of your prompt should always be in upper case.  If it is in lower
-case, it means that you must supply a password using the
+part of your prompt should always be in upper case.
+If it is in lower case, it means that you must supply a password using the
 .Dq passwd
-command.  This only ever happens if you connect to a running version of
+command.
+This only ever happens if you connect to a running version of
 .Nm
 and have not authenticated yourself using the correct password.
 .Pp
@@ -491,13 +517,15 @@
 ppp ON awfulhak> set speed 38400
 .Ed
 .Pp
-Normally, hardware flow control (CTS/RTS) is used.  However, under
+Normally, hardware flow control (CTS/RTS) is used.
+However, under
 certain circumstances (as may happen when you are connected directly
 to certain PPP-capable terminal servers), this may result in
 .Nm
 hanging as soon as it tries to write data to your communications link
 as it is waiting for the CTS (clear to send) signal - which will never
-come.  Thus, if you have a direct line and can't seem to make a
+come.
+Thus, if you have a direct line and can't seem to make a
 connection, try turning CTS/RTS off with
 .Dq set ctsrts off .
 If you need to do this, check the
@@ -508,22 +536,25 @@
 Usually, parity is set to
 .Dq none ,
 and this is
-.Nm ppp Ns No s
-default.  Parity is a rather archaic error checking mechanism that is no
+.Nm Ns No 's
+default.
+Parity is a rather archaic error checking mechanism that is no
 longer used because modern modems do their own error checking, and most
 link-layer protocols (that's what
 .Nm
-is) use much more reliable checking mechanisms.  Parity has a relatively
+is) use much more reliable checking mechanisms.
+Parity has a relatively
 huge overhead (a 12.5% increase in traffic) and as a result, it is always
 disabled
 .Pq set to Dq none
 when
 .Dv PPP
-is opened.  However, some ISPs (Internet Service Providers) may use
+is opened.
+However, some ISPs (Internet Service Providers) may use
 specific parity settings at connection time (before
 .Dv PPP
-is opened).  Notably, Compuserve insist
-on even parity when logging in:
+is opened).
+Notably, Compuserve insist on even parity when logging in:
 .Bd -literal -offset indent
 ppp ON awfulhak> set parity even
 .Ed
@@ -546,7 +577,7 @@
 Connect time: 0 secs
 0 octets in, 0 octets out
 Overall 0 bytes/sec
-ppp ON awfulhak> 
+ppp ON awfulhak>
 .Ed
 .Pp
 The term command can now be used to talk directly to the device:
@@ -573,7 +604,8 @@
 .Ed
 .Pp
 If it does not, it's probable that the peer is waiting for your end to
-start negotiating.  To force
+start negotiating.
+To force
 .Nm
 to start sending
 .Em PPP
@@ -583,7 +615,8 @@
 .Pp
 If you never even receive a login prompt, it is quite likely that the
 peer wants to use PAP or CHAP authentication instead of using Unix-style
-login/password authentication.  To set things up properly, drop back to
+login/password authentication.
+To set things up properly, drop back to
 the prompt and set your authentication name and key, then reconnect:
 .Bd -literal -offset indent
 ~.
@@ -605,23 +638,28 @@
 PPP ON awfulhak>               # We've agreed IP numbers
 .Ed
 .Pp
-You are now connected!  Note that
+You are now connected!
+Note that
 .Sq PPP
 in the prompt has changed to capital letters to indicate that you have
-a peer connection.  If only some of the three Ps go uppercase, wait until
-either everything is uppercase or lowercase.  If they revert to lowercase,
-it means that
+a peer connection.
+If only some of the three Ps go uppercase, wait until
+either everything is uppercase or lowercase.
+If they revert to lowercase, it means that
 .Nm
-couldn't successfully negotiate with the peer.  A good first step
-for troubleshooting at this point would be to
+couldn't successfully negotiate with the peer.
+A good first step for troubleshooting at this point would be to
 .Bd -literal -offset indent
 ppp ON awfulhak> set log local phase lcp ipcp
 .Ed
 .Pp
-and try again.  Refer to the
+and try again.
+Refer to the
 .Dq set log
-command description below for further details.  If things fail at this point,
-it is quite important that you turn logging on and try again.  It is also
+command description below for further details.
+If things fail at this point,
+it is quite important that you turn logging on and try again.
+It is also
 important that you note any prompt changes and report them to anyone trying
 to help you.
 .Pp
@@ -642,9 +680,11 @@
 * Logical (high level) connection related information is shown here *
 .Ed
 .Pp
-At this point, your machine has a host route to the peer.  This means
+At this point, your machine has a host route to the peer.
+This means
 that you can only make a connection with the host on the other side
-of the link.  If you want to add a default route entry (telling your
+of the link.
+If you want to add a default route entry (telling your
 machine to send all packets without another routing entry to the other
 side of the
 .Em PPP
@@ -670,8 +710,8 @@
 will update your default route accordingly.
 .Pp
 You can now use your network applications (ping, telnet, ftp etc.)
-in other windows or terminals on your machine.  If you wish to reuse
-the current terminal, you can put
+in other windows or terminals on your machine.
+If you wish to reuse the current terminal, you can put
 .Nm
 into the background using your standard shell suspend and background
 commands (usually
@@ -694,12 +734,13 @@
 .It
 A line starting with a
 .Pq Dq #
-character is treated as a comment line.  Leading whitespace are ignored
-when identifying comment lines.
+character is treated as a comment line.
+Leading whitespace are ignored when identifying comment lines.
 .It
 An inclusion is a line beginning with the word
 .Sq !include .
-It must have one argument - the file to include.  You may wish to
+It must have one argument - the file to include.
+You may wish to
 .Dq !include ~/.ppp.conf
 for compatibility with older versions of
 .Nm ppp .
@@ -715,7 +756,9 @@
 .Pa /etc/ppp/ppp.conf
 file should consist of at least a
 .Dq default
-section.  This section is always executed.  It should also contain
+section.
+This section is always executed.
+It should also contain
 one or more sections, named according to their purpose, for example,
 .Dq MyISP
 would represent your ISP, and
@@ -728,12 +771,13 @@
 Commands associated with the
 .Dq default
 label are executed, followed by those associated with the destination
-label provided.  When
+label provided.
+When
 .Nm
 is started with no arguments, the
 .Dq default
-section is still executed.  The load command can be used to manually
-load a section from the
+section is still executed.
+The load command can be used to manually load a section from the
 .Pa /etc/ppp/ppp.conf
 file:
 .Bd -literal -offset indent
@@ -745,8 +789,10 @@
 after a section is loaded, whether it's the result of passing a label on
 the command line or using the
 .Dq load
-command.  Only the commands specified for that label in the configuration
-file are executed.  However, when invoking
+command.
+Only the commands specified for that label in the configuration
+file are executed.
+However, when invoking
 .Nm
 with the
 .Fl background ,
@@ -755,7 +801,8 @@
 .Fl dedicated
 switches, the link mode tells
 .Nm
-to establish a connection.  Refer to the
+to establish a connection.
+Refer to the
 .Dq set mode
 command below for further details.
 .Pp
@@ -774,9 +821,11 @@
 .Pp
 The Ppp prompt indicates that
 .Nm
-has entered the authentication phase.  The PPp prompt indicates that
+has entered the authentication phase.
+The PPp prompt indicates that
 .Nm
-has entered the network phase.  The PPP prompt indicates that
+has entered the network phase.
+The PPP prompt indicates that
 .Nm
 has successfully negotiated a network layer protocol and is in
 a usable state.
@@ -786,7 +835,8 @@
 file is available, its contents are executed
 when the
 .Em PPP
-connection is established.  See the provided
+connection is established.
+See the provided
 .Dq pmdemand
 example in
 .Pa /usr/share/examples/ppp/ppp.conf.sample
@@ -795,10 +845,11 @@
 .Dq shell
 and
 .Dq bg
-commands below for a description of possible substitution strings).  Similarly,
-when a connection is closed, the contents of the
+commands below for a description of possible substitution strings).
+Similarly, when a connection is closed, the contents of the
 .Pa /etc/ppp/ppp.linkdown
-file are executed.  Both of these files have the same format as
+file are executed.
+Both of these files have the same format as
 .Pa /etc/ppp/ppp.conf .
 .Pp
 In previous versions of
@@ -832,9 +883,10 @@
 .Fl background
 is specified,
 .Nm
-attempts to establish the connection immediately.  If multiple phone
-numbers are specified, each phone number will be tried once.  If the
-attempt fails,
+attempts to establish the connection immediately.
+If multiple phone
+numbers are specified, each phone number will be tried once.
+If the attempt fails,
 .Nm
 exits immediately with a non-zero exit code.
 If it succeeds, then
@@ -849,9 +901,11 @@
 .Fl auto
 or
 .Fl ddial
-options.  You must also specify the destination label in
+options.
+You must also specify the destination label in
 .Pa /etc/ppp/ppp.conf
-to use.  It must contain the
+to use.
+It must contain the
 .Dq set ifaddr
 command to define the remote peers IP address.
 (refer to
@@ -884,7 +938,8 @@
 .Dq show who
 command lists users that are currently connected to
 .Nm
-itself.  If the diagnostic socket is closed or changed to a different
+itself.
+If the diagnostic socket is closed or changed to a different
 socket, all connections are immediately dropped.
 .Pp
 In
@@ -892,7 +947,8 @@
 mode, when an outgoing packet is detected,
 .Nm
 will perform the dialing action (chat script) and try to connect
-with the peer.  In
+with the peer.
+In
 .Fl ddial
 mode, the dialing action is performed any time the line is found
 to be down.
@@ -919,10 +975,11 @@
 .It Ar inc
 is the number of seconds that
 .Ar secs
-should be incremented each time a new dial attempt is made.  The timeout
-reverts to
+should be incremented each time a new dial attempt is made.
+The timeout reverts to
 .Ar secs
-only after a successful connection is established.  The default value for
+only after a successful connection is established.
+The default value for
 .Ar inc
 is zero.
 .It Ar max
@@ -937,14 +994,16 @@
 is the number of seconds to wait before attempting
 to dial the next number in a list of numbers (see the
 .Dq set phone
-command).  The default is 3 seconds.  Again, if the argument is the literal
-string
+command).
+The default is 3 seconds.
+Again, if the argument is the literal string
 .Sq Li random ,
 the delay period is a random value between 1 and 30 seconds.
 .It Ar attempts
 is the maximum number of times to try to connect for each outgoing packet
-that triggers a dial.  The previous value is unchanged if this parameter
-is omitted.  If a value of zero is specified for
+that triggers a dial.
+The previous value is unchanged if this parameter is omitted.
+If a value of zero is specified for
 .Ar attempts ,
 .Nm
 will keep trying until a connection is made.
@@ -957,7 +1016,8 @@
 .Pp
 will attempt to connect 4 times for each outgoing packet that causes
 a dial attempt with a 3 second delay between each number and a 10 second
-delay after all numbers have been tried.  If multiple phone numbers
+delay after all numbers have been tried.
+If multiple phone numbers
 are specified, the total number of attempts is still 4 (it does not
 attempt each number 4 times).
 .Pp
@@ -969,11 +1029,14 @@
 .Pp
 tells
 .Nm
-to attempt to connect 20 times.  After the first attempt,
+to attempt to connect 20 times.
+After the first attempt,
 .Nm
-pauses for 10 seconds.  After the next attempt it pauses for 20 seconds
-and so on until after the sixth attempt it pauses for 1 minute.  The next
-14 pauses will also have a duration of one minute.  If
+pauses for 10 seconds.
+After the next attempt it pauses for 20 seconds
+and so on until after the sixth attempt it pauses for 1 minute.
+The next 14 pauses will also have a duration of one minute.
+If
 .Nm
 connects, disconnects and fails to connect again, the timeout starts again
 at 10 seconds.
@@ -987,7 +1050,8 @@
 both ends wind up calling each other at the same time if the link
 drops and both ends have packets queued.
 At some locations, the serial link may not be reliable, and carrier
-may be lost at inappropriate times.  It is possible to have
+may be lost at inappropriate times.
+It is possible to have
 .Nm
 redial should carrier be unexpectedly lost during a session.
 .Bd -literal -offset indent
@@ -1000,7 +1064,8 @@
 .Ar ntries
 times on loss of carrier with a pause of
 .Ar timeout
-seconds before each try.  For example,
+seconds before each try.
+For example,
 .Bd -literal -offset indent
 set reconnect 3 5
 .Ed
@@ -1009,24 +1074,28 @@
 .Nm
 that on an unexpected loss of carrier, it should wait
 .Ar 3
-seconds before attempting to reconnect.  This may happen up to
+seconds before attempting to reconnect.
+This may happen up to
 .Ar 5
 times before
 .Nm
-gives up.  The default value of ntries is zero (no reconnect).  Care
-should be taken with this option.  If the local timeout is slightly
+gives up.
+The default value of ntries is zero (no reconnect).
+Care should be taken with this option.
+If the local timeout is slightly
 longer than the remote timeout, the reconnect feature will always be
 triggered (up to the given number of times) after the remote side
 times out and hangs up.
-NOTE:  In this context, losing too many LQRs constitutes a loss of
+NOTE: In this context, losing too many LQRs constitutes a loss of
 carrier and will trigger a reconnect.
 If the
 .Fl background
 flag is specified, all phone numbers are dialed at most once until
-a connection is made.  The next number redial period specified with
-the
+a connection is made.
+The next number redial period specified with the
 .Dq set redial
-command is honoured, as is the reconnect tries value.  If your redial
+command is honoured, as is the reconnect tries value.
+If your redial
 value is less than the number of phone numbers specified, not all
 the specified numbers will be tried.
 To terminate the program, type
@@ -1073,7 +1142,7 @@
 on the port where the modem is attached.
 For example:
 .Pp
-.Dl ttyd1  "/usr/libexec/getty std.38400" dialup on secure
+.Dl ttyd1 "/usr/libexec/getty std.38400" dialup on secure
 .Pp
 Don't forget to send a
 .Dv HUP
@@ -1096,7 +1165,8 @@
 .Pq Fl direct
 lets
 .Nm
-work with stdin and stdout.  You can also use
+work with stdin and stdout.
+You can also use
 .Xr pppctl 8
 to connect to a configured diagnostic port, in the same manner as with
 client-side
@@ -1129,12 +1199,13 @@
 .Dq accept dns
 and
 .Dq set nbns
-commands.  Refer to their descriptions below.
+commands.
+Refer to their descriptions below.
 .El
 .Pp
 .Sh RECEIVING INCOMING PPP CONNECTIONS (Method 2)
 This method differs in that we use
-.Nm ppp
+.Nm
 to authenticate the connection rather than
 .Xr login 1 :
 .Bl -enum
@@ -1185,17 +1256,19 @@
 .Pp
 It is
 .Em VITAL
-that either PAP or CHAP are enabled as above.  If they are not, you are
+that either PAP or CHAP are enabled as above.
+If they are not, you are
 allowing anybody to establish ppp session with your machine
 .Em without
 a password, opening yourself up to all sorts of potential attacks.
 .Sh AUTHENTICATING INCOMING CONNECTIONS
 Normally, the receiver of a connection requires that the peer
-authenticates itself.  This may be done using
+authenticates itself.
+This may be done using
 .Xr login 1 ,
-but alternatively, you can use PAP or CHAP.  CHAP is the more secure
-of the two, but some clients may not support it.  Once you decide which
-you wish to use, add the command
+but alternatively, you can use PAP or CHAP.
+CHAP is the more secure of the two, but some clients may not support it.
+Once you decide which you wish to use, add the command
 .Sq enable chap
 or
 .Sq enable pap
@@ -1204,7 +1277,8 @@
 .Pp
 You must then configure the
 .Pa /etc/ppp/ppp.secret
-file.  This file contains one line per possible client, each line
+file.
+This file contains one line per possible client, each line
 containing up to five fields:
 .Pp
 .Ar name Ar key Oo
@@ -1215,7 +1289,8 @@
 .Ar name
 and
 .Ar key
-specify the client username and password.  If
+specify the client username and password.
+If
 .Ar key
 is
 .Dq \&*
@@ -1223,8 +1298,8 @@
 .Nm
 will look up the password database
 .Pq Xr passwd 5
-when authenticating.  If the client does not offer a suitable
-response based on any
+when authenticating.
+If the client does not offer a suitable response based on any
 .Ar name Ns No / Ns Ar key
 combination in
 .Pa ppp.secret ,
@@ -1233,7 +1308,8 @@
 If authentication is successful,
 .Ar hisaddr
 .Pq if specified
-is used when negotiating IP numbers.  See the
+is used when negotiating IP numbers.
+See the
 .Dq set ifaddr
 command for details.
 .Pp
@@ -1253,14 +1329,16 @@
 .Dq set callback
 has been used in
 .Pa ppp.conf ,
-the client will be called back on the given number.  If CBCP is being used,
+the client will be called back on the given number.
+If CBCP is being used,
 .Ar callback-number
 may also contain a list of numbers or a
 .Dq \&* ,
 as if passed to the
 .Dq set cbcp
-command.  The value will be used in
-.Nm ppp Ns No s
+command.
+The value will be used in
+.Nm Ns No 's
 subsequent CBCP phase.
 .Sh PPP OVER TCP and UDP (a.k.a Tunnelling)
 Instead of running
@@ -1274,13 +1352,15 @@
 Instead of opening a serial device,
 .Nm
 will open a TCP connection to the given machine on the given
-socket.  It should be noted however that
+socket.
+It should be noted however that
 .Nm
 doesn't use the telnet protocol and will be unable to negotiate
-with a telnet server.  You should set up a port for receiving this
+with a telnet server.
+You should set up a port for receiving this
 .Em PPP
-connection on the receiving machine (ui-gate).  This is
-done by first updating
+connection on the receiving machine (ui-gate).
+This is done by first updating
 .Pa /etc/services
 to name the service:
 .Pp
@@ -1312,8 +1392,8 @@
  add 10.0.1.0/24 10.0.4.2
 .Ed
 .Pp
-You may also want to enable PAP or CHAP for security.  To enable PAP, add
-the following line:
+You may also want to enable PAP or CHAP for security.
+To enable PAP, add the following line:
 .Bd -literal -offset indent
  enable PAP
 .Ed
@@ -1373,15 +1453,18 @@
 "guaranteed delivery" mechanisms in place - the underlying TCP
 stream and whatever protocol is used over the
 .Em PPP
-link - probably TCP again.  If packets are lost, both levels will
+link - probably TCP again.
+If packets are lost, both levels will
 get in each others way trying to negotiate sending of the missing
 packet.
 .Pp
 To avoid this overhead, it is also possible to do all this using
 UDP instead of TCP as the transport by simply changing the protocol
-from "tcp" to "udp".  When using UDP as a transport,
+from "tcp" to "udp".
+When using UDP as a transport,
 .Nm
-will operate in synchronous mode.  This is another gain as the incoming
+will operate in synchronous mode.
+This is another gain as the incoming
 data does not have to be rearranged into packets.
 .Pp
 .Sh NETWORK ADDRESS TRANSLATION (PACKET ALIASING)
@@ -1389,11 +1472,12 @@
 .Fl nat
 .Pq \&or Fl alias
 command line option enables network address translation (a.k.a. packet
-aliasing).  This allows the
+aliasing).
+This allows the
 .Nm
 host to act as a masquerading gateway for other computers over
-a local area network.  Outgoing IP packets are aliased so that
-they appear to come from the
+a local area network.
+Outgoing IP packets are aliased so that they appear to come from the
 .Nm
 host, and incoming packets are de-aliased so that they are routed
 to the correct machine on the local area network.
@@ -1403,7 +1487,7 @@
 In general, correct
 .Nm
 operation should first be verified with network address translation disabled.
-Then, the 
+Then, the
 .Fl nat
 option should be switched on, and network applications (web browser,
 .Xr telnet 1 ,
@@ -1412,13 +1496,15 @@
 .Xr traceroute 8 )
 should be checked on the
 .Nm
-host.  Finally, the same or similar applications should be checked on other
+host.
+Finally, the same or similar applications should be checked on other
 computers in the LAN.
 If network applications work correctly on the
 .Nm
 host, but not on other machines in the LAN, then the masquerading
 software is working properly, but the host is either not forwarding
-or possibly receiving IP packets.  Check that IP forwarding is enabled in
+or possibly receiving IP packets.
+Check that IP forwarding is enabled in
 .Pa /etc/rc.conf
 and that other machines have designated the
 .Nm
@@ -1434,7 +1520,8 @@
 .Em dial
 filter and the
 .Em alive
-filter.  Here are the basics:
+filter.
+Here are the basics:
 .Bl -bullet
 .It
 A filter definition has the following syntax:
@@ -1470,7 +1557,8 @@
 .Sq 0
 and
 .Sq 39
-specifying the rule number.  Rules are specified in numeric order according to
+specifying the rule number.
+Rules are specified in numeric order according to
 .Ar rule-no ,
 but only if rule
 .Sq 0
@@ -1487,7 +1575,8 @@
 can also be specified as
 .Sq clear
 to clear the action associated with that particular rule, or as a new
-rule number greater than the current rule.  In this case, if a given
+rule number greater than the current rule.
+In this case, if a given
 packet matches the current rule, the packet will next be matched against
 the new rule number (rather than the next rule number).
 .Pp
@@ -1502,7 +1591,8 @@
 .Op Ar src_addr Ns Op / Ns Ar width
 and
 .Op Ar dst_addr Ns Op / Ns Ar width
-are the source and destination IP number specifications.  If
+are the source and destination IP number specifications.
+If
 .Op / Ns Ar width
 is specified, it gives the number of relevant netmask bits,
 allowing the specification of an address range.
@@ -1517,9 +1607,10 @@
 .Dv HISADDR
 (refer to the description of the
 .Dq bg
-command for a description of these values).  When these values are used,
-the filters will be updated any time the values change.  This is similar
-to the behaviour of the
+command for a description of these values).
+When these values are used,
+the filters will be updated any time the values change.
+This is similar to the behaviour of the
 .Dq add
 command below.
 .It
@@ -1558,7 +1649,7 @@
 .It
 Each filter can hold up to 40 rules, starting from rule 0.
 The entire rule set is not effective until rule 0 is defined,
-ie. the default is to allow everything through.
+i.e., the default is to allow everything through.
 .It
 If no rule is matched to a packet, that packet will be discarded
 (blocked).
@@ -1580,7 +1671,7 @@
 ppp ON awfulhak> set timeout 600
 .Ed
 .Pp
-The timeout period is measured in seconds, the  default value for which
+The timeout period is measured in seconds, the default value for which
 is 180 seconds
 .Pq or 3 min .
 To disable the idle timer function, use the command
@@ -1592,15 +1683,16 @@
 .Fl ddial
 and
 .Fl dedicated
-modes, the idle timeout is ignored.  In
+modes, the idle timeout is ignored.
+In
 .Fl auto
 mode, when the idle timeout causes the
 .Em PPP
 session to be
 closed, the
 .Nm
-program itself remains running.  Another trigger packet will cause it to
-attempt to re-establish the link.
+program itself remains running.
+Another trigger packet will cause it to attempt to re-establish the link.
 .Sh PREDICTOR-1 and DEFLATE COMPRESSION
 .Nm
 supports both Predictor type 1 and deflate compression.
@@ -1626,13 +1718,16 @@
 .Pp
 By default, when negotiating DEFLATE,
 .Nm
-will use a window size of 15.  Refer to the
+will use a window size of 15.
+Refer to the
 .Dq set deflate
 command if you wish to change this behaviour.
 .Pp
 A special algorithm called DEFLATE24 is also available, and is disabled
-and denied by default.  This is exactly the same as DEFLATE except that
-it uses CCP ID 24 to negotiate.  This allows
+and denied by default.
+This is exactly the same as DEFLATE except that
+it uses CCP ID 24 to negotiate.
+This allows
 .Nm
 to successfully negotiate DEFLATE with
 .Nm pppd
@@ -1644,7 +1739,8 @@
 specifies the IP address that it's willing to use, and if the requested
 IP address is acceptable then
 .Nm
-returns ACK to the requester.  Otherwise,
+returns ACK to the requester.
+Otherwise,
 .Nm
 returns NAK to suggest that the peer use a different IP address.
 When
@@ -1682,7 +1778,8 @@
 .Sq src_addr .
 It is only possible to make
 .Sq netmask
-smaller than the default.  The usual value is 255.255.255.255, as
+smaller than the default.
+The usual value is 255.255.255.255, as
 most kernels ignore the netmask of a POINTOPOINT interface.
 .Pp
 Some incorrect
@@ -1692,7 +1789,8 @@
 .Sq src_addr .
 If this is the case,
 .Sq trigger_addr
-may be used to specify this IP number.  This will not affect the
+may be used to specify this IP number.
+This will not affect the
 routing table unless the other side agrees with this proposed number.
 .Bd -literal -offset indent
 set ifaddr 192.244.177.38 192.244.177.2 255.255.255.255 0.0.0.0
@@ -1715,8 +1813,8 @@
 .Pp
 This is all fine when each side has a pre-determined IP address, however
 it is often the case that one side is acting as a server which controls
-all IP addresses and the other side should go along with it.  In order
-to allow more flexible behaviour, the
+all IP addresses and the other side should go along with it.
+In order to allow more flexible behaviour, the
 .Dq set ifaddr
 command allows the user to specify IP addresses more loosely:
 .Pp
@@ -1724,8 +1822,8 @@
 .Pp
 A number followed by a slash
 .Pq Dq /
-represents the number of bits significant in the IP address.  The above
-example means:
+represents the number of bits significant in the IP address.
+The above example means:
 .Pp
 .Bl -bullet -compact
 .It
@@ -1740,8 +1838,8 @@
 192.244.177.2/32.
 .It
 As an exception, 0 is equivalent to 0.0.0.0/0, meaning that I have no
-preferred IP address and will obey the remote peers selection.  When
-using zero, no routing table entries will be made until a connection
+preferred IP address and will obey the remote peers selection.
+When using zero, no routing table entries will be made until a connection
 is established.
 .It
 192.244.177.2/0 means that I'll accept/permit any IP address but I'll
@@ -1754,7 +1852,8 @@
 .It
 Describe your providers phone number(s) in the dial script using the
 .Dq set phone
-command.  This command allows you to set multiple phone numbers for
+command.
+This command allows you to set multiple phone numbers for
 dialing and redialing separated by either a pipe
 .Pq Dq \&|
 or a colon
@@ -1768,22 +1867,29 @@
 .Ed
 .Pp
 Numbers after the first in a pipe-separated list are only used if the
-previous number was used in a failed dial or login script.  Numbers
+previous number was used in a failed dial or login script.
+Numbers
 separated by a colon are used sequentially, irrespective of what happened
-as a result of using the previous number.  For example:
+as a result of using the previous number.
+For example:
 .Bd -literal -offset indent
 set phone "1234567|2345678:3456789|4567890"
 .Ed
 .Pp
-Here, the 1234567 number is attempted.  If the dial or login script fails,
+Here, the 1234567 number is attempted.
+If the dial or login script fails,
 the 2345678 number is used next time, but *only* if the dial or login script
-fails.  On the dial after this, the 3456789 number is used.  The 4567890
-number is only used if the dial or login script using the 3456789 fails.  If
-the login script of the 2345678 number fails, the next number is still the
-3456789 number.  As many pipes and colons can be used as are necessary
+fails.
+On the dial after this, the 3456789 number is used.
+The 4567890
+number is only used if the dial or login script using the 3456789 fails.
+If the login script of the 2345678 number fails, the next number is still the
+3456789 number.
+As many pipes and colons can be used as are necessary
 (although a given site would usually prefer to use either the pipe or the
-colon, but not both).  The next number redial timeout is used between all
-numbers.  When the end of the list is reached, the normal redial period is
+colon, but not both).
+The next number redial timeout is used between all numbers.
+When the end of the list is reached, the normal redial period is
 used before starting at the beginning again.
 The selected phone number is substituted for the \\\\T string in the
 .Dq set dial
@@ -1805,7 +1911,8 @@
 .Dq set dial
 and
 .Dq set login
-commands.  The
+commands.
+The
 .Dq set dial
 command is used to talk to your modem and establish a link with your
 ISP, for example:
@@ -1825,7 +1932,8 @@
 .It
 Send ATZ.
 .It
-Expect OK.  If that's not received within the 4 second timeout, send ATZ
+Expect OK.
+If that's not received within the 4 second timeout, send ATZ
 and expect OK.
 .It
 Send ATDTxxxxxxx where xxxxxxx is the next number in the phone list from
@@ -1836,8 +1944,8 @@
 Wait for the CONNECT string.
 .El
 .Pp
-Once the connection is established, the login script is executed.  This
-script is written in the same style as the dial script, but care should
+Once the connection is established, the login script is executed.
+This script is written in the same style as the dial script, but care should
 be taken to avoid having your password logged:
 .Bd -literal -offset indent
 set authkey MySecret
@@ -1850,7 +1958,8 @@
 .It
 Set the timeout to 15 seconds.
 .It
-Expect "login:".  If it's not received, send a carriage return and expect
+Expect "login:".
+If it's not received, send a carriage return and expect
 "login:" again.
 .It
 Send "awfulhak"
@@ -1870,7 +1979,8 @@
 .Pp
 The
 .Dq set authkey
-command is logged specially.  When
+command is logged specially.
+When
 .Ar command
 or
 .Ar chat
@@ -1878,8 +1988,8 @@
 .Sq ******** Ns
 is logged instead.
 .Pp
-Login scripts vary greatly between ISPs.  If you're setting one up
-for the first time,
+Login scripts vary greatly between ISPs.
+If you're setting one up for the first time,
 .Em ENABLE CHAT LOGGING
 so that you can see if your script is behaving as you expect.
 .It
@@ -1893,11 +2003,16 @@
 set speed 115200
 .Ed
 .Pp
-Cuaa0 is the first serial port on FreeBSD.  If you're running
+Cuaa0 is the first serial port on
+.Fx .
+If you're running
 .Nm
-on OpenBSD, cua00 is the first.  A speed of 115200 should be specified
-if you have a modem capable of bit rates of 28800 or more.  In general,
-the serial speed should be about four times the modem speed.
+on
+.Ox ,
+cua00 is the first.
+A speed of 115200 should be specified
+if you have a modem capable of bit rates of 28800 or more.
+In general, the serial speed should be about four times the modem speed.
 .It
 Use the
 .Dq set ifaddr
@@ -1911,15 +2026,17 @@
 it as your address (src_addr).
 .It
 If your provider assigns your address dynamically, choose a suitably
-unobtrusive and unspecific IP number as your address.  10.0.0.1/0 would
-be appropriate.  The bit after the / specifies how many bits of the
+unobtrusive and unspecific IP number as your address.
+10.0.0.1/0 would be appropriate.
+The bit after the / specifies how many bits of the
 address you consider to be important, so if you wanted to insist on
 something in the class C network 1.2.3.0, you could specify 1.2.3.1/24.
 .It
 If you find that your ISP accepts the first IP number that you suggest,
 specify third and forth arguments of
 .Dq 0.0.0.0 .
-This will force your ISP to assign a number.  (The third argument will
+This will force your ISP to assign a number.
+(The third argument will
 be ignored as it is less restrictive than the default mask for your
 .Sq src_addr .
 .El
@@ -1931,8 +2048,8 @@
 .Ed
 .Pp
 .It
-In most cases, your ISP will also be your default router.  If this is
-the case, add the line
+In most cases, your ISP will also be your default router.
+If this is the case, add the line
 .Bd -literal -offset indent
 add default HISADDR
 .Ed
@@ -1954,7 +2071,8 @@
 .Nm
 required a similar entry in the
 .Pa /etc/ppp/ppp.linkup
-file.  Since the advent of
+file.
+Since the advent of
 .Sq sticky routes ,
 this is no longer required.
 .It
@@ -1978,9 +2096,16 @@
 .Bd -literal -offset indent
 enable dns
 .Ed
+.Pp
 Do
 .Em NOT
-do this if you are running an local DNS, as
+do this if you are running a local DNS unless you also either use
+.Dq resolv readonly
+or have
+.Dq resolv restore
+in
+.Pa /etc/ppp/ppp.linkdown ,
+as
 .Nm
 will simply circumvent its use by entering some nameserver lines in
 .Pa /etc/resolv.conf .
@@ -1990,8 +2115,8 @@
 .Pa /usr/share/examples/ppp/ppp.conf.sample
 and
 .Pa /usr/share/examples/ppp/ppp.linkup.sample
-for some real examples.  The pmdemand label should be appropriate for most
-ISPs.
+for some real examples.
+The pmdemand label should be appropriate for most ISPs.
 .Sh LOGGING FACILITY
 .Nm
 is able to generate the following log info either via
@@ -2020,6 +2145,8 @@
 Log Chat lines containing the string "CONNECT".
 .It Li Debug
 Log debug information.
+.It Li DNS
+Log DNS QUERY packets.
 .It Li HDLC
 Dump HDLC packet in hex.
 .It Li ID0
@@ -2043,7 +2170,8 @@
 .It Li TUN
 Include the tun device on each log line.
 .It Li Warning
-Output to the terminal device.  If there is currently no terminal,
+Output to the terminal device.
+If there is currently no terminal,
 output is sent to the log file using syslogs
 .Dv LOG_WARNING .
 .It Li Error
@@ -2057,18 +2185,19 @@
 .Pp
 The
 .Dq set log
-command allows you to set the logging output level.  Multiple levels
-can be specified on a single command line.  The default is equivalent to
+command allows you to set the logging output level.
+Multiple levels can be specified on a single command line.
+The default is equivalent to
 .Dq set log Phase .
 .Pp
-It is also possible to log directly to the screen.  The syntax is
-the same except that the word
+It is also possible to log directly to the screen.
+The syntax is the same except that the word
 .Dq local
 should immediately follow
 .Dq set log .
 The default is
 .Dq set log local
-(ie. only the un-maskable warning, error and alert output).
+(i.e., only the un-maskable warning, error and alert output).
 .Pp
 If The first argument to
 .Dq set log Op local
@@ -2104,7 +2233,8 @@
 .Bl -tag -width XX
 .It INT
 Receipt of this signal causes the termination of the current connection
-(if any).  This will cause
+(if any).
+This will cause
 .Nm
 to exit unless it is in
 .Fl auto
@@ -2127,29 +2257,32 @@
 .Em PPP
 peer, that peer must also understand the
 .Em MULTI-LINK PPP
-protocol.  Refer to RFC 1990 for specification details.
+protocol.
+Refer to RFC 1990 for specification details.
 .Pp
 The peer is identified using a combination of his
 .Dq endpoint discriminator
 and his
 .Dq authentication id .
-Either or both of these may be specified.  It is recommended that
+Either or both of these may be specified.
+It is recommended that
 at least one is specified, otherwise there is no way of ensuring that
 all links are actually connected to the same peer program, and some
-confusing lock-ups may result.  Locally, these identification variables
-are specified using the
+confusing lock-ups may result.
+Locally, these identification variables are specified using the
 .Dq set enddisc
 and
 .Dq set authname
-commands.  The
+commands.
+The
 .Sq authname
 .Pq and Sq authkey
 must be agreed in advance with the peer.
 .Pp
 Multi-link capabilities are enabled using the
 .Dq set mrru
-command (set maximum reconstructed receive unit).  Once multi-link
-is enabled,
+command (set maximum reconstructed receive unit).
+Once multi-link is enabled,
 .Nm
 will attempt to negotiate a multi-link connection with the peer.
 .Pp
@@ -2159,7 +2292,8 @@
 .Pq called Sq deflink .
 To create more links, the
 .Dq clone
-command is used.  This command will clone existing links, where all
+command is used.
+This command will clone existing links, where all
 characteristics are the same except:
 .Bl -enum
 .It
@@ -2169,7 +2303,8 @@
 .It
 The new link is an
 .Sq interactive
-link.  It's mode may subsequently be changed using the
+link.
+Its mode may subsequently be changed using the
 .Dq set mode
 command.
 .It
@@ -2182,11 +2317,11 @@
 .Dq show links
 command.
 .Pp
-Once a new link has been created, command usage varies.  All link
-specific commands must be prefixed with the
+Once a new link has been created, command usage varies.
+All link specific commands must be prefixed with the
 .Dq link Ar name
-command, specifying on which link the command is to be applied.  When
-only a single link is available,
+command, specifying on which link the command is to be applied.
+When only a single link is available,
 .Nm
 is smart enough not to require the
 .Dq link Ar name
@@ -2195,7 +2330,8 @@
 Some commands can still be used without specifying a link - resulting
 in an operation at the
 .Sq bundle
-level.  For example, once two or more links are available, the command
+level.
+For example, once two or more links are available, the command
 .Dq show ccp
 will show CCP configuration and statistics at the multi-link level, and
 .Dq link deflink show ccp
@@ -2223,8 +2359,9 @@
  link deflink remove
 .Ed
 .Pp
-Note how all cloning is done at the end of the configuration.  Usually,
-the link will be configured first, then cloned.  If you wish all links
+Note how all cloning is done at the end of the configuration.
+Usually, the link will be configured first, then cloned.
+If you wish all links
 to be up all the time, you can add the following line to the end of your
 configuration.
 .Pp
@@ -2263,11 +2400,13 @@
 .Em MULTI-LINK
 mode with the peer, it creates a local domain socket in the
 .Pa /var/run
-directory.  This socket is used to pass link information (including
+directory.
+This socket is used to pass link information (including
 the actual link file descriptor) between different
 .Nm
-invocations.  This facilitates
-.Nm ppp Ns No s
+invocations.
+This facilitates
+.Nm Ns No 's
 ability to be run from a
 .Xr getty 8
 or directly from
@@ -2275,16 +2414,18 @@
 (using the
 .Sq pp=
 capability), without needing to have initial control of the serial
-line.  Once
+line.
+Once
 .Nm
 negotiates multi-link mode, it will pass its open link to any
-already running process.  If there is no already running process,
+already running process.
+If there is no already running process,
 .Nm
 will act as the master, creating the socket and listening for new
 connections.
 .Sh PPP COMMAND LIST
-This section lists the available commands and their effect.  They are
-usable either from an interactive
+This section lists the available commands and their effect.
+They are usable either from an interactive
 .Nm
 session, from a configuration file or from a
 .Xr pppctl 8
@@ -2295,7 +2436,8 @@
 .It accept|deny|enable|disable Ar option....
 These directives tell
 .Nm
-how to negotiate the initial connection with the peer.  Each
+how to negotiate the initial connection with the peer.
+Each
 .Dq option
 has a default of either accept or deny and enable or disable.
 .Dq Accept
@@ -2311,10 +2453,12 @@
 may be one of the following:
 .Bl -tag -width XX
 .It acfcomp
-Default: Enabled and Accepted.  ACFComp stands for Address and Control
-Field Compression.  Non LCP packets will usually have an address
+Default: Enabled and Accepted.
+ACFComp stands for Address and Control Field Compression.
+Non LCP packets will usually have an address
 field of 0xff (the All-Stations address) and a control field of
-0x03 (the Unnumbered Information command).  If this option is
+0x03 (the Unnumbered Information command).
+If this option is
 negotiated, these two bytes are simply not sent, thus minimising
 traffic.
 .Pp
@@ -2322,16 +2466,18 @@
 .Pa rfc1662
 for details.
 .It chap Ns Op \&05
-Default: Disabled and Accepted.  CHAP stands for Challenge Handshake
-Authentication Protocol.  Only one of CHAP and PAP (below) may be
-negotiated.  With CHAP, the authenticator sends a "challenge" message
-to its peer.  The peer uses a one-way hash function to encrypt the
-challenge and sends the result back.  The authenticator does the same,
-and compares the results.  The advantage of this mechanism is that no
+Default: Disabled and Accepted.
+CHAP stands for Challenge Handshake Authentication Protocol.
+Only one of CHAP and PAP (below) may be negotiated.
+With CHAP, the authenticator sends a "challenge" message to its peer.
+The peer uses a one-way hash function to encrypt the
+challenge and sends the result back.
+The authenticator does the same, and compares the results.
+The advantage of this mechanism is that no
 passwords are sent across the connection.
-A challenge is made when the connection is first made.  Subsequent
-challenges may occur.  If you want to have your peer authenticate
-itself, you must
+A challenge is made when the connection is first made.
+Subsequent challenges may occur.
+If you want to have your peer authenticate itself, you must
 .Dq enable chap .
 in
 .Pa /etc/ppp/ppp.conf ,
@@ -2349,12 +2495,15 @@
 Some
 .Em PPP
 implementations use "MS-CHAP" rather than MD5 when encrypting the
-challenge.  MS-CHAP is a combination of MD4 and DES.  If
+challenge.
+MS-CHAP is a combination of MD4 and DES.
+If
 .Nm
 was built on a machine with DES libraries available, it will respond
 to MS-CHAP authentication requests, but will never request them.
 .It deflate
-Default: Enabled and Accepted.  This option decides if deflate
+Default: Enabled and Accepted.
+This option decides if deflate
 compression will be used by the Compression Control Protocol (CCP).
 This is the same algorithm as used by the
 .Xr gzip 1
@@ -2391,16 +2540,20 @@
 and
 .Ar accept Ns No ed .
 .It deflate24
-Default: Disabled and Denied.  This is a variance of the
+Default: Disabled and Denied.
+This is a variance of the
 .Ar deflate
 option, allowing negotiation with the
 .Xr pppd 8
-program.  Refer to the
+program.
+Refer to the
 .Ar deflate
-section above for details.  It is disabled by default as it violates
+section above for details.
+It is disabled by default as it violates
 .Pa rfc1975 .
 .It dns
-Default: Disabled and Denied.  This option allows DNS negotiation.
+Default: Disabled and Denied.
+This option allows DNS negotiation.
 .Pp
 If
 .Dq enable Ns No d,
@@ -2415,22 +2568,27 @@
 .Dq accept Ns No ed,
 .Nm
 will answer any DNS queries requested by the peer rather than rejecting
-them.  The answer is taken from
+them.
+The answer is taken from
 .Pa /etc/resolv.conf
 unless the
 .Dq set dns
 command is used as an override.
 .It enddisc
-Default: Enabled and Accepted.  This option allows control over whether we
-negotiate an endpoint discriminator.  We only send our discriminator if
+Default: Enabled and Accepted.
+This option allows control over whether we
+negotiate an endpoint discriminator.
+We only send our discriminator if
 .Dq set enddisc
 is used and
 .Ar enddisc
-is enabled.  We reject the peers discriminator if
+is enabled.
+We reject the peers discriminator if
 .Ar enddisc
 is denied.
 .It LANMan|chap80lm
-Default: Disabled and Accepted.  The use of this authentication protocol
+Default: Disabled and Accepted.
+The use of this authentication protocol
 is discouraged as it partially violates the authentication protocol by
 implementing two different mechanisms (LANMan & NT) under the guise of
 a single CHAP type (0x80).
@@ -2442,41 +2600,50 @@
 .Dq MSChap
 description below for more details.
 .It lqr
-Default: Disabled and Accepted.  This option decides if Link Quality
-Requests will be sent or accepted.  LQR is a protocol that allows
+Default: Disabled and Accepted.
+This option decides if Link Quality Requests will be sent or accepted.
+LQR is a protocol that allows
 .Nm
 to determine that the link is down without relying on the modems
-carrier detect.  When LQR is enabled,
+carrier detect.
+When LQR is enabled,
 .Nm
 sends the
 .Em QUALPROTO
 option (see
 .Dq set lqrperiod
-below) as part of the LCP request.  If the peer agrees, both sides will
+below) as part of the LCP request.
+If the peer agrees, both sides will
 exchange LQR packets at the agreed frequency, allowing detailed link
-quality monitoring by enabling LQM logging.  If the peer doesn't agree,
-ppp will send ECHO LQR requests instead.  These packets pass no
-information of interest, but they
+quality monitoring by enabling LQM logging.
+If the peer doesn't agree,
+.Nm
+will send ECHO LQR requests instead.
+These packets pass no information of interest, but they
 .Em MUST
 be replied to by the peer.
 .Pp
 Whether using LQR or ECHO LQR,
 .Nm
 will abruptly drop the connection if 5 unacknowledged packets have been
-sent rather than sending a 6th.  A message is logged at the
+sent rather than sending a 6th.
+A message is logged at the
 .Em PHASE
 level, and any appropriate
 .Dq reconnect
 values are honoured as if the peer were responsible for dropping the
 connection.
 .It MSChap|chap80nt
-Default: Disabled and Accepted.  The use of this authentication protocol
+Default: Disabled and Accepted.
+The use of this authentication protocol
 is discouraged as it partially violates the authentication protocol by
 implementing two different mechanisms (LANMan & NT) under the guise of
-a single CHAP type (0x80).  It is very similar to standard CHAP (type 0x05)
+a single CHAP type (0x80).
+It is very similar to standard CHAP (type 0x05)
 except that it issues challenges of a fixed 8 bytes in length and uses a
 combination of MD4 and DES to encrypt the challenge rather than using the
-standard MD5 mechanism.  CHAP type 0x80 for LANMan is also supported - see
+standard MD5 mechanism.
+CHAP type 0x80 for LANMan is also supported - see
 .Dq enable LANMan
 for details.
 .Pp
@@ -2488,8 +2655,8 @@
 .Dq enable Ns No d ,
 .Nm
 will rechallenge the peer up to three times if it responds using the wrong
-one of the two protocols.  This gives the peer a chance to attempt using
-both protocols.
+one of the two protocols.
+This gives the peer a chance to attempt using both protocols.
 .Pp
 Conversely, when
 .Nm
@@ -2497,18 +2664,20 @@
 .Dq accept Ns No ed ,
 the protocols are used alternately in response to challenges.
 .Pp
-Note:  If only LANMan is enabled,
+Note: If only LANMan is enabled,
 .Xr pppd 8
-(version 2.3.5) misbehaves when acting as authenticatee.  It provides both
+(version 2.3.5) misbehaves when acting as authenticatee.
+It provides both
 the NT and the LANMan answers, but also suggests that only the NT answer
 should be used.
 .It pap
-Default: Disabled and Accepted.  PAP stands for Password Authentication
-Protocol.  Only one of PAP and CHAP (above) may be negotiated.  With
-PAP, the ID and Password are sent repeatedly to the peer until
-authentication is acknowledged or the connection is terminated.  This
-is a rather poor security mechanism.  It is only performed when the
-connection is first established.
+Default: Disabled and Accepted.
+PAP stands for Password Authentication Protocol.
+Only one of PAP and CHAP (above) may be negotiated.
+With PAP, the ID and Password are sent repeatedly to the peer until
+authentication is acknowledged or the connection is terminated.
+This is a rather poor security mechanism.
+It is only performed when the connection is first established.
 If you want to have your peer authenticate itself, you must
 .Dq enable pap .
 in
@@ -2529,29 +2698,33 @@
 .Pa /etc/ppp/ppp.conf .
 PAP is accepted by default.
 .It pred1
-Default: Enabled and Accepted.  This option decides if Predictor 1
+Default: Enabled and Accepted.
+This option decides if Predictor 1
 compression will be used by the Compression Control Protocol (CCP).
 .It protocomp
-Default: Enabled and Accepted.  This option is used to negotiate
+Default: Enabled and Accepted.
+This option is used to negotiate
 PFC (Protocol Field Compression), a mechanism where the protocol
 field number is reduced to one octet rather than two.
 .It shortseq
-Default: Enabled and Accepted.  This option determines if
+Default: Enabled and Accepted.
+This option determines if
 .Nm
 will request and accept requests for short
 .Pq 12 bit
-sequence numbers when negotiating multi-link mode.  This is only
-applicable if our MRRU is set (thus enabling multi-link).
+sequence numbers when negotiating multi-link mode.
+This is only applicable if our MRRU is set (thus enabling multi-link).
 .It vjcomp
-Default: Enabled and Accepted.  This option determines if Van Jacobson
-header compression will be used.
+Default: Enabled and Accepted.
+This option determines if Van Jacobson header compression will be used.
 .El
 .Pp
 The following options are not actually negotiated with the peer.
 Therefore, accepting or denying them makes no sense.
 .Bl -tag -width XX
 .It idcheck
-Default: Enabled.  When
+Default: Enabled.
+When
 .Nm
 exchanges low-level LCP, CCP and IPCP configuration traffic, the
 .Em Identifier
@@ -2559,17 +2732,20 @@
 By default,
 .Nm
 drops any reply packets that do not contain the expected identifier
-field, reporting the fact at the respective log level.  If
+field, reporting the fact at the respective log level.
+If
 .Ar idcheck
 is disabled,
 .Nm
 will ignore the identifier field.
 .It keep-session
-Default: Disabled.  When
+Default: Disabled.
+When
 .Nm
 runs as a Multi-link server, a different
 .Nm
-instance initially receives each connection.  After determining that
+instance initially receives each connection.
+After determining that
 the link belongs to an already existing bundle (controlled by another
 .Nm
 invocation),
@@ -2584,7 +2760,7 @@
 .Nm
 to finish with the link and deliver a signal back to the idle process.
 This prevents the confusion that results from
-.Nm ppp Ns No 's
+.Nm Ns No 's
 parent considering the link resource available again.
 .Pp
 For tty devices that have entries in
@@ -2595,42 +2771,50 @@
 .Xr sshd 8 ,
 it prevents
 .Xr sshd 8
-from exiting due to the death of its child.  As
+from exiting due to the death of its child.
+As
 .Nm
 cannot determine its parents requirements (except for the tty case), this
 option must be enabled manually depending on the circumstances.
 .It loopback
-Default: Enabled.  When
+Default: Enabled.
+When
 .Ar loopback
 is enabled,
 .Nm
 will automatically loop back packets being sent
 out with a destination address equal to that of the
 .Em PPP
-interface.  If disabled,
+interface.
+If disabled,
 .Nm
 will send the packet, probably resulting in an ICMP redirect from
-the other end.  It is convenient to have this option enabled when
+the other end.
+It is convenient to have this option enabled when
 the interface is also the default route as it avoids the necessity
 of a loopback route.
 .It passwdauth
-Default: Disabled.  Enabling this option will tell the PAP authentication
+Default: Disabled.
+Enabling this option will tell the PAP authentication
 code to use the password database (see
 .Xr passwd 5 )
 to authenticate the caller if they cannot be found in the
 .Pa /etc/ppp/ppp.secret
 file.
 .Pa /etc/ppp/ppp.secret
-is always checked first.  If you wish to use passwords from
+is always checked first.
+If you wish to use passwords from
 .Xr passwd 5 ,
 but also to specify an IP number or label for a given client, use
 .Dq \&*
 as the client password in
 .Pa /etc/ppp/ppp.secret .
 .It proxy
-Default: Disabled.  Enabling this option will tell
+Default: Disabled.
+Enabling this option will tell
 .Nm
-to proxy ARP for the peer.  This means that
+to proxy ARP for the peer.
+This means that
 .Nm
 will make an entry in the ARP table using
 .Dv HISADDR
@@ -2638,11 +2822,15 @@
 .Dv MAC
 address of the local network in which
 .Dv HISADDR
-appears.  The proxy entry cannot be made unless
+appears.
+This allows other machines connecteed to the LAN to talk to
+the peer as if the peer itself was connected to the LAN.
+The proxy entry cannot be made unless
 .Dv HISADDR
 is an address from a LAN.
 .It proxyall
-Default: Disabled.  Enabling this will tell
+Default: Disabled.
+Enabling this will tell
 .Nm
 to add proxy arp entries for every IP address in all class C or
 smaller subnets routed via the tun interface.
@@ -2650,12 +2838,14 @@
 Proxy arp entries are only made for sticky routes that are added
 using the
 .Dq add
-command.  No proxy arp entries are made for the interface address itself
+command.
+No proxy arp entries are made for the interface address itself
 (as created by the
 .Dq set ifaddr
 command).
 .It sroutes
-Default: Enabled.  When the
+Default: Enabled.
+When the
 .Dq add
 command is used with the
 .Dv HISADDR
@@ -2663,7 +2853,8 @@
 .Dv MYADDR
 values, entries are stored in the
 .Sq stick route
-list.  Each time
+list.
+Each time
 .Dv HISADDR
 or
 .Dv MYADDR
@@ -2674,34 +2865,39 @@
 .Sq stick route
 list will still be maintained.
 .It throughput
-Default: Enabled.  This option tells
+Default: Enabled.
+This option tells
 .Nm
-to gather throughput statistics.  Input and output is sampled over
-a rolling 5 second window, and current, best and total figures are
-retained.  This data is output when the relevant
+to gather throughput statistics.
+Input and output is sampled over
+a rolling 5 second window, and current, best and total figures are retained.
+This data is output when the relevant
 .Em PPP
 layer shuts down, and is also available using the
 .Dq show
-command.  Throughput statistics are available at the
+command.
+Throughput statistics are available at the
 .Dq IPCP
-and 
+and
 .Dq physical
 levels.
 .It utmp
-Default: Enabled.  Normally, when a user is authenticated using PAP or
-CHAP, and when
+Default: Enabled.
+Normally, when a user is authenticated using PAP or CHAP, and when
 .Nm
 is running in
 .Fl direct
-mode, an entry is made in the utmp and wtmp files for that user.  Disabling
-this option will tell
+mode, an entry is made in the utmp and wtmp files for that user.
+Disabling this option will tell
 .Nm
-not to make any utmp or wtmp entries.  This is usually only necessary if
+not to make any utmp or wtmp entries.
+This is usually only necessary if
 you require the user to both login and authenticate themselves.
 .It iface-alias
 Default: Enabled if
 .Fl nat
-is specified.  This option simply tells
+is specified.
+This option simply tells
 .Nm
 to add new interface addresses to the interface rather than replacing them.
 The option can only be enabled if network address translation is enabled
@@ -2729,23 +2925,24 @@
 .Op Ar gateway
 .Xc
 .Ar Dest
-is the destination IP address.  The netmask is specified either as a
-number of bits with
+is the destination IP address.
+The netmask is specified either as a number of bits with
 .Ar /nn
 or as an IP number using
 .Ar mask .
 .Ar 0 0
 or simply
 .Ar 0
-with no mask refers to the default route.  It is also possible to use the
-literal name
+with no mask refers to the default route.
+It is also possible to use the literal name
 .Sq default
 instead of
 .Ar 0 .
 .Ar Gateway
 is the next hop gateway to get to the given
 .Ar dest
-machine/network.  Refer to the
+machine/network.
+Refer to the
 .Xr route 8
 command for further details.
 .Pp
@@ -2773,27 +2970,33 @@
 for further details).
 .Pp
 Routes that contain the
-.Dq HISADDR
+.Dq HISADDR ,
+.Dq MYADDR ,
+.Dq DNS0 ,
 or
-.Dq MYADDR
+.Dq DNS1
 constants are considered
 .Sq sticky .
 They are stored in a list (use
 .Dq show ipcp
 to see the list), and each time the value of
-.Dv HISADDR
+.Dv HISADDR ,
+.Dv MYADDR ,
+.Dv DNS0 ,
 or
-.Dv MYADDR
-changes, the appropriate routing table entries are updated.  This facility
-may be disabled using
+.Dv DNS1
+changes, the appropriate routing table entries are updated.
+This facility may be disabled using
 .Dq disable sroutes .
 .It allow Ar command Op Ar args
 This command controls access to
 .Nm
-and its configuration files.  It is possible to allow user-level access,
+and its configuration files.
+It is possible to allow user-level access,
 depending on the configuration file label and on the mode that
 .Nm
-is being run in.  For example, you may wish to configure
+is being run in.
+For example, you may wish to configure
 .Nm
 so that only user
 .Sq fred
@@ -2814,10 +3017,12 @@
 If this command is used, all of the listed users are allowed access to
 the section in which the
 .Dq allow users
-command is found.  The
+command is found.
+The
 .Sq default
 section is always checked first (even though it is only ever automatically
-loaded at startup).  Each successive
+loaded at startup).
+Each successive
 .Dq allow users
 command overrides the previous one, so it's possible to allow users access
 to everything except a given label by specifying default users in the
@@ -2833,7 +3038,8 @@
 .Xc
 By default, access using any
 .Nm
-mode is possible.  If this command is used, it restricts the access
+mode is possible.
+If this command is used, it restricts the access
 .Ar modes
 allowed to load the label under which this command is specified.
 Again, as with the
@@ -2897,7 +3103,6 @@
 This option causes various NAT statistics and information to
 be logged to the file
 .Pa /var/log/alias.log .
-This file name is likely to change in the near future.
 .It nat port Ar proto Ar targetIP Ns Xo
 .No : Ns Ar targetPort Ns
 .Oo
@@ -2925,8 +3130,8 @@
 or
 .Dq udp .
 .Pp
-A range of port numbers may be specified as shown above.  The ranges
-must be of the same size.
+A range of port numbers may be specified as shown above.
+The ranges must be of the same size.
 .Pp
 If
 .Ar remoteIP
@@ -2940,50 +3145,40 @@
 This option is useful if you wish to run things like Internet phone on
 machines behind your gateway, but is limited in that connections to only
 one interior machine per source machine and target port are possible.
-.It nat pptp Op Ar addr
-This tells
-.Nm
-to translate any
-.Em G Ns No eneral
-.Em R Ns No outing
-.Em E Ns No encapsulated
-.Pq Dv IPPROTO_GRE
-packets using
-.Ar addr
-rather than the local interface address.  This allows the uses of the
-.Em P Ns No oint
-to
-.Em P Ns No oint
-.Em T Ns No unneling
-.Em P Ns No rotocol
-on a machine on the internal network.
-.Pp
-If
-.Ar addr
-is not specified,
-.Dv PPTP
-address translation is disabled.
 .It "nat proxy cmd" Ar arg Ns No ...
 This command tells
 .Nm
-to proxy certain connections, redirecting them to a given server.  Refer
-to the description of
+to proxy certain connections, redirecting them to a given server.
+Refer to the description of
 .Fn PacketAliasProxyRule
 in
 .Xr libalias 3
 for details of the available commands.
 .It nat same_ports yes|no
 When enabled, this command will tell the network address translation engine to
- attempt to avoid changing the port number on outgoing packets.  This is useful
+attempt to avoid changing the port number on outgoing packets.
+This is useful
 if you want to support protocols such as RPC and LPD which require
 connections to come from a well known port.
+.It nat target Op Ar address
+Set the given target address or clear it if no address is given.
+The target address is used by libalias to specify how to NAT incoming
+packets by default.
+If a target address is not set or if
+.Dq default
+is given, packets are not altered and are allowed to route to the internal
+network.
+.Pp
+The target address may be set to
+.Dq MYADDR ,
+in which case libalias will redirect all packets to the interface address.
 .It nat use_sockets yes|no
 When enabled, this option tells the network address translation engine to
 create a socket so that it can guarantee a correct incoming ftp data or
 IRC connection.
 .It nat unregistered_only yes|no
-Only alter outgoing packets with an unregistered source ad-
-dress.  According to RFC 1918, unregistered source addresses
+Only alter outgoing packets with an unregistered source address.
+According to RFC 1918, unregistered source addresses
 are 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16.
 .El
 .Pp
@@ -3001,11 +3196,13 @@
 .It Li AUTHNAME
 This is replaced with the local
 .Ar authname
-value.  See the
+value.
+See the
 .Dq set authname
 command below.
 .It Li ENDDISC
-This is replaced with the local endpoint discriminator value.  See the
+This is replaced with the local endpoint discriminator value.
+See the
 .Dq set enddisc
 command below.
 .It Li HISADDR
@@ -3013,8 +3210,8 @@
 .It Li INTERFACE
 This is replaced with the name of the interface that's in use.
 .It Li LABEL
-This is replaced with the last label name used.  A label may be specified
-on the
+This is replaced with the last label name used.
+A label may be specified on the
 .Nm
 command line, via the
 .Dq load
@@ -3031,8 +3228,12 @@
 This is replaced with the current process id.
 .It Li USER
 This is replaced with the username that has been authenticated with PAP or
-CHAP.  Normally, this variable is assigned only in -direct mode.  This value
-is available irrespective of whether utmp logging is enabled.
+CHAP.
+Normally, this variable is assigned only in -direct mode.
+This value is available irrespective of whether utmp logging is enabled.
+.It Li DNS0 No " & " Li DNS1
+These are replaced with the primary and secondary nameserver IP numbers.
+If nameservers are negotiated by IPCP, the values of these macros will change.
 .El
 .Pp
 These substitutions are also done by the
@@ -3049,22 +3250,25 @@
 .Dq physical
 or
 .Dq ipcp
-level.  If
+level.
+If
 .Dq physical
 is specified, context must be given (see the
 .Dq link
-command below).  If no second argument is given, all values are
-cleared.
+command below).
+If no second argument is given, all values are cleared.
 .It clone Ar name Ns Xo
 .Op \&, Ns Ar name Ns
 .No ...
 .Xc
 Clone the specified link, creating one or more new links according to the
 .Ar name
-argument(s).  This command must be used from the
+argument(s).
+This command must be used from the
 .Dq link
 command below unless you've only got a single link (in which case that
-link  becomes the default).  Links may be removed using the
+link becomes the default).
+Links may be removed using the
 .Dq remove
 command below.
 .Pp
@@ -3072,23 +3276,27 @@
 .Dq deflink .
 .It close Op lcp|ccp Ns Op \&!
 If no arguments are given, the relevant protocol layers will be brought
-down and the link will be closed.  If
+down and the link will be closed.
+If
 .Dq lcp
 is specified, the LCP layer is brought down, but
 .Nm
-will not bring the link offline.  It is subsequently possible to use
+will not bring the link offline.
+It is subsequently possible to use
 .Dq term
 .Pq see below
 to talk to the peer machine if, for example, something like
 .Dq slirp
-is being used.  If
+is being used.
+If
 .Dq ccp
-is specified, only the relevant compression layer is closed.  If the
+is specified, only the relevant compression layer is closed.
+If the
 .Dq \&!
 is used, the compression layer will remain in the closed state, otherwise
 it will re-enter the STOPPED state, waiting for the peer to initiate
-further CCP negotiation.  In any event, this command does not disconnect
-the user from
+further CCP negotiation.
+In any event, this command does not disconnect the user from
 .Nm
 or exit
 .Nm ppp .
@@ -3101,14 +3309,16 @@
 .Xc
 This command deletes the route with the given
 .Ar dest
-IP address.  If
+IP address.
+If
 .Ar dest
 is specified as
 .Sq ALL ,
 all non-direct entries in the routing table for the current interface,
 and all
 .Sq sticky route
-entries are deleted.  If
+entries are deleted.
+If
 .Ar dest
 is specified as
 .Sq default ,
@@ -3130,19 +3340,24 @@
 and is provided for backwards compatibility.
 .It down Op Ar lcp|ccp
 Bring the relevant layer down ungracefully, as if the underlying layer
-had become unavailable.  It's not considered polite to use this command on
-a Finite State Machine that's in the OPEN state.  If no arguments are
+had become unavailable.
+It's not considered polite to use this command on
+a Finite State Machine that's in the OPEN state.
+If no arguments are
 supplied, the entire link is closed (or if no context is given, all links
-are terminated).  If
+are terminated).
+If
 .Sq lcp
 is specified, the
 .Em LCP
 layer is terminated but the device is not brought offline and the link
-is not closed.  If
+is not closed.
+If
 .Sq ccp
 is specified, only the relevant compression layer(s) are terminated.
 .It help|? Op Ar command
-Show a list of available commands.  If
+Show a list of available commands.
+If
 .Ar command
 is specified, show the usage string for that command.
 .It iface Ar command Op args
@@ -3164,7 +3379,8 @@
 .Xc
 Add the given
 .Ar addr mask peer
-combination to the interface.  Instead of specifying
+combination to the interface.
+Instead of specifying
 .Ar mask ,
 .Ar /bits
 can be used
@@ -3193,7 +3409,8 @@
 is in the OPENED state or while in
 .Fl auto
 mode, all addresses except for the IPCP negotiated address are deleted
-from the interface.  If
+from the interface.
+If
 .Nm
 is not in the OPENED state and is not in
 .Fl auto
@@ -3206,20 +3423,22 @@
 .Xc
 This command deletes the given
 .Ar addr
-from the interface.  If the
+from the interface.
+If the
 .Dq \&!
 is used, no error is given if the address isn't currently assigned to
 the interface (and no deletion takes place).
 .It iface show
-Shows the current state and current addresses for the interface.  It is
-much the same as running
+Shows the current state and current addresses for the interface.
+It is much the same as running
 .Dq ifconfig INTERFACE .
 .It iface help Op Ar sub-command
 This command, when invoked without
 .Ar sub-command ,
 will show a list of possible
 .Dq iface
-sub-commands and a brief synopsis for each.  When invoked with
+sub-commands and a brief synopsis for each.
+When invoked with
 .Ar sub-command ,
 only the synopsis for the given sub-command is shown.
 .El
@@ -3229,18 +3448,20 @@
 .No ... Ar command Op Ar args
 .Xc
 This command may prefix any other command if the user wishes to
-specify which link the command should affect.  This is only
-applicable after multiple links have been created in Multi-link
+specify which link the command should affect.
+This is only applicable after multiple links have been created in Multi-link
 mode using the
 .Dq clone
 command.
 .Pp
 .Ar Name
-specifies the name of an existing link.  If
+specifies the name of an existing link.
+If
 .Ar name
 is a comma separated list,
 .Ar command
-is executed on each link.  If
+is executed on each link.
+If
 .Ar name
 is
 .Dq * ,
@@ -3253,7 +3474,8 @@
 .Ar label Ns No (s)
 from the
 .Pa ppp.conf
-file.  If
+file.
+If
 .Ar label
 is not given, the
 .Ar default
@@ -3272,8 +3494,8 @@
 .It open Op lcp|ccp|ipcp
 This is the opposite of the
 .Dq close
-command.  All closed links are immediately brought up apart from second
-and subsequent
+command.
+All closed links are immediately brought up apart from second and subsequent
 .Ar demand-dial
 links - these will come up based on the
 .Dq set autoload
@@ -3282,15 +3504,17 @@
 If the
 .Dq lcp
 argument is used while the LCP layer is already open, LCP will be
-renegotiated.  This allows various LCP options to be changed, after which
+renegotiated.
+This allows various LCP options to be changed, after which
 .Dq open lcp
-can be used to put them into effect.  After renegotiating LCP,
+can be used to put them into effect.
+After renegotiating LCP,
 any agreed authentication will also take place.
 .Pp
 If the
 .Dq ccp
-argument is used, the relevant compression layer is opened.  Again,
-if it is already open, it will be renegotiated.
+argument is used, the relevant compression layer is opened.
+Again, if it is already open, it will be renegotiated.
 .Pp
 If the
 .Dq ipcp
@@ -3306,14 +3530,15 @@
 .It passwd Ar pass
 Specify the password required for access to the full
 .Nm
-command set.  This password is required when connecting to the diagnostic
-port (see the
+command set.
+This password is required when connecting to the diagnostic port (see the
 .Dq set server
 command).
 .Ar Pass
 is specified on the
 .Dq set server
-command line.  The value of
+command line.
+The value of
 .Ar pass
 is not logged when
 .Ar command
@@ -3324,7 +3549,8 @@
 If
 .Dq quit
 is executed from the controlling connection or from a command file,
-ppp will exit after closing all connections.  Otherwise, if the user
+ppp will exit after closing all connections.
+Otherwise, if the user
 is connected to a diagnostic socket, the connection is simply dropped.
 .Pp
 If the
@@ -3334,9 +3560,9 @@
 will exit despite the source of the command after closing all existing
 connections.
 .It remove|rm
-This command removes the given link.  It is only really useful in
-multi-link mode.  A link must be
-in the
+This command removes the given link.
+It is only really useful in multi-link mode.
+A link must be in the
 .Dv CLOSED
 state before it is removed.
 .It rename|mv Ar name
@@ -3354,6 +3580,77 @@
 or
 .Sq USR
 may make the log file more readable.
+.It resolv Ar command
+This command controls
+.Nm Ns No 's
+manipulation of the
+.Xr resolv.conf 5
+file.
+When
+.Nm
+starts up, it loads the contents of this file into memory and retains this
+image for future use.
+.Ar command
+is one of the following:
+.Bl -tag -width readonly
+.It Em readonly
+Treat
+.Pa /etc/resolv.conf
+as read only.
+If
+.Dq dns
+is enabled,
+.Nm
+will still attempt to negotiate nameservers with the peer, making the results
+available via the
+.Dv DNS0
+and
+.Dv DNS1
+macros.
+This is the opposite of the
+.Dq resolv writable
+command.
+.It Em reload
+Reload
+.Pa /etc/resolv.conf
+into memory.
+This may be necessary if for example a DHCP client overwrote
+.Pa /etc/resolv.conf .
+.It Em restore
+Replace
+.Pa /etc/resolv.conf
+with the version originally read at startup or with the last
+.Dq resolv reload
+command.
+This is sometimes a useful command to put in the
+.Pa /etc/ppp/ppp.linkdown
+file.
+.It Em rewrite
+Rewrite the
+.Pa /etc/resolv.conf
+file.
+This command will work even if the
+.Dq resolv readonly
+command has been used.
+It may be useful as a command in the
+.Pa /etc/ppp/ppp.linkup
+file if you wish to defer updating
+.Pa /etc/resolv.conf
+until after other commands have finished.
+.It Em writable
+Allow
+.Nm
+to update
+.Pa /etc/resolv.conf
+if
+.Dq dns
+is enabled and
+.Nm
+successfully negotiates a DNS.
+This is the opposite of the
+.Dq resolv readonly
+command.
+.El
 .It save
 This option is not (yet) implemented.
 .It set Ns Xo
@@ -3363,7 +3660,8 @@
 This option allows the setting of any of the following variables:
 .Bl -tag -width XX
 .It set accmap Ar hex-value
-ACCMap stands for Asynchronous Control Character Map.  This is always
+ACCMap stands for Asynchronous Control Character Map.
+This is always
 negotiated with the peer, and defaults to a value of 00000000 in hex.
 This protocol is required to defeat hardware that depends on passing
 certain characters from end to end (such as XON/XOFF etc).
@@ -3374,10 +3672,12 @@
 .No key Ar value
 .Xc
 This sets the authentication key (or password) used in client mode
-PAP or CHAP negotiation to the given value.  It also specifies the
+PAP or CHAP negotiation to the given value.
+It also specifies the
 password to be used in the dial or login scripts in place of the
 .Sq \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\P
-sequence, preventing the actual password from being logged.  If
+sequence, preventing the actual password from being logged.
+If
 .Ar command
 or
 .Ar chat
@@ -3404,7 +3704,8 @@
 .Ar value
 is parsed as a program to execute in the same was as the
 .Dq !bg
-command above, substituting special names in the same manner.  Once executed,
+command above, substituting special names in the same manner.
+Once executed,
 .Nm
 will feed the program three lines of input, each terminated by a newline
 character:
@@ -3434,7 +3735,8 @@
 When configuring
 .Nm
 in this manner, it's expected that the host challenge is a series of ASCII
-digits or characters.  An encryption device or Secure ID card is usually
+digits or characters.
+An encryption device or Secure ID card is usually
 required to calculate the secret appropriate for the given challenge.
 .It set authname Ar id
 This sets the authentication id used in client mode PAP or CHAP negotiation.
@@ -3455,13 +3757,15 @@
 .Pq also known as Fl auto
 mode link is available, only the first link is made active when
 .Nm
-first reads data from the tun device.  The next
+first reads data from the tun device.
+The next
 .Ar demand-dial
 link will be opened only when the current bundle throughput is at least
 .Ar max-percent
 percent of the total bundle bandwidth for
 .Ar period
-seconds.  When the current bundle throughput decreases to
+seconds.
+When the current bundle throughput decreases to
 .Ar min-percent
 percent or less of the total bundle bandwidth for
 .Ar period
@@ -3484,7 +3788,8 @@
 .It set bandwidth Ar value
 This command sets the connection bandwidth in bits per second.
 .Ar value
-must be greater than zero.  It is currently only used by the
+must be greater than zero.
+It is currently only used by the
 .Dq set autoload
 command above.
 .It set callback Ar option Ns No ...
@@ -3510,7 +3815,8 @@
 .Nm
 will accept any of the given protocols - but the client
 .Em must
-request one of them.  If you wish callback to be optional, you must include
+request one of them.
+If you wish callback to be optional, you must include
 .Ar none
 as an option.
 .Pp
@@ -3521,13 +3827,15 @@
 .Bl -tag -width Ds
 .It auth
 The callee is expected to decide the callback number based on
-authentication.  If
+authentication.
+If
 .Nm
 is the callee, the number should be specified as the fifth field of
 the peers entry in
 .Pa /etc/ppp/ppp.secret .
 .It cbcp
-Microsofts callback control protocol is used.  See
+Microsoft's callback control protocol is used.
+See
 .Dq set cbcp
 below.
 .Pp
@@ -3551,7 +3859,8 @@
 .Ar number
 should be either a comma separated list of allowable numbers or a
 .Dq \&* ,
-meaning any number is permitted.  If
+meaning any number is permitted.
+If
 .Nm
 is the caller, only a single number should be specified.
 .Pp
@@ -3565,7 +3874,8 @@
 If the peer does not wish to do callback at all,
 .Nm
 will accept the fact and continue without callback rather than terminating
-the connection.  This is required (in addition to one or more other callback
+the connection.
+This is required (in addition to one or more other callback
 options) if you wish callback to be optional.
 .El
 .Pp
@@ -3578,7 +3888,7 @@
 .Op Ar delay Op Ar retry
 .Oc
 .Xc
-If no arguments are given, CBCP (Microsofts CallBack Control Protocol)
+If no arguments are given, CBCP (Microsoft's CallBack Control Protocol)
 is disabled - ie, configuring CBCP in the
 .Dq set callback
 command will result in
@@ -3613,8 +3923,8 @@
 that has been opened:
 .Bl -tag -width XXX -offset XXX
 .It Terminal Devices
-Carrier is checked one second after the login script is complete.  If it's
-not set,
+Carrier is checked one second after the login script is complete.
+If it's not set,
 .Nm
 assumes that this is because the device doesn't support carrier (which
 is true for most
@@ -3625,21 +3935,27 @@
 As ptys don't support the TIOCMGET ioctl, the tty device will switch all
 carrier detection off when it detects that the device is a pty.
 .It ISDN (i4b) Devices
-Carrier is checked once per second for 6 seconds.  If it's not set after
+Carrier is checked once per second for 6 seconds.
+If it's not set after
 the sixth second, the connection attempt is considered to have failed and
-the device is closed.  Carrier is always required for i4b devices.
+the device is closed.
+Carrier is always required for i4b devices.
 .It PPPoE (netgraph) Devices
-Carrier is checked once per second for 5 seconds.  If it's not set after
+Carrier is checked once per second for 5 seconds.
+If it's not set after
 the fifth second, the connection attempt is considered to have failed and
-the device is closed.  Carrier is always required for PPPoE devices.
+the device is closed.
+Carrier is always required for PPPoE devices.
 .El
 .Pp
-All other device types don't support carrier.  Setting a carrier value will
+All other device types don't support carrier.
+Setting a carrier value will
 result in a warning when the device is opened.
 .Pp
 Some modems take more than one second after connecting to assert the carrier
-signal.  If this delay isn't increased, this will result in
-.Nm ppp Ns No s
+signal.
+If this delay isn't increased, this will result in
+.Nm Ns No 's
 inability to detect when the link is dropped, as
 .Nm
 assumes that the device isn't asserting carrier.
@@ -3676,7 +3992,8 @@
 .Nm
 will
 .Em require
-carrier.  If carrier is not detected after
+carrier.
+If carrier is not detected after
 .Ar seconds
 seconds, the link will be disconnected.
 .It set choked Op Ar timeout
@@ -3695,7 +4012,8 @@
 has read a certain number of packets from the local network for transmission,
 but cannot send the data due to link failure (the peer is busy etc.).
 .Nm
-will not read packets indefinitely.  Instead, it reads up to
+will not read packets indefinitely.
+Instead, it reads up to
 .Em 30
 packets (or
 .Em 30 No +
@@ -3710,12 +4028,14 @@
 .Ar timeout
 seconds pass, all pending output packets are dropped.
 .It set ctsrts|crtscts on|off
-This sets hardware flow control.  Hardware flow control is
+This sets hardware flow control.
+Hardware flow control is
 .Ar on
 by default.
 .It set deflate Ar out-winsize Op Ar in-winsize
 This sets the DEFLATE algorithms default outgoing and incoming window
-sizes.  Both
+sizes.
+Both
 .Ar out-winsize
 and
 .Ar in-winsize
@@ -3732,10 +4052,11 @@
 .It set dns Op Ar primary Op Ar secondary
 This command specifies DNS overrides for the
 .Dq accept dns
-command.  Refer to the
+command.
+Refer to the
 .Dq accept
-command description above for details.  This command does not affect the
-IP numbers requested using
+command description above for details.
+This command does not affect the IP numbers requested using
 .Dq enable dns .
 .It set device|line Xo
 .Ar value Ns No ...
@@ -3769,7 +4090,8 @@
 .Pp
 If it begins with an exclamation mark, the rest of the device name is
 treated as a program name, and that program is executed when the device
-is opened.  Standard input, output and error are fed back to
+is opened.
+Standard input, output and error are fed back to
 .Nm
 and are read and written as if they were a regular device.
 .Pp
@@ -3783,10 +4105,13 @@
 .Em PPP
 over Ethernet connection using the given
 .Ar iface
-interface.  The given
+interface.
+The given
 .Ar provider
 is passed as the service name in the PPPoE Discovery Initiation (PADI)
-packet.  If no provider is given, an empty value will be used.  Refer to
+packet.
+If no provider is given, an empty value will be used.
+Refer to
 .Xr netgraph 4
 and
 .Xr ng_pppoe 8
@@ -3820,9 +4145,11 @@
 devices.
 .It set dial Ar chat-script
 This specifies the chat script that will be used to dial the other
-side.  See also the
+side.
+See also the
 .Dq set login
-command below.  Refer to
+command below.
+Refer to
 .Xr chat 8
 and to the example configuration files for details of the chat script
 format.
@@ -3884,7 +4211,8 @@
 .Dq set device
 command), and standard error is read by
 .Nm
-and substituted as the expect or send string.  If
+and substituted as the expect or send string.
+If
 .Nm
 is running in interactive mode, file descriptor 3 is attached to
 .Pa /dev/tty .
@@ -3902,8 +4230,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
@@ -3914,20 +4242,23 @@
 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!
 .Ed
 .Pp
 Note (again) the use of the escape character, allowing many levels of
-nesting.  Here, there are four parsers at work.  The first parses the
-original line, reading it as three arguments.  The second parses the
-third argument, reading it as 11 arguments.  At this point, it is
+nesting.
+Here, there are four parsers at work.
+The first parses the original line, reading it as three arguments.
+The second parses the third argument, reading it as 11 arguments.
+At this point, it is
 important that the
 .Dq \&-
 signs are escaped, otherwise this parser will see them as constituting
-an expect-send-expect sequence.  When the
+an expect-send-expect sequence.
+When the
 .Dq \&!
 character is seen, the execution parser reads the first command as three
 arguments, and then
@@ -3942,7 +4273,8 @@
 .Pp
 This, of course means that it is possible to execute an entirely external
 .Dq chat
-command rather than using the internal one.  See
+command rather than using the internal one.
+See
 .Xr chat 8
 for a good alternative.
 .Pp
@@ -3951,26 +4283,30 @@
 .Dq !bg
 command.
 .It set enddisc Op label|IP|MAC|magic|psn value
-This command sets our local endpoint discriminator.  If set prior to
-LCP negotiation, and if no
+This command sets our local endpoint discriminator.
+If set prior to LCP negotiation, and if no
 .Dq disable enddisc
 command has been used,
 .Nm
 will send the information to the peer using the LCP endpoint discriminator
-option.  The following discriminators may be set:
+option.
+The following discriminators may be set:
 .Bd -unfilled -offset indent
 .It Li label
 The current label is used.
 .It Li IP
-Our local IP number is used.  As LCP is negotiated prior to IPCP, it is
-possible that the IPCP layer will subsequently change this value.  If
+Our local IP number is used.
+As LCP is negotiated prior to IPCP, it is
+possible that the IPCP layer will subsequently change this value.
+If
 it does, the endpoint discriminator stays at the old value unless manually
 reset.
 .It Li MAC
 This is similar to the
 .Ar IP
 option above, except that the MAC address associated with the local IP
-number is used.  If the local IP number is not resident on any Ethernet
+number is used.
+If the local IP number is not resident on any Ethernet
 interface, the command will fail.
 .Pp
 As the local IP number defaults to whatever the machine host name is,
@@ -3979,14 +4315,14 @@
 .Dq set ifaddr
 commands.
 .It Li magic
-A 20 digit random number is used.  Care should be taken when using magic
-numbers as restarting
+A 20 digit random number is used.
+Care should be taken when using magic numbers as restarting
 .Nm
 or creating a link using a different
 .Nm
 invocation will also use a different magic number and will therefore not
-be recognised by the peer as belonging to the same bundle.  This makes it
-unsuitable for
+be recognised by the peer as belonging to the same bundle.
+This makes it unsuitable for
 .Fl direct
 connections.
 .It Li psn Ar value
@@ -4002,8 +4338,8 @@
 .It set escape Ar value...
 This option is similar to the
 .Dq set accmap
-option above.  It allows the user to specify a set of characters that
-will be
+option above.
+It allows the user to specify a set of characters that will be
 .Sq escaped
 as they travel across the link.
 .It set filter dial|alive|in|out Ar rule-no Xo
@@ -4020,16 +4356,19 @@
 .Oc
 .Xc
 .Nm
-supports four filter sets.  The
+supports four filter sets.
+The
 .Em alive
 filter specifies packets that keep the connection alive - resetting the
-idle timer.  The
+idle timer.
+The
 .Em dial
 filter specifies packets that cause
 .Nm
 to dial when in
 .Fl auto
-mode.  The
+mode.
+The
 .Em in
 filter specifies packets that are allowed to travel
 into the machine and the
@@ -4038,29 +4377,35 @@
 .Pp
 Filtering is done prior to any IP alterations that might be done by the
 NAT engine on outgoing packets and after any IP alterations that might
-be done by the NAT engine on incoming packets.  By default all filter
-sets allow all packets to pass.  Rules are processed in order according to
+be done by the NAT engine on incoming packets.
+By default all filter sets allow all packets to pass.
+Rules are processed in order according to
 .Ar rule-no
 (unless skipped by specifying a rule number as the
 .Ar action ) .
-Up to 40 rules may be given for each set.  If a packet doesn't match
-any of the rules in a given set, it is discarded.  In the case of
+Up to 40 rules may be given for each set.
+If a packet doesn't match
+any of the rules in a given set, it is discarded.
+In the case of
 .Em in
 and
 .Em out
-filters, this means that the packet is dropped.  In the case of
+filters, this means that the packet is dropped.
+In the case of
 .Em alive
 filters it means that the packet will not reset the idle timer and in
 the case of
 .Em dial
-filters it means that the packet will not trigger a dial.  A packet failing
-to trigger a dial will be dropped rather than queued.  Refer to the
+filters it means that the packet will not trigger a dial.
+A packet failing to trigger a dial will be dropped rather than queued.
+Refer to the
 section on
 .Sx PACKET FILTERING
 above for further details.
 .It set hangup Ar chat-script
 This specifies the chat script that will be used to reset the device
-before it is closed.  It should not normally be necessary, but can
+before it is closed.
+It should not normally be necessary, but can
 be used for devices that fail to reset themselves properly on close.
 .It set help|? Op Ar command
 This command gives a summary of available set commands, or if
@@ -4074,7 +4419,8 @@
 .Oc Oc
 .Oc
 This command specifies the IP addresses that will be used during
-IPCP negotiation.  Addresses are specified using the format
+IPCP negotiation.
+Addresses are specified using the format
 .Pp
 .Dl a.b.c.d/nn
 .Pp
@@ -4082,7 +4428,8 @@
 .Dq a.b.c.d
 is the preferred IP, but
 .Ar nn
-specifies how many bits of the address we will insist on.  If
+specifies how many bits of the address we will insist on.
+If
 .No / Ns Ar nn
 is omitted, it defaults to
 .Dq /32
@@ -4107,10 +4454,12 @@
 will only negotiate
 .Dq 10.0.0.1
 as the local IP number, but may assign any of the given 10 IP
-numbers to the peer.  If the peer requests one of these numbers,
+numbers to the peer.
+If the peer requests one of these numbers,
 and that number is not already in use,
 .Nm
-will grant the peers request.  This is useful if the peer wants
+will grant the peers request.
+This is useful if the peer wants
 to re-establish a link using the same IP number as was previously
 allocated (thus maintaining any existing tcp or udp connections).
 .Pp
@@ -4123,9 +4472,11 @@
 .Ar triggeraddr
 is specified, it is used in place of
 .Ar myaddr
-in the initial IPCP negotiation.  However, only an address in the
+in the initial IPCP negotiation.
+However, only an address in the
 .Ar myaddr
-range will be accepted.  This is useful when negotiating with some
+range will be accepted.
+This is useful when negotiating with some
 .Dv PPP
 implementations that will not assign an IP number unless their peer
 requests
@@ -4137,7 +4488,8 @@
 .Nm
 will configure the interface immediately upon reading the
 .Dq set ifaddr
-line in the config file.  In any other mode, these values are just
+line in the config file.
+In any other mode, these values are just
 used for IPCP negotiations, and the interface isn't configured
 until the IPCP layer is up.
 .Pp
@@ -4155,6 +4507,26 @@
 .Nm
 will try to maintain the interface IP numbers so that any existing
 bound sockets will remain valid.
+.It set ifqueue Ar packets
+Set the maximum number of packets that
+.Nm
+will read from the tunnel interface while data cannot be sent to any of
+the available links.
+This queue limit is necessary to flow control outgoing data as the tunnel
+interface is likely to be far faster than the combined links available to
+.Nm ppp .
+.Pp
+If
+.Ar packets
+is set to a value less than the number of links,
+.Nm
+will read up to that value regardless.
+This prevents any possible latency problems.
+.Pp
+The default value for
+.Ar packets
+is
+.Dq 30 .
 .It set ccpretry|ccpretries Oo Ar timeout
 .Op Ar reqtries Op Ar trmtries
 .Oc
@@ -4182,7 +4554,8 @@
 is specified, it tells
 .Nm
 how many configuration request attempts it should make while receiving
-no reply from the peer before giving up.  The default is 5 attempts for
+no reply from the peer before giving up.
+The default is 5 attempts for
 CCP, LCP and IPCP and 3 attempts for PAP and CHAP.
 .Pp
 If
@@ -4190,7 +4563,9 @@
 is specified, it tells
 .Nm
 how many terminate requests should be sent before giving up waiting for the
-peers response.  The default is 3 attempts.  Authentication protocols are
+peers response.
+The default is 3 attempts.
+Authentication protocols are
 not terminated and it is therefore invalid to specify
 .Ar trmtries
 for PAP or CHAP.
@@ -4205,17 +4580,19 @@
 .Op +|- Ns
 .Ar value Ns No ...
 .Xc
-This command allows the adjustment of the current log level.  Refer
-to the Logging Facility section for further details.
+This command allows the adjustment of the current log level.
+Refer to the Logging Facility section for further details.
 .It set login Ar chat-script
 This
 .Ar chat-script
-compliments the dial-script.  If both are specified, the login
-script will be executed after the dial script.  Escape sequences
-available in the dial script are also available here.
+compliments the dial-script.
+If both are specified, the login
+script will be executed after the dial script.
+Escape sequences available in the dial script are also available here.
 .It set logout Ar chat-script
 This specifies the chat script that will be used to logout
-before the hangup script is called.  It should not normally be necessary.
+before the hangup script is called.
+It should not normally be necessary.
 .It set lqrperiod Ar frequency
 This command sets the
 .Ar frequency
@@ -4223,13 +4600,16 @@
 .Em LQR
 or
 .Em ECHO LQR
-packets are sent.  The default is 30 seconds.  You must also use the
+packets are sent.
+The default is 30 seconds.
+You must also use the
 .Dq enable lqr
 command if you wish to send LQR requests to the peer.
 .It set mode Ar interactive|auto|ddial|background
 This command allows you to change the
 .Sq mode
-of the specified link.  This is normally only useful in multi-link mode,
+of the specified link.
+This is normally only useful in multi-link mode,
 but may also be used in uni-link mode.
 .Pp
 It is not possible to change a link that is
@@ -4241,33 +4621,37 @@
 .Dq set mode auto ,
 and have network address translation enabled, it may be useful to
 .Dq enable iface-alias
-afterwards.  This will allow
+afterwards.
+This will allow
 .Nm
 to do the necessary address translations to enable the process that
 triggers the connection to connect once the link is up despite the
 peer assigning us a new (dynamic) IP address.
 .It set mrru Op Ar value
 Setting this option enables Multi-link PPP negotiations, also known as
-Multi-link Protocol or MP.  There is no default MRRU (Maximum
-Reconstructed Receive Unit) value.  If no argument is given, multi-link
-mode is disabled.
+Multi-link Protocol or MP.
+There is no default MRRU (Maximum Reconstructed Receive Unit) value.
+If no argument is given, multi-link mode is disabled.
 .It set mru Op Ar value
-The default MRU (Maximum Receive Unit) is 1500.  If it is increased, the
-other side *may* increase its mtu.  There is no point in decreasing the
-MRU to below the default as the
+The default MRU (Maximum Receive Unit) is 1500.
+If it is increased, the other side *may* increase its MTU.
+There is no point in decreasing the MRU to below the default as the
 .Em PPP
-protocol *must* be able to accept packets of at least 1500 octets.  If
-no argument is given, 1500 is assumed.
+protocol *must* be able to accept packets of at least 1500 octets.
+If no argument is given, 1500 is assumed.
 .It set mtu Op Ar value
-The default MTU is 1500.  At negotiation time,
+The default MTU is 1500.
+At negotiation time,
 .Nm
 will accept whatever MRU or MRRU that the peer wants (assuming it's
-not less than 296 bytes).  If the MTU is set,
+not less than 296 bytes).
+If the MTU is set,
 .Nm
 will not accept MRU/MRRU values less than
 .Ar value .
 When negotiations are complete, the MTU is assigned to the interface, even
-if the peer requested a higher value MRU/MRRU.  This can be useful for
+if the peer requested a higher value MRU/MRRU.
+This can be useful for
 limiting your packet size (giving better bandwidth sharing at the expense
 of more header data).
 .Pp
@@ -4276,7 +4660,8 @@
 is given, 1500, or whatever the peer asks for is used.
 .It set nbns Op Ar x.x.x.x Op Ar y.y.y.y
 This option allows the setting of the Microsoft NetBIOS name server
-values to be returned at the peers request.  If no values are given,
+values to be returned at the peers request.
+If no values are given,
 .Nm
 will reject any such requests.
 .It set openmode active|passive Op Ar delay
@@ -4289,7 +4674,8 @@
 That is,
 .Nm
 will always initiate LCP/IPCP/CCP negotiation one second after the line
-comes up.  If you want to wait for the peer to initiate negotiations, you
+comes up.
+If you want to wait for the peer to initiate negotiations, you
 can use the value
 .Ar passive .
 If you want to initiate negotiations immediately or after more than one
@@ -4297,7 +4683,8 @@
 .Ar delay
 may be specified here in seconds.
 .It set parity odd|even|none|mark
-This allows the line parity to be set.  The default value is
+This allows the line parity to be set.
+The default value is
 .Ar none .
 .It set phone Ar telno Ns Xo
 .Oo \&| Ns Ar backupnumber
@@ -4322,7 +4709,8 @@
 will dial them according to these rules until a connection is made, retrying
 the maximum number of times specified by
 .Dq set redial
-below.  In
+below.
+In
 .Fl background
 mode, each number is attempted at most once.
 .It set Op proc Ns Xo
@@ -4334,7 +4722,8 @@
 .Ar value .
 If
 .Ar value
-is not specified, the original process title is restored.  All the
+is not specified, the original process title is restored.
+All the
 word replacements done by the shell commands (see the
 .Dq bg
 command above) are done here too.
@@ -4425,8 +4814,8 @@
 .Dv HISADDR .
 .Pp
 All RADIUS routes are applied after any sticky routes are applied, making
-RADIUS routes override configured routes.  This also applies for RADIUS
-routes that don't include the
+RADIUS routes override configured routes.
+This also applies for RADIUS routes that don't include the
 .Dv MYADDR
 or
 .Dv HISADDR
@@ -4443,14 +4832,16 @@
 .Ar ntries
 times.
 .Ar Ntries
-defaults to zero.  A value of
+defaults to zero.
+A value of
 .Ar random
 for
 .Ar timeout
 will result in a variable pause, somewhere between 1 and 30 seconds.
 .It set recvpipe Op Ar value
-This sets the routing table RECVPIPE value.  The optimum value is
-just over twice the MTU value.  If
+This sets the routing table RECVPIPE value.
+The optimum value is just over twice the MTU value.
+If
 .Ar value
 is unspecified or zero, the default kernel controlled value is used.
 .It set redial Ar secs Ns Xo
@@ -4462,13 +4853,16 @@
 .Nm
 can be instructed to attempt to redial
 .Ar attempts
-times.  If more than one phone number is specified (see
+times.
+If more than one phone number is specified (see
 .Dq set phone
 above), a pause of
 .Ar next
-is taken before dialing each number.  A pause of
+is taken before dialing each number.
+A pause of
 .Ar secs
-is taken before starting at the first number again.  A literal value of
+is taken before starting at the first number again.
+A literal value of
 .Dq Li random
 may be used here in place of
 .Ar secs
@@ -4495,16 +4889,19 @@
 delay will be effective, even after
 .Ar attempts
 has been exceeded, so an immediate manual dial may appear to have
-done nothing.  If an immediate dial is required, a
+done nothing.
+If an immediate dial is required, a
 .Dq \&!
 should immediately follow the
 .Dq open
-keyword.  See the
+keyword.
+See the
 .Dq open
 description above for further details.
 .It set sendpipe Op Ar value
-This sets the routing table SENDPIPE value.  The optimum value is
-just over twice the MTU value.  If
+This sets the routing table SENDPIPE value.
+The optimum value is just over twice the MTU value.
+If
 .Ar value
 is unspecified or zero, the default kernel controlled value is used.
 .It set server|socket Ar TcpPort|LocalName|none password Op Ar mask
@@ -4523,23 +4920,27 @@
 If you wish to specify a local domain socket,
 .Ar LocalName
 must be specified as an absolute file name, otherwise it is assumed
-to be the name or number of a TCP port.  You must specify the octal umask
-to be used with a local domain socket.  Refer to
+to be the name or number of a TCP port.
+You must specify the octal umask to be used with a local domain socket.
+Refer to
 .Xr umask 2
-for umask details.  Refer to
+for umask details.
+Refer to
 .Xr services 5
 for details of how to translate TCP port names.
 .Pp
 You must also specify the password that must be entered by the client
 (using the
 .Dq passwd
-command above) when connecting to this socket.  If the password is
+command above) when connecting to this socket.
+If the password is
 specified as an empty string, no password is required for connecting clients.
 .Pp
 When specifying a local domain socket, the first
 .Dq %d
 sequence found in the socket name will be replaced with the current
-interface unit number.  This is useful when you wish to use the same
+interface unit number.
+This is useful when you wish to use the same
 profile for more than one connection.
 .Pp
 In a similar manner TCP sockets may be prefixed with the
@@ -4551,19 +4952,22 @@
 .Nm
 with a server socket, the
 .Xr pppctl 8
-command is the preferred mechanism of communications.  Currently,
+command is the preferred mechanism of communications.
+Currently,
 .Xr telnet 1
 can also be used, but link encryption may be implemented in the future, so
 .Xr telnet 1
 should not be relied upon.
 .It set speed Ar value
-This sets the speed of the serial device.  If speed is specified as
+This sets the speed of the serial device.
+If speed is specified as
 .Dq sync ,
 .Nm
 treats the device as a synchronous device.
 .Pp
 Certain device types will know whether they should be specified as
-synchronous or asynchronous.  These devices will override incorrect
+synchronous or asynchronous.
+These devices will override incorrect
 settings and log a warning to this effect.
 .It set stopped Op Ar LCPseconds Op Ar CCPseconds
 If this option is set,
@@ -4573,10 +4977,12 @@
 .Dq seconds .
 This option may be useful if the peer sends a terminate request,
 but never actually closes the connection despite our sending a terminate
-acknowledgement.  This is also useful if you wish to
+acknowledgement.
+This is also useful if you wish to
 .Dq set openmode passive
 and time out if the peer doesn't send a Configure Request within the
-given time.  Use
+given time.
+Use
 .Dq set log +lcp +ccp
 to make
 .Nm
@@ -4590,8 +4996,8 @@
 .Dq set openmode
 above).
 .It set timeout Ar idleseconds Op Ar mintimeout
-This command allows the setting of the idle timer.  Refer to the
-section titled
+This command allows the setting of the idle timer.
+Refer to the section titled
 .Sx SETTING THE IDLE TIMER
 for further details.
 .Pp
@@ -4602,16 +5008,18 @@
 will never idle out before the link has been up for at least that number
 of seconds.
 .It set urgent Xo
-.Op tcp|udp
+.Op tcp|udp|none
 .Oo Op +|- Ns
 .Ar port
 .Oc No ...
 .Xc
 This command controls the ports that
 .Nm
-prioritizes when transmitting data.  The default priority TCP ports
+prioritizes when transmitting data.
+The default priority TCP ports
 are ports 21 (ftp control), 22 (ssh), 23 (telnet), 513 (login), 514 (shell),
-543 (klogin) and 544 (kshell).  There are no priority UDP ports by default.
+543 (klogin) and 544 (kshell).
+There are no priority UDP ports by default.
 See
 .Xr services 5
 for details.
@@ -4630,7 +5038,8 @@
 .Dq tcp
 or
 .Dq udp
-is specified, only that list is cleared).  If the first
+is specified, only that list is cleared).
+If the first
 .Ar port
 argument is prefixed with a plus
 .Pq Dq \&+
@@ -4641,18 +5050,25 @@
 prefixed with a plus or not prefixed at all are added to the list and
 .Ar port Ns No s
 prefixed with a minus are removed from the list.
+.Pp
+If
+.Dq none
+is specified, all priority port lists are disabled and even
+.Dv IPTOS_LOWDELAY
+packets are not prioritised.
 .It set vj slotcomp on|off
 This command tells
 .Nm
-whether it should attempt to negotiate VJ slot compression.  By default,
-slot compression is turned
+whether it should attempt to negotiate VJ slot compression.
+By default, slot compression is turned
 .Ar on .
 .It set vj slots Ar nslots
 This command sets the initial number of slots that
 .Nm
 will try to negotiate with the peer when VJ compression is enabled (see the
 .Sq enable
-command above).  It defaults to a value of 16.
+command above).
+It defaults to a value of 16.
 .Ar Nslots
 must be between
 .Ar 4
@@ -4666,17 +5082,20 @@
 .Ar command
 is not specified a shell is invoked according to the
 .Dv SHELL
-environment variable.  Otherwise, the given
+environment variable.
+Otherwise, the given
 .Ar command
-is executed.  Word replacement is done in the same way as for the
+is executed.
+Word replacement is done in the same way as for the
 .Dq !bg
 command as described above.
 .Pp
 Use of the ! character
-requires a following space as with any of the other commands.  You should
-note that this command is executed in the foreground -
+requires a following space as with any of the other commands.
+You should note that this command is executed in the foreground;
 .Nm
-will not continue running until this process has exited.  Use the
+will not continue running until this process has exited.
+Use the
 .Dv bg
 command if you wish processing to happen in the background.
 .It show Ar var
@@ -4691,7 +5110,8 @@
 .It show escape
 Show the current escape characters.
 .It show filter Op Ar name
-List the current rules for the given filter.  If
+List the current rules for the given filter.
+If
 .Ar name
 is not specified, all filters are shown.
 .It show hdlc
@@ -4735,9 +5155,10 @@
 .El
 .Pp
 .It term
-Go into terminal mode.  Characters typed at the keyboard are sent to
-the device.  Characters read from the device are displayed on the
-screen.  When a remote
+Go into terminal mode.
+Characters typed at the keyboard are sent to the device.
+Characters read from the device are displayed on the screen.
+When a remote
 .Em PPP
 peer is detected,
 .Nm
@@ -4747,7 +5168,8 @@
 .Sh MORE DETAILS
 .Bl -bullet
 .It
-Read the example configuration files.  They are a good source of information.
+Read the example configuration files.
+They are a good source of information.
 .It
 Use
 .Dq help ,
@@ -4793,13 +5215,15 @@
 .Nm
 closes a network level connection.
 .It Pa /var/log/ppp.log
-Logging and debugging information file.  Note, this name is specified in
+Logging and debugging information file.
+Note, this name is specified in
 .Pa /etc/syslogd.conf .
 See
 .Xr syslog.conf 5
 for further details.
-.It Pa /var/spool/lock/LCK..* 
-tty port locking file.  Refer to
+.It Pa /var/spool/lock/LCK..*
+tty port locking file.
+Refer to
 .Xr uucplock 3
 for further details.
 .It Pa /var/run/tunN.pid
@@ -4809,7 +5233,8 @@
 .Sq N
 is the number of the device.
 .It Pa /var/run/ttyXX.if
-The tun interface used by this port.  Again, this file is only created in
+The tun interface used by this port.
+Again, this file is only created in
 .Fl background ,
 .Fl auto
 and
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/prefix.8 man8/prefix.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/prefix.8	Tue Mar 21 06:32:14 2000
+++ man8/prefix.8	Mon Jul  3 19:53:17 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: prefix.8,v 1.1.1.1 1999/08/08 23:31:13 itojun Exp $
-.\"	$FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2 2000/03/12 19:50:11 shin Exp $
+.\"	$FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2.2.1 2000/05/06 14:04:21 phantom Exp $
 .\"
 .Dd October 10, 1998
 .Dt PREFIX 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm prefix
 .Nd configure network interface prefixes
@@ -38,7 +38,7 @@
 .Nm prefix
 .Ar interface prefix
 .Op Ar parameters
-.Op Cm set|delete
+.Op Cm set | delete
 .Nm prefix
 .Ar interface
 .Cm matchpr
@@ -50,7 +50,7 @@
 .Cm up_uselen
 .Ar use_prefix_len
 .Op Ar parameters
-.Op Cm add|change|setglobal
+.Op Cm add | change | setglobal
 .Nm prefix
 .Fl a
 .Op Fl d
@@ -64,23 +64,25 @@
 .Cm up_uselen
 .Ar use_prefix_uselen
 .Op Ar parameters
-.Op Cm add|change|setglobal
+.Op Cm add | change | setglobal
 .Sh DESCRIPTION
 .Nm Prefix
 is used to assign an prefix
 to a network interface and/or renumbering
 network interface prefixes.
-.Nm Prefix
+.Nm
 must be used at boot time to define the network prefix
 of each interface present on a machine; it may also be used at
 a later time to renumbering multiple interface's prefixes
 and other prefix related parameters.
-.Nm Prefix
+.Nm
 is router-only command, so you must do following to use it.
 .Dl % sysctl -w net.inet6.ip6.forwarding=1
 If net.inet6.ip6.forwarding is set to 0,
-.Nm Prefix
-command fails by EPERM error.
+.Nm
+command fails by
+.Er EPERM
+error.
 .Pp
 The following options are available:
 .Bl -tag -width indent
@@ -112,7 +114,7 @@
 Specify
 .Ar match_prefix
 that is used for matching with preassigned prefixes to which
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 command should be applied.
 .It Cm mp_len Ar match_prefix_len
 Specify the starting part of
@@ -122,27 +124,27 @@
 Specify the minimum length of prefixes which is allowed to be matched to
 .Ar match_prefix ,
 as decimal bit number.
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 is not applied to preassigned prefixes with smaller prefix len than
 .Ar match_prefix_minlen .
 .It Cm mp_maxlen Ar match_prefix_maxlen
 Specify the maximum length of prefixes which is allowed to be matched to
 .Ar match_prefix ,
 as decimal bit number.
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 is not applied to preassigned prefixes with bigger prefix len than
 .Ar match_prefix_maxlen .
 .It Cm usepr Ar use_prefix
 Specify
 .Ar use_prefix
 that is used for prefixes to be added on
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 command.
 .It Cm up_uselen Ar use_prefix_uselen
 Specify the starting part of
 .Ar use_prefix
 copied to the starting part of prefixes to be added on
-.Cm add|change|setglobal
+.Cm add | change | setglobal
 command, as decimal bit number.
 .It Cm up_keeplen Ar use_prefix_keeplen
 Specify the medium part of
@@ -198,20 +200,22 @@
 requested prefix is unknown, or the user is not privileged and
 tried to alter an interface's configuration.
 .Sh SEE ALSO
-M. Crawford,
-Router Renumbering for IPv6,
-internet-draft,
-draft-ietf-ipngwg-router-renum-05.txt
-.Pp
-.Xr ifconfig 8 ,
 .Xr netstat 1 ,
 .Xr netintro 4 ,
+.Xr ifconfig 8 ,
 .Xr rc 8 ,
 .Xr routed 8
+.Rs
+.%A M. Crawford
+.%T Router Renumbering for IPv6
+.%R internet-draft
+.%N draft-ietf-ipngwg-router-renum-05.txt
+.Re
 .Sh HISTORY
 The
 .Nm
 command first appeared in WIDE/KAME IPv6 protocol stack kit.
-.\"
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
Only in man8: pxeboot.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/rc.8 man8/rc.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/rc.8	Tue Mar 21 06:30:42 2000
+++ man8/rc.8	Mon Jul  3 19:51:37 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/share/man/man8/rc.8,v 1.9 2000/03/03 14:05:02 sheldonh Exp $
+.\" $FreeBSD: src/share/man/man8/rc.8,v 1.9.2.1 2000/06/20 10:32:11 alex Exp $
 .\"
 .Dd December 11, 1993
 .Dt RC 8
@@ -148,10 +148,10 @@
 is executed after the scripts above, but before the rest of the
 .Nm rc
 file is completed.
-Presently, all
+In a default installation
 .Nm rc.local
-does is to put version information in
-.Pa /etc/motd .
+does not exist, but its contents will be executed if the file is created
+by the administrator.
 .Pp
 Following tradition, the startup files reside in
 .Pa /etc .
Only in man8: rc.atm.8
Only in man8: rc.firewall.8
Only in man8: rc.i386.8
Only in man8: rc.local.8
Only in man8: rc.network.8
Only in man8: rc.pccard.8
Only in man8: rc.serial.8
Only in man8: rc.shutdown.8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/rdump.8 man8/rdump.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/rdump.8	Tue Mar 21 06:30:08 2000
+++ man8/rdump.8	Mon Jul  3 19:50:55 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27 2000/03/01 11:27:03 sheldonh Exp $
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27.2.1 2000/07/01 06:47:47 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
@@ -141,7 +141,7 @@
 like
 .Pa /dev/rsa0
 (a tape drive),
-.Pa /dev/rfd1
+.Pa /dev/fd1
 (a floppy disk drive),
 an ordinary file,
 or
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/restore.8 man8/restore.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/restore.8	Tue Mar 21 06:30:16 2000
+++ man8/restore.8	Mon Jul  3 19:51:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20 2000/03/01 11:27:37 sheldonh Exp $
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20.2.1 2000/07/01 08:10:59 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
@@ -200,11 +200,11 @@
 detrimental to one's health if not used carefully (not to mention
 the disk). An example:
 .Bd -literal -offset indent
-newfs /dev/rrp0g eagle
-mount /dev/rp0g /mnt
+newfs /dev/da0s1a
+mount /dev/da0s1a /mnt
 cd /mnt
 
-restore rf /dev/rst8
+restore rf /dev/rsa0
 .Ed
 .Pp
 Note that 
@@ -281,9 +281,9 @@
 .Ar file
 may be a special device file
 like
-.Pa /dev/rmt12
+.Pa /dev/rsa0
 (a tape drive),
-.Pa /dev/rda1c
+.Pa /dev/da1c
 (a disk drive),
 an ordinary file,
 or
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/rexecd.8 man8/rexecd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/rexecd.8	Tue Mar 21 06:30:03 2000
+++ man8/rexecd.8	Mon Jul  3 19:50:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/libexec/rexecd/rexecd.8,v 1.9 1999/08/28 00:09:49 peter Exp $
+.\" $FreeBSD: src/libexec/rexecd/rexecd.8,v 1.9.2.1 2000/06/30 16:49:41 nsayer Exp $
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
@@ -40,6 +40,7 @@
 .Nd remote execution server
 .Sh SYNOPSIS
 .Nm rexecd
+.Op Fl i
 .Sh DESCRIPTION
 .Nm Rexecd
 is the server for the 
@@ -99,9 +100,13 @@
 .El
 .Sh CAVEATS
 .Nm Rexecd
-will no longer allow root logins, access for users listed in
+will not allow root logins unless the
+.Fl i
+option is given on the command line (typically in
+.Pa /etc/inetd.conf ) .
+It will also disallow access for users listed in
 .Pa /etc/ftpusers ,
-or access for users with no passwords, which were all serious security holes.
+or users with no passwords, which were all serious security holes.
 The entire concept of rexec/rexecd is a major security hole and an example
 of how not to do things.
 .Nm Rexecd
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/rrestore.8 man8/rrestore.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/rrestore.8	Tue Mar 21 06:30:16 2000
+++ man8/rrestore.8	Mon Jul  3 19:51:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20 2000/03/01 11:27:37 sheldonh Exp $
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20.2.1 2000/07/01 08:10:59 ps Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
@@ -200,11 +200,11 @@
 detrimental to one's health if not used carefully (not to mention
 the disk). An example:
 .Bd -literal -offset indent
-newfs /dev/rrp0g eagle
-mount /dev/rp0g /mnt
+newfs /dev/da0s1a
+mount /dev/da0s1a /mnt
 cd /mnt
 
-restore rf /dev/rst8
+restore rf /dev/rsa0
 .Ed
 .Pp
 Note that 
@@ -281,9 +281,9 @@
 .Ar file
 may be a special device file
 like
-.Pa /dev/rmt12
+.Pa /dev/rsa0
 (a tape drive),
-.Pa /dev/rda1c
+.Pa /dev/da1c
 (a disk drive),
 an ordinary file,
 or
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/setkey.8 man8/setkey.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/setkey.8	Tue Mar 21 06:32:18 2000
+++ man8/setkey.8	Mon Jul  3 19:53:22 2000
@@ -26,16 +26,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: setkey.8,v 1.14 1999/10/27 17:08:58 sakane Exp $
-.\"     $FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4 2000/03/13 01:38:46 shin Exp $
+.\"     $FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4.2.3 2000/05/15 14:16:49 hoek Exp $
 .\"
 .Dd May 17, 1998
 .Dt SETKEY 8
-.Os KAME
-.\" 
+.Os
 .Sh NAME
 .Nm setkey
 .Nd manually manipulate the SA/SP database.
-.\" 
 .Sh SYNOPSIS
 .Nm setkey
 .Op Fl dv
@@ -261,7 +259,7 @@
 .Bl -tag -width Fl -compact 
 .It Fl E Ar ealgo Ar key
 Specify encryption algorithm.
-.It Fl A Ar ealgo Ar key
+.It Fl A Ar aalgo Ar key
 Specify authentication algorithm.
 If
 .Fl A
@@ -548,5 +546,7 @@
 .Nm
 command first appeared in WIDE Hydrangea IPv6 protocol stack kit.
 The command was completely re-designed in June 1998.
-.\"
-.\" .Sh BUGS
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/spppcontrol.8 man8/spppcontrol.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/spppcontrol.8	Tue Mar 21 06:30:20 2000
+++ man8/spppcontrol.8	Mon Jul  3 19:51:10 2000
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6 2000/03/01 11:27:41 sheldonh Exp $
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6.2.1 2000/05/10 09:53:31 sheldonh Exp $
 .\"
 .Dd October 11, 1997
 .Os
@@ -202,7 +202,8 @@
 .Xr sppp 4 ,
 .Xr ifconfig 8
 .Rs
-.%A B. Lloyd,  W. Simpson
+.%A B. Lloyd
+.%A W. Simpson
 .%T "PPP Authentication Protocols"
 .%O RFC 1334
 .Re
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/swapfile.8 man8/swapfile.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/swapfile.8	Tue Mar 21 06:32:23 2000
+++ man8/swapfile.8	Mon Jul  3 19:53:26 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14 2000/02/17 02:54:36 gsutter Exp $
+.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14.2.1 2000/06/29 23:49:34 ps Exp $
 .\"
 .Dd July 8, 1993
 .Dt VNCONFIG 8
@@ -241,7 +241,7 @@
 .Pp
 .Dl vnconfig -e -s labels,reserve -S 400m vn1
 .Dl disklabel -r -w vn1 auto
-.Dl newfs /dev/rvn1c
+.Dl newfs /dev/vn1c
 .Dl mount /dev/vn1c /usr/obj
 .Pp
 Is an example of a swap-backed VN disk configuration.  This example assumes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/telnetd.8 man8/telnetd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/telnetd.8	Tue Mar 21 06:30:06 2000
+++ man8/telnetd.8	Mon Jul  3 19:50:51 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\" $FreeBSD: src/libexec/telnetd/telnetd.8,v 1.16 2000/01/25 14:52:00 shin Exp $
+.\" $FreeBSD: src/libexec/telnetd/telnetd.8,v 1.16.2.1 2000/05/24 13:19:43 mpp Exp $
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
@@ -536,7 +536,7 @@
 or
 .Em \&if
 will be displayed to both console and remote logins.
-.Sh ENVIRONMENT
+.\" .Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /usr/ucb/bftp -compact
 .It Pa /etc/services
@@ -624,4 +624,4 @@
 .Dv IAC GA
 (go ahead) commands.
 .Sh HISTORY
-IPv6 support was added by WIDE/KAME project.
\ No newline at end of file
+IPv6 support was added by WIDE/KAME project.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/timed.8 man8/timed.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/timed.8	Tue Mar 21 06:32:20 2000
+++ man8/timed.8	Mon Jul  3 19:53:25 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timed.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.7 1999/08/28 01:20:19 peter Exp $
+.\" $FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.7.2.1 2000/03/14 10:54:57 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIMED 8
@@ -40,21 +40,21 @@
 .Nd time server daemon
 .Sh SYNOPSIS
 .Nm timed
-.Op Fl M
-.Op Fl t
-.Op Fl d
+.Op Fl dtM
 .Op Fl i Ar network
 .Op Fl n Ar network
-.Op Fl F Ar host1 host2 ...
+.Op Fl F Ar host ...
 .Sh DESCRIPTION
-This
-is a time server daemon and is normally invoked
-at boot time from the
-.Xr rc 8
+The
+.Nm
+daemon is a time server daemon
+which is normally invoked at boot time from the
+.Xr rc.network 8
 file.  
 It synchronizes the host's time with the time of other
-machines in a local area network running 
-.Nm Ns .
+machines, which are also running
+.Nm Ns ,
+in a local area network.
 These time servers will slow down the clocks of some machines
 and speed up the clocks of others to bring them to the average network time.
 The average network time is computed from measurements of clock differences
@@ -62,9 +62,87 @@
 .Tn ICMP
 timestamp request message.
 .Pp
-The service provided by
+The following options are available:
+.Bl -tag -width indent
+.It Fl d
+Enable debugging mode;
+do not detach from the terminal.
+.It Fl i Ar network
+Add
+.Ar network
+to the list of networks to ignore.
+All other networks
+to which the machine is directly connected
+are used by
+.Nm Ns .
+This option may be specified multiple times
+to add more than one network to the list.
+.It Fl F Ar host ...
+Create a list of trusted hosts.  
+.Nm
+will only accept trusted hosts as masters.
+If it finds an untrusted host claiming to be master,
+.Nm
+will suppress incoming messages from that host
+and call for a new election.
+This option implies the
+.Fl M
+option.
+If this option is not specified,
+all hosts on the connected networks are treated as trustworthy.
+.It Fl M
+Allow this host to become a
+.Nm
+master if necessary.
+.It Fl n Ar network
+Add
+.Ar network
+to the list of allowed networks.
+All other networks
+to which the machine is directly connected
+are ignored by
+.Nm Ns .
+This option may be specified multiple times
+to add more than one network to the list.
+.It Fl t
+Enable tracing of received messages
+and log to the file
+.It Pa /var/log/timed.log .
+Tracing can be turned on or off while
+.Nm
+is running with the
+.Xr timedc 8
+utility.
+.El
+.Pp
+The 
+.Fl n 
+and 
+.Fl i
+are mutually exclusive
+and require as arguments real networks to which
+the host is connected
+(see
+.Xr networks 5 ) .
+If neither flag is specified,
 .Nm
-is based  on a master-slave
+will listen on all connected networks.
+.Pp
+A
+.Nm
+running without the 
+.Fl M 
+nor 
+.Fl F 
+flags will always remain a slave.  
+If the 
+.Fl F 
+flag is not used, 
+.Nm
+will treat all machines as trustworthy.
+.Pp
+.Nm
+is based on a master-slave
 scheme.
 When
 .Nm
@@ -80,80 +158,40 @@
 in order to set the date globally,
 and with 
 .Xr timedc 8 ,
-a timed control program.
-If the machine running the master crashes, then the slaves will elect
-a new master from among slaves running with the 
-.Fl M
-flag.
-A
+a 
 .Nm
-running without the
+control program.
+If the machine running the master becomes unreachable,
+the slaves will elect a new master
+from among those slaves
+which are running with at least one of the
 .Fl M
-or
+and
 .Fl F
-flags will remain a slave.
-The 
-.Fl t
-flag enables
-.Nm timed
-to trace the messages it receives in the
-file
-.Pa /var/log/timed.log .
-Tracing can be turned on or off by the program
-.Xr timedc 8 .
-The
-.Fl d
-flag is for debugging the daemon.
-It causes the program to not put itself into the background.
+flags.
 .Pp
-Normally
+At startup
 .Nm
-checks for a master time server on each network to which
-it is connected, except as modified by the options described below.
-It will request synchronization service from the first master server
-located.
-If permitted by the
-.Fl M
-flag, it will provide synchronization service on any attached networks
-on which no current master server was detected.
-Such a server propagates the time computed by the top-level master.
-The 
-.Fl n
-flag, followed by the name of a network which the host is connected to
-(see
-.Xr networks 5 ) ,
-overrides the default choice of the
-network addresses made by the program.
-Each time the
-.Fl n
-flag appears, that network name is added to a list of valid networks.
-All other networks are ignored.
-The 
-.Fl i
-flag, followed by the name of a network to which the host is connected
-(see
-.Xr networks 5 ) ,
-overrides the default choice of the network addresses made by the program.
-Each time the
-.Fl i
-flag appears, that network name is added to a list of networks to ignore.
-All other networks are used by the time daemon.
-The
-.Fl n
-and 
-.Fl i
-flags are meaningless if used together.
-.Pp
-.Nm Timed
-checks for a master time server on each network to which
+normally checks for a master time server on each network to which
 it is connected, except as modified by the
 .Fl n
 and
 .Fl i
 options described above.
-If it finds masters on more than one network, it chooses one network
-on which to be a "slave," and then periodically checks the other
-networks to see if the masters there have disappeared.
+It will request synchronization service from the first master server
+located.
+If permitted by the
+.Fl M
+or 
+.Fl F
+flags, it will provide synchronization service on any attached networks
+on which no trusted master server was detected.
+Such a server propagates the time computed by the top-level master.
+.Nm
+will periodically check for the presence of a master
+on those networks for which it is operating as a slave.
+If it finds that there are no trusted masters on a network,
+it will begin the election process on that network.
 .Pp
 One way to synchronize a group of machines is to use an
 .Tn NTP
@@ -214,6 +252,7 @@
 .Xr adjtime 2 ,
 .Xr gettimeofday 2 ,
 .Xr icmp 4 ,
+.Xr networks 5 ,
 .Xr timedc 8
 .Rs
 .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/traceroute6.8 man8/traceroute6.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/traceroute6.8	Tue Mar 21 06:32:20 2000
+++ man8/traceroute6.8	Mon Jul  3 19:53:25 2000
@@ -26,15 +26,15 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: traceroute6.8,v 1.1.1.1 1999/08/08 23:32:38 itojun Exp $
-.\"	$FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.1 1999/12/28 02:37:14 shin Exp $
+.\"	$FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.1.2.3 2000/05/09 14:12:53 sheldonh Exp $
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
-.Os KAME
+.Os
 .\"
 .Sh NAME
 .Nm traceroute6
-.Nd print the route IPv6 packets will take to the destination
+.Nd "print the route IPv6 packets will take to the destination"
 .\"
 .Sh SYNOPSIS
 .Nm
@@ -79,8 +79,9 @@
 .El
 .\"
 .Sh RETURN VALUES
-.Nm Traceroute6
-will exit with 0 on success, and non-zero on errors.
+The
+.Nm
+command will exit with 0 on success, and non-zero on errors.
 .\"
 .Sh SEE ALSO
 .Xr ping 8 ,
@@ -91,6 +92,7 @@
 The
 .Nm
 command first appeared in WIDE hydrangea IPv6 protocol stack kit.
-.\"
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/updatedb.8 man8/updatedb.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/updatedb.8	Tue Mar 21 06:31:24 2000
+++ man8/updatedb.8	Mon Jul  3 19:52:23 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7 1999/08/28 01:03:00 peter Exp $
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.7.2.1 2000/06/14 17:45:17 alex Exp $
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
@@ -43,7 +43,7 @@
 updates the database used by
 .Xr locate 1 .
 It is typically run once a week by the
-.Pa /etc/weekly
+.Pa /etc/periodic/weekly/310.locate
 script.
 .Pp
 The contents of the newly built database can be controlled by the
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/usbd.8 man8/usbd.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/usbd.8	Tue Mar 21 06:32:21 2000
+++ man8/usbd.8	Mon Jul  3 19:53:26 2000
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.9 2000/03/01 14:08:37 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.9.2.1 2000/04/02 21:14:13 n_hibma Exp $
 .\"
 .Dd July 12, 1998
 .Dt USBD 8
@@ -64,6 +64,13 @@
 .Fl f Ar device
 command line options specify which controllers it should handle.
 Normally this option is not needed.
+.Pp
+If the
+.Dq usb ,
+.Dq ohci
+and
+.Dq uhci
+modules are not loaded, it will load them automatically.
 .Pp
 The second part is the handling of the attachment and detachment of USB
 devices.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/vinum.8 man8/vinum.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/vinum.8	Tue Mar 21 06:30:21 2000
+++ man8/vinum.8	Mon Jul  3 19:51:12 2000
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog $
-.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.33 2000/03/01 07:22:10 grog Exp $
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.33.2.3 2000/06/08 07:27:35 grog Exp $
 .\"
 .Dd 13 October 1999
 .Dt vinum 8
@@ -55,9 +55,10 @@
 .in +1i
 Attach a plex to a volume, or a subdisk to a plex.
 .in
-.Cd checkparity Ar plex
+.Cd checkparity Ar plex Op Fl f 
+.Op Fl v
 .in +1i
-Check the parity blocks of a RAID-5 plex.
+Check the parity blocks of a RAID-4 or RAID-5 plex.
 .in
 .Nm concat
 .Op Fl f
@@ -89,6 +90,12 @@
 .in +1i
 Detach a plex or subdisk from the volume or plex to which it is attached.
 .in
+.Cd dumpconfig
+.Op Ar drive ...
+.in +1i
+List the configuration information stored on the specified drives, or all drives
+in the system if no drive names are specified.
+.in
 .Cd info
 .Op Fl v
 .Op Fl V
@@ -97,7 +104,6 @@
 .in
 .Cd init
 .Op Fl S Ar size
-.Op Fl v
 .Op Fl w
 .Ar plex | subdisk
 .in +1i
@@ -222,9 +228,11 @@
 Move all the subdisks from the specified drive onto the new drive.
 .in
 ..
-.Cd rebuildparity Ar plex
+.Cd rebuildparity Ar plex Op Fl f
+.Op Fl v 
+.Op Fl V
 .in +1i
-Rebuild the parity blocks of a RAID-5 plex.
+Rebuild the parity blocks of a RAID-4 or RAID-5 plex.
 .in
 .Cd resetconfig
 .in +1i
@@ -278,6 +286,7 @@
 Read configuration from all vinum drives.
 .in
 .Cd start
+.Op Fl i Ar interval
 .Op Fl S Ar size
 .Op Fl w
 volume | plex | subdisk
@@ -339,6 +348,14 @@
 .Ar myvolume
 even if it is open.  Any subsequent access to the volume will almost certainly
 cause a panic.
+.It Fl i Ar millisecs
+When performing the
+.Nm init
+and
+.Nm start
+commands, wait
+.Ar millisecs
+milliseconds between copying each block.  This lowers the load on the system.
 .It Fl n Ar name
 Use the
 .Fl n
@@ -367,7 +384,7 @@
 .if n ("statistics")
 option is used by the list commands to display statistical information.  The
 .Nm mirror
-command also uses this flag to specify that it should create striped plexes.
+command also uses this option to specify that it should create striped plexes.
 .It Fl S Ar size
 The
 .Fl S
@@ -381,10 +398,7 @@
 .Fl v
 .if t (``verbose'')
 .if n ("verbose")
-option can be used to request more detailed information.  This flag also means
-``verify'' for the
-.Nm init
-command.
+option can be used to request more detailed information.
 .It Fl V
 The
 .Fl V
@@ -457,6 +471,27 @@
 first subdisk will have offset 0, the second offset 256k, the third 512k, etc.
 This calculation ignores parity blocks in RAID-5 plexes.
 .El
+.It Nm checkparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Pp
+Check the parity blocks on the specified RAID-4 or RAID-5 plex.  This operation
+maintains a pointer in the plex, so it can be stopped and later restarted from
+the same position if desired.  In addition, this pointer is used by the
+.Nm rebuildparity
+command, so rebuilding the parity blocks need only start at the location where
+the first parity problem has been detected.
+.Pp
+If the
+.Fl f
+flag is specified,
+.Nm checkparity
+starts checking at the beginning of the plex.  If the
+.Fl v
+flag is specified,
+.Nm checkparity
+prints a running progress report.
 .It Nm concat
 .Op Fl f
 .Op Fl n Ar name
@@ -622,6 +657,18 @@
 the subdisk is marked absent, and can later be replaced with the
 .Nm attach
 command.
+.It Nm dumpconfig  Op Ar drive ...
+.Pp
+.Nm
+.Ar dumpconfig
+shows the configuration information stored on the specified drives.  If no drive
+names are specified,
+.Nm dumpconfig
+searches all drives on the system for Vinum partitions and dumps the
+information.  If configuration updates are disabled, it is possible that this
+information is not the same as the information returned by the
+.Nm list
+command.  This command is used primarily for maintenance and debugging.
 .It Nm info
 .br
 .Nm
@@ -768,7 +815,7 @@
 .El
 .\" XXX
 .It Nm init Op Fl S 
-.Ar size Op Fl v 
+.Ar size
 .Op Fl w
 .Ar plex | subdisk
 .Pp
@@ -788,9 +835,7 @@
 Specify the
 .Fl S
 option if you want to write blocks of a different size from the default value of
-16 kB.  Specify the
-.Fl v
-if you want to confirm that the initialization is correct.
+16 kB.
 .Nm
 prints a console message when the initialization is complete.
 .It Nm label
@@ -1018,8 +1063,36 @@
 .Nm setdaemon
 and
 .Nm saveconfig
-commands.  Reset bit 4 of the daemon options mask to re-enable configuration
-saves.
+commands.  Reset bit 2 (numerical value 4) of the daemon options mask to
+re-enable configuration saves.
+.It Nm rebuildparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Op Fl V
+.Pp
+Rebuild the parity blocks on the specified RAID-4 or RAID-5 plex.  This
+operation maintains a pointer in the plex, so it can be stopped and later
+restarted from the same position if desired.  In addition, this pointer is used
+by the
+.Nm checkparity
+command, so rebuilding the parity blocks need only start at the location where
+the first parity problem has been detected.
+.Pp
+If the
+.Fl f
+flag is specified,
+.Nm rebuildparity
+starts rebuilding at the beginning of the plex.  If the
+.Fl v
+flag is specified,
+.Nm rebuildparity
+first checks the existing parity blocks prints information about those found to
+be incorrect before rebuilding.  If the
+.Fl V
+flag is specified,
+.Nm rebuildparity
+prints a running progress report.
 .It Nm rename
 .Op Fl r
 .Ar [ drive | subdisk | plex | volume ]
@@ -1108,13 +1181,13 @@
 .Nm
 to remove the object anyway by using the
 .Fl f
-flag, or you can cause
+option, or you can cause
 .Nm
 to remove the subordinate objects as well by using the
 .Fl r
-(recursive) flag.  If you remove a volume with the
+(recursive) option.  If you remove a volume with the
 .Fl r
-flag, it will remove both the plexes and the subdisks which belong to the
+option, it will remove both the plexes and the subdisks which belong to the
 plexes.
 .It Nm saveconfig
 .Pp
@@ -1160,9 +1233,10 @@
 and should be used only for recovery purposes.  It is possible to crash the
 system by incorrect use of this command.
 .It Nm start
+.Op Fl i Ar interval
 .Op Fl S Ar size
 .Op Fl w
-.Op volume | plex | subdisk
+.Op plex | subdisk
 .Pp
 .Nm start
 starts (brings into to the
@@ -1202,8 +1276,7 @@
 depends on the current state of the object:
 .Bl -bullet
 .It
-If the
-object is already in the
+If the object is already in the
 .Ar up
 state,
 .Nm
@@ -1254,24 +1327,25 @@
 automatically checks the state of any plex and volume to which it may belong and
 changes their state where appropriate.
 .Pp
-If the object is a volume or a plex,
+If the object is a plex,
 .Nm start
-currently has no effect: it checks the state of the subordinate subdisks (and
-plexes in the case of a volume) and sets the state of the object accordingly.
+checks the state of the subordinate subdisks (and plexes in the case of a
+volume) and starts any subdisks which can be started.
 .Pp
 To start a plex in a multi-plex volume, the data must be copied from another
 plex in the volume.  Since this frequently takes a long time, it is normally
 done in the background.  If you want to wait for this operation to complete (for
 example, if you are performing this operation in a script), use the
 .Fl w
-flag.
+option.
 .Pp
 Copying data doesn't just take a long time, it can also place a significant load
-on the system.  You can specify the transfer size with the
+on the system.  You can specify the transfer size in bytes or sectors with the
 .Fl S
-flag.  A future change to
-.Nm
-will allow a pause between each block to lessen the load on the system.
+option, and an interval (in milliseconds) to wait between copying each block with
+the
+.Fl i
+option.  Both of these options lessen the load on the system.
 .It Nm stop
 .Op Fl f
 .Op volume | plex | subdisk
@@ -1284,7 +1358,7 @@
 .Xr vinum 8 .
 This can only be done if no objects are active.  In particular, the
 .Fl f
-flag does not override this requirement.  Normally, the
+option does not override this requirement.  Normally, the
 .Nm stop
 command writes the current configuration back to the drives before terminating.
 This will not be possible if configuration updates are disabled, so
@@ -1292,7 +1366,7 @@
 will not stop if configuration updates are disabled.  You can override this by
 specifying the
 .Fl f
-flag.
+option.
 .Pp
 The
 .Nm stop
@@ -1314,7 +1388,7 @@
 .Fl r
 and
 .Fl f
-flags must be specified.  This command does not remove the objects from the
+options must be specified.  This command does not remove the objects from the
 configuration.  They can be accessed again after a
 .Nm start
 command.
@@ -2098,7 +2172,7 @@
 .Pp
 The
 .Fl v
-flag tells
+option tells
 .Nm
 to list the file as it configures.  Subsequently it lists the current
 configuration in the same format as the
@@ -2142,7 +2216,7 @@
 .Pp
 As this example (this time with the
 .Fl f
-flag) shows, re-running the
+option) shows, re-running the
 .Nm create
 has created four new plexes, each with a new subdisk.  If you want to add other
 volumes, create new configuration files for them.  They do not need to reference
@@ -2234,10 +2308,13 @@
 decrease in transfer time per disk is offset by the order of magnitude greater
 increase in latency.
 .Pp
-With modern disk sizes and the FreeBSD block I/O system, you can expect to have
-a reasonably small number of fragmented requests with a stripe size between 256
-kB and 512 kB; with correct RAID implementations there is no obvious reason not
-to increase the size to 2 or 4 MB on a large disk.
+With modern disk sizes and the FreeBSD I/O system, you can expect to have a
+reasonably small number of fragmented requests with a stripe size between 256 kB
+and 512 kB; with correct RAID implementations there is no obvious reason not to
+increase the size to 2 or 4 MB on a large disk.
+.Pp
+When choosing a stripe size, consider that most current ufs file systems have
+cylinder groups 32 MB in size.  
 .Pp
 The easiest way to consider the impact of any transfer in a multi-access system
 is to look at it from the point of view of the potential bottleneck, the disk
@@ -2341,21 +2418,17 @@
 before creating a file system on a
 .Nm
 volume.  Just run
-.Nm newfs
-against the raw device.  Use the
+.Nm newfs .
+Use the
 .Fl v
 option to state that the device is not divided into partitions.  For example, to
 create a file system on volume
 .Pa mirror ,
 enter the following command:
 .Bd -literal -offset 4n
-# newfs -v /dev/vinum/rmirror
+# newfs -v /dev/vinum/mirror
 .Ed
 .Pp
-Note the name
-.Pa rmirror ,
-indicating the raw device.
-.Ss Other considerations
 A number of other considerations apply to
 .Nm
 configuration:
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/vnconfig.8 man8/vnconfig.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/vnconfig.8	Tue Mar 21 06:32:23 2000
+++ man8/vnconfig.8	Mon Jul  3 19:53:26 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14 2000/02/17 02:54:36 gsutter Exp $
+.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14.2.1 2000/06/29 23:49:34 ps Exp $
 .\"
 .Dd July 8, 1993
 .Dt VNCONFIG 8
@@ -241,7 +241,7 @@
 .Pp
 .Dl vnconfig -e -s labels,reserve -S 400m vn1
 .Dl disklabel -r -w vn1 auto
-.Dl newfs /dev/rvn1c
+.Dl newfs /dev/vn1c
 .Dl mount /dev/vn1c /usr/obj
 .Pp
 Is an example of a swap-backed VN disk configuration.  This example assumes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man8/ypserv.8 man8/ypserv.8
--- /home/horikawa/man-jp/work/fbsd-400r/man/man8/ypserv.8	Tue Mar 21 06:32:24 2000
+++ man8/ypserv.8	Mon Jul  3 19:53:30 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22 2000/03/02 14:53:40 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22.2.1 2000/06/30 08:43:45 ps Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -138,7 +138,7 @@
 handles the
 .Pa master.passwd.byname
 and
-.Pa master.basswd.byuid
+.Pa master.passwd.byuid
 maps in a special way.
 When the server receives a request to access
 either of these two maps, it will check the TCP port from which the

----Next_Part(Tue_Jul__4_21:41:53_2000_518)----
