From owner-man-jp-reviewer@jp.freebsd.org  Sun Nov 28 22:34:09 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA71651;
	Sun, 28 Nov 1999 22:34:09 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA71646
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 28 Nov 1999 22:34:08 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (pppb30.yk.rim.or.jp [202.247.186.130])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id WAA24836
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 28 Nov 1999 22:33:58 +0900 (JST)
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Sun_Nov_28_22:20:56_1999_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19991128223315D.k-horik@yk.rim.or.jp>
Date: Sun, 28 Nov 1999 22:33:15 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 1929
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: man-jp-reviewer 1705
Subject: [man-jp-reviewer 1705] diff to 3.3-1999127-STABLE
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

----Next_Part(Sun_Nov_28_22:20:56_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

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

 3.3-19991127-STABLE $B$X$N(B diff $B$G$9!#(B
 o pkg_version.1, ng* $B$r=|$/!#(B
 o adjkerntz.8 (man-jp 1952), mail.1 (man-jp 1950), sh.1 (man-jp
   1949), ipfw.8 (man-jp 1939) $B$N=$@5$r4^$_$^$9!#(B



----Next_Part(Sun_Nov_28_22:20:56_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.3-19991127-STABLE
Content-Disposition: attachment; filename=diff_3.3-19991127-STABLE

diff -ur man/man1/mail.1 man/man1/mail.1
--- man/man1/mail.1	Sun Sep  5 01:36:17 1999
+++ man/man1/mail.1	Sun Nov 28 21:04:44 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.1 1999/08/29 15:30:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.2 1999/11/22 10:33:49 jkoshy Exp %
 .\" jpman %Id: mail.1,v 1.3 1997/10/30 01:42:49 h-nokubi Stab %
 .\"
 .Dd December 30, 1993
@@ -54,10 +54,10 @@
 .Nm mail
 .Op Fl iInNv
 .Op Fl u Ar user
-.Sh $B%$%s%H%m%@%/%7%g%s(B
+.Sh $B>R2p(B
 .Nm mail
 $B$O%$%s%F%j%8%'%s%H$J%a!<%k=hM}%7%9%F%`$G$9!#(B
-$B%3%^%s%I%7%s%?%C%/%9$O(B
+$B%3%^%s%IJ8K!$O(B
 .Xr \&ed 1
 $B$K;w$F$*$j!"(B
 .Xr \&ed 1
@@ -85,7 +85,7 @@
 $B%a!<%k$rFI$s$@$j%a!<%k%U%)%k%@$rJT=8$9$k;~$K!":G=i$N%a%C%;!<%8%X%C%@$N(B
 $BI=<($r9T$$$^$;$s!#(B
 .It Fl s
-$B%3%^%s%I%i%$%s$+$i%5%V%8%'%/%H$r;XDj$7$^$9!#(B
+$B%3%^%s%I%i%$%s$+$i%5%V%8%'%/%H$r;XDj$7$^$9(B
 (
 .Fl s
 $B%U%i%0$N8e$N:G=i$N0z?t$@$1$,%5%V%8%'%/%H$H$7$F;H$o$l$^$9!#6uGr$r4^$`(B
@@ -113,6 +113,21 @@
 .Pp
 .Dl mail -f /var/mail/user
 .El
+.Ss $B5/F0;~$NF0:n(B
+.Nm
+$B$O!"5/F0;~$K!"%7%9%F%`$N%3%^%s%I%U%!%$%k(B
+.Pa /usr/share/misc/mail.rc ,
+.Pa /usr/local/etc/mail.rc ,
+.Pa /etc/mail.rc
+$B$r$3$N=gHV$K<B9T$7$^$9!#$?$@$7!"(B
+.Fl n
+$B%*%W%7%g%s$r;HMQ$7$F!"<B9T$7$J$$$h$&L@<(E*$K;XDj$5$l$?>l9g$ONc30$G$9!#(B
+$B<!$K!"%f!<%6$N8D?ME*$J%3%^%s%I%U%!%$%k(B
+.Pa ~/.mailrc
+$B$r<B9T$7$^$9!#$=$N8e(B
+.Nm
+$B$O%3%^%s%I%i%$%s%*%W%7%g%s$r8!::$7!"(B
+$B?75,%a%C%;!<%8$rAw$k$N$+4{B8$N%a!<%k%\%C%/%9$rFI$`$N$+$r7hDj$7$^$9!#(B
 .Ss $B%a!<%k$rAw$k(B
 $B%a%C%;!<%8$r(B 1 $B?M$+$=$l0J>e$N?M$KAw$k$?$a$K(B
 .Nm mail
@@ -210,14 +225,14 @@
 $B$G;O$^$k9T$rFCJL$K07$$$^$9!#(B
 $BNc$($P!"(B
 .Ql Ic \&~m
-$B$H%?%$%W$9$k!J9T$K$3$l$@$1%?%$%W$7$^$9!K$H8=:_$N%a%C%;!<%8$r(B
+$B$H%?%$%W$9$k(B ($B9T$K$3$l$@$1%?%$%W$7$^$9(B) $B$H8=:_$N%a%C%;!<%8$r(B
 $B%?%V$NJ,(B ($B2<5-$NJQ?t(B
 .Em indentprefix
 $B$r;2>H(B) $B$@$11&$K%7%U%H$7$FJV;v$N%a%C%;!<%8$K%3%T!<$7$^$9!#(B
 $BB>$N%(%9%1!<%W$O%5%V%8%'%/%H$N@_Dj$d!"%a%C%;!<%8$N<u<h?M$NDI2C$d:o=|$r(B
 $B9T$J$C$?$j!"$^$?%a%C%;!<%8$r=$@5$9$k$?$a$K%(%G%#%?$r5/F0$7$?$j!"%3%^%s(B
 $B%I$r<B9T$9$k$?$a$K%7%'%k$r5/F0$7$?$j$7$^$9!#(B
-($B2<$K$3$l$i$N%*%W%7%g%s$NMWLs$,$"$j$^$9!#!K(B
+($B2<$K$3$l$i$N%*%W%7%g%s$NMWLs$,$"$j$^$9!#(B)
 .Pp
 .Ss $B%a!<%k$N=hM}%;%C%7%g%s$r=*N;$9$k(B
 .Nm mail
@@ -285,7 +300,7 @@
 $B$O(B
 .Ar askcc
 $B5!G=$rM-8z$K$7$^$9!#(B
-($B$3$l$i$N%*%W%7%g%s$K$D$$$F$O2<$K$^$H$a$F$"$j$^$9!#!K(B
+($B$3$l$i$N%*%W%7%g%s$K$D$$$F$O2<$K$^$H$a$F$"$j$^$9!#(B)
 .Sh $BMWLs(B
 (`Mail Reference Manual' $B$h$jH4?h(B)
 .Pp
@@ -913,7 +928,7 @@
 $B$,CM$J$7$G%;%C%H$5$l$F$$$k$H!"%7%9%F%`$KJ]B8$5$l$F$$$k%?!<%_%J%k$N2hLL(B
 $B$N9b$5$,ogCM$N7W;;$K;H$o$l$^$9(B (
 .Xr stty 1 
-$B$r;2>H$7$F2<$5$$!K!#(B
+$B$r;2>H$7$F2<$5$$(B)$B!#(B
 .It Ar escape
 $B$3$l$,Dj5A$5$l$F$$$k$H!"$3$N%*%W%7%g%s$N:G=i$N%-%c%i%/%?$,%(%9%1!<%W$r(B 
 $B<($9$?$a$N(B ~ $B$NBe$o$j$K;H$o$l$^$9!#(B
diff -ur man/man1/pawd.1 man/man1/pawd.1
--- man/man1/pawd.1	Sun Sep 12 18:34:44 1999
+++ man/man1/pawd.1	Sun Nov 28 21:04:44 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -39,6 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: pawd.1,v 1.2 1998/09/05 06:56:36 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/amq/pawd.1,v 1.3.2.1 1999/11/27 04:46:44 obrien Exp %
 .\" jpman %Id: pawd.1,v 1.3 1998/12/17 08:07:53 jsakai Stab %
 .\"
 .\" WORD: automounter	$B%*!<%H%^%&%s%?(B[pawd.1]
diff -ur man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Sun Nov 28 21:05:41 1999
+++ man/man1/sh.1	Sun Nov 28 21:04:47 1999
@@ -360,25 +360,25 @@
 $B$3$l$i$N1i;;;R$r$I$N$h$&$KMxMQ$9$k$+$NNc$r$$$/$D$+0J2<$K5s$2$^$9!#(B
 .Bl -tag -width "1234567890" -offset indent
 .It [n]> file
-$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n $B$X$N=PNO(B) $B$r%U%!%$%k(B file $B$K=q$-=P$7$^$9!#(B
+$BI8=`=PNO(B ($B$^$?$O(B n) $B$r(B file $B$K=q$-=P$7$^$9!#(B
 .It [n]>| file
 $B>e$HF1MM!#$?$@$7!"(B-C $B%*%W%7%g%s$N8z2L$rBG$A>C$7$^$9!#(B
 .It [n]>> file
-$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n $B$X$N=PNO(B) $B$r%U%!%$%k(B file $B$KDI2C$7$^$9!#(B
+$BI8=`=PNO(B ($B$^$?$O(B n) $B$r(B file $B$KDI2C$7$^$9!#(B
 .It [n]< file
-$BI8=`F~NO(B ($B$^$?$O%U%!%$%k5-=R;R(B n $B$+$i$NF~NO(B) $B$r%U%!%$%k(B file $B$+$i<h$j$^$9!#(B
+$BI8=`F~NO(B ($B$^$?$O(B n) $B$r(B file $B$+$iFI$_<h$j$^$9!#(B
 .It [n1]<&n2
-$B%U%!%$%k5-=R;R(B n2 $B$rI8=`F~NO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$KJ#@=$7$^$9!#(B
+$B%U%!%$%k5-=R;R(B n2 $B$rI8=`F~NO(B ($B$^$?$O(B n1) $B$KJ#@=$7$^$9!#(B
 .It [n]<&-
-$BI8=`F~NO(B ($B$^$?$O%U%!%$%k5-=R;R(B n) $B$r%/%m!<%:$7$^$9!#(B
+$BI8=`F~NO(B ($B$^$?$O(B n) $B$r%/%m!<%:$7$^$9!#(B
 .It [n1]>&n2
-$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$r%U%!%$%k5-=R;R(B n2 $B$KJ#@=$7$^$9(B
+$BI8=`=PNO(B ($B$^$?$O(B n1) $B$r(B n2 $B$KJ#@=$7$^$9(B
 ($BLuCm(B: $B%U%!%$%k5-=R;R(B n2 $B$rI8=`=PNO(B ($B$^$?$O(B n1) $B$N%U%!%$%k5-=R;R$K(B
 $BJ#@=$9$k7k2L!"I8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1 $B$X$N=PNO(B) $B$,(B n2 $B$K(B
 $B%j%@%$%l%/%H$5$l$k!"$H$$$&$3$H$G$9(B)$B!#(B
 .\" [man-jp 1544], [man-jp 1827] $B0J9_$N%9%l%C%I;2>H!#(B
 .It [n]>&-
-$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n) $B$r%/%m!<%:$7$^$9!#(B
+$BI8=`=PNO(B ($B$^$?$O(B n) $B$r%/%m!<%:$7$^$9!#(B
 .El
 .Pp
 $B0J2<$N%j%@%$%l%/%H$O!"$7$P$7$P(B
Only in man: man1aout
diff -ur man/man5/amd.conf.5 man/man5/amd.conf.5
--- man/man5/amd.conf.5	Sun Sep 12 18:34:44 1999
+++ man/man5/amd.conf.5	Sun Nov 28 21:04:56 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: amd.conf.5,v 1.8 1999/08/18 05:54:49 chris Exp %
+.\" %Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.6.2.3 1999/11/27 04:47:09 obrien Exp %
 .\"
 .\" jpman %Id: amd.conf.5,v 1.3 1998/11/28 13:23:35 horikawa Stab %
 .\"
@@ -628,7 +629,7 @@
 .Xr statfs 2
 $B8F$S=P$7$KBP$7$FHs(B 0 $BCM$rJV$9$3$H$G<B8=$5$l$F$$$^$9(B
 .Pc $B!#(B
-.It Nm unmount_on_exist ($B%V!<%kCM(B, $B%G%U%)%k%H(B = no)
+.It Nm unmount_on_exit ($B%V!<%kCM(B, $B%G%U%)%k%H(B = no)
 .Dq yes
 $B$H$9$k$H!"(B
 .Nm amd
diff -ur man/man5/loader.conf.5 man/man5/loader.conf.5
--- man/man5/loader.conf.5	Sun Sep  5 01:36:19 1999
+++ man/man5/loader.conf.5	Sun Nov 28 21:04:56 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.1.2.3 1999/08/29 16:20:39 peter Exp %
+.\" %FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.1.2.5 1999/11/26 08:46:58 dcs Exp %
 .\"
 .\" jpman %Id: loader.conf.5,v 1.4 1999/05/13 05:58:04 horikawa Stab %
 .Dd April 18, 1999
@@ -105,6 +105,8 @@
 $BDI2C$N%b%8%e!<%k$O%m!<%I$5$l$^$;$s!#(B
 .It Ar kernel_options
 $B%+!<%M%k$KEO$5$l$k%U%i%0$G$9!#(B
+.It Ar password
+$B<B9T7QB35v2DA0$K%Q%9%o!<%I3NG'$,Ld$$9g$o$;$k%Q%9%o!<%I$rDs6!$7$^$9!#(B
 .It Ar verbose_loading
 .Dq YES
 $B$K@_Dj$9$k$H!"%b%8%e!<%k$,%m!<%I$5$l$k$H!"$=$NL>A0$,I=<($5$l$^$9!#(B
@@ -151,7 +153,11 @@
 .Pq Dq NO
 .Dq YES
 $B$K@_Dj$9$k$H!"5/F02hLL%b%8%e!<%k$r%m!<%I$7!"(B
-$B%V!<%HCf$K%S%C%H%^%C%W$r2hLL$KI=<($9$k$3$H$r2DG=$K$7$^$9!#(B
+$B%V!<%HCf$K(B bmp $B%$%a!<%8$r2hLL$KI=<($9$k$3$H$r2DG=$K$7$^$9!#(B
+.It Va splash_pcx_load
+.Dq YES
+$B$K@_Dj$9$k$H!"5/F02hLL%b%8%e!<%k$r%m!<%I$7!"(B
+$B%V!<%HCf$K(B pcx $B%$%a!<%8$r2hLL$KI=<($9$k$3$H$r2DG=$K$7$^$9!#(B
 .It Va userconfig_script_load
 .Pq Dq NO
 .Dq YES
diff -ur man/man5/rc.conf.5 man/man5/rc.conf.5
--- man/man5/rc.conf.5	Sun Oct 31 17:50:00 1999
+++ man/man5/rc.conf.5	Sun Nov 28 21:04:58 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.20 1999/10/14 11:49:33 des Exp %
+.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.21 1999/11/23 10:32:45 jkoshy Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -1135,6 +1135,13 @@
 $BMxMQ2DG=$J%;%-%e%j%F%#%l%Y%k$H%7%9%F%`A`:n$X$N1F6A$K$D$$$F$O!"(B
 .Xr init 8
 $B$r;2>H$7$F$/$@$5$$!#(B
+.It Ar start_vinum
+($B%V!<%kCM(B)
+$B%7%9%F%`%V!<%H;~$K(B
+.Xr vinum 8
+$B$r3+;O$7$?$$>l9g!"(B
+.Ar YES
+$B$K%;%C%H$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/defaults/rc.conf -compact
 .It Pa /etc/defaults/rc.conf
@@ -1185,6 +1192,7 @@
 .Xr swapon 8 ,
 .Xr tickadj 8 ,
 .Xr timed 8 ,
+.Xr vinum 8 ,
 .Xr vnconfig 8 ,
 .Xr xntpd 8 ,
 .Xr xtend 8 ,
diff -ur man/man8/adjkerntz.8 man/man8/adjkerntz.8
--- man/man8/adjkerntz.8	Sun Sep  5 01:36:20 1999
+++ man/man8/adjkerntz.8	Sun Nov 28 21:15:56 1999
@@ -38,13 +38,13 @@
 .Fl a Op Fl s
 .Sh $B2r@b(B
 .Nm
-$B$O!"(B UTC $B$,$$$D$b@_Dj$5$l$F$$$k%+!<%M%k%/%m%C%/$H!"(B
+$B$O!"(BUTC $B$,$$$D$b@_Dj$5$l$F$$$k%+!<%M%k%/%m%C%/$H!"(B
 $B%m!<%+%k;~4V$,@_Dj$5$l$F$$$k$+$b$7$l$J$$(B CMOS $B%/%m%C%/$H$N4V$NE,@Z$J4X78$r07$$$^$9!#(B
 .Nm
 $B$O!"$^$?(B MS-DOS $B%U%!%$%k%7%9%F%`$N$h$&$J%m!<%+%k;~4V%U%!%$%k%7%9%F%`(B
 $B$N$?$a$NE,@Z$J%?%$%`%9%?%s%W$r07$&$?$a$K!"%+!<%M%k$K5!3#$N%?%$%`%>!<%s(B
 $B$N%7%U%H$r65$($^$9!#$3$N<gMW$JL\E*$O!":G=i$+$i2u$l$F$$$k(B MS-DOS 
-$B%U%!%$%k%?%$%`%9%?%s%W$N9M$(J}$r0lHL$K8GDj$9$k$?$a$G$O$J$/!"(B
+$B%U%!%$%k%?%$%`%9%?%s%W$N9M$(J}$rA4LLE*$KD>$9$?$a$G$O$J$/!"(B
 $BF1$8%?%$%`%9%?%s%W$rF1$85!3#>e$N(B
 .Bx Free
 $B$N(B MS-DOS $B%U%!%$%k%7%9%F%`$H(B 
diff -ur man/man8/amd.8 man/man8/amd.8
--- man/man8/amd.8	Sun Sep 12 18:34:44 1999
+++ man/man8/amd.8	Sun Nov 28 21:05:06 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: amd.8,v 1.2 1998/09/05 05:52:24 obrien Exp %
+.\" %Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.1 1999/11/27 04:46:21 obrien Exp %
 .\"
 .\" jpman %Id: amd.8,v 1.2 1997/04/15 00:24:08 mutoh Stab %
 .\"
@@ -61,7 +62,7 @@
 .Ek
 .Op Fl l Ar logfile
 .Op Fl o Ar op_sys_ver
-.Op Fl t Ar interval.interval
+.Op Fl t Ar timeout.retransmit
 .Bk -words
 .Op Fl w Ar interval
 .Ek
@@ -155,7 +156,7 @@
 .It Fl n
 $B%[%9%HL>$r@55,2=$7$^$9!#(B${rhost}$B$G;2>H$5$l$kL>A0$O!";H$o(B
 $B$l$kA0$K%[%9%H%G!<%?%Y!<%9$K4XO"$E$1$F@55,2=$5$l$^$9!#(B
-$B$3$l$O!"%(%$%j%"%9$r(B `` $B8x<0(B (official)'' $B%[%9%HL>$KJQ49$9$k8z2L$,$"$j$^$9!#(B
+$B$3$l$O!"%(%$%j%"%9$r(B ``$B8x<0(B (official)'' $B%[%9%HL>$KJQ49$9$k8z2L$,$"$j$^$9!#(B
 .It Fl o Ar op_sys_ver
 $BAH$_9~$^$l$F$$$k%*%Z%l!<%F%#%s%0%7%9%F%`%P!<%8%g%sHV9f$r>e=q$-$7$^$9!#(B
 $B8eJ}8_49@-$N$?$a$K!"(B
@@ -177,11 +178,20 @@
 $B%U%!%$%k%7%9%F%`$,<+F0%^%&%s%H$5$l$?$b$N$G$"$l$P!"(B
 .Nm
 $B$O!"$=$N>pJs$r7Q>5$7$^$9!#(B
-.It Fl t  Ar interval.interval
-NFS/RPC/UDP$B$N%j%H%i%$$N4V3V$r!"(B10$BJ,$N(B1$BICC10L$G;XDj$7$^$9!#(B
-$B%G%U%)%k%HCM$O(B0.8$BIC$G$9!#(B2$BHVL\$NCM$O:FAw%+%&%s%?$rJQ99$7$^$9!#(B
+.It Fl t Ar timeout.retransmit
+NFS/RPC $B$N%j%H%i%$$N4V3V!"$9$J$o$A(B NFS $B%?%$%`%"%&%H4V3V$r!"(B
+10 $BJ,$N(B 1 $BICC10L$G;XDj$7$^$9(B (UDP $B$N$_(B)$B!#(B
+$B%G%U%)%k%HCM$O(B 0.8 $BIC$G$9!#(B2 $BHVL\$NCM$O:FAw%+%&%s%?$rJQ99$7$^$9!#(B
+$B%G%U%)%k%HCM$G$O(B 11 $B2s$N:FAw$G$9!#(B
+$B%+!<%M%k$O!"N>J}$NCM$r;HMQ$7$F(B amd $B$HDL?.$7$^$9!#(B
 $B$I$A$i$+0lJ}$+!"N>J}$NCM$,@_Dj$5$l$F$$$J$1$l$P!"(B
 $BE,Ev$J%G%U%)%k%HCM$,@_Dj$5$l$^$9!#(B
+.Pp
+amd $B$O!"(B
+$B%+!<%M%k$N(B RPC $B:FAw5!9=$,%^%&%s%H%j%H%i%$$N0z$-6b$H$J$k$3$H$K0MB8$7$F$$$^$9!#(B
+$B$3$l$i$N%Q%i%a!<%?CM$O!"Am9gE*$J%j%H%i%$4V3V$rJQ99$7$^$9!#(B
+$B4V3V$,D9$/$J$j2a$.$k$H!"BPOC1~Ez$,Nt2=$7$^$9!#(B
+$B4V3V$,C;$/$J$j2a$.$k$H!"%j%H%i%$$,A}$(2a$.$^$9!#(B
 .It Fl v
 $B%P!<%8%g%s$rI=<($7$^$9!#I8=`%(%i!<=PNO$K@_Dj>pJs$rI=<($7$^$9!#(B
 .It Fl w  Ar interval
@@ -193,7 +203,7 @@
 $B$K$O<!$N$b$N$r%3%s%^$G6h@Z$C$F;HMQ$G$-$^$9(B: 
 fatal, error, user, warn, info, map, stats, all$B!#(B
 .It Fl y  Ar domain
-NIS$B%^%C%W$r$H$C$F$/$k:]$KMQ$$$k(BNIS$B%I%a%$%s$r;XDj$7$^$9!#(B
+NIS $B%^%C%W$r$H$C$F$/$k:]$KMQ$$$k(B NIS $B%I%a%$%s$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$O%7%9%F%`$N%I%a%$%sL>$G$9!#$3$N%*%W%7%g%s$O!"(BNIS
 $B$rF0$+$7$F$$$J$$$H$-$K$OL5;k$5$l$^$9!#(B
 .It Fl C Ar cluster-name
diff -ur man/man8/amq.8 man/man8/amq.8
--- man/man8/amq.8	Sun Sep 12 18:34:44 1999
+++ man/man8/amq.8	Sun Nov 28 21:05:06 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: amq.8,v 1.3 1998/09/12 04:04:57 obrien Exp %
+.\" %Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/amq/amq.8,v 1.4.2.1 1999/11/27 04:46:42 obrien Exp %
 .\"
 .\" jpman %Id: amq.8,v 1.3 1997/08/11 14:26:54 horikawa Stab %
 .\"
diff -ur man/man8/fixmount.8 man/man8/fixmount.8
--- man/man8/fixmount.8	Sun Sep 12 18:34:44 1999
+++ man/man8/fixmount.8	Sun Nov 28 21:05:07 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: fixmount.8,v 1.3 1998/09/12 04:04:58 obrien Exp %
+.\" %Id: fixmount.8,v 1.2 1999/01/10 21:54:26 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.4.2.1 1999/11/27 04:46:51 obrien Exp %
 .\" jpman %Id: fixmount.8,v 1.3 1998/11/21 14:55:42 horikawa Stab %
 .\"
 .Dd February 26, 1993
diff -ur man/man8/fsinfo.8 man/man8/fsinfo.8
--- man/man8/fsinfo.8	Sun Sep 12 18:34:44 1999
+++ man/man8/fsinfo.8	Sun Nov 28 21:05:07 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1993 Jan-Simon Pendry.
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
-.\"	%Id: fsinfo.8,v 1.3 1999/06/26 22:53:22 mpp Exp %
+.\"	%Id: fsinfo.8,v 1.2 1999/01/10 21:54:28 ezk Exp %
+.\"	%FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.2.2.2 1999/11/27 04:46:55 obrien Exp %
 .\"
 .\" jpman %Id: fsinfo.8,v 1.2 1997/06/06 10:17:38 bobson Stab %
 .\"
diff -ur man/man8/hlfsd.8 man/man8/hlfsd.8
--- man/man8/hlfsd.8	Sun Sep 12 18:34:44 1999
+++ man/man8/hlfsd.8	Sun Nov 28 21:05:08 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1989 The Regents of the University of California.
@@ -36,7 +36,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %Id: hlfsd.8,v 1.4 1999/08/18 05:54:47 chris Exp %
+.\" %Id: hlfsd.8,v 1.2 1999/01/10 21:54:32 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.3.2.2 1999/11/27 04:46:58 obrien Exp %
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff -ur man/man8/ipfw.8 man/man8/ipfw.8
--- man/man8/ipfw.8	Sun Nov 28 21:05:41 1999
+++ man/man8/ipfw.8	Wed Nov 24 00:13:30 1999
@@ -66,9 +66,11 @@
 .Op via Ar name | ipno
 .Op Ar options
 .Sh $B2r@b(B
-$B=q<0$N(B 1 $B9TL\$N$h$&$K%U%!%$%kL>$r;XDj$7$?>l9g$O!"(B
+$B=q<0$N(B 1 $B9TL\$N$h$&$K;XDj$7$?>l9g$O!"(B
 .Ar file
-$B$r(B 1 $B9T$:$D!"0z?t$H$7$FFI$_9~$_$^$9!#(B
+$B$r(B 1 $B9T$:$D!"(B
+.Nm
+$B%3%^%s%I$X$N0z?t$H$7$FFI$_9~$_$^$9!#(B
 .Pp
 .Fl p Ar preproc
 $B$r;HMQ$7$F!"(B
@@ -97,6 +99,109 @@
 $B=@Fp@-$N$"$k@_Dj%U%!%$%k$r:n@.2DG=$H$J$j!"(BIP $B%"%I%l%9$N$h$&$K(B
 $BIQHK$KI,MW$H$J$k0z?t$r=8Cf4IM}$9$k$?$a$N%^%/%m$r;HMQ2DG=$H$J$j$^$9!#(B
 .Pp
+$B<u?.$5$l$?$"$k$$$OAw?.$5$l$k3F%Q%1%C%H$O(B
+.Nm
+$B$N%k!<%k$rDL2a$7$^$9!#(B
+$B%[%9%H$,%2!<%H%&%'%$$H$7$FF0:n$7$F$$$k>l9g!"(B
+$B%[%9%H$K$h$C$FE>Aw$5$l$k%Q%1%C%H$O(B
+.Nm
+$B$K$h$C$F(B 2 $B2s=hM}$5$l$^$9(B
+.Po
+1 $B2s$OF~$C$FMh$?;~!"$b$&(B 1 $B2s$O=P$F$$$/;~$G$9(B
+.Pc $B!#(B
+$B0J2<$N>pJs$r4p$K3F%Q%1%C%H$r%U%#%k%?$9$k$3$H$,=PMh$^$9!#(B
+.Pp
+.Bl -tag -offset indent -compact -width xxxx
+.It $B<u?.%$%s%?%U%'!<%9(B Pq Ar recv
+$B%Q%1%C%H$,<u?.$5$l$?%$%s%?%U%'!<%9(B
+.It $BAw?.%$%s%?%U%'!<%9(B Pq Ar xmit
+$B%Q%1%C%H$,Aw=P$5$l$k%$%s%?%U%'!<%9(B
+.It Incoming Pq Ar in
+$B%Q%1%C%H$,<u?.$5$l$?(B
+.It Outgoing Pq Ar out
+$B%Q%1%C%H$,Aw=P$5$l$?(B
+.It $B;OE@(B IP $B%"%I%l%9(B
+$BAw?.<T$N(B IP $B%"%I%l%9(B
+.It $B08@h(B IP $B%"%I%l%9(B
+$B%?!<%2%C%H$N(B IP $B%"%I%l%9(B
+.It $B%W%m%H%3%k(B
+IP
+.Pq Ar ip ,
+UDP
+.Pq Ar udp ,
+TCP
+.Pq Ar tcp ,
+ICMP
+.Pq Ar icmp
+$B$K8B$i$J$$$,!"$=$l$i$r4^$`(B IP $B%W%m%H%3%k(B
+.It $B;OE@%]!<%H(B
+$BAw?.<T$N(B UDP $B$+(B TCP $B$N%]!<%H(B
+.It $B08@h%]!<%H(B
+$B%?!<%2%C%H$N(B UDP $B$+(B TCP $B%]!<%H(B
+.It $B%3%M%/%7%g%s%U%i%0(B Pq Ar setup
+$B$3$N%Q%1%C%H$O(B TCP $B%3%M%/%7%g%s%;%C%H%"%C%W$NMW5a$G$"$k(B
+.It $B%3%M%/%7%g%s3NN)%U%i%0(B Pq Ar established
+$B$3$N%Q%1%C%H$O3NN)$5$l$?(B TCP $B%3%M%/%7%g%s$N0lIt$G$"$k(B
+.It $B$9$Y$F$N(B TCP $B%U%i%0(B Pq Ar tcpflags
+1 $B$D0J>e$N(B TCP $B%U%i%0(B: $B%3%M%/%7%g%s2rJ|(B
+.Pq Ar fin ,
+$B%3%M%/%7%g%s%*!<%W%s(B
+.Pq Ar syn ,
+$B%3%M%/%7%g%s%j%;%C%H(B
+.Pq Ar rst ,
+$B%W%C%7%e(B
+.Pq Ar push ,
+$B3NG'1~Ez(B
+.Pq Ar ack ,
+$B6[5^(B
+.Pq Ar urg
+.It $BCGJR2=%U%i%0(B Pq Ar frag
+$B$3$N%Q%1%C%H$O(B IP $B%Q%1%C%H$NCGJR2=$G$"$k(B
+.It IP $B%*%W%7%g%s(B Pq Ar ipoptions
+1 $B$D0J>e$N(B IP $B%*%W%7%g%s(B: $B87L)$J%=!<%9%k!<%H(B
+.Pq Ar ssrr ,
+$B%k!<%9%=!<%9%k!<%H(B
+.Pq Ar lsrr ,
+$B%k!<%H5-O?(B
+.Pq Ar rr ,
+$B%?%$%`%9%?%s%W(B
+.Pq Ar ts
+.It ICMP $B%?%$%W(B Pq Ar icmptypes
+1 $B$D0J>e$N(B ICMP $B%?%$%W(B: $B%(%3!<JVEz(B
+.Pq Ar 0 ,
+$B=*E@ITE~C#(B
+.Pq Ar 3 ,
+$BH/?.M^@)(B
+.Pq Ar 4 ,
+$B8~$1D>$7(B
+.Pq Ar 5 ,
+$B%(%3!<MW5a(B
+.Pq Ar 8 ,
+$B%k!<%?9-9p(B
+.Pq Ar 9 ,
+$B%k!<%?MW@A(B
+.Pq Ar 10 ,
+$B;~4VD62a(B
+.Pq Ar 11 ,
+IP $B%X%C%@0[>o(B
+.Pq Ar 12 ,
+$B%?%$%`%9%?%s%WMW5a(B
+.Pq Ar 13 ,
+$B%?%$%`%9%?%s%W1~Ez(B
+.Pq Ar 14 ,
+$B>pJsMW5a(B
+.Pq Ar 15 ,
+$B>pJsJVEz(B
+.Pq Ar 16 ,
+$B%"%I%l%9%^%9%/MW5a(B
+.Pq Ar 17 ,
+$B%"%I%l%9%^%9%/1~Ez(B
+.Pq Ar 18
+.El
+.Pp
+$B;OE@(B IP $B%"%I%l%9$d;OE@(B TCP/UDP $B%]!<%H$r%U%#%k%?$9$k$3$H$O(B
+$B%9%W!<%U$5$l$d$9$/$J$k$N$GCm0U$7$F2<$5$$!#(B
+.Pp
 .Nm
 $B$O%Q%1%C%H$4$H$K!"%^%C%A$9$k%k!<%k$,8+$D$+$k$^$G%k!<%k%j%9%H$rD4$Y$^$9!#(B
 $B3F%k!<%k$K$O%Q%1%C%H?t$H%Q%1%C%H%5%$%:$N(B 2 $B$D$N%+%&%s%?$,MQ0U$5$l$F$$$F!"(B
@@ -122,7 +227,6 @@
 $BHV9f$r;XDj$;$:$K%k!<%k$rDI2C$7$?>l9g$O!"(B
 $B4{$KDj5A$5$l$F$$$k%k!<%k$N:GBg$NHV9f$K(B 100 $B$r2C$($?$b$N$H$J$j$^$9!#(B
 $B%k!<%k$NHV9f$,(B 65435 $B0J>e$N>l9g$O!"?7$7$$%k!<%k$OF1$8HV9f$,M?$($i$l$^$9!#(B
-$B!#(B
 .Pp
 delete $BA`:n$O!"(B
 .Ar number 
@@ -173,7 +277,7 @@
 .It Fl f
 $BA`:n$r<B9T$9$k:]$K3NG'%a%C%;!<%8$rI=<($7$^$;$s!#(B
 flush $BA`:n$bL5>r7o$K<B9T$5$l$^$9!#(B
-.Ar $B!JCm0U!K(B
+.Ar ($BCm0U(B)
 $B%W%m%;%9$K(B tty $B$,4XO"IU$1$i$l$F$$$J$$>l9g$K$O!"(B
 $B$3$N%*%W%7%g%s$,;XDj$5$l$F$$$k$b$N$H$7$F<B9T$5$l$^$9!#(B
 .It Fl q
@@ -196,18 +300,7 @@
 .It Fl t
 list $BA`:n$N;~$K!":G8e$K%^%C%A$7$?%Q%1%C%H$N%?%$%`%9%?%s%W$rI=<($7$^$9!#(B
 .It Fl N
-IP $B%"%I%l%9$H%5!<%S%9L>$r%j%>%k%V$7$F%[%9%HL>$GI=<($7$^$9!#(B
-.It Ar uid user
-.Ar user
-$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
-$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
-.Ar user
-$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
-.It Ar gid group
-$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
-$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
-.Ar group
-$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
+IP $B%"%I%l%9$H%5!<%S%9L>$r2r7h$7$F%[%9%HL>$GI=<($7$^$9!#(B
 .El
 .Pp
 .Ar action :
@@ -289,7 +382,7 @@
 $B$3$l$OF)2aE*%W%m%-%7%5!<%P$N$?$a$K$"$j$^$9!#(B
 IP $B$,(B $B%m!<%+%k%"%I%l%9$G$O$J$$>l9g!"%]!<%HHV9f$O(B ($B;XDj$5$l$F$$$F$b(B) $BL5;k$5$l!"(B
 $B%k!<%k$O%7%9%F%`$+$i=P$F9T$/%Q%1%C%H$KBP$7$F$N$_E,MQ$5$l$^$9!#(B
-$B$^$?!"!W(B
+$B$^$?!"(B
 $B%Q%1%C%H%m!<%+%k$K@8@.$5$l$?;~$K$b%"%I%l%9$r%m!<%+%k%]!<%H$K%^%C%W$7$^$9!#(B
 $B8!:w$O%k!<%k$,%^%C%A$7$?$H$-$K=*N;$7$^$9!#(B
 $B%]!<%HHV9f$,M?$($i$l$J$+$C$?>l9g!"%Q%1%C%HCf$N%]!<%HHV9f$,;HMQ$5$l!"(B
@@ -312,6 +405,17 @@
 $B$h$j>.$5$JHV9f$N%k!<%k$rHt$S1[$7$F!"(B
 .Ar number
 $B0J>e$NHV9f$N%k!<%k$G:G=i$KB8:_$9$k$b$N$+$i!"%^%C%A%s%0$r7QB3$7$^$9!#(B
+.It Ar uid user
+.Ar user
+$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
+$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
+.Ar user
+$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
+.It Ar gid group
+$B$,Aw?.$7$?$^$?$O<u?.$9$k!"(B
+$B$9$Y$F$N(B TCP $B%Q%1%C%H$H(B UDP $B%Q%1%C%H$K%^%C%A$7$^$9!#(B
+.Ar group
+$B$O!"L>A0$G$b(B ID $BHV9f$G$b%^%C%A$7$^$9!#(B
 .El
 .Pp
 $B%Q%1%C%H$,(B
@@ -361,7 +465,7 @@
 .It Ar <number|name>
 $B;XDj$5$l$?%W%m%H%3%k$N%Q%1%C%H$N$_%^%C%A$7$^$9(B (
 .Pa /etc/protocols
-$B$N%j%9%H$r;2>H$N;v(B)
+$B$N%j%9%H$r;2>H$N;v(B)$B!#(B
 .El
 .Pp
 .Ar src 
@@ -482,8 +586,8 @@
 $B$r;XDj$9$k;v$O$G$-$^$;$s!#(B
 .Pp
 $B8D!9$N%Q%1%C%H$O!"<u?.MQ$J$$$7Aw?.MQ%$%s%?%U%'!<%9$r;}$?$J$$$+$b$7$l$^$;$s!#(B
-$B%m!<%+%k%[%9%H$GH/@8$7$?%Q%1%C%H$K$O<u?.MQ$N%$%s%?%U%'!<%9$O$J$$$7!"(B
-$B%m!<%+%k%[%9%HFb08$N%Q%1%C%H$O!"Aw?.MQ%$%s%?%U%'!<%9$,M-$j$^$;$s!#(B
+$B%m!<%+%k%[%9%H$GH/@8$7$?%Q%1%C%H$K$O<u?.MQ$N%$%s%?%U%'!<%9$O$"$j$^$;$s$7!"(B
+$B%m!<%+%k%[%9%HFb08$N%Q%1%C%H$K$OAw?.MQ%$%s%?%U%'!<%9$O$"$j$^$;$s!#(B
 .Pp
 $BDI2CMQ(B
 .Ar options :
@@ -599,12 +703,14 @@
 .Pp
 .Dl ipfw add deny tcp from cracker.evil.org to wolf.tambov.su 23
 .Pp 
-$B<!$N%3%^%s%I$O%M%C%H%o!<%/(B hackers $B$+$i%[%9%H(B my $B$X$N$9$Y$F$N%3%M%/%7%g%s$r(B
-$B5qH]$7$^$9!#(B
+$B<!$N%3%^%s%I$O%/%i%C%+!<$N%M%C%H%o!<%/A4BN$+$i%[%9%H(B my $B$X$N(B
+$B$9$Y$F$N%3%M%/%7%g%s$r5qH]$7$^$9!#(B
 .Pp
 .Dl ipfw add deny all from 123.45.67.0/24 to my.host.org
 .Pp
-$B<!$O%+%&%s%H$5$l$F$$$k>pJs$H%?%$%`%9%?%s%W$r8+$kNc$G$9(B
+$B<!$O%+%&%s%H$5$l$F$$$k>pJs$H%?%$%`%9%?%s%W>pJs$r8+$k(B
+.Ar list
+$B%3%^%s%I$N$h$$Nc$G$9!#(B
 .Pp
 .Dl ipfw -at l
 .Pp
diff -ur man/man8/mk-amd-map.8 man/man8/mk-amd-map.8
--- man/man8/mk-amd-map.8	Sun Sep 12 18:34:44 1999
+++ man/man8/mk-amd-map.8	Sun Nov 28 21:05:08 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1993 Jan-Simon Pendry
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
-.\"	%Id: mk-amd-map.8,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp %
+.\"	%Id: mk-amd-map.8,v 1.2 1999/01/10 21:54:41 ezk Exp %
+.\"	%FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.2.2.1 1999/11/27 04:47:07 obrien Exp %
 .\"
 .\" jpman %Id: mk-amd-map.8,v 1.2 1997/06/06 10:48:37 bobson Stab %
 .\"
diff -ur man/man8/ppp.8 man/man8/ppp.8
--- man/man8/ppp.8	Fri Nov 19 23:09:24 1999
+++ man/man8/ppp.8	Sun Nov 28 21:12:51 1999
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.15 1999/10/10 20:39:35 brian Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.16 1999/11/19 23:48:01 brian Exp %
 .\"
 .\" jpman %Id: ppp.8,v 1.4 1997/06/08 18:41:58 saeki Stab %
 .\" WORD: expect string	$B<u?.BT$AJ8;zNs(B (chat.8)
@@ -12,9 +12,10 @@
 .Nd PPP (Point to Point Protocol) ($BJLL>(B user-ppp)
 .Sh $B=q<0(B
 .Nm
+.Op Fl Va mode
 .Op Fl nat
 .Op Fl quiet
-.Op Fl Va mode
+.Op Fl unit Ns Ar N
 .Op Fl alias
 .Op Ar system Ns
 .No ...
@@ -54,6 +55,21 @@
 $B$O5/F0;~$K@E$+$K$J$j!"(B
 $B%b!<%I$H%$%s%?%U%'!<%9$rI8=`=PNO$XI=<($7$J$/$J$j$^$9!#(B
 .Pp
+.Fl unit
+$B%U%i%0$O!"(B
+.Nm
+$B$,(B
+.Pa /dev/tun Ns Ar N
+$B$N$_$N%*!<%W%s$r;n$_$k$h$&$K;XDj$7$^$9!#(B
+$BDL>o!"(B
+.Nm
+$B$O(B
+.Ar N
+$B$KBP$7$FCM(B 0 $B$+$i3+;O$7!"@.8y$9$k$^$G(B
+.Ar N
+$B$rCM(B 1 $B$:$DA}2C$5$;$F!"%H%s%M%k%G%P%$%9$N%*!<%W%s$r;n$_$^$9!#(B
+$B%G%P%$%9%U%!%$%k$,B8:_$7$J$$$?$a$K!"(B3 $B2sO"B3$7$F<:GT$9$k$H!"D|$a$^$9!#(B
+.Pp
 .Nm
 $B$O<!$N(B
 .Va mode
@@ -199,7 +215,7 @@
 $B$OI8=`(B LCP $B%3!<%k%P%C%/%W%m%H%3%k$J$i$S$K(B Microsoft $B%3!<%k%P%C%/@)8f%W%m%H%3%k(B
 (ftp://ftp.microsoft.com/developr/rfc/cbcp.txt)
 $B$r;HMQ$G$-$^$9!#(B
-.It $B%Q%1%C%H%(%$%j%"%7%s%0$r%5%]!<%H(B
+.It NAT$B!"$9$J$o$A%Q%1%C%H%(%$%j%"%7%s%0$r%5%]!<%H(B
 $B%Q%1%C%H%(%$%j%"%7%s%0(B ($BJLL>(B: IP $B%^%9%+%l!<%I(B) $B$K$h$j!"(B
 $BL$EPO?$G%W%i%$%Y!<%H$J%M%C%H%o!<%/>e$N%3%s%T%e!<%?$+$i$b(B
 $B%$%s%?!<%M%C%H$K%"%/%;%9$9$k$3$H$,2DG=$G$9!#(B
@@ -271,7 +287,9 @@
 .It PPP $B%*!<%P(B TCP $B$*$h$S(B PPP $B%*!<%P(B UDP $B$r%5%]!<%H(B
 $B%G%P%$%9L>$,(B
 .Em host Ns No : Ns Em port Ns
-.Op / Ns Em tcp Ns No | Ns Em udp
+.Xo
+.Op / Ns tcp|udp ,
+.Xc
 $B7A<0$G;XDj$5$l$?>l9g!"(B
 .Nm
 $B$ODL>o$N%7%j%"%k%G%P%$%9$r;H$&$N$G$O$J$/!"(B
@@ -286,6 +304,23 @@
 $B@8$N(B B $B%A%c%M%k(B i4b $B%G%P%$%9$r;XDj$9$k$H!"(B
 .Xr isdnd 8
 $B$HBPOC$7$F(B ISDN $B@\B3$r3NN)$G$-$^$9!#(B
+.It PPP $B%*!<%P%$!<%5%M%C%H$r%5%]!<%H(B (rfc 2516)
+.Nm
+$B$,(B
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
+$B$N=q<0$N%G%P%$%9;XDj$rM?$($i$l!"(B
+.Xr netgraph 4
+$B$,MxMQ2DG=$J>l9g!"(B
+.Nm
+$B$O(B
+.Ar iface
+$B%M%C%H%o!<%/%$%s%?%U%'!<%9$r;HMQ$7!"(B
+.Ar provider
+$B$KBP$7$F(B
+.Em PPP
+$B%*!<%P%$!<%5%M%C%H$rOC$=$&$H$7$^$9!#(B
 .It "IETF $B%I%i%U%H$N(B Predictor-1 (rfc 1978) $B$H(B DEFLATE (rfc 1979) $B05=L$r%5%]!<%H(B
 .Nm
 $B$O(B VJ $B05=L$NB>$K(B Predictor-1 $B$H(B DEFLATE $B05=L$b%5%]!<%H$7$F$$$^$9!#(B
@@ -347,12 +382,9 @@
 $B$r<B9T$9$k;~$K$O!"$$$/$D$+$N=i4|@_Dj$r@0$($kI,MW$,$"$j$^$9!#(B
 .Bl -bullet
 .It
-1999 $BG/(B 10 $B7n$^$G$N(B FreeBSD-current $B$G$O!"(B
-$B%+!<%M%k$K%H%s%M%k%G%P%$%9$,4^$^$l$F$$$J$1$l$P(B
-$B$J$j$^$;$s(B (GENERIC $B%+!<%M%k$G$O%G%U%)%k%H$G(B 1 $B$D4^$^$l$^$9(B)$B!#(B
-$B$3$l0J9_$N(B FreeBSD $B$G$O!"(Bif_tun kld $B$rF0E*$K%m!<%I$7!"(B
-tun $B%G%P%$%9$O?75,%^%$%JHV9f$r%*%s%G%^%s%I$K3d$jEv$F$^$9!#(B
-$B8E$$%+!<%M%k$G!"(Btun $B%G%P%$%9$,4^$^$l$F$$$J$$>l9g$d!"(B
+$B%+!<%M%k$K%H%s%M%k%G%P%$%9$,4^$^$l$F$$$k$3$H$,I,MW$G$9(B
+(GENERIC $B%+!<%M%k$G$O%G%U%)%k%H$G(B 1 $B$D4^$^$l$^$9(B)$B!#(B
+tun $B%G%P%$%9$,4^$^$l$F$$$J$$>l9g$d!"(B
 $BJ#?t$N(B tun $B%$%s%?%U%'!<%9$,I,MW$J>l9g!"(B
 $B<!$N9T$r%+!<%M%k@_Dj%U%!%$%k$KDI2C$7$F!"(B
 $B%+!<%M%k$r:F9=C[$9$kI,MW$,$"$j$^$9(B:
@@ -376,9 +408,6 @@
 $B$3$l$K$h$j(B 0 $B$+$i(B
 .Ar N
 $B$^$G$N(B tun $B%G%P%$%9$,:n@.$5$l$^$9!#(B
-.Pp
-$BF0E*$K(B tun $B%G%P%$%9$r3d$jEv$F$k5!G=$r%+!<%M%k$,;}$C$F$$$k>l9g$G$b!"(B
-$B$3$NA`:n$OI,MW$G$9!#(B
 .It
 $B$"$J$?$N%7%9%F%`$N(B
 .Pa /etc/group
@@ -2038,6 +2067,7 @@
 .It Li Chat
 .Sq dial ,
 .Sq login ,
+.Sq logout ,
 .Sq hangup
 $B$N%A%c%C%H%9%/%j%W%H$N%H%l!<%9%m%0$N@8@.!#(B
 .It Li Command
@@ -2392,10 +2422,7 @@
 MS-CHAP $B$O(B MD4 $B$H(B DES $B$NAH$_9g$o$;$G$9!#$b$7(B
 .Nm
 $B$,(B DES $B%i%$%V%i%j$NB8:_$9$k%^%7%s>e$G9=C[$5$l$?>l9g(B
-MS-CHAP $BG'>ZMW5a$K1~Ez$7$^$9!#(B
-$B8e=R$N(B
-.Dq MSChap
-$B$N2r@b$r;2>H$7$F$/$@$5$$!#(B
+MS-CHAP $BG'>ZMW5a$K1~Ez$7$^$9$,!"MW5a$O$7$^$;$s!#(B
 .It deflate
 $B%G%U%)%k%H(B: enable $B$+$D(B accept$B!#(B
 $B$3$N%*%W%7%g%s$O05=L@)8f%W%m%H%3%k(B (Compression Control Protocol; CCP) $B$K(B
@@ -3732,7 +3759,7 @@
 $B$,;XDj$5$l$?>l9g$K$O!"(B
 .Nm
 $B@\B3Aj<j$,HV9f$r;XDj$9$k$b$N$HA[Dj$7$^$9!#(B
-.It set cd Ar seconds Ns Op \&!
+.It "set cd off|" Ns Ar seconds Ns Op \&!
 $BDL>o!"%m%0%$%s%9%/%j%W%H40N;$N(B 1 $BIC8e$K!"(B
 .Nm
 $B$O%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9!#(B
@@ -3752,6 +3779,10 @@
 .Nm
 $B$,BT$D$Y$-IC?t$r;XDj$7$^$9!#(B
 .Pp
+.Dq off
+$B$,;XDj$5$l$k$H!"(B
+.Nm
+$B$O%G%P%$%9$N%-%c%j%"$r3NG'$7$^$;$s!#$=$&$G$J$$>l9g!"(B
 $B%-%c%j%"$,8!=P$5$l$k$+(B
 .Ar seconds
 $B$NIC?t$,7P2a$9$k$^$G!"(B
@@ -3771,7 +3802,9 @@
 .Pp
 ISDN $B%G%P%$%9$G$O!"(B
 .Nm
-$B$O>o$K%-%c%j%"$K8G<9$7$^$9!#(B
+$B$O>o$K%-%c%j%"$K8G<9$7$^$9(B ($BCM(B
+.Dq off
+$B$OIT@5$G$9(B)$B!#(B
 $B8F$,@\B3$7$?8e$G$N$_!"(B
 i4brbchX $B%G%P%$%9%I%i%$%P$O%-%c%j%"$rN)$A>e$2$^$9!#$=$l$f$(!"(B
 .Ar 6
@@ -3780,6 +3813,9 @@
 $B%j%s%/$,B>$N%G%P%$%9$N>l9g!"%-%c%j%"$N(B
 .Em $BI,MW@-(B
 $B$OL5;k$5$l$^$9!#(B
+$B$9$J$o$A(B
+.Dq off
+$B$,%;%C%H$5$l$?$+$N$h$&$K$J$j$^$9!#(B
 .It set choked Op Ar timeout
 $B$3$l$O(B
 .Nm
@@ -3799,9 +3835,9 @@
 $BH/@8$7$^$9!#(B
 .Nm
 $B$O%Q%1%C%H$rL58B$K$OFI$_9~$_$^$;$s!#Be$j$K(B
-.Em 20
+.Em 30
 $B%Q%1%C%H(B ($B%^%k%A%j%s%/%b!<%I$G$O(B
-.Em 20 No +
+.Em 30 No +
 .Em nlinks No *
 .Em 2
 $B%Q%1%C%H(B) $B$^$GFI$_9~$_!"(B
@@ -3862,7 +3898,13 @@
 $B$+$i;O$^$i$J$$>l9g!"%(%/%9%/%i%a!<%7%g%s%^!<%/(B
 .Pq Dq \&!
 $B$+$i;O$a$k$+!"(B
-.Dq host:port Ns Op Ns /proto
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
+$B$N7A<0$G$"$k$+!"(B
+.Ar host Ns No : Ns Ar port Ns Oo
+.No /tcp|udp
+.Oc
 $B$N7A<0$G$"$kI,MW$,$"$j$^$9!#(B
 .Pp
 $B%(%/%9%/%i%a!<%7%g%s%^!<%/$G;O$^$k>l9g!"(B
@@ -3872,15 +3914,42 @@
 .Nm
 $B$K%U%#!<%I%P%C%/$5$l!"$=$l$i$,DL>o%G%P%$%9$G$"$k$+$N$h$&$KFI$_=q$-$5$l$^$9!#(B
 .Pp
-.Dq host:port Ns Op /tcp|/udp
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
+$B;XDj$,M?$($i$l$k>l9g!"(B
+.Nm
+$B$O!";XDj$5$l$?(B
+.Ar iface
+$B%$%s%?%U%'!<%9$r;HMQ$7$F(B
+.Em PPP
+$B%*!<%P%$!<%5%M%C%H@\B3$r:n@.$7$h$&$H$7$^$9!#(B
+$BM?$($i$l$?(B
+.Ar provider
+$B$O!"(BPPPoE Discovery Initiation (PADI) $B%Q%1%C%HCf$G%5!<%S%9L>$H$7$FEO$5$l$^$9!#(B
+provider $B$,M?$($i$l$J$$$H!"6u$NCM$,;HMQ$5$l$^$9!#(B
+$B$5$i$J$k>\:Y$O(B
+.Xr netgraph 4
+$B$H(B
+.Xr ng_pppoe 8
+$B$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+.Ar host Ns No : Ns Ar port Ns Oo
+.No /tcp|udp
+.Oc
 $B;XDj$,M?$($i$l$k>l9g!"(B
 .Nm
 $B$O!";XDj$5$l$?(B
-.Dq host
+.Ar host
 $B$N;XDj$5$l$?(B
-.Dq port
+.Ar port
 $B$H@\B3$7$h$&$H$7$^$9!#(B
-tcp $B$^$?$O(B udp $B$N;XDj$,$J$$>l9g!"%G%U%)%k%H$O(B tcp $B$H$J$j$^$9!#(B
+.Dq /tcp
+$B$^$?$O(B
+.Dq /udp
+$B$N%5%U%#%C%/%9$,$J$$>l9g!"%G%U%)%k%H$O(B
+.Dq /tcp
+$B$H$J$j$^$9!#(B
 $B>\:Y$O>e=R$N(B
 .Em PPP $B%*!<%P(B TCP $B$H(B PPP $B%*!<%P(B UDP
 $B$N@a$r;2>H$7$F$/$@$5$$!#(B
@@ -4296,6 +4365,11 @@
 $B$b$7N>J}$,;XDj$5$l$?>l9g!"%@%$%d%k%9%/%j%W%H$N8e$G!"(B
 $B%m%0%$%s%9%/%j%W%H$,<B9T$5$l$^$9!#(B
 $B%@%$%d%k%9%/%j%W%HCf$G;HMQ2DG=$J%(%9%1!<%W%7!<%1%s%9$O$3$3$G$b;HMQ2DG=$G$9!#(B
+.It set logout Ar chat-script
+$B$3$N%3%^%s%I$O!"(B
+$B%O%s%0%"%C%W%9%/%j%W%H$,8F$P$l$kA0$K%m%0%"%&%H$N$?$a$K;HMQ$5$l$k!"(B
+$B%A%c%C%H%9%/%j%W%H$r;XDj$7$^$9!#(B
+$BDL>o$G$OI,MW$J$$$G$7$g$&!#(B
 .It set lqrperiod Ar frequency
 $B$3$N%3%^%s%I$O!"(B
 .Em LQR
@@ -4625,8 +4699,6 @@
 $B$K@dBP%U%!%$%kL>$r;XDj$7$^$9!#$=$&$7$J$$$H!"(BTCP $B%]!<%H$NL>A0$b$7$/$OHV9f(B
 $B$G$"$k$H2r<a$5$l$^$9!#(B
 $B%m!<%+%k%I%a%$%s%=%1%C%H$K;HMQ$5$l$k(B 8 $B?J(B umask $B$r;XDj$9$kI,MW$,$"$j$^$9!#(B
-.Sq 0
-$B$+$i;O$^$k(B 4 $B7e(B 8 $B?J?t$G;XDj$7$^$9!#(B
 umask $B$N>\:Y$K$D$$$F$O(B
 .Xr umask 2
 $B$r;2>H$7$F$/$@$5$$!#(BTCP $B%]!<%HL>$,$I$N$h$&$KJQ49$5$l$k$+$K$D$$$F$O(B
@@ -4709,6 +4781,49 @@
 $B:GC;$G$b;XDj$5$l$?IC?t$@$1%j%s%/$,%"%C%W$7$F$$$J$$$H!"(B
 .Nm
 $B$O%"%$%I%k%"%&%H$7$^$;$s!#(B
+.It set urgent Xo
+.Op tcp|udp
+.Oo Op +|- Ns
+.Ar port
+.Oc No ...
+.Xc
+$B$3$N%3%^%s%I$O!"%G!<%?E>Aw;~$K(B
+.Nm
+$B$,M%@h$9$k%]!<%H$r@)8f$7$^$9!#(B
+$B%G%U%)%k%H$NM%@h(B TCP $B%]!<%H$O!"%]!<%H(B
+21 (ftp control), 22 (ssh), 23 (telnet), 513 (login), 514 (shell),
+543 (klogin), 544 (kshell) $B$G$9!#(B
+$BM%@h(B UDP $B%]!<%H$O!"%G%U%)%k%H$G$O$"$j$^$;$s!#(B
+$B>\:Y$O(B
+.Xr services 5
+$B$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+.Dq tcp
+$B$b(B
+.Dq udp
+$B$b;XDj$7$J$$$H!"(B
+.Dq tcp
+$B$,2>Dj$5$l$^$9!#(B
+.Pp
+.Ar port
+$B$r;XDj$7$J$$$H!"M%@h%]!<%H%j%9%H$,%/%j%"$5$l$^$9(B (
+.Dq tcp
+$B$^$?$O(B
+.Dq udp
+$B$r;XDj$9$k$H!"$=$N%j%9%H$N$_$,%/%j%"$5$l$^$9(B)$B!#(B
+$B:G=i$N(B
+.Ar port
+$B0z?t$K%W%i%9(B
+.Pq Dq \&+
+$B$^$?$O%^%$%J%9(B
+.Pq Dq \&-
+$B$N%W%l%U%#%C%/%9$rIU$1$?>l9g!"8=:_$N%j%9%H$,=$@5$5$l$^$9$,!"(B
+$B$=$&$G$J$$>l9g$K$O!":F3d$jEv$F$5$l$^$9!#(B
+$B%W%i%9$N%W%l%U%#%C%/%9IU$-$^$?$O%W%l%U%#%C%/%9L5$7$N(B
+.Ar port
+$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
 .It set vj slotcomp on|off
 $B$3$N%3%^%s%I$O(B
 .Nm
@@ -4920,6 +5035,7 @@
 .Xr libalias 3 ,
 .Xr syslog 3 ,
 .Xr uucplock 3 ,
+.Xr netgraph 4 ,
 .Xr crontab 5 ,
 .Xr group 5 ,
 .Xr passwd 5 ,
@@ -4931,6 +5047,7 @@
 .Xr getty 8 ,
 .Xr inetd 8 ,
 .Xr init 8 ,
+.Xr ng_pppoe 8 ,
 .Xr named 8 ,
 .Xr ping 8 ,
 .Xr pppctl 8 ,
diff -ur man/man8/sicontrol.8 man/man8/sicontrol.8
--- man/man8/sicontrol.8	Sun Nov 28 21:05:42 1999
+++ man/man8/sicontrol.8	Mon Nov 22 03:41:53 1999
@@ -66,11 +66,6 @@
 $B;XDj$5$l$?%7%j%"%k%]!<%H$K4X$9$k%+!<%M%kFbIt$N(B "tty" $B9=B$BN$N8=:_$NFbMF$r(B
 $BI=<($7$^$9!#$3$l$O%I%i%$%P$N%G%P%C%00J30$K$O!"$"$^$j;H$$F;$,$"$j$^$;$s!#(B
 .El
-.\" The following requests should be uncommented and used where appropriate.
-.\" This next request is for sections 2 and 3 function return values only.
-.\" .Sh RETURN VALUES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\" .Sh ENVIRONMENT
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /dev/si_control -compact
 .It Pa /dev/si_control
@@ -85,20 +80,14 @@
 .Xr stty 1
 $B$G;HMQ$5$l$k!"%m%C%/$5$l$?(B termios $B%9%F!<%H%G%P%$%9(B
 .El
-.\" .Sh EXAMPLES
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
 .Sh $B?GCG(B
 $B0lHL$K<+L@$G$9(B.....
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh $B4XO"9`L\(B
 .Xr stty 1 ,
 .Xr si 4 ,
 .Xr termios 4 ,
 .Xr tty 4 ,
 .Xr comcontrol 8 .
-.\" .Sh STANDARDS
 .Sh $BNr;K(B
 .Nm sicontrol
 $B$O(B
diff -ur man/man8/sysctl.8 man/man8/sysctl.8
--- man/man8/sysctl.8	Sun Sep  5 01:36:21 1999
+++ man/man8/sysctl.8	Sun Nov 28 21:05:15 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.1 1999/08/29 15:15:55 peter Exp %
+.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.2 1999/11/22 08:43:59 des Exp %
 .\" jpman %Id: sysctl.8,v 1.2 1997/05/30 00:57:58 yugawa Stab %
 .\"
 .Dd September 23, 1994
@@ -41,14 +41,14 @@
 .Nd $B%+!<%M%k>uBV$N<hF@$d@_Dj(B
 .Sh $B=q<0(B
 .Nm sysctl
-.Op Fl bdn
+.Op Fl bn
 .Ar name ... 
 .Nm sysctl
 .Op Fl bn
 .Fl w
 .Ar name=value ... 
 .Nm sysctl
-.Op Fl bdn
+.Op Fl bn
 .Fl aAX
 .Sh $B2r@b(B
 .Nm
@@ -87,8 +87,6 @@
 $BJQ?t$NCM$r2C9)$;$:$K!"%P%$%J%j7A<0$GI=<($7$^$9!#(B
 $BJQ?tL>$d!":G8e$N2~9TJ8;z$O=PNO$5$l$^$;$s!#$3$l$O!"C10l$NJQ?t$KBP$7$F(B
 $BA`:n$9$k:]$KJXMx$G$7$g$&!#(B
-.It Fl d
-$B;XDj$7$?JQ?t$NCM$G$O$J$/!"FbMF5-=R$rI=<($7$^$9!#(B
 .It Fl w Ar name=value ...
 MIB $B$N(B
 .Ar name
diff -ur man/man8/umount.8 man/man8/umount.8
--- man/man8/umount.8	Sun Sep  5 01:36:21 1999
+++ man/man8/umount.8	Sun Nov 28 21:05:16 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" %FreeBSD: src/sbin/umount/umount.8,v 1.5.2.1 1999/08/29 15:16:01 peter Exp %
+.\" %FreeBSD: src/sbin/umount/umount.8,v 1.5.2.2 1999/11/22 23:04:01 green Exp %
 .\" jpman %Id: umount.8,v 1.3 1997/07/22 17:06:06 horikawa Stab %
 .\"
 .Dd February 20, 1994
@@ -121,29 +121,6 @@
 .Xr unmount 2 ,
 .Xr fstab 5 ,
 .Xr mount 8
-.Sh $B%P%0(B
-union $B%U%!%$%k%7%9%F%`$r;H$C$F$$$k;~$O!"(B
-.Xr umount 8
-$B$O!">o$K%^%&%s%H%]%$%s%H$G$"$k%N!<%I$r7hDj$9$k$3$H$,$G$-$^$;$s!#(B
-$B$3$N>l9g!"%"%s%^%&%s%H$9$k$?$a$K(B
-.Xr mount 8 
-$B$GI=<($5$l$k$N$HF1$87A<0$GE,@Z$J%G%#%l%/%H%j$r;XDj$7$F$d$kI,MW$,(B
-$B$"$j$^$9!#(B
-$BNc$($P!"%^%&%s%H%(%s%H%j$,0J2<$N$h$&$J>l9g!"(B
-.Bd -literal -offset indent
-<above>/tmpdir on /cdrom (local, user mount)
-.Ed
-.Pp
-$B%"%s%^%&%s%H$N$?$a$N%3%^%s%I$O!"(B
-.Bd -literal -offset indent
-umount '<above>/tmpdir'
-.Ed
-.Pp
-$B$H$J$j$^$9!#$3$3$G!"(B
-.Ar /tmpdir 
-$B$O!"%^%&%s%H%]%$%s%H(B
-.Ar /cdrom 
-$B$+$i%"%s%^%&%s%H$5$l$^$9!#(B
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
diff -ur man/man8/wire-test.8 man/man8/wire-test.8
--- man/man8/wire-test.8	Sun Sep 12 18:34:44 1999
+++ man/man8/wire-test.8	Sun Nov 28 21:05:16 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: wire-test.8,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp %
+.\" %Id: wire-test.8,v 1.2 1999/01/10 21:54:44 ezk Exp %
+.\" %FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.2.2.1 1999/11/27 04:47:11 obrien Exp %
 .\"
 .\" jpman %Id: wire-test.8,v 1.3 1999/01/06 00:07:27 jsakai Stab %
 .\"
Only in man: whatis

----Next_Part(Sun_Nov_28_22:20:56_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ediff_3.3-19991127-STABLE
Content-Disposition: attachment; filename=ediff_3.3-19991127-STABLE

diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man1/mail.1 man1/mail.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man1/mail.1	Fri Nov 19 19:38:38 1999
+++ man1/mail.1	Sat Nov 27 19:36:39 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.1 1999/08/29 15:30:12 peter Exp $
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.2 1999/11/22 10:33:49 jkoshy Exp $
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
@@ -112,6 +112,24 @@
 .Pp
 .Dl mail -f /var/mail/user
 .El
+.Ss Startup actions
+At startup time
+.Nm
+will execute commands in the system command files
+.Pa /usr/share/misc/mail.rc ,
+.Pa /usr/local/etc/mail.rc
+and
+.Pa /etc/mail.rc
+in order, unless explicitly told not to by the use of the
+.Fl n
+option.
+Next, the commands in the user's personal command file
+.Pa ~/.mailrc
+are executed.
+.Nm
+then examines its command line options to determine whether a 
+new message is to be sent, or whether an existing mailbox is to 
+be read.
 .Ss Sending mail
 To send a message to one or more people,
 .Nm mail
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man1/pawd.1 man1/pawd.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man1/pawd.1	Fri Nov 19 19:39:03 1999
+++ man1/pawd.1	Sat Nov 27 19:37:06 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -39,6 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: pawd.1,v 1.2 1998/09/05 06:56:36 obrien Exp $
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.3.2.1 1999/11/27 04:46:44 obrien Exp $
 .\"
 .Dd January 6, 1998
 .Dt PAWD 1
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/amd.conf.5 man5/amd.conf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/amd.conf.5	Fri Nov 19 19:39:04 1999
+++ man5/amd.conf.5	Sat Nov 27 19:37:06 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: amd.conf.5,v 1.8 1999/08/18 05:54:49 chris Exp $
+.\" $Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.6.2.3 1999/11/27 04:47:09 obrien Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
@@ -588,7 +589,7 @@
 .Po This is accomplished by returning non-zero values to the
 .Xr statfs 2
 .Pc system call .
-.It Nm unmount_on_exist (boolean, default=no)
+.It Nm unmount_on_exit (boolean, default=no)
 If
 .Dq yes ,
 then 
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/loader.conf.5 man5/loader.conf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/loader.conf.5	Fri Nov 19 19:38:13 1999
+++ man5/loader.conf.5	Sat Nov 27 19:36:11 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.1.2.3 1999/08/29 16:20:39 peter Exp $
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.1.2.5 1999/11/26 08:46:58 dcs Exp $
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
@@ -43,7 +43,7 @@
 .Pp
 The file
 .Pa /boot/loader.rc
-must have the follow two lines for
+must contain the following two lines for
 .Nm
 to be automatically processed:
 .Pp
@@ -103,6 +103,9 @@
 modules will be loaded.
 .It Ar kernel_options
 Flags to be passed to the kernel.
+.It Ar password
+Provides a password to be asked by check-password before execution is
+allowed to continue.
 .It Ar verbose_loading
 If set to
 .Dq YES ,
@@ -152,7 +155,13 @@
 .Pq Dq NO
 If set to
 .Dq YES ,
-will load the splash screen module, making possible to display a bitmap
+will load the splash screen module, making possible to display a bmp image
+on the screen while booting.
+.It Va splash_pcx_load
+.Pq Dq NO
+If set to
+.Dq YES ,
+will load the splash screen module, making possible to display a pcx image
 on the screen while booting.
 .It Va userconfig_script_load
 .Pq Dq NO
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/rc.conf.5 man5/rc.conf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man5/rc.conf.5	Fri Nov 19 19:38:02 1999
+++ man5/rc.conf.5	Sat Nov 27 19:36:01 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.20 1999/10/14 11:49:33 des Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.21 1999/11/23 10:32:45 jkoshy Exp $
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -1078,6 +1078,12 @@
 .Xr init 8
 for the list of possible security levels and their effect
 on system operation.
+.It Ar start_vinum
+(bool) Set to
+.Ar YES
+if you want to start
+.Xr vinum 8
+at system boot time.
 .Sh FILES
 .Bl -tag -width /etc/defaults/rc.conf -compact
 .It Pa /etc/defaults/rc.conf
@@ -1128,6 +1134,7 @@
 .Xr swapon 8 ,
 .Xr tickadj 8 ,
 .Xr timed 8 ,
+.Xr vinum 8 ,
 .Xr vnconfig 8 ,
 .Xr xntpd 8 ,
 .Xr xtend 8 ,
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/amd.8 man8/amd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/amd.8	Fri Nov 19 19:39:02 1999
+++ man8/amd.8	Sat Nov 27 19:37:04 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: amd.8,v 1.2 1998/09/05 05:52:24 obrien Exp $
+.\" $Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.1 1999/11/27 04:46:21 obrien Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -59,7 +60,7 @@
 .Ek
 .Op Fl l Ar logfile
 .Op Fl o Ar op_sys_ver
-.Op Fl t Ar interval.interval
+.Op Fl t Ar timeout.retransmit
 .Bk -words
 .Op Fl w Ar interval
 .Ek
@@ -174,13 +175,21 @@
 .Nm amd
 .Em inherits
 it.
-.It Fl t Ar interval.interval
-Specify the
+.It Fl t Ar timeout.retransmit
+Specify the NFS timeout
 .Ar interval ,
 in tenths of a second, between
-.Tn NFS/RPC/UDP
-retries.  The default is 0.8 seconds.  The second values alters the retransmit
-counter.  Useful defaults are supplied if either or both values are missing.
+.Tn NFS/RPC
+retries (for UDP only).  The default
+is 0.8 seconds.  The second value alters the restransmit counter, which
+defaults to 11 retransmissions.  Both of these values are used by the kernel
+to communicate with amd.  Useful defaults are supplied if either or both
+values are missing.
+.Pp
+Amd relies on the kernel RPC retransmit mechanism to trigger mount retries.
+The values of these parameters change the overall retry interval.  Too long
+an interval gives poor interactive response; too short an interval causes
+excessive retries.
 .It Fl v
 Version.  Displays version and configuration information on standard error.
 .It Fl w Ar interval
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/amq.8 man8/amq.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/amq.8	Fri Nov 19 19:39:02 1999
+++ man8/amq.8	Sat Nov 27 19:37:04 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: amq.8,v 1.3 1998/09/12 04:04:57 obrien Exp $
+.\" $Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.4.2.1 1999/11/27 04:46:42 obrien Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/fixmount.8 man8/fixmount.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/fixmount.8	Fri Nov 19 19:39:03 1999
+++ man8/fixmount.8	Sat Nov 27 19:37:05 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: fixmount.8,v 1.3 1998/09/12 04:04:58 obrien Exp $
+.\" $Id: fixmount.8,v 1.2 1999/01/10 21:54:26 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.4.2.1 1999/11/27 04:46:51 obrien Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/fsinfo.8 man8/fsinfo.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/fsinfo.8	Fri Nov 19 19:39:03 1999
+++ man8/fsinfo.8	Sat Nov 27 19:37:05 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1993 Jan-Simon Pendry.
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
-.\"	$Id: fsinfo.8,v 1.3 1999/06/26 22:53:22 mpp Exp $
+.\"	$Id: fsinfo.8,v 1.2 1999/01/10 21:54:28 ezk Exp $
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.2.2.2 1999/11/27 04:46:55 obrien Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/hlfsd.8 man8/hlfsd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/hlfsd.8	Fri Nov 19 19:39:03 1999
+++ man8/hlfsd.8	Sat Nov 27 19:37:05 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1989 The Regents of the University of California.
@@ -36,7 +36,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: hlfsd.8,v 1.4 1999/08/18 05:54:47 chris Exp $
+.\" $Id: hlfsd.8,v 1.2 1999/01/10 21:54:32 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.3.2.2 1999/11/27 04:46:58 obrien Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/mk-amd-map.8 man8/mk-amd-map.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/mk-amd-map.8	Fri Nov 19 19:39:03 1999
+++ man8/mk-amd-map.8	Sat Nov 27 19:37:05 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1993 Jan-Simon Pendry
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
-.\"	$Id: mk-amd-map.8,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp $
+.\"	$Id: mk-amd-map.8,v 1.2 1999/01/10 21:54:41 ezk Exp $
+.\"	$FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.2.2.1 1999/11/27 04:47:07 obrien Exp $
 .\"
 .Dd June 28, 1993
 .Dt MK-AMD-MAP 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/ppp.8 man8/ppp.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/ppp.8	Fri Nov 19 19:56:08 1999
+++ man8/ppp.8	Sat Nov 27 19:54:15 1999
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.15 1999/10/10 20:39:35 brian Exp $
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.16 1999/11/19 23:48:01 brian Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -8,9 +8,10 @@
 .Nd Point to Point Protocol (a.k.a. user-ppp) 
 .Sh SYNOPSIS
 .Nm
+.Op Fl Va mode
 .Op Fl nat
 .Op Fl quiet
-.Op Fl Va mode
+.Op Fl unit Ns Ar N
 .Op Ar system Ns
 .No ...
 .Sh DESCRIPTION
@@ -48,6 +49,21 @@
 to be silent at startup rather than displaying the mode and interface
 to standard output.
 .Pp
+The
+.Fl unit
+flag tells
+.Nm
+to only attempt to open
+.Pa /dev/tun Ns Ar N .
+Normally,
+.Nm
+will start with a value of 0 for
+.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
+because the device file is missing, it gives up.
+.Pp
 The following
 .Va mode Ns No s
 are understood by
@@ -190,7 +206,7 @@
 .Nm
 can use either the standard LCP callback protocol or the Microsoft
 CallBack Control Protocol (ftp://ftp.microsoft.com/developr/rfc/cbcp.txt).
-.It Supports packet aliasing.
+.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
 .Em PPP
@@ -261,19 +277,39 @@
 .It Supports PPP over TCP and PPP over UDP.
 If a device name is specified as
 .Em host Ns No : Ns Em port Ns
-.Op / Ns Em tcp Ns No | Ns Em udp ,
+.Xo
+.Op / Ns tcp|udp ,
+.Xc
 .Nm
 will open a TCP or UDP connection for transporting data rather than using a
 conventional serial device.  UDP connections force
 .Nm
 into synchronous mode.
-.It Supports PPP over ISDN
+.It Supports PPP over ISDN.
 If
 .Nm
 is given a raw B-channel i4b device to open as a link, it's able to talk
 to the
 .Xr isdnd 8
 daemon to establish an ISDN connection.
+.It Supports PPP over Ethernet (rfc 2516).
+If
+.Nm
+is given a device specification of the format
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
+and if
+.Xr netgraph 4
+is available,
+.Nm
+will attempt talk
+.Em PPP
+over Ethernet to
+.Ar provider
+using the
+.Ar iface
+network interface.
 .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.
@@ -330,12 +366,10 @@
 you may need to deal with some initial configuration details.
 .Bl -bullet
 .It
-Up until FreeBSD-current as of October 1999, your kernel must include a
-tunnel device (the GENERIC kernel includes one by default).  Versions of
-FreeBSD after this will dynamically load the if_tun kld and the tun device
-will allocate new minors on demand.  If an older kernel doesn't contain any
-tun device or if you require more than one tun interface with that old kernel,
-you'll need to rebuild it with the following line in the configuration file:
+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
+interface, you'll need to rebuild your kernel with the following line in
+your kernel configuration file:
 .Pp
 .Dl pseudo-device tun N
 .Pp
@@ -355,9 +389,6 @@
 If they don't exist, you can create them by running "sh ./MAKEDEV tunN".
 This will create tun devices 0 through
 .Ar N .
-.Pp
-This is required even if your kernel is capable of dynamically allocating
-tun devices.
 .It
 Make sure that your system has a group named
 .Dq network
@@ -1971,7 +2002,8 @@
 .It Li Chat
 Generate
 .Sq dial ,
-.Sq login
+.Sq login ,
+.Sq logout
 and
 .Sq hangup
 chat script trace logs.
@@ -2314,9 +2346,7 @@
 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.  See the
-.Dq MSChap
-description below.
+to MS-CHAP authentication requests, but will never request them.
 .It deflate
 Default: Enabled and Accepted.  This option decides if deflate
 compression will be used by the Compression Control Protocol (CCP).
@@ -3568,7 +3598,7 @@
 is specified,
 .Nm
 will expect the peer to specify the number.
-.It set cd Ar seconds Ns Op \&!
+.It "set cd off|" Ns Ar seconds Ns Op \&!
 Normally,
 .Nm
 checks for the existence of carrier one second after the login script is
@@ -3588,6 +3618,11 @@
 should wait after the dial script has finished before deciding if
 carrier is available or not.
 .Pp
+If
+.Dq off
+is specified,
+.Nm
+will not check for carrier on the device, otherwise
 .Nm
 will not proceed to the login script until either carrier is detected
 or until
@@ -3607,15 +3642,18 @@
 .Pp
 For ISDN devices,
 .Nm
-will always insist on carrier.  Carrier is raised by the i4brbchX device
-driver only after the call has connected.  It is therefore wise to set
-a reasonable value such as
+will always insist on carrier (the value
+.Dq off
+is invalid).  Carrier is raised by the i4brbchX device driver only after
+the call has connected.  It is therefore wise to set a reasonable value
+such as
 .Ar 6
 seconds.
 .Pp
 Carrier
 .Em require Ns No ment
-is ignored for all other device types.
+is ignored for all other device types - as if set to
+.Dq off .
 .It set choked Op Ar timeout
 This sets the number of seconds that
 .Nm
@@ -3633,9 +3671,9 @@
 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
-.Em 20
+.Em 30
 packets (or
-.Em 20 No +
+.Em 30 No +
 .Em nlinks No *
 .Em 2
 packets in multi-link mode), then stops reading the network interface
@@ -3694,9 +3732,15 @@
 does not begin with
 .Pa /dev/ ,
 it must either begin with an exclamation mark
-.Pq Dq \&!
+.Pq Dq \&! ,
+be of the format
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
 or be of the format
-.Dq host:port Ns Op Ns /proto .
+.Ar host Ns No : Ns Ar port Ns Oo
+.No /tcp|udp
+.Oc .
 .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
@@ -3705,15 +3749,41 @@
 and are read and written as if they were a regular device.
 .Pp
 If a
-.Dq host:port Ns Op /tcp|/udp
+.No PPPoE: Ns Ar iface Ns Xo
+.Op \&: Ns Ar provider Ns
+.Xc
+specification is given,
+.Nm
+will attempt to create a
+.Em PPP
+over Ethernet connection using the given
+.Ar iface
+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
+.Xr netgraph 4
+and
+.Xr ng_pppoe 8
+for further details.
+.Pp
+If a
+.Ar host Ns No : Ns Ar port Ns Oo
+.No /tcp|udp
+.Oc
 specification is given,
 .Nm
 will attempt to connect to the given
-.Dq host
+.Ar host
 on the given
-.Dq port .
-If a tcp or udp specification is not given, the default is tcp.  Refer to
-the section on
+.Ar port .
+If a
+.Dq /tcp
+or
+.Dq /udp
+suffix is not provided, the default is
+.Dq /tcp .
+Refer to the section on
 .Em PPP OVER TCP and UDP
 above for further details.
 .Pp
@@ -4118,6 +4188,9 @@
 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.
 .It set lqrperiod Ar frequency
 This command sets the
 .Ar frequency
@@ -4426,10 +4499,7 @@
 .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
-that should be used with local domain sockets as a four character octal
-number beginning with
-.Sq 0 .
-Refer to
+to be used with a local domain socket.  Refer to
 .Xr umask 2
 for umask details.  Refer to
 .Xr services 5
@@ -4506,6 +4576,46 @@
 .Nm
 will never idle out before the link has been up for at least that number
 of seconds.
+.It set urgent Xo
+.Op tcp|udp
+.Oo Op +|- Ns
+.Ar port
+.Oc No ...
+.Xc
+This command controls the ports that
+.Nm
+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.
+See
+.Xr services 5
+for details.
+.Pp
+If neither
+.Dq tcp
+or
+.Dq udp
+are specified,
+.Dq tcp
+is assumed.
+.Pp
+If no
+.Ar port Ns No s
+are given, the priority port lists are cleared (although if
+.Dq tcp
+or
+.Dq udp
+is specified, only that list is cleared).  If the first
+.Ar port
+argument is prefixed with a plus
+.Pq Dq \&+
+or a minus
+.Pq Dq \&- ,
+the current list is adjusted, otherwise the list is reassigned.
+.Ar port Ns No s
+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.
 .It set vj slotcomp on|off
 This command tells
 .Nm
@@ -4708,6 +4818,7 @@
 .Xr libalias 3 ,
 .Xr syslog 3 ,
 .Xr uucplock 3 ,
+.Xr netgraph 4 ,
 .Xr crontab 5 ,
 .Xr group 5 ,
 .Xr passwd 5 ,
@@ -4721,6 +4832,7 @@
 .Xr init 8 ,
 .Xr isdn 8 ,
 .Xr named 8 ,
+.Xr ng_pppoe 8 ,
 .Xr ping 8 ,
 .Xr pppctl 8 ,
 .Xr pppd 8 ,
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/sysctl.8 man8/sysctl.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/sysctl.8	Fri Nov 19 19:37:45 1999
+++ man8/sysctl.8	Sat Nov 27 19:35:40 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.1 1999/08/29 15:15:55 peter Exp $
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.2 1999/11/22 08:43:59 des Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
@@ -40,14 +40,14 @@
 .Nd get or set kernel state
 .Sh SYNOPSIS
 .Nm sysctl
-.Op Fl bdn
+.Op Fl bn
 .Ar name ...
 .Nm sysctl
 .Op Fl bn
 .Fl w
 .Ar name=value ...
 .Nm sysctl
-.Op Fl bdn
+.Op Fl bn
 .Fl aAX
 .Sh DESCRIPTION
 The
@@ -85,9 +85,6 @@
 Force the value of the variable(s) to be output in raw, binary
 format.  No names are printed and no terminating newlines are output.
 This is mostly useful with a single variable.
-.It Fl d
-Display the description rather than the value of the requested
-variable(s).
 .It Fl w Ar name=value ...
 Set the MIB
 .Ar name
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/umount.8 man8/umount.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/umount.8	Fri Nov 19 19:37:46 1999
+++ man8/umount.8	Sat Nov 27 19:35:41 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" $FreeBSD: src/sbin/umount/umount.8,v 1.5.2.1 1999/08/29 15:16:01 peter Exp $
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.5.2.2 1999/11/22 23:04:01 green Exp $
 .\"
 .Dd May 8, 1995
 .Dt UMOUNT 8
@@ -122,28 +122,6 @@
 .Xr unmount 2 ,
 .Xr fstab 5 ,
 .Xr mount 8
-.Sh BUGS
-When using union filesystems,
-.Xr umount 8
-cannot always determine the node which is the mountpoint.
-In this case,
-it is necessary to specify the relevant directory to be unmounted
-in the same form as that displayed by
-.Xr mount 8 .
-For example, given a mount entry like this:
-.Bd -literal -offset indent
-<above>/tmpdir on /cdrom (local, user mount)
-.Ed
-.Pp
-then the command:
-.Bd -literal -offset indent
-umount '<above>/tmpdir'
-.Ed
-.Pp
-would unmount 
-.Ar /tmpdir 
-from the mountpoint
-.Ar /cdrom .
 .Sh HISTORY
 A
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/wire-test.8 man8/wire-test.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991119-STABLE/man/man8/wire-test.8	Fri Nov 19 19:39:04 1999
+++ man8/wire-test.8	Sat Nov 27 19:37:06 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1998 Erez Zadok
+.\" Copyright (c) 1997-1999 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,8 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: wire-test.8,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp $
+.\" $Id: wire-test.8,v 1.2 1999/01/10 21:54:44 ezk Exp $
+.\" $FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.2.2.1 1999/11/27 04:47:11 obrien Exp $
 .\"
 .Dd February 26, 1993
 .Dt WIRE-TEST 8

----Next_Part(Sun_Nov_28_22:20:56_1999_809)----
