From owner-man-jp-reviewer@jp.freebsd.org  Sun Nov 21 00:08:53 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA63768;
	Sun, 21 Nov 1999 00:08:53 +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 AAA63760
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 21 Nov 1999 00:08:52 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp895.yk.rim.or.jp [202.247.185.146])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id AAA03489
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 21 Nov 1999 00:08:29 +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(Sat_Nov_20_23:59:36_1999_518)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19991121000747B.k-horik@yk.rim.or.jp>
Date: Sun, 21 Nov 1999 00:07:47 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 4697
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 1667
Subject: [man-jp-reviewer 1667] diff to 3.3-1999119-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(Sat_Nov_20_23:59:36_1999_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

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

 3.3-19991119-STABLE $B$X$N(B diff $B$G$9!#(B
 o dtmfdecode.1 g711.conv.1 elf.5 memcontrol.8 mergemaster.8 $B$O=|$/(B
 o $B<!$N%P%0%U%#%C%/%9$b4^$_$^$9!#(B
   - diff.1 refer.1 w.1 ypxfr.8 (man-jp 1917)
   - sh.1 (man-jp 1911 $B$J$I(B)
   - vinum.8 (man-jp 1821)
   - groff.1 (man-jp 1799)

----Next_Part(Sat_Nov_20_23:59:36_1999_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: jdiff_3.3-19991119-STABLE
Content-Disposition: attachment; filename=diff_3.3-19991119-STABLE

diff -ur man/man1/Makefile man/man1/Makefile
--- man/man1/Makefile	Wed Oct 13 22:54:25 1999
+++ man/man1/Makefile	Sat Nov 20 23:31:57 1999
@@ -1,7 +1,6 @@
 MAN1 =	a2p.1\
 	addftinfo.1\
 	addr2line.1\
-	alaw2ulaw.1\
 	apply.1\
 	apropos.1\
 	ar.1\
@@ -315,7 +314,6 @@
 	tsort.1\
 	tty.1\
 	ul.1\
-	ulaw2alaw.1\
 	uname.1\
 	unifdef.1\
 	uniq.1\
Only in man/man1: alaw2ulaw.1
diff -ur man/man1/chpass.1 man/man1/chpass.1
--- man/man1/chpass.1	Fri Nov 19 23:09:20 1999
+++ man/man1/chpass.1	Sat Nov 20 23:27:39 1999
@@ -30,14 +30,19 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.3 1999/08/29 15:26:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.5 1999/11/18 16:06:50 phantom Exp %
 .\"
 .\" jpman %Id: chpass.1,v 1.2 1997/03/31 14:06:36 horikawa Stab %
 .Dd December 30, 1993
 .Dt CHPASS 1
 .Os
 .Sh $BL>>N(B
-.Nm chpass, chfn, chsh, ypchpass, ypchfn, ypchsh
+.Nm chpass ,
+.Nm chfn ,
+.Nm chsh ,
+.Nm ypchpass ,
+.Nm ypchfn ,
+.Nm ypchsh
 .Nd $B%f!<%6%G!<%?%Y!<%9Fb$N>pJs$rJT=8$9$k(B
 .Sh $B=q<0(B
 .Nm chpass
@@ -46,7 +51,7 @@
 .Op Fl s Ar newshell
 .Op user
 .Sh $B2r@b(B
-.Nm chpass
+.Nm
 $B$O(B
 .Ar user
 $B$b$7$/$O%G%U%)%k%H$G$O<B9T$7$?%f!<%6$N%f!<%6%G!<%?%Y!<%9$N>pJs$rJQ99$7$^$9!#(B
@@ -55,23 +60,24 @@
 $B%f!<%6$,JQ99$9$k$3$H$,$G$-$k>pJs$@$1$,I=<($5$l$^$9!#(B
 .Pp
 $B%*%W%7%g%s$H$7$F$O!"<!$N$b$N$,$"$j$^$9(B:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl a
 $B%9!<%Q%f!<%6$O!"%f!<%6%G!<%?%Y!<%9$N%(%s%H%j$r(B
 .Xr passwd 5 
 $B$GDj5A$5$l$?%U%)!<%^%C%H$G0z?t$H$7$FD>@\;XDj$G$-$^$9!#(B
-$B$3$N0z?t$O%3%m%s(B (``:'') $B$G6h@Z$i$l$?%j%9%H$G$"$j!"(B
+$B$3$N0z?t$O%3%m%s(B
+.Pq Dq \:
+$B$G6h@Z$i$l$?%j%9%H$G$"$j!"(B
 $B6u$-$NItJ,$,$"$C$F$b5v$5$l$^$9$,!"(B
 $B$9$Y$F$N%U%#!<%k%I$r%j%9%H$K$7$J$1$l$P$J$j$^$;$s!#(B
 .It Fl p
 $B%9!<%Q%f!<%6$O!"0E9f2=$5$l$?%Q%9%o!<%I%U%#!<%k%I$r(B
 .Xr crypt 3 
 $B$GMQ$$$i$l$F$$$k%U%)!<%^%C%H$G0z?t$H$7$FD>@\;XDj$9$k$3$H$,$G$-$^$9!#(B
-.It Fl s
-.Fl s
-$B%*%W%7%g%s$O!"%f!<%6$N%7%'%k$r(B
+.It Fl s Ar newshell
+$B%f!<%6$N%7%'%k$r(B
 .Ar newshell
-$B$KJQ99$7$^$9!#(B
+$B$KJQ99$7$h$&$H$7$^$9!#(B
 .El
 .Pp
 $BI=<($5$l$k%(%s%H%j$K$O0J2<$N$b$N$,$"$j$^$9(B:
@@ -156,7 +162,9 @@
 .Ar change
 $B$H(B
 .Ar expire
-$B$NN>J}$N%U%#!<%k%I$O(B ``month day year'' $B$N7A<0$GF~NO$7!"(B
+$B$NN>J}$N%U%#!<%k%I$O(B
+.Dq month day year
+$B$N7A<0$GF~NO$7!"(B
 .Ar month
 $B$O!"1Q8l$N7n$NL>A0(B ($B$O$8$a$N(B 3 $BJ8;z$G$b==J,$G$9(B) $B$G!"(B
 .Ar day
@@ -186,7 +194,9 @@
 .Pp
 $B%f!<%6$N(B
 .Ar home directory
-$B$O%f!<%6$,%m%0%$%s;~$K$$$k>l=j$X$N@dBP(B UNIX $B%Q%9L>$G$9!#(B
+$B$O%f!<%6$,%m%0%$%s;~$K$$$k>l=j$X$N@dBP(B
+.Ux
+$B%Q%9L>$G$9!#(B
 .Pp
 .Ar shell
 $B%U%#!<%k%I$O%f!<%6$N9%$`%3%^%s%I%$%s%?%W%j%?$G$9!#(B
@@ -202,27 +212,29 @@
 $B$G8+$D$1$i$l$J$$%7%'%k$N$3$H$G$9!#(B
 .Pp
 $B0lEY>pJs$,3NG'$5$l$?$i(B
-.Nm chpass
+.Nm
 $B$O%f!<%6%G!<%?%Y!<%9$r99?7$9$k$?$a$K(B
 .Xr pwd_mkdb 8
 $B$rMQ$$$^$9!#(B
 .Sh $B4D6-JQ?t(B
-$B4D6-JQ?t(B EDITOR $B$r@_Dj$7$FB>$N%(%G%#%?$r;XDj$7$F$$$k>l9g$r=|$-!"(B
+$B4D6-JQ?t(B
+.Ev EDITOR
+$B$r@_Dj$7$FB>$N%(%G%#%?$r;XDj$7$F$$$k>l9g$r=|$-!"(B
 .Xr vi 1
 $B%(%G%#%?$,;H$o$l$^$9!#%(%G%#%?$,=*N;$9$k$H!"$=$N>pJs$O:FEYFI$_9~$^$l!"(B
 $B%f!<%6%G!<%?%Y!<%9$rJQ99$9$k$?$a$N>pJs$H$7$^$9!#(B
 $B%f!<%6$N>pJs$rJQ99$G$-$k$N$O!"$=$N%f!<%6$+%9!<%Q%f!<%6$N$_$G$9!#(B
 .Sh NIS $B$H$NAj8_:nMQ(B
 $B$$$/$D$+$N@)8B$,E,MQ$5$l$^$9$,!"(B
-.Nm chpass
+.Nm
 $B$r(B NIS $B$HF1;~$K;H$&$3$H$b$G$-$^$9!#8=:_(B
-.Nm chpass
+.Nm
 $B$,(B
 .Xr rpc.yppasswdd 8 
 $B$rDL$8$F(B NIS $B$N%Q%9%o!<%I%^%C%WCf$GJQ99$G$-$k$N$O!"(B
 $BDL>o$O%f!<%6$N%Q%9%o!<%I!"%7%'%k!"(BGECOS $B%U%#!<%k%I$@$1$G$9!#(B
 NIS $B%^%9%?%5!<%P>e$G%9!<%Q%f!<%6$K$h$C$F5/F0$5$l$?>l9g$r=|$-!"(B
-.Nm chpass
+.Nm
 ($BF1MM$K(B
 .Xr passwd 1 )
 $B$O!"%f!<%6>pJs$NJQ99$*$h$S?7%l%3!<%I$NDI2C$N$?$a$K(B
@@ -243,16 +255,18 @@
 $B$=$l$K$b$+$+$o$i$:%^%C%W%=!<%9%U%!%$%k$r<j$GJT=8$9$k$3$H$OLLE]$G$9!#(B
 .Pp
 $BCm(B: $B$3$l$i$NNc30$,E,MQ$5$l$k$N$O(B
-NIS $B%^%9%?%5!<%P$,(B FreeBSD $B%7%9%F%`$N;~$@$1$G$9!#(B)
+NIS $B%^%9%?%5!<%P$,(B
+.Fx
+$B%7%9%F%`$N;~$@$1$G$9!#(B)
 .Pp
 $B$=$N7k2L$H$7$F!">e=R$NNc30$r=|$-!"(BNIS $B4D6-$G(B
-.Nm chpass
+.Nm
 $B$r;H$&>l9g$K$O0J2<$N@)8B$,E,MQ$5$l$^$9(B:
 .Bl -enum -offset indent
 .It
-.Pa $B%7%'%k$H(B GECOS $B>pJs$@$1$rJQ99$G$-$^$9!#(B
+.Em "$B%7%'%k$H(B GECOS $B>pJs$@$1$rJQ99$G$-$^$9!#(B"
 $B$?$H$((B
-.Nm chpass
+.Nm
 $B$,%9!<%Q%f!<%6$K$h$C$F5/F0$5$l$?>l9g$G$"$C$F$b$G$9!#(B
 $BB>$N%U%#!<%k%I$NJQ99$,%5%]!<%H$5$l$k$h$&$K$J$C$F$b!"(B
 $BB>$N(B NIS $B%7%9%F%`$H$N8_49@-$NLdBj$r0z$-5/$3$9$G$7$g$&!#(B
@@ -264,9 +278,9 @@
 $BG$0U$N%U%#!<%k%I$NJQ99$,5v$5$l$F$$$^$9!#(B
 .Pp
 .It
-.Pa $B%Q%9%o!<%IG'>Z$,MW5a$5$l$^$9!#(B
+.Em "$B%Q%9%o!<%IG'>Z$,MW5a$5$l$^$9!#(B"
 $B$I$N$h$&$JJQ99$r9T$&A0$K$b(B
-.Nm chpass
+.Nm
 $B$O%f!<%6$N(B NIS $B%Q%9%o!<%I$rMW5a$7$^$9!#$b$7%Q%9%o!<%I$,4V0c$C$F$$$?$i!"(B
 $B$I$N$h$&$JJQ99$b9T$o$l$^$;$s!#(B
 .Pp
@@ -275,9 +289,9 @@
 .Fl o
 $B%U%i%0$r;XDj$9$k;v$K$h$j$3$N;EMM$rL58z$K$9$k;v$,A*Br$G$-$^$9!#(B)
 .It
-.Pa $B?7$7$$%l%3!<%I$N%m!<%+%k%Q%9%o!<%I%G!<%?%Y!<%9$X$NDI2C$O4+$a$i$l$^$;$s!#(B
+.Em "$B?7$7$$%l%3!<%I$N%m!<%+%k%Q%9%o!<%I%G!<%?%Y!<%9$X$NDI2C$O4+$a$i$l$^$;$s!#(B"
 NIS $B$,F0:n$7$F$$$k$H$-$K!"4IM}<T$,(B
-.Nm chpass
+.Nm
 $B$K$h$C$F?7$7$$%l%3!<%I$r%m!<%+%k$N%Q%9%o!<%I%G!<%?%Y!<%9$KDI2C2DG=$G$9!#(B
 $B$7$+$7!"?7$7$$%l%3!<%I$,%^%9%?%Q%9%o!<%I%U%!%$%k$N:G8e!"(B
 $BDL>o$O(B NIS $B$NFCJL$J(B '+' $B%(%s%H%j$N8e$KDI2C$5$l$k$?$a!"(B
@@ -292,50 +306,50 @@
 .Fl a
 $B%U%i%0IU$G5/F0$5$l$?>l9g!"$9$J$o$ADI2C$r5v2D$7$F5/F0$5$l$?>l9g$N$_$G$9(B
 ($BDL>o$ODI2C$r5qH]$7$^$9(B)$B!#(B
-.Nm chpass
+.Nm
 $B$O%G%U%)%k%H$G$O%m!<%+%k$N%Q%9%o!<%I%G!<%?%Y!<%9$r99?7$7$h$&$H$7$^$9(B;
 NIS $B%^%C%W$rJQ99$9$k>l9g$K$O(B chpass $B$r(B
 .Fl y
 $B%U%i%0IU$G5/F0$7$F$/$@$5$$!#(B
 .It
-.Pa $B%Q%9%o!<%I$NJQ99$O5v2D$5$l$F$$$^$;$s!#(B
+.Em "$B%Q%9%o!<%I$NJQ99$O5v2D$5$l$F$$$^$;$s!#(B"
 $B%f!<%6$,!"<+J,$N(B NIS $B$N%Q%9%o!<%I$rJQ99$9$k$H$-$K$O(B
 .Xr passwd 1
 $B$+(B
 .Xr yppasswd 1
 $B$r;H$&$Y$-$G$9!#%9!<%Q%f!<%6$O?7$7$$%Q%9%o!<%I$r;XDj$9$k$3$H$r5v$5$l(B
-$B$F$$$^$9(B ($B$?$H$(!"(B``Password:'' $B%U%#!<%k%I$,%(%G%#%?$N%F%s%W%l!<%H$K(B
+$B$F$$$^$9(B ($B$?$H$(!"(B
+.Dq Password:
+$B%U%#!<%k%I$,%(%G%#%?$N%F%s%W%l!<%H$K(B
 $B$"$i$o$l$F$$$J$/$F$b!"%9!<%Q%f!<%6$O<jF0$G2C$($k$3$H$,$G$-$^$9(B) $B!#(B
 $B$7$+$7$J$,$i!"%9!<%Q%f!<%6$G$"$C$F$b%f!<%6$N85$N%Q%9%o!<%I$,$J$1$l$P(B
 .Xr rpc.yppasswdd 8
 $B$,(B NIS $B%^%C%W$N99?7$r5qH]$9$k$G$7$g$&!#(B
 .Pp
 $BNc30(B: NIS $B%^%9%?%5!<%P>e$N%9!<%Q%f!<%6$O(B
-.Nm chpass
+.Nm
 $B$r;HMQ$7$F!"%f!<%6$N(B NIS $B%Q%9%o!<%I$rJQ99$9$k;v$,5v$5$l$F$$$^$9!#(B
 .El
 .Pp
-.Nm chpass
+.Nm
 $B$,(B NIS $B$r%5%]!<%H$7$F%3%s%Q%$%k$5$l$?$H$-$K!"?t8D$NFCJL$J%U%i%0$,M-8z(B
 $B$K$J$j$^$9(B:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl l
-.Fl l
-$B%U%i%0$O!"%m!<%+%k$H(B NIS $B$NN>J}$N%G!<%?%Y!<%9$K%f!<%6$,B8:_$7$F$$$F$b!"(B
+$B%m!<%+%k$H(B NIS $B$NN>J}$N%G!<%?%Y!<%9$K%f!<%6$,B8:_$7$F$$$F$b!"(B
 $B%f!<%6$N%Q%9%o!<%I>pJs$N%m!<%+%k$N%3%T!<$r=$@5$9$k$3$H$r(B
-.Nm chpass
+.Nm
 $B$K6/@)$7$^$9!#(B
 .It Fl y
-$B$3$N%U%i%0$O(B
 .Fl l 
 $B$HH?BP$N8z2L$,$"$j$^$9!#$b$7(B NIS $B$,F0:n$7$F$$$l$P!"(B
 $B%G%U%)%k%H$G$O(B
-.Nm chpass
+.Nm
 $B$O(B NIS $B$N%(%s%H%j$rA`:n$9$k$N$G!"(B
 $B$3$N%U%i%0$O$^$C$?$/>iD9$G$9!#(B
 .It Fl d Ar domain
 NIS $B%I%a%$%s$r;XDj$7$^$9!#(B
-.Nm chpass
+.Nm
 $B$O%G%U%)%k%H$G$O%7%9%F%`$N%I%a%$%sL>$r;HMQ$7$^$9!#(B
 $B$3$l$O(B
 .Xr domainname 1
@@ -348,7 +362,7 @@
 .It Fl h Ar host
 $BLd$$9g$o$;$k$Y$-(B NIS $B%5!<%P$NL>A0$b$7$/$O%"%I%l%9$r;XDj$7$^$9!#(B
 $BDL>o(B
-.Nm chpass
+.Nm
 $B$O(B
 .Pa master.passwd
 $B$b$7$/$O(B
@@ -361,7 +375,9 @@
 NIS $B%I%a%$%sFb$N%^%9%?%5!<%PL>$G$b%9%l!<%V%5!<%PL>$G$bNI$$$N$G$9!#(B
 .Pp
 .Fl d
-$B%*%W%7%g%s;HMQ;~$K$O!"%[%9%HL>$N%G%U%)%k%H$O(B ``localhost'' $B$G$9!#(B
+$B%*%W%7%g%s;HMQ;~$K$O!"%[%9%HL>$N%G%U%)%k%H$O(B
+.Dq localhost
+$B$G$9!#(B
 .Fl h
 $B%*%W%7%g%s$r(B
 .Fl d
@@ -369,15 +385,19 @@
 .Pp
 .It Fl o
 .Xr rpc.yppasswdd 8
-$B$K(B RPC $B%Y!<%9$N99?7$r6/@)$7$^$9(B (``$B5l%b!<%I(B'')$B!#(B
+$B$K(B RPC $B%Y!<%9$N99?7$r6/@)$7$^$9(B
+.Pq Dq $B5l%b!<%I(B
+$B!#(B
 NIS $B%^%9%?%5!<%P>e$G%9!<%Q%f!<%6$K$h$j5/F0$5$l$?>l9g!"(B
-.Nm chpass
+.Nm
 $B$O@lMQ$NHs(B RPC $B%Y!<%9$N5!9=$r;HMQ$7!"(B
 NIS $B%Q%9%o!<%I%^%C%W$KBP$9$kL5@)8B$NJQ99$r5v2D$7$^$9(B
-($B$3$N>l9g(B UNIX $B%I%a%$%s%=%1%C%H$r;HMQ$7$^$9(B)$B!#(B
+($B$3$N>l9g(B
+.Ux 
+$B%I%a%$%s%=%1%C%H$r;HMQ$7$^$9(B)$B!#(B
 .Fl o
 $B%U%i%0$r;HMQ$9$k;v$K$h$j(B
-.Nm chpass
+.Nm
 $B$KI8=`$N99?7%a%+%K%:%`$r;HMQ$5$;$k;v$,=PMh$^$9!#(B
 $B$3$N%*%W%7%g%s$O<g$K%F%9%HL\E*$N$?$a$KDs6!$5$l$F$$$^$9!#(B
 .El
@@ -413,15 +433,15 @@
 .Xr chsh 1 ,
 .Xr ypchpass 1 ,
 .Xr ypchfn 1 ,
-.Xr upchsh 1
+.Xr ypchsh 1
 $B%3%^%s%I$O<B:]$K$O(B
-.Nm chpass 
+.Nm
 $B$K%j%s%/$7$F$$$k$@$1$G$9!#(B
 .Sh $B%P%0(B
 $B%f!<%6>pJs$NJ]B8$O$I$3$+B>$N>l=j$K$9$k$Y$-$G$9(B
 ($B$7!"$$$D$+$O$=$&$J$k$G$7$g$&(B)$B!#(B
 .Sh $BNr;K(B
-.Nm chpass
+.Nm
 $B%3%^%s%I$O(B 
 .Bx 4.3 Reno
 $B$+$iEP>l$7$^$7$?!#(B
diff -ur man/man1/ctm_rmail.1 man/man1/ctm_rmail.1
--- man/man1/ctm_rmail.1	Sun Sep  5 01:36:15 1999
+++ man/man1/ctm_rmail.1	Sat Nov 20 23:34:39 1999
@@ -5,7 +5,9 @@
 .\"
 .\" Author: Stephen McKay
 .\"
+.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.3 1999/10/30 15:59:34 phantom Exp %
 .\" jpman %Id: ctm_rmail.1,v 1.3 1997/09/27 16:25:48 ryo2 Stab %
+.\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
 .Os
@@ -486,19 +488,11 @@
 .Xr ctm
 $B$+$i$N%a%C%;!<%8$bF1MM$K$3$3$K8=$l$^$9!#(B
 $B%(%i!<%a%C%;!<%8$O(B $B$=$l<+?H$,@bL@E*$G$"$k$Y$-$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 ctm 1 ,
 .Xr ctm 5
-.\" .Sh STANDARDS
 .\" .Sh HISTORY
 .Sh $B:n<T(B
 Stephen McKay <mckay@FreeBSD.org>
-.\" .Sh BUGS
-.\" Gosh!  No bugs here!
-.\" This message brought to you by the Coalition for More Humour in Man Pages.
-.\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.2 1999/08/29 15:41:03 peter Exp %
 .Sh $BF|K\8lLu(B
 $BLn<s(B $B429b(B (h-nokubi@nmit.mt.nec.co.jp): FreeBSD $BMQ$KK]Lu(B
diff -ur man/man1/diff.1 man/man1/diff.1
--- man/man1/diff.1	Sat Jul 31 20:15:55 1999
+++ man/man1/diff.1	Sat Nov 20 23:27:42 1999
@@ -197,7 +197,7 @@
 .BI "\-X " file
 $B%G%#%l%/%H%jC10L$NHf3S$N;~!"%U%!%$%k$d%G%#%l%/%H%jL>$,(B
 .I file
-$B$NCf$K4^$^$l$k(B pattern $B$K%^%C%A$7$?>l9g$O!"Hf3S$7$J$$$h$&$K$7$^$9!#(B
+$B$NCf$K4^$^$l$k%Q%?!<%s$K%^%C%A$7$?>l9g$O!"Hf3S$7$J$$$h$&$K$7$^$9!#(B
 .TP
 .B \-\-expand\-tabs
 .br
diff -ur man/man1/from.1 man/man1/from.1
--- man/man1/from.1	Wed Feb 25 13:53:59 1998
+++ man/man1/from.1	Sat Nov 20 23:27:42 1999
@@ -30,6 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"   @(#)from.1      8.2 (Berkeley) 12/30/93
+.\"	%FreeBSD: src/usr.bin/from/from.1,v 1.3.4.1 1999/10/30 21:49:05 green Exp %
+.\"
 .\" jpman %Id: from.1,v 1.2 1997/03/29 03:57:45 horikawa Stab %
 .\"
 .Dd December 30, 1993
@@ -41,6 +43,7 @@
 .Pp
 .Sh $B=q<0(B
 .Nm from
+.Op Fl c
 .Op Fl s Ar sender
 .Op Fl f Ar file
 .Op Ar user
@@ -53,7 +56,9 @@
 .Pp
 $B%*%W%7%g%s(B:
 .Bl -tag -width Fl
-.It Fl f  Ar file
+.It Fl c
+$B%a%C%;!<%8?t$rI=<($9$k$@$1$G!"=*N;$7$^$9!#(B
+.It Fl f Ar file
 $B%G%U%)%k%H$N%]%9%H%*%U%#%9(B(
 .Pa /var/mail/*
 $B$N%U%!%$%k(B)$B$N$+$o$j$K!"(B
diff -ur man/man1/groff.1 man/man1/groff.1
--- man/man1/groff.1	Mon Apr 26 23:34:46 1999
+++ man/man1/groff.1	Wed Nov 17 00:47:07 1999
@@ -371,7 +371,7 @@
 .SH $B:n<T(B
 James Clark <jjc@jclark.com>
 .SH $B%P%0(B
-$B%P%0%l%]!<%H$O!"(Bbug-groff@prep.ai.mit.edu. $B$^$G$*4j$$$7$^$9!#(B
+$B%P%0%l%]!<%H$O!"(Bbug-groff@prep.ai.mit.edu $B$^$G$*4j$$$7$^$9!#(B
 $B%l%]!<%H$N:]$K$O%P%0$r:F8=$G$-$k40A4$JNcBj$rE:IU$7!"$"$J$?$NMx(B
 $BMQ$7$F$$$k(B groff $B$N%P!<%8%g%s$rE:$($F2<$5$$!#(B 
 .SH COPYRIGHT
diff -ur man/man1/kbdcontrol.1 man/man1/kbdcontrol.1
--- man/man1/kbdcontrol.1	Sun Aug 29 22:15:43 1999
+++ man/man1/kbdcontrol.1	Sat Nov 20 23:27:43 1999
@@ -11,6 +11,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
+.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.4 1999/11/18 16:10:46 phantom Exp %
+.\"
 .\" jpman %Id: kbdcontrol.1,v 1.3 1997/07/26 21:37:54 horikawa Stab %
 .\"
 .Dd June 30, 1999
@@ -100,7 +102,6 @@
 .Fl l
 $B%*%W%7%g%s$r;HMQ$7$F8e$G%+!<%M%k$K%m!<%I$G$-$^$9!#(B
 .It Fl f Ar # Ar string
-.\".BI "\-f\ " #\ string
 .Ar #
 $BHV$N%U%!%s%/%7%g%s%-!<$GJ8;zNs(B
 .Ar string
diff -ur man/man1/mktemp.1 man/man1/mktemp.1
--- man/man1/mktemp.1	Tue Oct 27 23:33:12 1998
+++ man/man1/mktemp.1	Sat Nov 20 23:27:43 1999
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3 1998/08/31 16:41:08 wosch Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.1 1999/10/30 14:05:49 phantom Exp %
 .\" From: %OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp %
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -169,6 +169,5 @@
 .Ox 2.1
 $B$KEP>l$7$^$7$?!#$3$N<BAu$O%^%K%e%"%k%Z!<%8$H$OFHN)$K5-=R$5$l$^$7$?!#(B
 $B$3$N%^%K%e%"%k%Z!<%8$O(B
-.Bx Open
+.Ox
 $BM3Mh$G$9!#(B
-.\" Our stupid .Ox macro won't allow me to use .Ox alone.
diff -ur man/man1/mptable.1 man/man1/mptable.1
--- man/man1/mptable.1	Fri Oct 16 01:06:13 1998
+++ man/man1/mptable.1	Sat Nov 20 23:27:44 1999
@@ -20,8 +20,11 @@
 .\" 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.
-.Dd April 28, 1997
+.\"
+.\" %FreeBSD: src/usr.sbin/mptable/mptable.1,v 1.3.2.1 1999/10/30 16:11:12 phantom Exp %
+.\"
 .\" jpman %Id: mptable.1,v 1.3 1998/10/10 15:47:25 horikawa Stab %
+.Dd April 28, 1997
 .Dt MPTABLE 1
 .Os
 .Sh $BL>>N(B
diff -ur man/man1/netstat.1 man/man1/netstat.1
--- man/man1/netstat.1	Sun Sep 12 18:34:44 1999
+++ man/man1/netstat.1	Sat Nov 20 23:27:45 1999
@@ -30,8 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)netstat.1	8.8 (Berkeley) 4/18/94
+.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.3 1999/10/30 14:42:19 phantom Exp %
 .\"
-.\" Original Revision: 1.11.2.2
 .\" jpman %Id: netstat.1,v 1.4 1997/10/11 07:45:56 horikawa Stab %
 .\"
 .Dd April 18, 1994
@@ -174,7 +174,9 @@
 $B$r;XDj$7$^$9!#%W%m%H%3%k$N$$$/$D$+$O(B
 .Pa /etc/protocols
 $B$NCf$GDj5A$5$l$F$$$^$9!#(B
-$BFCJL$J%W%m%H%3%kL>(B ``bdg'' $B$O!"%V%j%C%8$N>uBV$rI=<($9$k$?$a$K;HMQ$7$^$9!#(B
+$BFCJL$J%W%m%H%3%kL>(B
+.Dq bdg
+$B$O!"%V%j%C%8$N>uBV$rI=<($9$k$?$a$K;HMQ$7$^$9!#(B
 $B%W%m%H%3%k$K$D$$$F>pJs$,I=<($5$l$J$$>l9g$O!"DL>o!"(B
 $BJs9p$9$Y$-M-0U$J?tCM$,$J$$$3$H$r0UL#$7$^$9!#(B
 .Ar protocol
@@ -199,9 +201,12 @@
 $B%G%U%)%k%H$N%"%/%F%#%V%=%1%C%HI=<($G$O!"%m!<%+%k$*$h$S%j%b!<%H%"%I%l%9!"(B
 $BAw<u?.%-%e!<$N%5%$%:(B($B%P%$%HC10L(B)$B!"%W%m%H%3%k!"$=$7$F%W%m%H%3%k$NFbIt>uBV$,(B
 $B$=$l$>$lI=<($5$l$^$9!#(B
-$B%"%I%l%97A<0$K$D$$$F$O!"(B``host.port'' $B$b$7$/$O!"%=%1%C%H$N%"%I%l%9$,(B
-$B%M%C%H%o!<%/C10L$G$7$+FCDj$G$-$J$$>l9g$K$O(B ``network.port'' $B$H$$$&7A<0$,:NMQ(B
-$B$5$l$^$9!#(B
+$B%"%I%l%97A<0$K$D$$$F$O!"(B
+.Dq host.port
+$B$b$7$/$O!"%=%1%C%H$N%"%I%l%9$,(B
+$B%M%C%H%o!<%/C10L$G$7$+FCDj$G$-$J$$>l9g$K$O(B
+.Dq network.port
+$B$H$$$&7A<0$,:NMQ$5$l$^$9!#(B
 $B%[%9%H$b$7$/$O%M%C%H%o!<%/%"%I%l%9$,%G!<%?%Y!<%9(B
 .Pa /etc/hosts
 $B$d(B
@@ -211,17 +216,22 @@
 .Fl n
 $B%*%W%7%g%s$,;XDj$5$l$?>l9g$K$O!"%"%I%l%9$O%"%I%l%9%U%!%_%j$K=>$C$F(B
 $B?tCM$GI=<($5$l$^$9!#(B
-$B%$%s%?!<%M%C%H%"%I%l%9$N7A<0$K$D$$$F$5$i$KCN$j$?$$>l9g$K$O!"(B
+$B%$%s%?!<%M%C%H%"%I%l%9$N(B
+.Dq $B%I%C%H7A<0(B
+$B$K$D$$$F$5$i$KCN$j$?$$>l9g$K$O!"(B
 .Xr inet 3
 $B$r;2>H$7$F2<$5$$!#(B
-$BFC$K%"%I%l%9$,;XDj$5$l$F$J$$>l9g$d!"%"%I%l%9$,%o%$%k%I%+!<%I(B
+$BFC$K%"%I%l%9$,;XDj$5$l$F$J$$>l9g$d!"%"%I%l%9$,(B
+.Dq $B%o%$%k%I%+!<%I(B
 $B;XDj$5$l$F$$$k>l9g$K$O!"$=$NItJ,$N%"%I%l%9$d%]!<%HHV9f$N$H$3$m$K$O(B 
-``*'' $B$,I=<($5$l$^$9!#(B
+.Dq *
+$B$,I=<($5$l$^$9!#(B
 .Pp
 $B%$%s%?%U%'!<%9I=<($G$O!"%Q%1%C%HE>Aw!"%(%i!<!"%3%j%8%g%s$K4X$9$k(B
 $BN_@Q>pJs$r8+$k$3$H$,$G$-$^$9!#$^$?!"%$%s%?%U%'!<%9$N(B
-$B%M%C%H%o!<%/%"%I%l%9$*$h$S:GBgE>Aw2DG=%f%K%C%H%5%$%:(B (``mtu'') $B$b(B
-$B8+$k$3$H$,$G$-$^$9!#(B
+$B%M%C%H%o!<%/%"%I%l%9$*$h$S:GBgE>Aw2DG=%f%K%C%H%5%$%:(B
+.Pq Dq mtu
+$B$b8+$k$3$H$,$G$-$^$9!#(B
 .Pp
 $B%k!<%F%#%s%0%F!<%V%kI=<($G$O!"MxMQ2DG=$J7PO)$H$=$N>uBV$,I=<((B
 $B$5$l$^$9!#3F7PO)$O!"E~C#@h%[%9%H$b$7$/$O%M%C%H%o!<%/$H!"(B
@@ -300,12 +310,12 @@
 $B%3%^%s%I$O!"(B
 .Bx 4.2
 $B$K$O$8$a$FEP>l$7$^$7$?!#(B
-.\" .Sh $B4XO"%U%!%$%k(B
-.\" .Bl -tag -width /dev/kmem -compact
-.\" .It Pa /netbsd
-.\" default kernel namelist
-.\" .It Pa /dev/kmem
-.\" default memory file
-.\" .El
+.Sh $B4XO"%U%!%$%k(B
+.Bl -tag -width /dev/kmem -compact
+.It Pa /kernel
+$B%G%U%)%k%H$N%+!<%M%k$NL>A0%j%9%H(B
+.It Pa /dev/kmem
+$B%G%U%)%k%H$N%a%b%j%U%!%$%k(B
+.El
 .Sh $B%P%0(B
 $B%(%i!<$N35G0$K$D$$$F$O!"Dj5A$,4V0c$C$F$$$^$9!#(B
diff -ur man/man1/nroff.1 man/man1/nroff.1
--- man/man1/nroff.1	Mon Apr 26 23:34:46 1999
+++ man/man1/nroff.1	Sat Nov 20 23:27:45 1999
@@ -15,9 +15,12 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.1 1999/11/02 12:33:21 phantom Exp %
+
 ..
 .\" jpman %Id: nroff.1,v 1.2 1997/05/13 16:18:02 horikawa Stab %
-.TH NROFF 1 "8 September 1996" "Groff Version 1.11"
+.TH NROFF 1 "2 November 1999" "Groff Version 1.11"
 .SH $BL>>N(B
 nroff \- groff $B$K$h$k(B nroff $B%3%^%s%I$N%(%_%e%l!<%H(B
 .SH $B=q<0(B
@@ -38,9 +41,15 @@
 .BI \-o list
 ]
 [
+.BI \-p
+]
+[
 .BI \-r cn
 ]
 [
+.BI \-t
+]
+[
 .BI \-T name
 ]
 [
@@ -69,8 +78,10 @@
 .BR \-i ,
 .BR \-n ,
 .BR \-m ,
+.BR \-p ,
 .BR \-o ,
-.B \-r
+.BR \-r ,
+.B \-t
 $B%*%W%7%g%s$O(B
 .BR troff (1)
 $B$K@bL@$5$l$F$$$k8z2L$r;}$A$^$9!#(B
diff -ur man/man1/refer.1 man/man1/refer.1
--- man/man1/refer.1	Mon Apr 26 23:34:46 1999
+++ man/man1/refer.1	Sat Nov 20 23:27:47 1999
@@ -152,10 +152,10 @@
 $B$G;O$^$k9T$b2r<a$7$^$9!#(B
 .SH $B%*%W%7%g%s(B
 .LP
-$B$[$H$s$I$N%*%W%7%g%s$K$OF1Ey$J%3%^%s%I$,$"$j$^$9!#(B
-$B!J$3$l$i$N%3%^%s%I$K$D$$$F$O(B
+$B$[$H$s$I$N%*%W%7%g%s$K$OF1Ey$J%3%^%s%I$,$"$j$^$9(B
+($B$3$l$i$N%3%^%s%I$K$D$$$F$O(B
 .B $B%3%^%s%I(B
-$B%;%/%7%g%s$N@bL@$r;2>H$7$F2<$5$$!#!K(B
+$B%;%/%7%g%s$N@bL@$r;2>H$7$F2<$5$$(B)$B!#(B
 .TP
 .B \-b
 .B
diff -ur man/man1/rpcgen.1 man/man1/rpcgen.1
--- man/man1/rpcgen.1	Sun Mar  7 18:27:09 1999
+++ man/man1/rpcgen.1	Sat Nov 20 23:27:48 1999
@@ -1,5 +1,7 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
+.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.1 1999/10/30 15:27:57 phantom Exp %
+.\"
 .\" jpman %Id: rpcgen.1,v 1.2 1997/06/08 13:49:19 jsakai Stab %
 .Dd March 28, 1993
 .Dt RPCGEN 1
@@ -499,8 +501,6 @@
 .Xr syslog 3 ,
 .Xr inetd 8
 .\" .BR rpc_svc_calls (3)
-.Pp
-.Tn NETP
-$B%^%K%e%"%k$N(B
-.Nm
-$B$N>O!#(B
+.Rs
+.%T NETP $B%^%K%e%"%k$N(B rpcgen $B$N>O(B
+.Re
diff -ur man/man1/rsh.1 man/man1/rsh.1
--- man/man1/rsh.1	Wed Mar  3 23:46:57 1999
+++ man/man1/rsh.1	Sat Nov 20 23:27:49 1999
@@ -30,6 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.1 1999/10/30 15:27:58 phantom Exp %
+.\"
 .\" jpman %Id: rsh.1,v 1.2 1997/05/13 00:56:14 mutoh Stab %
 .\"
 .Dd June 6, 1993
@@ -72,14 +74,14 @@
 .It Fl d
 .Nm
 $B$O(B
-.Xr setsockopt  2
+.Xr setsockopt 2
 $B$rMQ$$$F!"%j%b!<%H%[%9%H$H$NDL?.$KMQ$$$i$l$k(B
 .Tn TCP
 $B%=%1%C%H$N%G%P%C%0$rM-8z$K$7$^$9!#(B
 .It Fl k
 .Nm
 $B$O%j%b!<%H%[%9%H$KBP$7$F(B
-.Xr krb_realmofhost  3
+.Xr krb_realmofhost 3
 $B$K$h$C$FDj5A$5$l$k%j%b!<%H%[%9%H$N(B realm $B$NBe$o$j$K!";XDj$7$?(B
 .Ar realm
 $B$r;HMQ$7$F!"%j%b!<%H%[%9%H$KBP$7$F$N%"%/%;%95v2D$rF@$^$9!#(B
@@ -89,7 +91,7 @@
 .Fl l
 $B%*%W%7%g%s$K$h$j!"%j%b!<%H%[%9%H>e$G$N%f!<%6L>$r;XDj$G$-$^$9!#(B
 $B%f!<%6G'>Z$K$O(B
-.Xr rlogin  1
+.Xr rlogin 1
 $B$HF1MM$N;EAH$_$K$h$j(B Kerberos $B$K$h$k%f!<%6G'>Z5!9=$,;H$o$l$^$9!#(B
 .It Fl n
 .Nm
@@ -111,7 +113,7 @@
 .Pp
 .Ar command
 $B$,;XDj$5$l$J$$>l9g$K$O!"%f!<%6$O(B
-.Xr rlogin  1
+.Xr rlogin 1
 $B$rMQ$$$F%j%b!<%H%[%9%H$K%m%0%$%s$7$^$9!#(B
 .Pp
 $B%/%)!<%H$5$l$F$$$J$$%7%'%k$N%a%?%-%c%i%/%?$K$D$$$F$O!"%m!<%+%k%^%7%s>e(B
@@ -175,9 +177,9 @@
 .Pp
 .Nm
 $B$rMQ$$$F!"(B
-.Xr rogue  6
+.Xr rogue 6
 $B$d(B
-.Xr vi  1
+.Xr vi 1
 $B$N$h$&$J2qOCE*%3%^%s%I$r<B9T$9$k$3$H$O$G$-$^$;$s!#(B
 $BBe$o$j$K(B
 .Xr rlogin 1
diff -ur man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Sat Sep 11 14:26:48 1999
+++ man/man1/sh.1	Sat Nov 20 23:27:51 1999
@@ -351,7 +351,7 @@
 $B%j%@%$%l%/%H$O!"%3%^%s%I$,$I$3$+$iF~NO$9$k$+!"$I$3$X=PNO$9$k$+$r(B
 $BJQ99$9$k$H$-$KMQ$$$^$9!#(B
 $B0lHL$K$O!"%j%@%$%l%/%H$G$O!"%U%!%$%k$N%*!<%W%s!"%/%m!<%:!"$^$?$O(B
-$B%U%!%$%k$X$N;2>H$NJ#<L(B (duplicate) $B$r9T$$$^$9!#(B
+$B%U%!%$%k$X$N;2>H$NJ#@=(B (duplicate) $B$r9T$$$^$9!#(B
 $B%j%@%$%l%/%H$GMQ$$$i$l$kA4HLE*$J7A<0$O!"0J2<$N$H$*$j$G$9!#(B
 .sp
 .Dl [n] redir-op file
@@ -368,11 +368,15 @@
 .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
 .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#<L$7$^$9!#(B
+$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
 .It [n]<&-
 $BI8=`F~NO(B ($B$^$?$O%U%!%$%k5-=R;R(B n) $B$r%/%m!<%:$7$^$9!#(B
 .It [n1]>&n2
-$B%U%!%$%k5-=R;R(B n2 $B$rI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$KJ#<L$7$^$9!#(B
+$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$r%U%!%$%k5-=R;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
 .El
diff -ur man/man1/sleep.1 man/man1/sleep.1
--- man/man1/sleep.1	Sun Sep  5 01:36:18 1999
+++ man/man1/sleep.1	Sat Nov 20 23:27:51 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.2 1999/08/29 14:14:16 peter Exp %
+.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.3 1999/10/28 18:02:43 ru Exp %
 .\"
 .\" jpman %Id: sleep.1,v 1.2 1997/05/04 13:38:26 horikawa Stab %
 .\"
@@ -51,23 +51,33 @@
 $B%3%^%s%I$O!">/$J$/$H$b(B
 .Ar seconds
 $B$G;XDj$7$?IC?t$@$1<B9T$rDd;_$7$^$9!#(B
+.Pp
 .Nm
-$B%3%^%s%I$O(B
-$BB>$N%3%^%s%I$N<B9T$N%9%1%8%e!<%j%s%0$KMQ$$$i$l$^$9(B($B0J2<$N(B
-.Sx $B;HMQNc(B 
-$B$r;2>H(B)$B!#(B
+$B%3%^%s%I$,%7%0%J%k$r<u?.$9$k$HI8=`$NF0:n$r9T$$$^$9!#(B
+.Sh $B<BAu$K4X$9$kCm(B
+$B$3$N<BAu$K$*$$$F$O!"(B
+.Dv SIGALRM
+$B%7%0%J%k$OFCJL$K$O07$o$l$^$;$s!#(B
 .Pp
 .Nm
-$B%3%^%s%I$,(B SIGALRM $B%7%0%J%k$r<u?.$9$k$H=*N;%9%F!<%?%9(B 0 $B$K$F=*N;$7$^$9!#(B
-$B$=$NB>$N%7%0%J%k$G$OI8=`$NF0:n$r9T$$$^$9!#(B
+$B%3%^%s%I$O!"Hs@0?t$N?tCM$G;XDj$5$l$?IC?t$r<u$1IU$1$F!"$3$l$rB:=E$7$^$9!#(B
+.Po
+$B>.?tE@$H$7$F(B
+.Ql \&.
+$BJ8;z$r;HMQ$7$^$9(B
+.Pc
+$B!#(B
+.Bf Sy
+$B$3$l$O%]!<%?%V%k$G$O$J$$3HD%$G$9!#(B
+$B$3$l$r;HMQ$9$k%7%'%k%9%/%j%W%H$O!"(B
+$BB>$N%7%9%F%`$G@5$7$/<B9T$G$-$J$$$3$H$r!"$[$\J]>Z$G$-$^$9!#(B
+.Ef
 .Sh $B?GCG(B
 .Nm
 $B%3%^%s%I$O=*N;;~$K0J2<$NCM$N$$$:$l$+$rJV$7$^$9!#(B
 .Bl -tag -width flag
 .It Li \&0
-$B@5>o=*N;$7$?>l9g!"$b$7$/$O(B
-.Dv SIGALRM
-$B%7%0%J%k$r<u?.$7$?>l9g!#(B
+$B@5>o=*N;$7$?>l9g!#(B
 .It Li \&>\&0
 $B%(%i!<$,5/$-$?>l9g!#(B
 .El
@@ -110,9 +120,7 @@
 5 $BJ,$*$-$K3NG'$7!"@8@.$,3NG'$5$l$?$i(B 70 $BICBT$C$F(B awk $B%8%g%V$r(B
 $B<B9T$9$k!"$H$$$&A`:n$r7+$jJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr at 1 ,
-.Xr setitimer 2 ,
-.Xr alarm 3 ,
+.Xr nanosleep 2 ,
 .Xr sleep 3
 .Sh $B5,3J(B
 .Nm
Only in man/man1: ulaw2alaw.1
diff -ur man/man1/vidcontrol.1 man/man1/vidcontrol.1
--- man/man1/vidcontrol.1	Sun Sep  5 01:36:18 1999
+++ man/man1/vidcontrol.1	Sat Nov 20 23:27:52 1999
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.5 1999/08/29 15:48:54 peter Exp %
+.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.6 1999/10/30 14:31:56 phantom Exp %
 .\"
 .\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
 .Dd June 30, 1999
@@ -51,7 +51,6 @@
 .It Ar mode
 $B?7$7$$%S%G%*%b!<%I$rA*Br$7$^$9!#(B
 $B8=:_%5%]!<%H$7$F$$$k%b!<%I$O<!$NDL$j$G$9(B:
-.Ar 40x25 ,
 .Ar 80x25 ,
 .Ar 80x30 ,
 .Ar 80x43 ,
@@ -68,7 +67,6 @@
 .Ar EGA_80x25 ,
 .Ar EGA_80x43 ,
 .Ar VESA_132x25 ,
-.Ar VESA_132x30 ,
 .Ar VESA_132x43 ,
 .Ar VESA_132x50 ,
 .Ar VESA_132x60
@@ -83,9 +81,12 @@
 $B$r;2>H$7$F$/$@$5$$!#(B
 .It Ar foreground Op Ar background
 $B%F%-%9%H$rI=<($9$k:]$N?'$rJQ99$7$^$9!#(B
-$BA07J?'(B ($BNc(B: ``vidcontrol white'')$B!"$"$k$$$O(B
-$BA07J?'$*$h$SGX7J?'(B ($BNc(B: ``vidcontrol yellow blue'') $B$r;XDj$9$k$3$H$K$h$j(B
-$BJQ99$G$-$^$9!#(B
+$BA07J?'(B ($BNc(B: 
+.Dq vidcontrol white )
+$B!"$"$k$$$O(B
+$BA07J?'$*$h$SGX7J?'(B ($BNc(B: 
+.Dq vidcontrol yellow blue )
+$B$r;XDj$9$k$3$H$K$h$jJQ99$G$-$^$9!#(B
 $B8e=R$N(B
 .Cm show
 $B%3%^%s%I$r;HMQ$7$F!";HMQ2DG=$J?'$r8+$i$l$^$9!#(B
@@ -233,7 +234,7 @@
 .It Ar blanktime
 .Fl t
 $B%*%W%7%g%sMQ$N%?%$%`%"%&%H$r@_Dj$7$^$9!#(B
-.It Ar font8x16, font8x14, font8x8
+.It Ar font8x16 , font8x14 , font8x8
 .Fl f
 $B%*%W%7%g%sMQ$N%U%)%s%H%U%!%$%k$r;XDj$7$^$9!#(B
 .It Ar scrnmap
@@ -294,6 +295,7 @@
 .Xr syscons 4 ,
 .Xr vga 4 ,
 .Xr rc.conf 5 ,
+.Xr kldload 8 ,
 .Xr moused 8
 .Sh $B:n<T(B
 .An Soren Schmidt Aq sos@FreeBSD.org
diff -ur man/man1/w.1 man/man1/w.1
--- man/man1/w.1	Sun Sep  5 01:36:18 1999
+++ man/man1/w.1	Sat Nov 20 23:27:53 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/w/w.1,v 1.10.2.1 1999/08/29 15:34:36 peter Exp %
+.\" %FreeBSD: src/usr.bin/w/w.1,v 1.10.2.2 1999/10/30 22:15:30 green Exp %
 .\"
 .\" jpman %Id: w.1,v 1.2 1997/04/16 01:03:05 mitchy Stab %
 .\"
@@ -45,17 +45,17 @@
 .Op Fl dhin
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Op Ar user
+.Op Ar user ...
 .Sh $B2r@b(B
 .Nm
 $B$O!"%7%9%F%`$N8=:_$NF0:n>u67$d!"%f!<%6$N:n6HFbMF$rI=<($7$^$9!#(B
 $B:G=i$N9T$O8=:_;~9o!"%7%9%F%`$N2TF/;~4V!"%m%0%$%s$7$F$$$k%f!<%6?t!"(B
 $B%7%9%F%`$NJ?6QIi2Y$rI=<($7$^$9!#(B
-$BJ?6QIi2Y$O!":G6a$N(B1$BJ,!"(B5$BJ,!"(B15$BJ,4V$K$*$1$k<B9T%-%e!<Fb$N(B
+$BJ?6QIi2Y$O!":G6a$N(B 1 $BJ,!"(B5 $BJ,!"(B15 $BJ,4V$K$*$1$k<B9T%-%e!<Fb$N(B
 $B%8%g%V?t$NJ?6QCM$rI=$7$^$9!#(B
 .Pp
 $B=PNO9`L\$O!"%f!<%6$N%m%0%$%sL>$H%f!<%6$,8=:_$$$kC<Kv$NL>A0!"%f!<%6$,(B
-$B%m%0%$%s(B $B$7$F$-$?%[%9%H!"%f!<%6$,%m%0%$%s(B $B$7$F$$$k;~4V!"%f!<%6$,(B
+$B%m%0%$%s$7$F$-$?%[%9%H!"%f!<%6$,%m%0%$%s$7$F$$$k;~4V!"%f!<%6$,(B
 $B:G8e$K%3%^%s%I$rF~NO$7$F$+$i$N7P2a;~4V!"8=:_<B9T$7$F$$$k%W%m%;%9$N(B
 $BL>A0$H0z?t$G$9!#(B
 .Pp
@@ -73,11 +73,10 @@
 .Dq /dev/kmem
 $B$N$+$o$j$K!";XDj$5$l$?(B
 .Ar core
-$B$+(B
-$B$iL>A0$N%j%9%H$K4X78$9$kCM$r<h$j=P$7$^$9!#(B
+$B$+$iL>A0$N%j%9%H$K4X78$9$kCM$r<h$j=P$7$^$9!#(B
 .It Fl N
 $B%G%U%)%k%H$N(B
-.Dq /kernel 
+.Dq /kernel
 $B$N$+$o$j$K!";XDj$5$l$?(B
 .Ar system
 $B$+$i(B
@@ -89,6 +88,7 @@
 $B$O!"%"%I%l%9$r2r<a$7$F%[%9%HL>$GI=<($7$h$&$H$7$^$9(B)$B!#(B
 .El
 .Pp
+1 $B8D0J>e$N(B
 .Ar $B%f!<%6L>(B
 $B$,;XDj$5$l$k$H!";XDj$5$l$?%f!<%6$N$b$N$@$1=PNO$r9T$$$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
@@ -107,8 +107,8 @@
 .Dq $BC<Kv$N3d$j9~$_$rL5;k$7$F$$$J$$!"$b$C$H$b%W%m%;%9(B-ID $B$NBg$-$$%W%m%;%9!"$=$l$,8+$D$+$i$J$1$l$P!"$=$NC<Kv$N$b$C$H$b%W%m%;%9(B-ID$B$NBg$-$$%W%m%;%9$r8+$D$1$k(B
 $B$H$$$&;EAH$_$K$J$C$F$$$^$9!#(B
 $B$3$l$O<:GT$9$k>l9g$,$"$j$^$9!#$?$H$($P!"%7%'%k$d%(%G%#%?$N$h$&$K(B
-$B%W%m%0%i%`$,%/%j%F%#%+%k%;%/%7%g%s!J$[$+$+$i$N3d$j9~$_$r<u$1IU$1$k$Y$-(B
-$B$G$O$J$$$h$&$J=EMW$JA`:n$r$9$k>uBV!K$K$$$k>l9g$d!"(B
+$B%W%m%0%i%`$,%/%j%F%#%+%k%;%/%7%g%s(B ($B$[$+$+$i$N3d$j9~$_$r<u$1IU$1$k$Y$-(B
+$B$G$O$J$$$h$&$J=EMW$JA`:n$r$9$k>uBV(B) $B$K$$$k>l9g$d!"(B
 $BIT40A4$J%W%m%0%i%`$,%P%C%/%0%i%&%s%I$GF0$$$F$$$F!"3d$j9~$_$rL5;k$9$k(B
 $B$N$K<:GT$7$F$$$k$h$&$J>l9g$G$9(B ($B%W%m%;%9$r8+$D$1$k$3$H$,$G$-$J$+$C$?(B
 $B>l9g!"(B
Only in man: man1aout
diff -ur man/man5/isdnd.acct.5 man/man5/isdnd.acct.5
--- man/man5/isdnd.acct.5	Sun Sep  5 01:36:19 1999
+++ man/man5/isdnd.acct.5	Sat Nov 20 23:28:03 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.2 1999/08/29 15:41:41 peter Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.3 1999/11/15 22:40:55 joe Exp % 
 .\"
-.\"	last edit-date: [Sat Dec  5 18:09:33 1998]
+.\"	last edit-date: [Mon Feb 15 16:54:23 1999]
 .\"
 .\" jpman %Id: isdnd.acct.5,v 1.3 1999/02/01 15:18:01 horikawa Stab %
 .Dd September 11, 1998
@@ -62,7 +62,7 @@
 .Pp
 .Em FROM
 $B$O@\B3$,3NN)$5$l$?;~9o$G!"(B
-.Dl $BF|(B:$B7n(B:$BG/(B $B;~(B:$BJ,(B:$BIC(B
+.Dl $BF|(B.$B7n(B.$BG/(B $B;~(B:$BJ,(B:$BIC(B
 $B$H$$$&7A<0$K$J$j$^$9!#(B
 .Pp
 .Em UNTIL
@@ -93,17 +93,16 @@
 ISDN $B%G!<%b%s(B
 .Nm isdnd
 $BMQ$N%G%U%)%k%H$N%"%+%&%s%F%#%s%0>pJs%U%!%$%k!#(B
-
 .Sh $B;HMQNc(B
 $B$3$l$OE57?E*$J%"%+%&%s%F%#%s%09T$G$9(B:
 .Pp
 .Dl 12.06.97 10:41:37 - 12.06.97 10:45:18 GROGGY 2 (65) (4711/1147)
-
 .Sh $B4XO"9`L\(B
-.Xr isdnd 8 ,
-.Xr isdnd.rc 5
-
+.Xr isdnd.rc 5 ,
+.Xr isdnd 8
 .Sh $B:n<T(B
 .Xr isdnd 8
-$B%G!<%b%s$HK\%^%K%e%"%k%Z!<%8$O(B Hellmuth Michaelis $B$,:n@.$7$^$7$?!#(B
+$B%G!<%b%s$HK\%^%K%e%"%k%Z!<%8$O(B
+.An Hellmuth Michaelis
+$B$,:n@.$7$^$7$?!#(B
 $BH`$NO"Mm@h$O!"(Bhm@kts.org $B$^$?$O(B hm@hcs.de $B$G$9!#(B
diff -ur man/man5/isdnd.rates.5 man/man5/isdnd.rates.5
--- man/man5/isdnd.rates.5	Sun Sep  5 01:36:19 1999
+++ man/man5/isdnd.rates.5	Sat Nov 20 23:28:04 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.2 1999/08/29 15:41:41 peter Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp % 
 .\"
-.\"     last edit-date: [Sat Dec  5 18:09:57 1998]
+.\"     last edit-date: [Sun Feb 14 10:11:05 1999]
 .\"
 .\" jpman %Id: isdnd.rates.5,v 1.3 1999/02/06 15:32:40 horikawa Stab %
 .\" WORD: short hold time	$B%7%g!<%H%[!<%k%I;~4V(B
@@ -91,7 +91,7 @@
 ISDN $B%G!<%b%s(B
 .Nm isdnd
 $BMQ$N%G%U%)%k%H$NNA6b;XDj%U%!%$%k!#(B
-
+.El
 .Sh $B;HMQNc(B
 $B<!$N9T(B:
 .Bd -literal
diff -ur man/man5/isdnd.rc.5 man/man5/isdnd.rc.5
--- man/man5/isdnd.rc.5	Fri Nov 19 23:09:22 1999
+++ man/man5/isdnd.rc.5	Sat Nov 20 23:28:05 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,16 +22,17 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.2 1999/08/29 15:41:42 peter Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp % 
 .\"
-.\"     last edit-date: [Sat Dec  5 18:10:08 1998]
+.\"     last edit-date: [Wed Jul 28 15:57:02 1999]
 .\"
 .\" jpman %Id: isdnd.rc.5,v 1.4 1999/02/11 15:43:12 horikawa Stab %
 .\"
 .\" WORD: exchange	$B8r496I(B
 .\" WORD: subscribe	(AOCD $B%5!<%S%9Ey$r(B) $B?=$79~$s$G$$$k(B
-.Dd October 27, 1998
-.Dt isdnd.rc 5
+.Dd May 20, 1999
+.Dt ISDND.RC 5
+.Os
 .Sh $BL>>N(B
 .Nm isdnd.rc
 .Nd isdn4bsd ISDN $B@\B34IM}%G!<%b%s$N@_Dj%U%!%$%k=q<0(B
@@ -98,6 +99,9 @@
 ($B8e=R(B) $B$,(B
 .Em on
 $B$K@_Dj$5$l$?$H$-$K;HMQ$5$l$k%"%+%&%s%F%#%s%0%U%!%$%k$NL>A0$r;XDj$7$^$9!#(B
+$B%7%9%F%`%-!<%o!<%I(B
+.Em rotatesuffix
+$B$r;2>H$7$F$/$@$5$$!#(B
 $BK\%-!<%o!<%I$r;XDj$7$J$$$H!"%7%9%F%`%G%U%)%k%H$,;HMQ$5$l$^$9!#(B($B>JN,2DG=(B)
 
 .It Li aliasing
@@ -115,6 +119,11 @@
 $BEEOCHV9f$+$iL>A0$X$N%(%$%j%"%9%G!<%?%Y!<%9%U%!%$%k$NL>A0$r;XDj$7$^$9!#(B
 ($B>JN,2DG=(B)
 
+.It Li beepconnect
+$BA42hLL%b!<%I$K$*$$$F!"K\%Q%i%a!<%?$,(B
+.Em on
+$B$K@_Dj$5$l$k$H!"8F$N@\B3$^$?$O@ZCG;~$K%Y%k$rLD$i$7$^$9!#(B
+
 .It Li isdntime
 $BK\%Q%i%a!<%?$,(B
 .Em on
@@ -208,6 +217,16 @@
 $B$3$N%Q%9$O!"K\%-!<%o!<%I$N%Q%i%a!<%?$H$7$F;XDj$5$l$?J8;zNs$NA0$KIU$1$i$l$^$9!#(B
 ($B>JN,2DG=(B)
 
+.It Li rotatesuffix
+$B%m%0%U%!%$%k$*$h$S%"%+%&%s%F%#%s%0%U%!%$%k$N2~L>$K;HMQ$9$k%5%U%#%C%/%9$r(B
+$B;XDj$7$^$9!#(B
+rotatesuffix $B$,;HMQ$5$l(B USR1 $B%7%0%J%k$,(B isdnd $B$KAw$i$l$?>l9g!"(B
+$B%m%0%U%!%$%k$H%"%+%&%s%F%#%s%0%U%!%$%k$O!"(B
+$BJD$8$i$l$F:FEY3+$1$i$l$k$3$H$K2C$(!"(B
+$B85$NL>A0$K(B rotatesuffix $BJ8;zNs$r8eCV$7$?L>A0$K2~L>$5$l$^$9!#(B
+$BK\%-!<%o!<%I$r>JN,$9$k$H!"%m%0%U%!%$%k$OC1$KJD$8$i$l$F:FEY3+$1$i$l$^$9!#(B
+$B$3$l$O$^$?%G%U%)%k%H;~$NF0:n$G$9!#(B($B>JN,2DG=(B)
+
 .It Li rtprio
 .Nm isdnd
 $B$,<B9T$5$l$k%j%"%k%?%$%`M%@hEY$r!"(B0 $B!A(B 31 $B$NHO0O$N@0?tCM$G;XDj$7$^$9!#(B
@@ -365,11 +384,29 @@
 $B<!$N2]6bC10L$H$J$kA0$K@\B3$r@Z$k$?$a$N(B ($BJ]81$N(B) $BIC?t$r;XDj$7$^$9!#(B
 ($B>JN,2DG=(B)
 
+.It Li idle-algorithm-outgoing
+$BH/8F(B (outgoing call) $B$,%"%$%I%k$G$"$k$H$-!"(B
+$B2?;~@\B3$r@Z$k$+$rH=Dj$9$k$N$K;HMQ$9$k%"%k%4%j%:%`!#(B
+$B8=:_;HMQ2DG=$J%"%k%4%j%:%`$O<!$NDL$j$G$9(B:
+
+.Pp
+.Bl -tag -width calledback -compact -offset
+.It Ar fix-unit-size
+$B8FA4BN$rDL$8$F!"8GDjD9$N2]6bC10L$r2>Dj$9$k!"%"%$%I%k%"%k%4%j%:%`$G$9!#(B
+.\" idle algorithm which assumes fixed sized changing units during the whole call.
+.\" $B$N(B changing $B$O(B charging $B$G$"$k$O$:!#(Bsend-pr $B$9$k(B
+.\" <horikawa@jp.FreeBSD.org> Nov 20 1999
+.It Ar var-unit-size
+$B:G=i$N2]6bC10L8e$O!";~4V%Y!<%9$N2]6b$r2>Dj$9$k!"%"%$%I%k%"%k%4%j%:%`$G$9!#(B
+.El
+
 .It Li idletime-outgoing
-$B@\B3$r@Z$kA0$KH/8F(B (outgoing call) $B$,%"%$%I%k$H$J$kIC?t!#(B($B>JN,2DG=(B)
+$B@\B3$r@Z$kA0$KH/8F$,%"%$%I%k$H$J$kIC?t!#(B($B>JN,2DG=(B)
+$B%"%$%I%k%?%$%`%"%&%H$K(B 0 $B$r;XDj$9$k$H!"$3$N5!G=$rL58z$K$7$^$9!#(B
 
 .It Li idletime-incoming
 $B@\B3$r@Z$kA0$KCe8F$,%"%$%I%k$H$J$kIC?t!#(B($B>JN,2DG=(B)
+$B%"%$%I%k%?%$%`%"%&%H$K(B 0 $B$r;XDj$9$k$H!"$3$N5!G=$rL58z$K$7$^$9!#(B
 
 .It Li isdncontroller
 $BK\%(%s%H%j$N@\B3$K;HMQ$5$l$k(B ISDN $B%3%s%H%m!<%iHV9f!#(B($BI,?\(B)
@@ -418,9 +455,9 @@
 .Em "$BH/HV9f>pJsMWAG(B (Calling Party Number Information Element)"
 $B$KKd$a9~$^$l$^$9!#(B
 .Pp
-$BK\%-!<%o!<%I$O!"(Bipr $B%f!<%6%i%s%I%$%s%?%U%'!<%9$N$?$a$KI,?\$G$9!#(B
-.\" $B86J8$N(B .em (Execute Macro) $B$O!"0z?tL5$7$N>l9g8z2L$,L5$$$N$G:o=|(B
-.\" horikawa@jp.freebsd.org 1999/01/19
+$BK\%-!<%o!<%I$O!"(B
+.Em ipr
+$B%f!<%6%i%s%I%$%s%?%U%'!<%9$N$?$a$KI,?\$G$9!#(B
 
 .It Li local-phone-incoming
 $BCe8F$N08@h$r3NG'$9$k$?$a$K;HMQ$9$k!"%m!<%+%k$NEEOCHV9f$G$9!#(B
@@ -431,7 +468,9 @@
 .Em "$BCeHV9f>pJsMWAG(B (Called Party Number Information Element)"
 $B$HHf3S$5$l$^$9!#(B
 .Pp
-$BK\%-!<%o!<%I$O(B ipr $B%$%s%?%U%'!<%9$N$?$a$KI,?\$G$9!#(B
+$BK\%-!<%o!<%I$O(B
+.Em ipr
+$B%$%s%?%U%'!<%9$N$?$a$KI,?\$G$9!#(B
 
 .It Li name
 $B$=$N@_Dj%(%s%H%j$K%7%s%\%k$K$h$kL>A0$rDj5A$7$^$9!#(B
@@ -545,13 +584,6 @@
 
 .It Li usrdeviceunit
 usrdevicename $B$,;XDj$9$k%G%P%$%9$N!"%f%K%C%HHV9f$r;XDj$7$^$9!#(B
-.\" $B86J8$N(B .em (Execute Macro) $B$O!"0z?tL5$7$N>l9g8z2L$,L5$$$N$G:o=|(B
-.\" horikawa@jp.freebsd.org 1999/01/19
-.\" $BJ8K!$b$A$g$C$H%X%s$G$9$M!#(B
-.\" Specifies the unit number for the with the
-.\" .em
-.\" usrdevicename
-.\" specified device.
 
 .It Li usedown
 $B%(%s%H%j%;%/%7%g%s$K$*$$$F!"%-!<%o!<%I(B
@@ -575,6 +607,19 @@
 .Pa /etc/isdn
 $B0J2<$G%W%m%0%i%`$r8+IU$1$i$l$k$b$N$H4|BT$7$^$9!#(B
 $B$3$N%Q%9$O!"K\%-!<%o!<%I$N%Q%i%a!<%?$H$7$F;XDj$5$l$?J8;zNs$NA0$KIU$1$i$l$^$9!#(B
+$B@\B3$*$h$S@ZCG$K$h$j;XDj$5$l$k%W%m%0%i%`$O!"(B
+-d (device) -f (flag) [ -a (addr) ] $B$H$$$&%3%^%s%I%i%$%s0z?t$rF@$^$9!#(B
+$B$3$3$G!"(B
+.Em device
+$B$O%G%P%$%9L>$G$"$j!"Nc$($P(B "isp0" $B$G$9!#$^$?!"(B
+.Em flag
+$B$O!"@\B3$,$^$5$K3NN)$7$?;~$O(B "up" $B$G$"$j!"(B
+$B%$%s%?%U%'!<%9$,%@%&%s>uBV$KJQ2=$7$?;~$O(B "down" $B$G$9!#(B
+$B$^$?!"(B
+.Em addr
+$B$O!"%$%s%?%U%'!<%9$K3d$jEv$F$i$l$?%"%I%l%9$G$"$j!"(B
+$B%I%C%H6h@Z$j(B 4 $B$DAH$N(B IP $B%"%I%l%9$G$9(B
+(isdnd $B$N$_$,M}2r2DG=$J>l9g$K$O>JN,2DG=$G$9(B)$B!#(B
 ($B>JN,2DG=(B)
 
 .It Li disconnectprog
@@ -606,11 +651,15 @@
 $BE57?E*$JCM$O(B 1 $B!A(B 5 $BJ,$G$9!#(B
 
 .It Li $BH/8F(B
-$BH/8F$N@ZCG;~4V$r!"(B2 $B<oN`$NJ}K!$N$$$:$l$+$K@_Dj2DG=$G$9(B:
+$BH/8F$N@ZCG;~4V$r!"(B3 $B<oN`$NJ}K!$N$$$:$l$+$K@_Dj2DG=$G$9(B:
 
 .Bl -tag -width shorthold mode -compact
 .It Li $BC1=c%b!<%I(B
 $BC1=c$J%b!<%I$G$"$j!"(B
+.Em idle-algorithm-outgoing
+$B$O(B
+.Em fix-unit-size
+$B$G$"$k$3$H$,I,MW$G!"(B
 .Em unitlength
 $B$NA*BrCM$O(B 0 ($B%<%m(B) $B$G$"$j(B
 .Em idletime-outgoing
@@ -622,8 +671,10 @@
 .Pp
 $BC1=c$J%b!<%I$NE57?CM$O(B 10 $B!A(B 30 $BIC$G$9!#(B
 
-.It Li $B%7%g!<%H%[!<%k%I%b!<%I(B
-$B%7%g!<%H%[!<%k%I%b!<%I$G$O!"(B
+.It Li $B8GDjC10L2]6bMQ%7%g!<%H%[!<%k%I%b!<%I(B
+$B$3$N%7%g!<%H%[!<%k%I%b!<%I$G$O!"(B
+.Em idle-algorithm-outgoing
+$B$G$"$k$3$H$,I,MW$G!"(B
 .Em unitlength 
 $B$H(B
 .Em idletime-outgoing
@@ -660,6 +711,52 @@
 .Em earlyhangup
 $B$N9g7W$h$j$bBg$-$$$3$H$,I,MW(B (!) $B$G$9(B!
 
+.It $B2DJQC10L2]6bMQ%7%g!<%H%[!<%k%I%b!<%I(B
+$B$3$N%7%g!<%H%[!<%k%I%b!<%I$G$O!"(B
+.Em idle-algorithm-outgoing
+$B$O(B
+.Em var-unit-size
+$B$G$"$k$3$H$,I,MW$G!"(B
+.Em unitlength 
+$B$H(B
+.Em idletime-outgoing
+$B$NA*BrCM$O(B 0 ($B%<%m(B) $B$h$jBg$-$$$3$H$,I,MW$G$9!#(B
+.Pp
+
+$B$3$N%7%g!<%H%[!<%k%I%b!<%I$O!"(B
+$B8F$N2]6b$,!"7P2a;~4V$H8GDj$N@\B32]6b$+$i$J$k>l9g$K8~$$$F$$$^$9!#(B
+$BNc$($P(B British Telecom $B$N2]6b$,$3$NJ}K!$G$9!#(B
+.Pp
+
+$B3F8F$O!"(B2 $B$D$N4|4V$KJ,3d$5$l$^$9!#(B
+1 $BHVL\$O(B
+.Em $B%A%'%C%/BP>]30(B (unchecked)
+$B4|4V$G$"$j!"(B2 $BHVL\$O(B
+.Em $B%A%'%C%/BP>](B (checked)
+$B4|4V$G$9!#(B
+.Em $B%A%'%C%/BP>](B
+$B4|4V$O!":G=i$NC10L;~4V$,=*$k(B 1 $BICA0$K3+;O$7$^$9!#(B
+.Pp
+.Em $B%A%'%C%/BP>](B
+$B4|4V$G$O!"(B
+.Em idle-time
+$BIC$N4V$K%H%i%U%#%C%/$,L5$$>l9g!"8F$,@ZCG$5$l$^$9!#(B
+.Pp
+
+.Bd -literal
+
+|<---unchecked------------------>|<------checked------>
++------------------+-------------+
+|                  |<-idle-time->|
+|<--------------unitlength------->|
+
+.Ed
+
+$B7P83$+$i$O!"M-MQ$J(B idle-time $B$O(B 15 $BIC$+$i(B 30 $BIC$G$9!#(B
+.Pp
+idle-time $B$,C;$+2a$.$k$H!"(B
+$B%M%C%H%o!<%/=hM}$r$^$@=*$($F$$$J$$%"%W%j%1!<%7%g%s$,?7$?$J8F$rH/@8$7$^$9!#(B
+.Pp
 .El
 .El
 
@@ -669,14 +766,19 @@
 .It Pa /etc/isdn/isdnd.rc
 .Nm isdnd
 ISDN $B%G!<%b%s$N%G%U%)%k%H$N@_Dj%U%!%$%k!#(B
-
+.El
 .Sh $B4XO"9`L\(B
-.Xr isdnd 8
+.Xr regex 3 ,
+.Xr re_format 7 ,
+.Xr isdnd 8 ,
 .Xr isdnmonitor 8
-.Xr regex 3
-.Xr re_format 7
-
 .Sh $B:n<T(B
 .Xr isdnd 8
-$B%G!<%b%s$HK\%^%K%e%"%k%Z!<%8$O(B Hellmuth Michaelis $B$,=q$-$^$7$?!#(B
+$B%G!<%b%s$HK\%^%K%e%"%k%Z!<%8$O(B
+.An Hellmuth Michaelis
+$B$,=q$-$^$7$?!#(B
 $BH`$NO"Mm@h$O!"(Bhm@kts.org $B$G$9!#(B
+.Pp
+$BK\%^%K%e%"%k%Z!<%8$X(B
+.An Barry Scott Aq barry@scottb.demon.co.uk
+$B$,DI2C$7$^$7$?!#(B
diff -ur man/man5/radius.conf.5 man/man5/radius.conf.5
--- man/man5/radius.conf.5	Fri Feb 12 00:44:39 1999
+++ man/man5/radius.conf.5	Sat Nov 20 23:28:06 1999
@@ -1,4 +1,4 @@
-.\" Copyright 1998 Juniper Networks, Inc.
+,.\" Copyright 1998 Juniper Networks, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -45,8 +45,22 @@
 $B3F9T$O!"%i%$%V%i%j$,;HMQ$9$kC10l$N(B RADIUS $B%5!<%P$K$D$$$F5-=R$7$^$9!#(B
 $B@h9T$9$k6uGr$O!"6u9T$*$h$S!"%3%a%s%H$N$_$N9T$HF1MM!"L5;k$5$l$^$9!#(B
 .Pp
-1 $B$D$N(B RADIUS $B%5!<%P$O!"(B2 $B$+$i(B 4 $B%U%#!<%k%I$+$i$J$k(B 1 $B9T$K$h$j5-=R$5$l$^$9!#(B
-$B%U%#!<%k%I$O!"6uGr$K$h$j6h@Z$i$l$^$9!#(B
+1 $B$D$N(B RADIUS $B%5!<%P$O!"(B3 $B$+$i(B 5 $B%U%#!<%k%I$+$i$J$k(B 1 $B9T$K$h$j5-=R$5$l$^$9(B:
+.Pp
+.Bl -item -offset indent -compact
+.It
+$B%5!<%P%?%$%W(B
+.It
+$B%5!<%P%[%9%H(B
+.It
+$B6&M-80(B
+.It
+$B%?%$%`%"%&%H(B
+.It
+$B%j%H%i%$?t(B
+.El
+.Pp
+$B%U%#!<%k%I$O6uGr$G6h@Z$j$^$9!#(B
 $B%U%#!<%k%I$N@hF,$K$"$k(B
 .Ql #
 $BJ8;z$O%3%a%s%H$r3+;O$7!"9TKv$^$GB3$-$^$9!#(B
@@ -61,21 +75,45 @@
 $B$GI=8=2DG=$G$9!#(B
 $BB>$N%(%9%1!<%W%7!<%1%s%9$O%5%]!<%H$5$l$F$$$^$;$s!#(B
 .Pp
-$B:G=i$N%U%#!<%k%I$O%5!<%P%[%9%H$r;XDj$7$^$9!#(B
+.Pp
+$B:G=i$N%U%#!<%k%I$O%5!<%P%?%$%W$r;XDj$7$^$9!#(B
+.Ql auth
+$B$G(B RADIUS $BG'>Z$r;XDj$9$k$+!"(B
+.Ql acct
+$B$G(B RADIUS $B%"%+%&%s%F%#%s%0$r;XDj$7$^$9!#(B
+$BC10l%5!<%P$GN>J}$N%5!<%S%9$rDs6!$9$k>l9g!"%U%!%$%kCf$K(B 2 $B9TI,MW$G$9!#(B
+$B0JA0$N%P!<%8%g%s$N%U%!%$%k$G$O%5!<%S%9%?%$%W$r4^$_$^$;$s$G$7$?!#(B
+$B8eJ}8_49$N$?$a!":G=i$N%U%#!<%k%I$,(B
+.Ql auth
+$B$+(B
+.Ql acct
+$B$N$$$:$l$G$b$J$$>l9g!"%i%$%V%i%j$O!"(B
+.Ql auth
+$B$,;XDj$5$l$?$b$N$H$7$F?6Iq$$!"(B
+$B$=$N9T$r%U%#!<%k%I(B 2 $B$+$i(B 5 $B$,;XDj$5$l$?$b$N$H$7$F2r<a$7$^$9!#(B
+.Pp
+$BBh(B 2 $B%U%#!<%k%I$O!"(B
 $B40A4$J7A$G$N%I%a%$%sL>$G$b$+$^$$$^$;$s$7!"(B
 $B%I%C%HIU$-(B 4 $B$DAH$N(B IP $B%"%I%l%9$G$b$+$^$$$^$;$s!#(B
 $B%[%9%H$N8e$K$O(B
 .Ql \&:
 $B$H?tCM$K$h$k%]!<%HHV9f$rB3$1$k$3$H$,$G$-$^$9!#$3$N;~!"4V$K6uGr$rF~$l$F$O(B
-$B$$$1$^$;$s!#%]!<%H$r;XDj$7$J$$>l9g!"(B
+$B$$$1$^$;$s!#%]!<%H$r;XDj$7$J$$>l9g!"%5!<%S%9%?%$%W(B
+.Ql auth
+$B$*$h$S(B
+.Ql acct
+$B$N$=$l$>$l$KBP$7$F(B
 .Pa /etc/services
 $B%U%!%$%k$N(B
 .Ql radius
-$B%5!<%S%9$K$J$k$+!"(B
+$B$^$?$O(B
+.Ql radacct
+$B$N%5!<%S%9$K$J$j$^$9!#(B
 .Pa /etc/services
-$B%U%!%$%k$K$3$N$h$&$J%(%s%H%j$,L5$$>l9gI8=`$N(B RADIUS $B%]!<%H(B 1812 $B$K$J$j$^$9!#(B
+$B%U%!%$%k$K$3$N$h$&$J%(%s%H%j$,L5$$>l9g!"(B
+$BI8=`$N(B RADIUS $B%]!<%H(B 1812 $B$*$h$S(B 1813 $B$K$J$j$^$9!#(B
 .Pp
-$BBh(B 2 $B%U%#!<%k%I$K$O6&M-80$,CV$+$l!"(B
+$BBh(B 3 $B%U%#!<%k%I$K$O6&M-80$,CV$+$l!"(B
 $B%/%i%$%"%s%H$H%5!<%P%[%9%H0J30$K$OCN$i$l$F$O$J$j$^$;$s!#(B
 $B6&M-80$OG$0U$NJ8;zNs$G$9$,!"(B
 $B6uGr$r4^$`>l9g$O%@%V%k%/%)!<%H$G3g$kI,MW$,$"$j$^$9!#(B
@@ -84,17 +122,17 @@
 $BCm0U(B: $BM-L>$J(B RADIUS $B%5!<%P$K$O!"(B
 16 $BJ8;z$h$jD9$$6&M-80$G$O@5$7$/F0:n$7$J$$$H$$$&%P%0$r;}$C$?$b$N$,$"$j$^$9!#(B
 .Pp
-$BBh(B 3 $B%U%#!<%k%I$O!"(B
+$BBh(B 4 $B%U%#!<%k%I$O!"(B
 $B%5!<%P$+$i@5Ev$J%j%W%i%$$r<u$1<h$k$^$G$KBT$DIC?t$G$"$j!"(B
 10 $B?J?t$G;XDj$7$^$9!#(B
 $B$3$N%U%#!<%k%I$r>JN,$9$k$H!"%G%U%)%k%H$N(B 3 $BIC$K$J$j$^$9!#(B
 .Pp
-$BBh(B 4 $B%U%#!<%k%I$O!"(B
+$BBh(B 5 $B%U%#!<%k%I$O!"(B
 $BD|$a$k$^$G$K:GBg2?2s%5!<%P$KG'>Z$r;n$_$k$+$r<($9CM$r(B 10 $B?J?t$G;XDj$7$^$9!#(B
 $B>JN,$9$k$H!"%G%U%)%k%H$N(B 3 $B2s$K$J$j$^$9!#(B
 $B$3$l$O;n9T2s?t$N9g7W$G$"$j!"%j%H%i%$2s?t$G$O$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
 .Pp
-RADIUS $B%5!<%P$O:GBg(B 10 $B8D$^$G;XDj$G$-$^$9!#(B
+RADIUS $B%5!<%P$O!"3F%5!<%S%9$KBP$7$F:GBg(B 10 $B8D$^$G;XDj$G$-$^$9!#(B
 $B%5!<%P$O%i%&%s%I%m%S%sJ}<0$G;n$5$l!"M-8z$JJVEz$,JV$5$l$k$+!"(B
 $BA4%5!<%P$KBP$7$F!":GBg;n9T2s?t$KC#$9$k$^$GB3$1$^$9!#(B
 .Pp
@@ -110,14 +148,14 @@
 .Sh $B;HMQNc(B
 .Bd -literal
 # $BA4It%G%U%)%k%H$G$"$kC1=c$J%(%s%H%j(B
-radius1.domain.com	OurLittleSecret
+acct  radius1.domain.com  OurLittleSecret
 
 # $B%5!<%P$O$^$@GQ$l$?(B RADIUS $B%]!<%H;H$C$F$*$j!"(B
 # $B%?%$%`%"%&%H$H:GBg;n9T2s?t$rA}2C$7$F$$$^$9(B:
-auth.domain.com:1645	"I can't see you, but I know you're there"  5  4
+auth  auth.domain.com:1645  "I can't see you"  5  4
 
 # $B%5!<%P$r(B IP $B%"%I%l%9$G;XDj(B:
-192.168.27.81		$X*#..38947ax-+=
+auth  192.168.27.81  $X*#..38947ax-+=
 .Ed
 .Sh $B4XO"9`L\(B
 .Xr libradius 3
@@ -125,6 +163,11 @@
 .%A C. Rigney, et al
 .%T Remote Authentication Dial In User Service (RADIUS)
 .%O RFC 2138
+.Re
+.Rs
+.%A C. Rigney
+.%T RADIUS Accounting
+.%O RFC 2139
 .Re
 .Sh $B:n<T(B
 $B$3$NJ8=q$r(B
diff -ur man/man7/man.7 man/man7/man.7
--- man/man7/man.7	Sun Sep  5 01:36:20 1999
+++ man/man7/man.7	Sat Nov 20 23:28:20 1999
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man7/man.7,v 1.1.4.1 1999/08/29 16:46:59 peter Exp %
+.\" %FreeBSD: src/share/man/man7/man.7,v 1.1.4.2 1999/10/30 14:12:18 phantom Exp %
 .\" jpman %Id: man.7,v 1.3 1999/02/10 13:32:51 horikawa Stab %
 .\"
 .\" WORD: format		(roff$B$G(B)$B=q<0@07A(B($B$9$k(B)[man.7]
@@ -335,15 +335,15 @@
 $B4{CN$N>c32$d;HMQ>e$N@)8B$,$"$l$P!"$=$l$r5-=R$7$^$9!#(B
 .El
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width "/usr/share/lib/tmac/tmac.groff_an"
-.It "/usr/share/lib/tmac/tmac.an"
+.Bl -tag -width "/usr/share/tmac/tmac.groff_an"
+.It "/usr/share/tmac/tmac.an"
 .Nm
 $B%Q%C%1!<%8$rDj5A$9$k=i4|%U%!%$%k!#(B
-.It "/usr/share/lib/tmac/tmac.groff_an"
+.It "/usr/share/tmac/tmac.groff_an"
 $B%^%/%mDj5A$N$?$a$N(B
 .Nm groff
 $B$N%=!<%9!#(B
-.It "/usr/share/lib/tmac/man.local"
+.It "/usr/share/tmac/man.local"
 .Nm
 $B%Q%C%1!<%8$KBP$9$k%m!<%+%k$JJQ99!#(B
 .El
@@ -358,9 +358,8 @@
 .Xr mdoc.samples 7
 .Sh $BNr;K(B
 $B$3$N%^%K%e%"%k%Z!<%8$O(B
-.An "Joseph Koshy"
-.Ad Aq jkoshy@freebsd.org
-$B$K$h$C$F5-=R$5$l$^$7$?!#(B
+.An Joseph Koshy Aq jkoshy@FreeBSD.org
+$B$,5-=R$7$^$7$?!#(B
 .Sh $BLuCm(B
 $B$3$NF|K\8lLu%^%K%e%"%k%Z!<%8$K$*$1$k%;%/%7%g%s%?%$%H%k$N1QOBBP1~$O<!$N(B
 $B$H$*$j$G$9!#(B
diff -ur man/man7/mdoc.7 man/man7/mdoc.7
--- man/man7/mdoc.7	Sun Sep 19 13:28:30 1999
+++ man/man7/mdoc.7	Sat Nov 20 23:28:21 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.4 1999/09/14 16:35:16 phantom Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.6 1999/11/02 13:56:47 phantom Exp %
 .\"
 .\" jpman %Id: mdoc.7,v 1.5 1999/01/21 18:02:11 kuma Stab %
 .\"
@@ -308,6 +308,11 @@
 .It Li \&Op Ta Yes Ta Yes Ta "$B%*%W%7%g%s(B (.Oo $B$d(B .Oc $B$bF1MM(B)$B!#(B"
 .It Li \&Ot Ta Yes Ta Yes Ta "$B8E$$%9%?%$%k$N4X?t7?(B (Fortran $B$N$_(B)$B!#(B"
 .It Li \&Pa Ta Yes Ta Yes Ta "$B%Q%9L>$d%U%!%$%kL>!#(B"
+.It Li \&St Ta Yes Ta Yes Ta "$B5,3J!#4{CN$N5,3J$N40A4$J%j%9%H$K4X$7$F$O!"(B"
+.Xr mdoc.samples 7
+$B$N(B
+.Sx $B5,3J(B
+$B$N@a$r;2>H!#(B
 .It Li \&St Ta Yes Ta Yes Ta "$B5,3J(B (-p1003.2 $B$d(B -p1003.1 $B$d(B -ansiC)$B!#(B"
 .It Li \&Ta Ta Yes Ta Yes Ta "$B<!$N%?%V%3%i%`$X$N%?%VB7$(!#(B"
 .It Li \&Va Ta Yes Ta Yes Ta "$BJQ?tL>!#(B"
@@ -393,26 +398,21 @@
 $B3HD%%j%9%H%^%/%m$O!"%^%/%m0z?t$,(B
 .Xr troff
 $B$N@)8B$G$"$k(B 9 $B8D$r1[$($k>l9g$K;H$o$l$^$9!#(B
-.Sh $B%3%s%U%#%.%e%l!<%7%g%s(B
-$B%^%/%m%Q%C%1!<%8$N%5%$%H0MB8%3%s%U%#%.%e%l!<%7%g%s$N$?$a$K!"(B
-$B%U%!%$%k(B
-.Pa /usr/src/share/tmac/README
-$B$r;2>H$7$F2<$5$$!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width "tmac.doc-ditroff" -compact
 .It Pa tmac.doc
 $B%^%K%e%"%kNN0h$H0lHL%F%-%9%HNN0h$N%^%/%m!#(B
-.It Pa tmac.doc-common
+.It Pa doc-common
 $B6&DL9=B$%^%/%m$HDj5A!#(B
-.It Pa tmac.doc-nroff
+.It Pa doc-nroff
 $B%5%$%H0MB8$N(B
 .Xr nroff
 $B%9%?%$%k%U%!%$%k!#(B
-.It Pa tmac.doc-ditroff
+.It Pa doc-ditroff
 $B%5%$%H0MB8$N(B
 .Xr troff
 $B%9%?%$%k%U%!%$%k!#(B
-.It Pa tmac.doc-syms
+.It Pa doc-syms
 ($BI8=`%^%/%m$N$h$&$J(B) $BFC<lDj5A!#(B
 .El
 .Sh $B4XO"9`L\(B
diff -ur man/man7/mdoc.samples.7 man/man7/mdoc.samples.7
--- man/man7/mdoc.samples.7	Fri Nov 19 23:09:22 1999
+++ man/man7/mdoc.samples.7	Sat Nov 20 23:28:25 1999
@@ -30,14 +30,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.4 1999/08/29 16:47:00 peter Exp %
-.\"
-.\" jpman %Id: mdoc.samples.7,v 1.4 1999/01/21 17:52:58 kuma Stab %
+.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.6 1999/11/02 13:56:47 phantom Exp %
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
 .\" for an already extremely slow package.
 .\"
+.\" jpman %Id: mdoc.samples.7,v 1.4 1999/01/21 17:52:58 kuma Stab %
+.\"
 .\" WORD:	display		$BI=<(FbMF(B
 .\" WORD:	angle bracket	$B%+%.3g8L(B <>
 .\" WORD:	keep		$B%-!<%W(B
@@ -152,6 +152,7 @@
 .It "$BL>>N(B"
 .It "$B%*%W%7%g%s(B"
 .It "$B%Q%9L>(B"
+.It "$BI8=`(B"
 .It "$BJQ?t(B"
 .It "$B%/%m%9%j%U%!%l%s%9(B"
 .El
@@ -160,7 +161,7 @@
 .Bl -tag -width flag -compact -offset indent
 .It "AT&T $B%^%/%m(B"
 .It "BSD $B%^%/%m(B"
-.It "FreeBSD $B%^%/%m(B"
+.It "FreeBSD/NetBSD/OpenBSD $B%^%/%m(B"
 .It "UNIX $B%^%/%m(B"
 .It "$B0O$$(B/$B%/%)!<%H(B $B%^%/%m(B"
 .Bl -tag -width flag -compact -offset indent
@@ -1237,6 +1238,55 @@
 .Pp
 .Ql \&.Pa
 $B%^%/%m$O2r@O$5$l!"8F$S=P$72DG=$G$9!#(B
+.Ss $B5,3J(B
+.Ql \&.St
+$B%^%/%m$O!"5,3J$NC;=LL>>N$r@5<0L>>N$KCV49$7$^$9!#(B
+.Pp
+.Dl $B;H$$J}(B: .St abbreviature
+.Pp
+$B;HMQ2DG=$J(B
+.Dq $BC;=LL>>N(B/$B@5<0L>>N(B
+$B$NAH$O<!$NDL$j$G$9(B:
+.Bl -tag -width "-p1003.2-92XX." -compact -offset indent
+.It Li "-ansiC"
+.St -ansiC
+.It Li "-ansiC-89"
+.St -ansiC-89
+.It Li "-ieee754"
+.St -ieee754
+.It Li "-iso8802-3"
+.St -iso8802-3
+.It Li "-iso9899"
+.St -iso9899
+.It Li "-iso9945-1"
+.St -iso9945-1
+.It Li "-isoC"
+.St -isoC
+.It Li "-p1003.1"
+.St -p1003.1
+.It Li "-p1003.1-88"
+.St -p1003.1-88
+.It Li "-p1003.1-90"
+.St -p1003.1-90
+.It Li "-p1003.1b"
+.St -p1003.1b
+.It Li "-p1003.1b-93"
+.St -p1003.1b-93
+.It Li "-p1003.1g"
+.St -p1003.1g
+.It Li "-p1003.2"
+.St -p1003.2
+.It Li "-p1003.2-92"
+.St -p1003.2-92
+.It Li "-susv2"
+.St -susv2
+.It Li "-xpg3"
+.St -xpg3
+.It Li "-xpg4"
+.St -xpg4
+.It Li "-xpg4.2"
+.St -xpg4.2
+.El
 .Ss $BJQ?t(B
 $B0lHLE*$JJQ?t$X$N;2>H$G$9!#(B
 .Pp
@@ -1308,16 +1358,34 @@
 .Pp
 .Ql \&.Bx
 $B%^%/%m$O2r@O$5$l!"8F$S=P$72DG=$G$9!#(B
-.Ss FreeBSD $B%^%/%m(B
+.Ss FreeBSD/NetBSD/OpenBSD $B%^%/%m(B
 .Bd -literal -offset indent -compact
-$B;H$$J}(B: .Fx Version.release ... \*(Pu
+$B;H$$J}(B: .Fx [ Version.release ] ... \*(Pu
 .Ed
 .Bl -tag -width ".Fx 2.2 ) ," -compact -offset 14n
 .It Li ".Fx 2.2 ."
 .Fx 2.2 .
 .El
 .Pp
-.Ql \&.Fx
+.Bd -literal -offset indent -compact
+$B;H$$J}(B: .Nx [ Version.release ] ... \*(Pu
+.Ed
+.Bl -tag -width ".Nx 1.4 ) ," -compact -offset 14n
+.It Li ".Nx 1.4 ."
+.Nx 1.4 .
+.El
+.Pp
+.Bd -literal -offset indent -compact
+$B;H$$J}(B: .Ox [ Version.release ] ... \*(Pu
+.Ed
+.Bl -tag -width ".Ox 2.5 ) ," -compact -offset 14n
+.It Li ".Ox 2.5 ."
+.Ox 2.5 .
+.El
+.Pp
+.Ql \&.Fx ,
+.Ql \&.Nx ,
+.Ql \&.Ox
 $B%^%/%m$O2r@O(B
 .Em $B$5$l$:(B
 $B!"8F$S=P$7(B
diff -ur man/man8/apmd.8 man/man8/apmd.8
--- man/man8/apmd.8	Wed Oct 13 22:54:26 1999
+++ man/man8/apmd.8	Sat Nov 20 23:28:32 1999
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
-.\" %FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.2.2.3 1999/09/12 01:06:32 iwasaki Exp %
+.\" %FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.2.2.4 1999/10/30 19:43:42 mpp Exp %
 .\"
 .\" jpman %Id: apmd.8,v 1.3 1999/09/15 14:27:48 yt-kage Stab %
 .\"
@@ -140,11 +140,8 @@
 $B$,<u$1<h$k$H!"(B
 .Ql sync
 $B%3%^%s%I$r(B 3 $B2s<B9T$7!">/$7BT$C$?$"$H$K(B
-.Ql zzz 
-(
-.Nm
-.Fl z
-) $B$r<B9T$7$F%7%9%F%`$r%5%9%Z%s%I$5$;$^$9!#(B
+.Nm zzz ( Ns Nm apm Fl z )
+$B$r<B9T$7$F%7%9%F%`$r%5%9%Z%s%I$5$;$^$9!#(B
 .Pp
 .Bl -bullet
 .It
diff -ur man/man8/camcontrol.8 man/man8/camcontrol.8
--- man/man8/camcontrol.8	Fri Nov 19 23:09:22 1999
+++ man/man8/camcontrol.8	Sat Nov 20 23:28:34 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.7 1999/08/29 15:12:35 peter Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.8 1999/10/28 17:20:07 mph 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]
@@ -683,9 +683,9 @@
 .Sh $B4XO"9`L\(B
 .Xr cam 3 ,
 .Xr cam_cdbparse 3 ,
+.Xr cam 4 ,
 .Xr pass 4 ,
-.Xr cam 9 ,
-.Xr xpt 9
+.Xr xpt 4
 .Sh $BNr;K(B
 .Nm camcontrol
 $B%3%^%s%I$O!"(B
@@ -707,9 +707,6 @@
 .Sh $B:n<T(B
 .An Kenneth Merry Aq ken@FreeBSD.org
 .Sh $B%P%0(B
-$B%^%K%e%"%k%Z!<%8$N%/%m%9%j%U%!%l%s%9$N$[$H$s$I$O$^$@B8:_$7$F$$$^$;$s!#(B
-$B$3$l$O6a$$$&$A$K=$@5$5$l$^$9!#(B
-.Pp
 $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
diff -ur man/man8/inetd.8 man/man8/inetd.8
--- man/man8/inetd.8	Fri Nov 19 23:09:22 1999
+++ man/man8/inetd.8	Sat Nov 20 23:28:35 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.4 1999/08/29 15:42:33 peter Exp %
+.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp %
 .\"
 .\" jpman %Id: inetd.8,v 1.2 1997/05/16 07:22:24 yugawa Stab %
 .Dd February 7, 1996
@@ -343,12 +343,46 @@
 $B$G$"$k(B argv[0] $B$r4^$a$F5-=R$7$^$9!#(B
 .Nm
 $BFbIt$K<BAu$5$l$F$$$k%5!<%S%9$rDs6!$9$k>l9g$K$O!"%5!<%P%W%m%0%i%`0z?t(B
-$B$H$7$F(B
+$B$H$7$F!"%5!<%S%9$N(B
+.Em $B%5!<%S%9L>(B
+($B$H0z?t(B) $B$^$?$O8l(B
 .Dq internal
 $B$r;XDj$7$^$9!#(B
 .Pp
+$B8=:_!"0z?t$r<h$kFbIt%5!<%S%9$O(B
+.Dq auth
+$B$N$_$G$9!#(B
+$B%*%W%7%g%sL5$7$@$H!"$3$N%5!<%S%9$O>o$K(B
+.Dq ERROR\ : HIDDEN-USER
+$B$rJV$7$^$9!#(B
+$B$3$N%5!<%S%9$NF0:n$rJQ99$9$k$?$a$K;HMQ2DG=$J0z?t$O<!$NDL$j$G$9(B:
+.Bl -tag -width indent
+.It Fl r
+RFC 1413 $B$K$"$k!"??$N(B
+.Dq auth
+$B%5!<%S%9$rDs6!$7$^$9!#<!$N$9$Y$F$N%U%i%0$,;HMQ$5$l$k$N$O!"$3$N>l9g$N$_$G$9!#(B
+.It Fl f
+$B<1JL$5$l$k%f!<%6$N%[!<%`%G%#%l%/%H%j$K(B
+.Pa .fakeid
+$B$H$$$&%U%!%$%k$,$"$k>l9g!"(B
+$BK\Ev$N%f!<%6L>$NBe$j$K$=$N%U%!%$%kCf$N%f!<%6L>$rJs9p$7$^$9!#(B
+.It Fl n
+$B<1JL$5$l$k%f!<%6$N%[!<%`%G%#%l%/%H%j$K(B
+.Pa .noident
+$B$H$$$&%U%!%$%k$,$"$k>l9g!"(B
+.Dq ERROR\ : HIDDEN-USER
+$B$rBe$j$KJV$7$^$9!#(B
+.It Fl o Ar osname
+.Xr uname 3
+$B$,JV$9%7%9%F%`<BAuL>$NBe$j$K!"(B
+.Ar osname
+$B$r;HMQ$7$^$9!#(B
+.It Fl t Ar sec[.usec]
+$B%5!<%S%9$N%?%$%`%"%&%H$r;XDj$7$^$9!#%G%U%)%k%H$N%?%$%`%"%&%H$O(B 10.0 $BIC$G$9!#(B
+.El
+.Pp
 .Nm
-$B$O!"FbIt%k!<%A%s$rMQ$$$F4JC1$J%5!<%S%9$r<+?H$GDs6!$7$^$9!#(B
+$B%W%m%0%i%`$O$^$?!"FbIt%k!<%A%s$rMQ$$$F4JC1$J%5!<%S%9$r<+?H$GDs6!$7$^$9!#(B
 $B$3$l$i$N%5!<%S%9$H$O(B
 .Dq echo ,
 .Dq discard ,
@@ -591,6 +625,11 @@
 .Xr rshd 8 ,
 .Xr telnetd 8 ,
 .Xr tftpd 8 ,
+.Rs
+.%A Michael C. St. Johns
+.%T Identification Protocol
+.%O RFC1413
+.Re
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
diff -ur man/man8/ipfw.8 man/man8/ipfw.8
--- man/man8/ipfw.8	Sun Sep  5 01:36:20 1999
+++ man/man8/ipfw.8	Sat Nov 20 23:28:36 1999
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.8 1999/08/29 15:13:45 peter Exp %
+.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp %
 .\"
 .\" jpman %Id: ipfw.8,v 1.4 1997/05/19 17:19:51 horikawa Stab %
 .Dd July 20, 1996
@@ -649,8 +649,6 @@
 $B$=$l$KBP$7!"(B
 .Ar tee
 $B$r7PM3$7$?CGJR(B ($B%U%i%0%a%s%H(B) $B$O!"AH$_N)$FD>$7$5$l$^$;$s!#(B
-.Pp
-$B%]!<%H$NJLL>$G%@%C%7%e(B (-) $B$r4^$`$b$N$O!"%j%9%H$N:G=i$K$O=q$1$^$;$s!#(B
 .Pp
 ``tee'' $B%"%/%7%g%s$OL$<BAu$G$9!#(B
 .Sh $B:n<T(B
diff -ur man/man8/isdnd.8 man/man8/isdnd.8
--- man/man8/isdnd.8	Sun Sep  5 01:36:20 1999
+++ man/man8/isdnd.8	Sat Nov 20 23:28:37 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.2 1999/08/29 15:41:40 peter Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.3 1999/11/15 22:40:55 joe Exp % 
 .\"
-.\"	last edit-date: [Sat Dec 12 21:13:59 1998]
+.\"	last edit-date: [Thu May 20 14:37:42 1999]
 .\"
 .\" jpman %Id: isdnd.8,v 1.3 1999/02/11 07:42:03 kuma Stab %
 .\" WORD: Call Description IDentifier (CDID)	$B8F5-=R<1JL;R(B [isdnd.8]
@@ -37,14 +37,14 @@
 .\" WORD: userland		$B%f!<%6%i%s%I(B
 .\" WORD: subscriber		$B2CF~<T(B [isdnd.8]
 .\" "
-.Dd November 3, 1998
-.Dt isdnd 8
+.Dd February 23, 1999
+.Dt ISDND 8
+.Os
 .Sh $BL>>N(B
 .Nm isdnd
 .Nd isdn4bsd ISDN $B@\B34IM}%G!<%b%s(B
 .Sh $B=q<0(B
 .Nm isdnd
-.Op Fl b
 .Op Fl c Ar configfile
 .Op Fl d Ar debuglevel
 .Op Fl f
@@ -64,8 +64,6 @@
 .Pp
 $B%*%W%7%g%s$O0J2<$NDL$j$G$9(B:
 .Bl -tag -width Ds
-.It Fl b
-$B%Y%k(B: $BA42hLL%b!<%I$K$*$$$F!"8F(B (call) $B$N@\B3;~!&@ZCG;~$K%Y%k$rLD$i$7$^$9!#(B
 .It Fl c
 $B%G%U%)%k%H$N%U%!%$%k(B
 .Li /etc/isdn/isdnd.rc
@@ -100,6 +98,8 @@
 isdn4bsd $B%+!<%M%k$NF~=PNO8F$S=P$7!#(B
 .It Ar 0x100
 $B%3%s%H%m!<%i$H%A%c%M%k$N%S%8!<(B/$B%U%j!<%a%C%;!<%8!#(B
+.It Ar 0x200
+$B@_Dj%U%!%$%k(B isdnd.rc $B$N=hM}!#(B
 .El
 .Pp
 $B$3$NCM$N;XDj$K:]$7$F!"(B
@@ -144,6 +144,10 @@
 $B%*%W%7%g%s(B
 .Em -l
 $B$,;XDj$5$l$F$$$k;~$K;HMQ$5$l$k%m%0%U%!%$%k$NL>A0$r;XDj$7$^$9!#(B
+.Xr isdnd.rc 5
+$B$N%7%9%F%`%;%/%7%g%s$N%-!<%o!<%I(B
+.Em rotatesuffix
+$B$b;2>H$7$F$/$@$5$$!#(B
 .It Fl P
 $B$3$N%*%W%7%g%s$O!"2r@O$5$lM-8z$K$J$C$?(B isdnd $B$N@_Dj$r(B
 isdnd.rc $B%U%!%$%k$HF1$8=q<0$G=PNO$7$^$9!#(B
@@ -304,10 +308,10 @@
 .Pp
 $B%m!<%+%k%5%$%H$,%?%$%`%"%&%H$9$k$+%j%b!<%HB&$,@\B3$r@Z$k!"(B
 $B$"$k$$$O%m!<%+%kB&$,G=F0E*$K(B ioctl $B%a%C%;!<%8(B
-.Em DISCONNECT_REQ
+.Em I4B_DISCONNECT_REQ
 $B$rAw$k$3$H$G!"8F$O=*N;$7$^$9!#(B
 $B$$$:$l$N%$%Y%s%H$b!"%+!<%M%k$,(B
-.Em DISCONNECT_IND
+.Em I4B_DISCONNECT_IND
 $B%a%C%;!<%8$rAw$C$F(B
 .Nm
 $B$KDLCN$5$l$^$9!#$^$?!"$=$N8F$KBP1~$9$k(B CDID $B$OL58z$K$J$j$^$9!#(B
@@ -328,16 +332,16 @@
 .Em I4B_CONNECT_RESP
 $B$KE,@Z$J%Q%i%a!<%?$r;XDj$7$F!"%+!<%M%k$KH/9T$7$^$9!#(B
 .Pp
-$B%G!<%b%s$,%a%C%;!<%8<u$1F~$l$r7h$a$?>l9g!"%+!<%M%k$O(B
+$B%G!<%b%s$,8F$N<u$1F~$l$r7h$a$?>l9g!"%+!<%M%k$O(B
 .Em MSG_CONNECT_ACTIVE_IND
-$B%a%C%;!<%8$r%G!<%b%s$KAw$C$F!"%"%/%F%#%V@\B3$rDLCN$7$^$9!#(B
+$B%a%C%;!<%8$r%G!<%b%s$KAw$C$F!"$3$N$3$H$rDLCN$7$^$9!#(B
 .Pp
 $B%m!<%+%k%5%$%H$,%?%$%`%"%&%H$9$k$+%j%b!<%HB&$,@\B3$r@Z$k!"(B
 $B$"$k$$$O%m!<%+%kB&$,G=F0E*$K(B ioctl $B%a%C%;!<%8(B
-.Em DISCONNECT_REQ
+.Em I4B_DISCONNECT_REQ
 $B$rAw$k$3$H$G!"8F$O=*N;$7$^$9!#(B
 $B$$$:$l$N%$%Y%s%H$b!"%+!<%M%k$,(B
-.Em DISCONNECT_IND
+.Em I4B_DISCONNECT_IND
 $B%a%C%;!<%8$rAw$C$F(B
 .Nm
 $B$KDLCN$5$l$^$9!#$^$?!"$=$N8F$KBP1~$9$k(B CDID $B$OL58z$K$J$j$^$9!#(B
diff -ur man/man8/isdndebug.8 man/man8/isdndebug.8
--- man/man8/isdndebug.8	Sun Sep  5 01:36:21 1999
+++ man/man8/isdndebug.8	Sat Nov 20 23:41:34 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,20 +22,17 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.2 1999/08/29 15:41:52 peter Exp %
-.\"
-.\"	last edit-date: [Sat Dec  5 18:13:34 1998]
-.\"
-.\"	-hm	writing manual pages
-.\"	-hm	getting uptodate
+.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.3 1999/11/15 22:41:02 joe Exp %
 .\"
+.\"	last edit-date: [Sat May 29 11:03:15 1999]
 .\"
 .\" jpman %Id: isdndebug.8,v 1.3 1999/02/06 15:30:25 horikawa Stab %
-.Dd July 9, 1998
-.Dt isdndebug 8
+.Dd May, 29, 1999
+.Dt ISDNDEBUG 8
+.Os
 .Sh $BL>>N(B
 .Nm isdndebug
-.Nd isdn4bsd $B%+!<%M%kFbIt$N%G%P%C%0A`:n$r@)8f$9$k(B
+.Nd isdn4bsd $B%+!<%M%kJQ?t$HE}7W>pJs$NI=<($H@)8f(B
 .Sh $B=q<0(B
 .Nm
 .Op Fl e
@@ -43,20 +40,28 @@
 .Op Fl h
 .Op Fl l Ar layer
 .Op Fl m
+.Op Fl q
 .Op Fl r
 .Op Fl s Ar value
 .Op Fl u Ar unit
 .Op Fl z
 .Op Fl H
+.Op Fl Q
 .Sh $B2r@b(B
 .Nm isdndebug
 $B$O(B isdn4bsd $B%Q%C%1!<%8$N0lIt$G$"$j!"(B
-isdn4bsd $B%+!<%M%kItJ,$N%G%P%C%0=PNO$r@)8f$9$k$N$K;H$o$l$^$9!#(B
+isdn4bsd $B%+!<%M%kItJ,$N%G%P%C%0=PNO%l%Y%k$r@)8f$9$k$N$K;H$o$l$^$9!#(B
 isdn4bsd $B%+!<%M%k$N3F%l%$%d$O!"(B
 $BK\%f!<%F%#%j%F%#$rMQ$$$FA`:n$G$-$k%G%P%C%0%^%9%/$r;H$$$^$9!#(B
 .Pp
 .Nm
-$B$NBh(B 2 $B$NMQES$O(B HSCX $B%(%i!<%+%&%s%?$NI=<($H%j%;%C%H$G$9!#(B
+$B$NBh(B 2 $B$NMQES$O(B HSCX 
+(HSCX $B$O(B
+.Xr isic 4
+$B%I%i%$%P$K$*$$$F(B B $B%A%c%M%k$NA`:n$K@UG$$,$"$k%A%C%W(B)
+$B$N%(%i!<%+%&%s%?$NI=<($H%j%;%C%H$H!"(B
+D $B%A%c%M%k%l%$%d(B 2 (Q.921 LAPD $B%W%m%H%3%k(B) $B$NE}7W>pJs$H%(%i!<%+%&%s%?$N(B
+$BI=<($H%j%;%C%H$G$9!#(B
 .Pp
 $B<!$N%*%W%7%g%s$,MxMQ2DG=$G$9(B:
 .Bl -tag -width Ds
@@ -72,6 +77,8 @@
 .It Fl m
 $BA*Br$7$?%l%$%d$N%G%P%C%0%^%9%/$r!"(B
 $B5/$3$j$&$k%G%P%C%0%a%C%;!<%8$9$Y$F$rI=<($9$k$h$&$K@_Dj$7$^$9(B ($B:GBg$N=PNO(B)$B!#(B
+.It Fl q
+Q.921 (D $B%A%c%M%k%l%$%d(B 2) $B%U%l!<%`$N<u?.(B/$BAw?.$NE}7W>pJs$rI=<($7$^$9!#(B
 .It Fl r
 $BA*Br$7$?%l%$%d$N%G%P%C%0%^%9%/$r(B
 $B%3%s%Q%$%k;~$N%G%U%)%k%H$K@_Dj$7$^$9(B ($B%j%;%C%H(B)$B!#(B
@@ -80,11 +87,15 @@
 .Xr sscanf 3
 $B$,%5%]!<%H$9$k4p?t$N$$$:$l$G$b;XDj$G$-$^$9!#(B
 .It Fl u
-$B%U%i%0(B -h $B$H(B -H $B$NC10LNL$r@_Dj$7$^$9!#(B
+$B%U%i%0(B -h, -q, -H, -Q $B$NC10LNL$r@_Dj$7$^$9!#(B
 .It Fl z
 $BA*Br$7$?%l%$%d$N%G%P%C%0%^%9%/$r!"2?$b=PNO$7$J$$$h$&$K@_Dj$7$^$9(B ($B%<%m(B)$B!#(B
 .It Fl H
 HSCX $B%(%i!<%+%&%s%?$r(B 0 $B$K%j%;%C%H$7$^$9!#(B
+.It Fl Q
+Q.921 (D $B%A%c%M%k%l%$%d(B 2) $B%U%l!<%`$N<u?.(B/$BAw?.$NE}7W>pJs$r!"(B
+0 $B$K%j%;%C%H$7$^$9!#(B
+.El
 .Pp
 .Sh $B4XO"%U%!%$%k(B
 /dev/i4bctl
diff -ur man/man8/isdndecode.8 man/man8/isdndecode.8
--- man/man8/isdndecode.8	Sun Sep  5 01:36:21 1999
+++ man/man8/isdndecode.8	Sat Nov 20 23:28:38 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1998, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.2 1999/08/29 15:41:56 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.3 1999/11/15 22:41:05 joe Exp %
 .\"
-.\"	last edit-date: [Fri Dec 18 18:11:31 1998]
+.\"	last edit-date: [Sun Feb 14 10:16:25 1999]
 .\"
 .\"	-hm	writing manual page
 .\"
@@ -140,6 +140,7 @@
 $B%"%J%i%$%:%b!<%I$K$*$$$F!"Aw?.%$%s%?%U%'!<%9%f%K%C%HHV9f$H$7$F!"(B
 .Ar unit
 $B$r;HMQ$7$^$9!#(B
+.El
 
 .Pp
 USR1 $B%7%0%J%k$,(B
diff -ur man/man8/isdntel.8 man/man8/isdntel.8
--- man/man8/isdntel.8	Sun Sep  5 01:36:21 1999
+++ man/man8/isdntel.8	Sat Nov 20 23:28:39 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	last edit-date: [Sat Dec  5 18:16:19 1998]
+.\"	last edit-date: [Sun Feb 14 10:19:44 1999]
 .\"	
-.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.2 1999/08/29 15:42:10 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.3 1999/11/15 22:41:11 joe Exp %
 .\"
 .\" jpman %Id: isdntel.8,v 1.3 1999/02/07 01:45:29 yohta Stab %
 .\" WORD: answering machine	$BN1<iHV%^%7%s(B [isdntel.8]
diff -ur man/man8/isdntelctl.8 man/man8/isdntelctl.8
--- man/man8/isdntelctl.8	Sun Sep  5 01:36:21 1999
+++ man/man8/isdntelctl.8	Sat Nov 20 23:28:39 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,14 +22,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.1 1999/08/29 15:42:12 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.2 1999/11/15 22:41:12 joe Exp %
 .\" jpman %Id: isdntelctl.8,v 1.3 1999/02/07 01:48:07 yohta Stab %
 .\" WORD: sound format	$B2;$N7A<0(B [isdntelctl.8]
 .\"
-.\"	last edit-date: [Mon Dec 14 11:34:51 1998]
+.\"	last edit-date: [Wed Apr 21 11:27:34 1999]
 .\"
-.Dd December 14, 1998
-.Dt isdntelctl 8
+.Dd April 21, 1999
+.Dt ISDNTELCTL 8
+.Os
 .Sh $BL>>N(B
 .Nm isdntelctl
 .Nd isdn4bsd $BEEOC$N2;$N7A<0JQ49$r@)8f$9$k(B
@@ -40,6 +41,7 @@
 .Op Fl u Ar unit
 .Op Fl A
 .Op Fl U
+.Op Fl N
 .Sh $B2r@b(B
 .Nm isdntelctl
 $B$O(B isdn4bsd $B%Q%C%1!<%8$N0lIt$G$"$j!"(B/dev/i4btel $B%$%s%?%U%'!<%9$N;}$D(B
@@ -57,16 +59,27 @@
 /dev/i4btel0
 $B$K%"%/%;%9$7$^$9!#(B
 .It Fl A
-$B2;$N7A<0$r(B A-Law $B$K@_Dj$7$^$9!#(B
+A-law (ISDN $B2s@~(B) $B$+$i(B u-law ($B%f!<%6%i%s%I(B) $B$X$NJQ49$r9T$$$^$9!#(B
 .It Fl U
-$B2;$N7A<0$r(B u-Law $B$K@_Dj$7$^$9!#(B
+u-law (ISDN $B2s@~(B) $B$+$i(B A-law ($B%f!<%6%i%s%I(B) $B$X$NJQ49$r9T$$$^$9!#(B
+.It Fl N
+$B2;@<JQ49$K$*$$$F!"=q<0JQ49L5$7$K@_Dj$7$^$9!#(B
+.El
+.Pp
+$B2s@~$+$i$O!"EEOC$N%G!<%?%9%H%j!<%`$O%S%C%HH?E>=q<0$G=PNO$5$l$^$9$N$G!"(B
+$B$I$s$J>l9g$G$b(B
+.Xr i4btel 4
+$B%I%i%$%P$,%S%C%HH?E>=hM}$r9T$$$^$9!#(B
+.Pp
+$B99$K!"(BA-law $B$+$i(B u-law $B$X!"(Bu-law $B$+$i(B A-law $B$X!"A4$/JQ49L5$7$N!"(B
+i4btel $B%I%i%$%P$N$$$:$l$+$NJQ49F0:n$r(B
+.Nm
+$B%f!<%F%#%j%F%#$r;HMQ$7$F;XDj2DG=$G$9!#(B
 .Pp
 .Sh $B4XO"%U%!%$%k(B
 /dev/i4btel<n>
-
 .Sh $B5,3J(B
 A-Law $B$*$h$S(B u-Law $B$O(B ITU Recommendation G.711 $B$K<($5$l$F$$$^$9!#(B
-
 .Sh $B;HMQNc(B
 $B%3%^%s%I(B:
 .Bd -literal -offset indent
@@ -74,8 +87,13 @@
 .Ed
 .Pp
 $B$O!"%G%P%$%9(B /dev/i4btel0 $B$K$F8=:_;H$o$l$F$$$k2;$N7A<0$rI=<($7$^$9!#(B
-
+.Sh $B4XO"9`L\(B
+.Xr g711conv 1 ,
+.Xr i4btel 4 ,
+.Xr isdnd.rc 5 ,
+.Xr isdnd 8   
 .Sh $B:n<T(B
 .Nm
-$B%f!<%F%#%j%F%#$HK\%^%K%e%"%k%Z!<%8$O(B Hellmuth Michaelis $B$,:n@.$7$^$7$?!#(B
-$BH`$NO"Mm@h$O(B hm@kts.org $B$G$9!#(B
+$B%f!<%F%#%j%F%#$HK\%^%K%e%"%k%Z!<%8$O(B
+.An Hellmuth Michaelis Aq hm@kts.org
+$B$,:n@.$7$^$7$?!#(B
diff -ur man/man8/isdntrace.8 man/man8/isdntrace.8
--- man/man8/isdntrace.8	Sun Sep  5 01:36:21 1999
+++ man/man8/isdntrace.8	Sat Nov 20 23:28:40 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.2 1999/08/29 15:42:17 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.3 1999/11/15 22:41:15 joe Exp %
 .\"
-.\"	last edit-date: [Sat Dec  5 18:18:59 1998]
+.\"	last edit-date: [Sun Feb 14 10:22:24 1999]
 .\"
 .\" jpman %Id: isdntrace.8,v 1.3 1999/02/01 21:31:47 vanitas Stab %
 .\" isdndecode.8 $B$H(B isdntrace.8 $B$O6&DLItJ,$,B?$$$?$a!"Aj8_$K;2>H(B
diff -ur man/man8/loader.4th.8 man/man8/loader.4th.8
--- man/man8/loader.4th.8	Sun Sep  5 01:36:21 1999
+++ man/man8/loader.4th.8	Sat Nov 20 23:28:40 1999
@@ -22,10 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.1.2.4 1999/08/29 16:20:38 peter Exp %
-.\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
+.\" %FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.1.2.5 1999/10/30 15:59:18 phantom Exp %
 .\"
 .\" jpman %Id: loader.4th.8,v 1.2 1999/05/07 11:24:51 horikawa Stab %
 .Dd May 16, 1999
diff -ur man/man8/mixer.8 man/man8/mixer.8
--- man/man8/mixer.8	Sat Jul 31 20:16:06 1999
+++ man/man8/mixer.8	Sat Nov 20 23:28:41 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" Original Revision: 1.4
+.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.1 1999/10/30 19:38:52 mpp Exp %
 .\" jpman %Id: mixer.8,v 1.3 1997/08/16 13:24:56 horikawa Stab %
 .Dd January 9, 1997
 .Dt MIXER 8
diff -ur man/man8/natd.8 man/man8/natd.8
--- man/man8/natd.8	Sun Sep  5 01:36:21 1999
+++ man/man8/natd.8	Sat Nov 20 23:28:42 1999
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.5 1999/08/29 15:14:49 peter Exp %
+.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.6 1999/10/28 18:55:35 ru Exp %
 .\" jpman %Id%
 .Dd 15 April 1997
 .Os FreeBSD
@@ -138,12 +138,12 @@
 0 ($BA4%]!<%H(B) $B$G$"$k$3$H$,I,MW$G$9!#(B
 $BNc$($P!"(B
 
-.Ar tcp inside1:telnet 6666
+.Dl Ar tcp inside1:telnet 6666
 
 $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
 
-.Ar tcp inside2:2300-2399 3300-3399
+.Dl Ar tcp inside2:2300-2399 3300-3399
 
 $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
@@ -293,7 +293,11 @@
 
 $B$O(B
 .Fl log
-$B$HF1$80UL#$K$J$j$^$9!#6u9T$H(B '#' $B$G;O$^$k9T$OL5;k$5$l$^$9!#(B
+$B$HF1$80UL#$K$J$j$^$9!#(B
+.Pp
+$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
@@ -425,9 +429,11 @@
 $B$=$&$9$k$3$H$K$h$C$F!"KI2PJI$K$h$jGS=|$5$l$F$7$^$&A0$K!"(B
 .Nm
 $B$,$9$Y$F$N%Q%1%C%H$r8+$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
-$B$9$Y$F$N(B divert $B%k!<%k$r=|$-!"(B
-.Nm
-$B$K$h$jJQ49$5$l$?3F%Q%1%C%H$K$O:F$SKI2PJI$N%k!<%k$,E,MQ$5$l$^$9!#(B
+.Pp
+.Nm natd
+$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
diff -ur man/man8/route.8 man/man8/route.8
--- man/man8/route.8	Sun Sep  5 01:36:21 1999
+++ man/man8/route.8	Sat Nov 20 23:28:43 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" %FreeBSD: src/sbin/route/route.8,v 1.12.2.2 1999/08/29 15:15:22 peter Exp %
+.\" %FreeBSD: src/sbin/route/route.8,v 1.12.2.4 1999/10/16 21:03:24 nsayer Exp %
 .\"
 .\" jpman %Id: route.8,v 1.3 1997/07/28 05:33:13 konuma Stab %
 .\"
diff -ur man/man8/sicontrol.8 man/man8/sicontrol.8
--- man/man8/sicontrol.8	Sun Sep  5 01:36:21 1999
+++ man/man8/sicontrol.8	Sat Nov 20 23:28:44 1999
@@ -1,6 +1,6 @@
-.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.1 1999/08/29 15:48:15 peter Exp %
+.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.2 1999/10/30 15:59:35 phantom Exp %
+.\"
 .\" jpman %Id: sicontrol.8,v 1.2 1997/06/17 17:49:35 saeki Stab %
-.\" The following requests are required for all man pages.
 .Dd September 26,1995
 .Dt SICONTROL 8
 .Os FreeBSD
diff -ur man/man8/trpt.8 man/man8/trpt.8
--- man/man8/trpt.8	Sat Jul 31 20:16:10 1999
+++ man/man8/trpt.8	Sat Nov 20 23:28:44 1999
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
+.\" %FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.4.2.1 1999/10/30 15:59:35 phantom Exp %
 .\"
 .\" Original Revision: 1.4
 .\" jpman %Id: trpt.8,v 1.2 1997/05/25 15:20:26 horikawa Stab %
@@ -120,8 +121,6 @@
 .Sh $B4XO"9`L\(B
 .Xr netstat 1 ,
 .Xr setsockopt 2
-.\" .Xr setsockopt 2 ,
-.\" .Xr trsp 8
 .Sh $B?GCG(B
 .Bl -tag -width Ds
 .It Sy no namelist
diff -ur man/man8/vinum.8 man/man8/vinum.8
--- man/man8/vinum.8	Sun Oct 31 17:50:01 1999
+++ man/man8/vinum.8	Wed Nov 17 01:01:59 1999
@@ -1441,6 +1441,28 @@
 $B%\%j%e!<%`$NBg$-$5$O(B 1659 MB $B$K$J$j$^$9!#(B
 .Ss 2 $B$D$N%3%s%+%A%M!<%H2=%W%l%C%/%9$N%_%i!<2=%\%j%e!<%`(B
 $B?.Mj@-$r8~>e$9$k$?$a!"%_%i!<2=$*$h$S%\%j%e!<%`2=$r;HMQ$7$^$9(B:
+.Bd -literal
+vinum -> mirror -v -n mirror /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume mirror setupstate
+  plex name mirror.p0 org concat
+    sd name mirror.p0.s0 drive vinumdrive0 size 0b
+    sd name mirror.p0.s1 drive vinumdrive2 size 0b
+  plex name mirror.p1 org concat
+    sd name mirror.p1.s0 drive vinumdrive1 size 0b
+    sd name mirror.p1.s1 drive vinumdrive3 size 0b
+V mirror                State: up       Plexes:       2 Size:       1146 MB
+P mirror.p0           C State: up       Subdisks:     2 Size:        988 MB
+P mirror.p1           C State: up       Subdisks:     2 Size:       1146 MB
+S mirror.p0.s0          State: up       PO:        0  B Size:        414 MB
+S mirror.p0.s1          State: up       PO:      414 MB Size:        573 MB
+S mirror.p1.s0          State: up       PO:        0  B Size:        573 MB
+S mirror.p1.s1          State: up       PO:      573 MB Size:        573 MB
+.Ed
+.Pp
 $B$3$NNc$G$O%\%j%e!<%`L>$r(B
 .Ar mirror
 $B$H;XDj$7$F$$$^$9!#(B
diff -ur man/man8/watch.8 man/man8/watch.8
--- man/man8/watch.8	Sat Jul 31 20:16:10 1999
+++ man/man8/watch.8	Sat Nov 20 23:28:45 1999
@@ -1,5 +1,6 @@
 .\"
 .\" @(#)watch.8		1.1 (FreeBSD) 2/17/95
+.\" %FreeBSD: src/usr.sbin/watch/watch.8,v 1.14.2.1 1999/10/30 14:57:33 phantom Exp %
 .\"
 .\" Original Revision: 1.14
 .\" jpman %Id: watch.8,v 1.3 1997/07/22 17:07:53 horikawa Stab %
@@ -13,7 +14,7 @@
 .Sh $B=q<0(B
 .Nm watch
 .Op Fl ciotnW
-.Ar tty
+.Op Ar tty
 .\"  watch [-ciotnW] [<tty name>]
 .Sh $B2r@b(B
 .Nm
diff -ur man/man8/ypxfr.8 man/man8/ypxfr.8
--- man/man8/ypxfr.8	Fri Nov 19 23:09:24 1999
+++ man/man8/ypxfr.8	Sat Nov 20 23:28:46 1999
@@ -181,8 +181,8 @@
 .Bx Free
 $B$N%W%m%H%3%k$O(B SunOS $B$N%W%m%H%3%k$H$O8_49$G$O$J$$$?$a!"(B
 Sun $B$N(B ypxfrd $B%5!<%P$H$H$b$K;HMQ$9$k;v$O=PMh$J$$;v$KCm0U$7$F2<$5$$!#(B
-FreeBSD $B$N%9%l!<%V$O(B
-.Bx $BHs(B Free
+FreeBSD $B$N%9%l!<%V$O!"Hs(B
+.Bx Free
 $B$N(B
 .Tn NIS
 $B%5!<%P$+$i(B
Only in man: whatis

----Next_Part(Sat_Nov_20_23:59:36_1999_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ediff_3.3-19991119-STABLE
Content-Disposition: attachment; filename=ediff_3.3-19991119-STABLE

diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/chpass.1 man1/chpass.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/chpass.1	Sat Oct 16 18:49:37 1999
+++ man1/chpass.1	Fri Nov 19 19:38:22 1999
@@ -30,13 +30,18 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.3 1999/08/29 15:26:12 peter Exp $
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.5 1999/11/18 16:06:50 phantom Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
 .Os
 .Sh NAME
-.Nm chpass, chfn, chsh, ypchpass, ypchfn, ypchsh
+.Nm chpass ,
+.Nm chfn ,
+.Nm chsh ,
+.Nm ypchpass ,
+.Nm ypchfn ,
+.Nm ypchsh
 .Nd add or change user database information
 .Sh SYNOPSIS
 .Nm chpass
@@ -46,7 +51,7 @@
 .Op user
 .Sh DESCRIPTION
 The
-.Nm chpass
+.Nm
 program
 allows editing of the user database information associated
 with
@@ -57,23 +62,23 @@
 Only the information that the user is allowed to change is displayed.
 .Pp
 The options are as follows:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl a
 The super-user is allowed to directly supply a user database
 entry, in the format specified by
 .Xr passwd 5 ,
 as an argument.
-This argument must be a colon (``:'') separated list of all the
+This argument must be a colon
+.Pq Dq \:
+separated list of all the
 user database fields, although they may be empty.
 .It Fl p
 The super-user is allowed to directly supply an encrypted password field,
 in the format used by
 .Xr crypt 3 ,
 as an argument.
-.It Fl s
-The
-.Fl s
-option attempts to change the user's shell to
+.It Fl s Ar newshell
+Attempt to change the user's shell to
 .Ar newshell .
 .El
 .Pp
@@ -163,7 +168,9 @@
 .Ar change
 and
 .Ar expire
-fields should be entered in the form ``month day year'' where
+fields should be entered in the form
+.Dq month day year
+where
 .Ar month
 is the month name (the first three characters are sufficient),
 .Ar day
@@ -188,7 +195,9 @@
 .Pp
 The user's
 .Ar home directory
-is the full UNIX path name where the user
+is the full
+.Ux
+path name where the user
 will be placed at login.
 .Pp
 The
@@ -206,14 +215,16 @@
 .Pa /etc/shells .
 .Pp
 Once the information has been verified,
-.Nm chpass
+.Nm
 uses
 .Xr pwd_mkdb 8
 to update the user database.
 .Sh ENVIRONMENT
 The
 .Xr vi 1
-editor will be used unless the environment variable EDITOR is set to
+editor will be used unless the environment variable
+.Ev EDITOR
+is set to
 an alternate editor.
 When the editor terminates, the information is re-read and used to
 update the user database itself.
@@ -224,12 +235,12 @@
 can also be used in conjunction with NIS, however some restrictions
 apply.
 Currently,
-.Nm chpass
+.Nm
 can only make changes to the NIS passwd maps through
 .Xr rpc.yppasswdd 8 ,
 which normally only permits changes to a user's password, shell and GECOS
 fields. Except when invoked by the super-user on the NIS master server,
-.Nm chpass
+.Nm
 (and, similarly,
 .Xr passwd 1 )
 can not use the
@@ -250,17 +261,18 @@
 be cumbersome.
 .Pp
 Note: these exceptions only apply when the NIS master server is a
-FreeBSD system.)
+.Fx
+system).
 .Pp
 Consequently, except where noted, the following restrictions apply when
-.Nm chpass
+.Nm
 is used with NIS:
 .Bl -enum -offset indent
 .It
-.Pa Only the shell and GECOS information may be changed.
+.Em "Only the shell and GECOS information may be changed" .
 All other
 fields are restricted, even when
-.Nm chpass
+.Nm
 is invoked by the super-user.
 While support for
 changing other fields could be added, this would lead to
@@ -273,7 +285,7 @@
 change any field.
 .Pp
 .It
-.Pa Password authentication is required.
+.Em "Password authentication is required" .
 .Nm Chpass
 will prompt for the user's NIS password before effecting
 any changes. If the password is invalid, all changes will be
@@ -285,8 +297,7 @@
 .Fl o
 flag, described below.)
 .It
-.Pa Adding new records to the local
-.Pa password database is discouraged.
+.Em "Adding new records to the local password database is discouraged" .
 .Nm Chpass
 will allow the administrator to add new records to the
 local password database while NIS is enabled, but this can lead to
@@ -309,13 +320,15 @@
 .Fl y
 flag.
 .It
-.Pa Password changes are not permitted.
+.Em "Password changes are not permitted".
 Users should use
 .Xr passwd 1
 or
 .Xr yppasswd 1
 to change their NIS passwords. The super-user is allowed to specify
-a new password (even though the ``Password:'' field does not show
+a new password (even though the
+.Dq Password:
+field does not show
 up in the editor template, the super-user may add it back by hand),
 but even the super-user must supply the user's original password
 otherwise
@@ -324,26 +337,24 @@
 .Pp
 Exception: the super-user on the NIS master server is permitted to
 change a user's NIS password with
-.Nm chpass .
+.Nm Ns .
 .El
 .Pp
 There are also a few extra option flags that are available when
-.Nm chpass
+.Nm
 is compiled with NIS support:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl l
-The
-.Fl l
-flag forces
-.Nm chpass
+Force
+.Nm
 to modify the local copy of a user's password
 information in the even that a user exists in both
 the local and NIS databases.
 .It Fl y
-This flag has the opposite effect of
+Opposite effect of
 .Fl l .
 This flag is largely redundant since
-.Nm chpass
+.Nm
 operates on NIS entries by default if NIS is enabled.
 .It Fl d Ar domain
 Specify a particular NIS domain.
@@ -356,7 +367,7 @@
 when the system domain name is not set.
 .It Fl h Ar host
 Specify the name or address of an NIS server to query. Normally,
-.Nm chpass
+.Nm
 will communicate with the NIS master host specified in the
 .Pa master.passwd
 or
@@ -369,7 +380,9 @@
 .Pp
 When using the
 .Fl d
-option, the hostname defaults to ``localhost.'' The
+option, the hostname defaults to 
+.Dq localhost .
+The
 .Fl h
 option can be used in conjunction with the
 .Fl d
@@ -379,14 +392,16 @@
 .It Fl o
 Force the use of RPC-based updates when communicating with
 .Xr rpc.yppasswdd 8
-(``old-mode'').
+.Pq Dq old-mode .
 When invoked by the super-user on the NIS master server,
-.Nm chpass
+.Nm
 allows unrestricted changes to the NIS passwd maps using dedicated,
-non-RPC-based mechanism (in this case, a UNIX domain socket). The
+non-RPC-based mechanism (in this case, a
+.Ux
+domain socket). The
 .Fl o
 flag can be used to force
-.Nm chpass
+.Nm
 to use the standard update mechanism instead. This option is provided
 mainly for testing purposes.
 .El
@@ -394,13 +409,13 @@
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
 .It Pa /etc/master.passwd
-The user database
+the user database
 .It Pa /etc/passwd
-A Version 7 format password file
+a Version 7 format password file
 .It Pa /etc/chpass.XXXXXX
-Temporary copy of the password file
+temporary copy of the password file
 .It Pa /etc/shells
-The list of approved shells
+the list of approved shells
 .El
 .Sh SEE ALSO
 .Xr finger 1 ,
@@ -426,11 +441,11 @@
 and
 .Xr ypchsh 1
 commands are really only links to
-.Nm chpass .
+.Nm Ns .
 .Sh BUGS
 User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
-.Nm
+.Nm chpass
 command appeared in 
 .Bx 4.3 Reno .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/ctm_rmail.1 man1/ctm_rmail.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/ctm_rmail.1	Sat Oct 16 18:50:27 1999
+++ man1/ctm_rmail.1	Fri Nov 19 19:39:07 1999
@@ -5,6 +5,8 @@
 .\"
 .\" Author: Stephen McKay
 .\"
+.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.3 1999/10/30 15:59:34 phantom Exp $
+.\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
 .Os
@@ -465,17 +467,9 @@
 or to the log file.  Messages from
 .Xr ctm
 turn up here too.  Error messages should be self explanatory.
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr ctm 1 ,
 .Xr ctm 5
-.\" .Sh STANDARDS
 .\" .Sh HISTORY
 .Sh AUTHORS
 .An Stephen McKay Aq mckay@FreeBSD.org
-.\" .Sh BUGS
-.\" Gosh!  No bugs here!
-.\" This message brought to you by the Coalition for More Humour in Man Pages.
-.\"
-.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.2 1999/08/29 15:41:03 peter Exp $
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/from.1 man1/from.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/from.1	Sat Oct 16 18:49:44 1999
+++ man1/from.1	Fri Nov 19 19:38:29 1999
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
+.\"	$FreeBSD: src/usr.bin/from/from.1,v 1.3.4.1 1999/10/30 21:49:05 green Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
@@ -39,6 +40,7 @@
 .Nd print names of those who have sent mail
 .Sh SYNOPSIS
 .Nm from
+.Op Fl c
 .Op Fl s Ar sender
 .Op Fl f Ar file
 .Op Ar user
@@ -49,6 +51,8 @@
 .Pp
 Options:
 .Bl -tag -width Fl
+.It Fl c
+Just print a count of messages and exit.
 .It Fl f Ar file 
 The supplied file
 is examined instead of the invoker's mailbox.
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/kbdcontrol.1 man1/kbdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/kbdcontrol.1	Sat Oct 16 18:50:30 1999
+++ man1/kbdcontrol.1	Fri Nov 19 19:39:09 1999
@@ -11,6 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.4 1999/11/18 16:10:46 phantom Exp $
 .\"
 .Dd June 30, 1999
 .Dt KBDCONTROL 1
@@ -91,7 +92,6 @@
 .Fl l
 option above.
 .It Fl f Ar # Ar string
-.\".BI "\-f\ " #\ string
 Set function key number
 .Ar #
 to send
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/mktemp.1 man1/mktemp.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/mktemp.1	Sat Oct 16 18:49:56 1999
+++ man1/mktemp.1	Fri Nov 19 19:38:40 1999
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3 1998/08/31 16:41:08 wosch Exp $
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.1 1999/10/30 14:05:49 phantom Exp $
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -179,5 +179,4 @@
 .Ox 2.1 .
 This implementation has been written independently based on the man page.
 This man page is taken from
-.Bx Open .
-.\" Our stupid .Ox macro won't allow me to use .Ox alone.
+.Ox
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/mptable.1 man1/mptable.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/mptable.1	Sat Oct 16 18:50:56 1999
+++ man1/mptable.1	Fri Nov 19 19:39:34 1999
@@ -20,6 +20,9 @@
 .\" 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/mptable/mptable.1,v 1.3.2.1 1999/10/30 16:11:12 phantom Exp $
+.\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
 .Os
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/netstat.1 man1/netstat.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/netstat.1	Sat Oct 16 18:49:57 1999
+++ man1/netstat.1	Fri Nov 19 19:38:41 1999
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.3 1999/10/30 14:42:19 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
@@ -165,11 +166,12 @@
 This option may be used with any of the display formats.
 .It Fl p Ar protocol 
 Show statistics about
-.Ar protocol  ,
+.Ar protocol ,
 which is either a well-known name for a protocol or an alias for it.  Some
 protocol names and aliases are listed in the file
 .Pa /etc/protocols .
-The special protocol name ``bdg''
+The special protocol name
+.Dq bdg
 is used to show bridging statistics.
 A null response typically means that there are no interesting numbers to
 report.
@@ -193,7 +195,10 @@
 The default display, for active sockets, shows the local
 and remote addresses, send and receive queue sizes (in bytes), protocol,
 and the internal state of the protocol.
-Address formats are of the form ``host.port'' or ``network.port''
+Address formats are of the form
+.Dq host.port
+or
+.Dq network.port
 if a socket's address specifies a network but no specific host address.
 When known the host and network addresses are displayed symbolically
 according to the data bases
@@ -206,16 +211,22 @@
 option is specified, the address is printed numerically, according
 to the address family.
 For more information regarding
-the Internet ``dot format,''
+the Internet
+.Dq dot format ,
 refer to
 .Xr inet 3 ) .
 Unspecified,
-or ``wildcard'', addresses and ports appear as ``*''.
+or
+.Dq wildcard ,
+addresses and ports appear as
+.Dq * .
 .Pp
 The interface display provides a table of cumulative
 statistics regarding packets transferred, errors, and collisions.
 The network addresses of the interface
-and the maximum transmission unit (``mtu'') are also displayed.
+and the maximum transmission unit
+.Pq Dq mtu
+are also displayed.
 .Pp
 The routing table display indicates the available routes and
 their status.  Each route consists of a destination host or network
@@ -293,12 +304,12 @@
 .Nm netstat
 command appeared in
 .Bx 4.2 .
-.\" .Sh FILES
-.\" .Bl -tag -width /dev/kmem -compact
-.\" .It Pa /kernel
-.\" default kernel namelist
-.\" .It Pa /dev/kmem
-.\" default memory file
-.\" .El
+.Sh FILES
+.Bl -tag -width /dev/kmem -compact
+.It Pa /kernel
+default kernel namelist
+.It Pa /dev/kmem
+default memory file
+.El
 .Sh BUGS
 The notion of errors is ill-defined.
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/nroff.1 man1/nroff.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/nroff.1	Sat Oct 16 18:47:20 1999
+++ man1/nroff.1	Fri Nov 19 19:36:24 1999
@@ -15,8 +15,11 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	$FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.1 1999/11/02 12:33:21 phantom Exp $
+
 ..
-.TH NROFF 1 "8 September 1996" "Groff Version 1.11"
+.TH NROFF 1 "2 November 1999" "Groff Version 1.11"
 .SH NAME
 nroff \- emulate nroff command with groff
 .SH SYNOPSIS
@@ -37,9 +40,15 @@
 .BI \-o list
 ]
 [
+.BI \-p
+]
+[
 .BI \-r cn
 ]
 [
+.BI \-t
+]
+[
 .BI \-T name
 ]
 [
@@ -71,9 +80,11 @@
 .BR \-i ,
 .BR \-n ,
 .BR \-m ,
-.B \-o
-and
+.BR \-p ,
+.BR \-o ,
 .B \-r
+and
+.B \-t
 options have the effect described in
 .BR troff (1).
 In addition
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/rpcgen.1 man1/rpcgen.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/rpcgen.1	Sat Oct 16 18:50:01 1999
+++ man1/rpcgen.1	Fri Nov 19 19:38:45 1999
@@ -1,5 +1,6 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.1 1999/10/30 15:27:57 phantom Exp $
 .Dd March 28, 1993
 .Dt RPCGEN 1
 .Os
@@ -501,15 +502,12 @@
 tcp,
 use:
 .Dl example% rpcgen -n tcp -o prot_svc.c prot.x
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr cc 1 ,
 .Xr rpc 3 ,
 .Xr syslog 3 ,
 .Xr inetd 8
 .\" .BR rpc_svc_calls (3)
-.Pp
-The
-.Nm
-chapter in the
-.Tn NETP
-manual.
+.Rs
+.%T The Nm rpcgen No chapter in the NETP manual
+.Re
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/rsh.1 man1/rsh.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/rsh.1	Sat Oct 16 18:50:01 1999
+++ man1/rsh.1	Fri Nov 19 19:38:45 1999
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
+.\" $FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.1 1999/10/30 15:27:58 phantom Exp $
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
@@ -50,7 +51,7 @@
 executes
 .Ar command
 on
-.Ar host  .
+.Ar host .
 .Pp
 .Nm Rsh
 copies its standard input to the remote command, the standard
@@ -66,7 +67,7 @@
 Turn off all Kerberos authentication.
 .It Fl d
 Turn on socket debugging (using
-.Xr setsockopt  2  )
+.Xr setsockopt 2 )
 on the
 .Tn TCP
 sockets used for communication with the remote host.
@@ -76,7 +77,7 @@
 to obtain tickets for the remote host in
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl l
 By default, the remote username is the same as the local username.
 The
@@ -84,7 +85,7 @@
 option allows the remote name to be specified.
 Kerberos authentication is used, and authorization is determined
 as in
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .It Fl n
 Redirect input from the special device
 .Pa /dev/null
@@ -104,7 +105,7 @@
 If no
 .Ar command
 is specified, you will be logged in on the remote host using
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .Pp
 Shell metacharacters which are not quoted are interpreted on local machine,
 while quoted metacharacters are interpreted on the remote machine.
@@ -167,9 +168,9 @@
 .Pp
 You cannot run an interactive command
 (like
-.Xr rogue  6
+.Xr rogue 6
 or
-.Xr vi  1  )
+.Xr vi 1 )
 using
 .Nm rsh ;
 use
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/sleep.1 man1/sleep.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/sleep.1	Sat Oct 16 18:46:32 1999
+++ man1/sleep.1	Fri Nov 19 19:35:42 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.2 1999/08/29 14:14:16 peter Exp $
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.3 1999/10/28 18:02:43 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
@@ -42,7 +42,7 @@
 .Nm sleep
 .Nd suspend execution for an interval of time
 .Sh SYNOPSIS
-.Nm sleep
+.Nm
 .Ar seconds
 .Sh DESCRIPTION
 The
@@ -50,25 +50,34 @@
 command
 suspends execution for a minimum of
 .Ar seconds .
-.Nm Sleep
-is used to schedule the execution of other commands (see
-.Sx EXAMPLES
-below).
 .Pp
 If the
 .Nm
-command
-receives a SIGALRM signal, it terminates normally with a zero exit status,
-for any other signal it takes the standard action.
+command receives a signal, it takes the standard action.
+.Sh IMPLEMENTATION NOTES
+The
+.Dv SIGALRM
+signal is not handled specially by this implementation.
+.Pp
+The
+.Nm
+command will accept and honor a non-integer number of specified seconds
+.Po
+with a
+.Ql \&.
+character as a decimal point
+.Pc .
+.Bf Sy
+This is a non-portable extension, and its use will nearly guarantee that
+a shell script will not execute properly on another system.
+.Ef
 .Sh DIAGNOSTICS
 The
 .Nm
 utility exits with one of the following values:
 .Bl -tag -width flag
 .It Li \&0
-On successful completion, or if the signal
-.Dv SIGALRM
-was received.
+On successful completion.
 .It Li \&>\&0
 An error occurred.
 .El
@@ -111,9 +120,7 @@
 is done courteously by sleeping for 70 seconds in between each
 awk job.
 .Sh SEE ALSO
-.Xr at 1 ,
-.Xr setitimer 2 ,
-.Xr alarm 3 ,
+.Xr nanosleep 2 ,
 .Xr sleep 3
 .Sh STANDARDS
 The
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/vidcontrol.1 man1/vidcontrol.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/vidcontrol.1	Sat Oct 16 18:50:47 1999
+++ man1/vidcontrol.1	Fri Nov 19 19:39:25 1999
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.5 1999/08/29 15:48:54 peter Exp $
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.6 1999/10/30 14:31:56 phantom Exp $
 .\"
 .Dd June 30, 1999
 .Dt VIDCONTROL 1
@@ -50,7 +50,6 @@
 .Bl -tag -width indent
 .It Ar mode
 Select a new video mode. The modes currently recognized are:
-.Ar 40x25 ,
 .Ar 80x25 ,
 .Ar 80x30 ,
 .Ar 80x43 ,
@@ -69,7 +68,6 @@
 .Ar EGA_80x25 ,
 .Ar EGA_80x43 ,
 .Ar VESA_132x25 ,
-.Ar VESA_132x30 ,
 .Ar VESA_132x43 ,
 .Ar VESA_132x50 ,
 .Ar VESA_132x60 .
@@ -84,8 +82,11 @@
 below.
 .It Ar foreground Op Ar background
 Change colors when displaying text. Specify the foreground color
-(e.g. ``vidcontrol white''), or both a foreground and background colors
-(e.g. ``vidcontrol yellow blue'').
+(e.g.
+.Dq vidcontrol white ) ,
+or both a foreground and background colors
+(e.g.
+.Dq vidcontrol yellow blue ) .
 Use the
 .Cm show
 command below to see available colors.
@@ -138,8 +139,7 @@
 .Cm 8x8 ,
 .Cm 8x14
 or
-.Cm 8x16
-).
+.Cm 8x16 ) .
 The font file can be either uuencoded or in raw binary format.
 You can also use the menu-driven
 .Xr vidfont 1
@@ -220,7 +220,7 @@
 Sets the timeout value for the 
 .Fl t
 option.
-.It Ar font8x16, font8x14, font8x8
+.It Ar font8x16 , font8x14 , font8x8
 Specifies font files for the
 .Fl f
 option.
@@ -281,6 +281,7 @@
 .Xr syscons 4 ,
 .Xr vga 4 ,
 .Xr rc.conf 5 ,
+.Xr kldload 8 ,
 .Xr moused 8
 .Sh AUTHORS
 .An Sen Schmidt Aq sos@FreeBSD.org
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/w.1 man1/w.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man1/w.1	Sat Oct 16 18:50:12 1999
+++ man1/w.1	Fri Nov 19 19:38:54 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/w/w.1,v 1.10.2.1 1999/08/29 15:34:36 peter Exp $
+.\" $FreeBSD: src/usr.bin/w/w.1,v 1.10.2.2 1999/10/30 22:15:30 green Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
@@ -43,7 +43,7 @@
 .Op Fl dhin
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Op Ar user
+.Op Ar user ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -83,9 +83,9 @@
 interprets addresses and attempts to display them symbolically).
 .El
 .Pp
-If a
+If one or more
 .Ar user
-name is specified, the output is restricted to that user.
+names are specified, the output is restricted to those users.
 .Sh FILES
 .Bl -tag -width /var/run/utmp -compact
 .It Pa /var/run/utmp
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/inetd.conf.5 man5/inetd.conf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/inetd.conf.5	Sat Oct 16 18:50:28 1999
+++ man5/inetd.conf.5	Fri Nov 19 19:39:08 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.4 1999/08/29 15:42:33 peter Exp $
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -351,14 +351,46 @@
 should be just as arguments
 normally are, starting with argv[0], which is the name of
 the program.  If the service is provided internally, the
-word
+.Em service-name
+of the service (and any arguments to it) or the word
 .Dq internal
 should take the place of this entry.
 .Pp
+Currently, the only internal service to take arguments is
+.Dq auth .
+Without options, the service will always return
+.Dq ERROR\ : HIDDEN-USER .
+The available arguments to this service that alter its behaviour are:
+.Bl -tag -width indent
+.It Fl r
+Offer a real
+.Dq auth
+service, as per RFC 1413. All the following flags apply only in this case.
+.It Fl f
+If the file
+.Pa .fakeid
+exists in the home directory of the identified user, report the username
+found in that file instead of the real username.
+.It Fl n
+If the file
+.Pa .noident
+exists in the home directory of the identified user, return
+.Dq ERROR\ : HIDDEN-USER .
+instead.
+.It Fl o Ar osname
+Use
+.Ar osname
+instead of the name of the system implementation
+returned by
+.Xr uname 3 .
+.It Fl t Ar sec[.usec]
+Specify a timeout for the service. The default timeout is 10.0 seconds.
+.El
+.Pp
 The
 .Nm
 program
-provides several
+also provides several other
 .Dq trivial
 services internally by use of
 routines within itself.  These services are
@@ -597,6 +629,11 @@
 .Xr rshd 8 ,
 .Xr telnetd 8 ,
 .Xr tftpd 8
+.Rs
+.%A Michael C. St. Johns
+.%T Identification Protocol
+.%O RFC1413
+.Re
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.acct.5 man5/isdnd.acct.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.acct.5	Sat Oct 16 18:50:54 1999
+++ man5/isdnd.acct.5	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.2 1999/08/29 15:41:41 peter Exp $ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.3 1999/11/15 22:40:55 joe Exp $ 
 .\"
-.\"	last edit-date: [Sat Dec  5 18:09:33 1998]
+.\"	last edit-date: [Mon Feb 15 16:54:23 1999]
 .\"
 .Dd September 11, 1998
 .Dt ISDND.ACCT 5
@@ -53,13 +53,13 @@
 accounting information is written even if the local site was not charged
 or no charging information is available or is not subscribed.
 .Pp
-The general format of an accounting line is a follows:
+The general format of an accounting line is as follows:
 .Pp
 .Dl FROM - UNTIL NAME UNITS (SECONDS) (INBYTES/OUTBYTES)
 .Pp
 .Em FROM
 is the time the connection was established in the format
-.Dl Day:Month:Year Hour:Minutes:seconds
+.Dl Day.Month.Year Hour:Minutes:seconds
 .Pp
 .Em UNTIL
 is the time the connection was closed. The format is the same as
@@ -90,19 +90,17 @@
 The default accounting information file for the
 .Nm isdnd
 ISDN daemon.
-
+.El
 .Sh EXAMPLES
 This is a typical accounting line:
 .Pp
 .Dl 12.06.97 10:41:37 - 12.06.97 10:45:18 GROGGY 2 (65) (4711/1147)
-
 .Sh SEE ALSO
-.Xr isdnd 8 ,
-.Xr isdnd.rc 5
-
-.Sh AUTHOR
+.Xr isdnd.rc 5 ,
+.Xr isdnd 8
+.Sh AUTHORS
 The 
 .Xr isdnd 8
-daemon and this manual page were written by Hellmuth Michaelis. 
+daemon and this manual page were written by
+.An Hellmuth Michaelis .
 He can be contacted at hm@kts.org or hm@hcs.de.
-
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.rates.5 man5/isdnd.rates.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.rates.5	Sat Oct 16 18:50:54 1999
+++ man5/isdnd.rates.5	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.2 1999/08/29 15:41:41 peter Exp $ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp $ 
 .\"
-.\"     last edit-date: [Sat Dec  5 18:09:57 1998]
+.\"     last edit-date: [Sun Feb 14 10:11:05 1999]
 .\"
 .Dd September 11, 1998
 .Dt ISDND.RATES 5
@@ -42,7 +42,7 @@
 ISDN connection management daemon to calculate the short hold time for a 
 connection.
 .Pp
-The format of a rate entry line is a follows:
+The format of a rate entry line is as follows:
 .Pp
 The first field, the
 .Pq Fa rate-code
@@ -88,7 +88,7 @@
 The default rates specification file for the
 .Nm isdnd
 ISDN daemon.
-
+.El
 .Sh EXAMPLES
 The line:
 .Bd -literal
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.rc.5 man5/isdnd.rc.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/isdnd.rc.5	Sat Oct 16 18:50:54 1999
+++ man5/isdnd.rc.5	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,12 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.2 1999/08/29 15:41:42 peter Exp $ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp $ 
 .\"
-.\"     last edit-date: [Sat Dec  5 18:10:08 1998]
+.\"     last edit-date: [Wed Jul 28 15:57:02 1999]
 .\"
-.Dd October 27, 1998
-.Dt isdnd.rc 5
+.Dd May 20, 1999
+.Dt ISDND.RC 5
+.Os
 .Sh NAME
 .Nm isdnd.rc
 .Nd isdn4bsd ISDN connection management daemon config file format
@@ -91,6 +92,8 @@
 .Em useacctfile
 (see below) is set to 
 .Em on .
+See also system keyword
+.Em rotatesuffix .
 If this keyword is omitted the system default is used. (optional)
 
 .It Li aliasing
@@ -108,6 +111,11 @@
 .Em aliasing
 keyword. (optional)
 
+.It Li beepconnect
+In fullscreen mode, if this parameter is set to
+.Em on ,
+ring the bell when connecting or disconnecting a call.
+
 .It Li isdntime
 If this parameter is set to
 .Em on ,
@@ -198,6 +206,14 @@
 which is prepended to the string specified as a parameter to this keyword.
 (optional)
 
+.It Li rotatesuffix
+Specifies a suffix for renaming the log- and the accountingfilename. In case
+rotatesuffix is used and a USR1 signal is sent to isdnd, the logfile and the
+accounting file is not only closed and reopened but the old logfile is also
+renamed to the former filename with the rotatesuffix string appended.
+If this keyword is omitted, the logfiles are just closed and reopened; this
+is also the default behaviour. (optional)
+
 .It Li rtprio
 Specifies the realtime priority 
 .Nm isdnd
@@ -284,7 +300,7 @@
 .El
 
 .It Li dialout-type
-This keyword ist used to configure what type of dialout mode is used.
+This keyword is used to configure what type of dialout mode is used.
 The keyword is mandatory.
 The currently supported parameters are:
 .Pp
@@ -311,6 +327,7 @@
 outgoing only connections are possible.
 The keyword is optional, the default is
 .Em inout .
+
 .Pp
 The currently supported parameters are:
 .Pp
@@ -345,12 +362,27 @@
 A (safety) time in seconds which specifies the time to hangup before an
 expected next charging unit will occur. (optional)
 
+.It Li idle-algorithm-outgoing
+The algorithm used to determine when to hang up an outgoing call when the
+line becomes idle. The current algorithms are:
+
+.Pp
+.Bl -tag -width calledback -compact -offset
+.It Ar fix-unit-size
+idle algorithm which assumes fixed sized changing units during the whole call.
+.It Ar var-unit-size
+idle algorithm which assumes that the charging is time based after the first
+units time has expired.
+.El
+
 .It Li idletime-outgoing
 The time in seconds an outgoing connection must be idle before hanging up.
+An idle timeout of zero disables this functionality.
 (optional)
 
 .It Li idletime-incoming
 The time in seconds an incoming connection must be idle before hanging up.
+An idle timeout of zero disables this functionality.
 (optional)
 
 .It Li isdncontroller
@@ -397,8 +429,7 @@
 .Em "Calling Party Number Information Element" .
 .Pp
 This keyword is mandatory for the 
-.em
-ipr 
+.Em ipr 
 userland interfaces.
 
 .It Li local-phone-incoming
@@ -448,8 +479,7 @@
 .Em "Called Party Number Information Element" .
 .Pp
 This keyword is mandatory for the
-.em
-ipr
+.Em ipr
 interfaces. It may be specified more than once to try to dial to several
 numbers until one succeeds.
 
@@ -510,10 +540,8 @@
 .El
 
 .It Li usrdeviceunit
-Specifies the unit number for the with the
-.em
-usrdevicename
-specified device.
+Specifies the unit number for the device which is specified with
+usrdevicename.
 
 .It Li usedown
 is used to enable the use of the keywords
@@ -535,7 +563,16 @@
 expects to find the program below the path
 .Pa /etc/isdn
 which is prepended to the string specified as a parameter to this keyword.
-(optional)
+The programs specified by connect and disconnect will get the following
+command line arguments: -d (device) -f (flag) [ -a (addr) ] where 
+.Em device
+is the name of device, e.g. "isp0", 
+.Em flag
+will be "up" if connection just got up, or "down" if interface changed to down 
+state and
+.Em addr
+the address that got assigned to the interface as a dotted-quad ip address
+(optional, only if it can be figured out by isdnd). (optional)
 
 .It Li disconnectprog
 specifies a program run everytime after a connection was shut down.
@@ -567,11 +604,15 @@
 unit time: typical values are one to five minutes.
 
 .It Li outgoing calls
-Outgoing call disconnect time can be setup in one of two ways:
+Outgoing call disconnect time can be setup in one of three ways:
 
 .Bl -tag -width shorthold mode -compact
 .It Li simple mode
-For simple mode, the selected
+For simple mode, the 
+.Em idle-algorithm-outgoing
+must be
+.Em fix-unit-size
+and the selected
 .Em unitlength
 must be 0 (zero) and
 .Em idletime-outgoing
@@ -584,8 +625,12 @@
 .Pp
 Typical values in simple mode are 10 to 30 seconds.
 
-.It Li shorthold mode
-For shorthold mode, the selected
+.It Li shorthold mode for fixed unit charging
+For shorthold mode, the 
+.Em idle-algorithm-outgoing
+ must be
+.Em fix-unit-size
+ and the selected
 .Em unitlength 
 and 
 .Em idletime-outgoing
@@ -617,6 +662,52 @@
 and
 .Em earlyhangup !
 
+.It Li shorthold mode for variable unit charging
+For shorthold mode, the 
+.Em idle-algorithm-outgoing
+must be
+.Em var-unit-size
+and the selected
+.Em unitlength 
+and
+.Em idletime-outgoing
+must be greater than 0 (zero);
+.Pp
+
+This shorthold mode is suitable when your calls are billed on
+the elapse time of the call plus a fixed connection charge.
+For example British Telecom bill this way.
+.Pp
+
+Each call is divided into two periods, the first is the
+.Em unchecked
+period and the second is the
+.Em checked
+. The
+.Em checked
+period starts 1 second before the first units time expires.
+.Pp
+During the
+.Em checked
+period if there is no traffic for
+.Em idle-time
+seconds the call is disconnected.
+.Pp
+
+.Bd -literal
+
+|<---unchecked------------------>|<------checked------>
++------------------+-------------+
+|                  |<-idle-time->|
+|<--------------unitlength------->|
+
+.Ed
+
+Experience shows that useful values for idle-time are from 15 to 30 seconds.
+.Pp
+If idle-time is too short an application that is not yet finished with the
+network will cause a new call to be placed.
+.Pp
 .El
 .El
 
@@ -627,15 +718,17 @@
 The default configuration file for the
 .Nm isdnd
 ISDN daemon.
-
+.El
 .Sh SEE ALSO
-.Xr isdnd 8
+.Xr regex 3 ,
+.Xr re_format 7 ,
+.Xr isdnd 8 ,
 .Xr isdnmonitor 8
-.Xr regex 3
-.Xr re_format 7
-
-.Sh AUTHOR
+.Sh AUTHORS
 The 
 .Xr isdnd 8
-daemon and this manual page were written by Hellmuth Michaelis. 
-He can be reached at hm@kts.org.
+daemon and this manual page were written by
+.An Hellmuth Michaelis Aq hm@kts.org .
+.Pp
+Additions to this manual page by
+.An Barry Scott Aq barry@scottb.demon.co.uk .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/radius.conf.5 man5/radius.conf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man5/radius.conf.5	Sat Oct 16 18:45:57 1999
+++ man5/radius.conf.5	Fri Nov 19 19:35:12 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD: src/lib/libradius/radius.conf.5,v 1.1.1.1 1998/11/13 00:53:01 jdp Exp $
+.\"	$FreeBSD: src/lib/libradius/radius.conf.5,v 1.1.1.1.2.1 1999/11/19 04:31:27 jdp Exp $
 .\"
 .Dd July 29, 1998
 .Dt RADIUS.CONF 5
@@ -42,8 +42,22 @@
 white space is ignored, as are empty lines and lines containing
 only comments.
 .Pp
-A RADIUS server is described by two to four fields on a line.  The
-fields are separated by white space.  The
+A RADIUS server is described by three to five fields on a line:
+.Pp
+.Bl -item -offset indent -compact
+.It
+Service type
+.It
+Server host
+.It
+Shared secret
+.It
+Timeout
+.It
+Retries
+.El
+.Pp
+The fields are separated by white space.  The
 .Ql #
 character at the beginning of a field begins a comment, which extends
 to the end of the line.  A field may be enclosed in double quotes,
@@ -56,19 +70,43 @@
 .Ql \e\e .
 No other escape sequences are supported.
 .Pp
-The first field specifies
+.Pp
+The first field gives the service type, either
+.Ql auth
+for RADIUS authentication or
+.Ql acct
+for RADIUS accounting.  If a single server provides both services, two
+lines are required in the file.  Earlier versions of this file did
+not include a service type.  For backward compatibility, if the first
+field is not
+.Ql auth
+or
+.Ql acct
+the library behaves as if
+.Ql auth
+were specified, and interprets the fields in the line as if they
+were fields two through five.
+.Pp
+The second field specifies
 the server host, either as a fully qualified domain name or as a
 dotted-quad IP address.  The host may optionally be followed by a
 .Ql \&:
 and a numeric port number, without intervening white space.  If the
 port specification is omitted, it defaults to the
 .Ql radius
+or
+.Ql radacct
 service in the
 .Pa /etc/services
-file, or to the standard RADIUS port 1812 if there is no such entry in
-.Pa /etc/services .
+file for service types
+.Ql auth
+and
+.Ql acct ,
+respectively.
+If no such entry is present, the standard ports 1812 and 1813 are
+used.
 .Pp
-The second field contains the shared secret, which should be known
+The third field contains the shared secret, which should be known
 only to the client and server hosts.  It is an arbitrary string of
 characters, though it must be enclosed in double quotes if it
 contains white space.  The shared secret may be
@@ -77,16 +115,17 @@
 prevent them from working properly with secrets longer than 16
 characters.
 .Pp
-The third field contains a decimal integer specifying the timeout in
+The fourth field contains a decimal integer specifying the timeout in
 seconds for receiving a valid reply from the server.  If this field
 is omitted, it defaults to 3 seconds.
 .Pp
-The fourth field contains a decimal integer specifying the maximum
+The fifth field contains a decimal integer specifying the maximum
 number of attempts that will be made to authenticate with the server
 before giving up.  If omitted, it defaults to 3 attempts.  Note,
 this is the total number of attempts and not the number of retries.
 .Pp
-Up to 10 RADIUS servers may be specified.  The servers are tried in
+Up to 10 RADIUS servers may be specified for each service type.
+The servers are tried in
 round-robin fashion, until a valid response is received or the
 maximum number of tries has been reached for all servers.
 .Pp
@@ -101,14 +140,14 @@
 .Sh EXAMPLES
 .Bd -literal
 # A simple entry using all the defaults:
-radius1.domain.com	OurLittleSecret
+acct  radius1.domain.com  OurLittleSecret
 
 # A server still using the obsolete RADIUS port, with increased
 # timeout and maximum tries:
-auth.domain.com:1645	"I can't see you, but I know you're there"  5  4
+auth  auth.domain.com:1645  "I can't see you"  5  4
 
 # A server specified by its IP address:
-192.168.27.81		$X*#..38947ax-+=
+auth  192.168.27.81  $X*#..38947ax-+=
 .Ed
 .Sh SEE ALSO
 .Xr libradius 3
@@ -116,6 +155,11 @@
 .%A C. Rigney, et al
 .%T Remote Authentication Dial In User Service (RADIUS)
 .%O RFC 2138
+.Re
+.Rs
+.%A C. Rigney
+.%T RADIUS Accounting
+.%O RFC 2139
 .Re
 .Sh AUTHORS
 This documentation was written by
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/man.7 man7/man.7
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/man.7	Sat Oct 16 18:49:14 1999
+++ man7/man.7	Fri Nov 19 19:38:02 1999
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man7/man.7,v 1.1.4.1 1999/08/29 16:46:59 peter Exp $
+.\" $FreeBSD: src/share/man/man7/man.7,v 1.1.4.2 1999/10/30 14:12:18 phantom Exp $
 .\"
 .Dd November 30, 1998
 .Os
@@ -315,15 +315,15 @@
 Known defects and limitations, if any.
 .El
 .Sh FILES
-.Bl -tag -width "/usr/share/lib/tmac/tmac.groff_an"
-.It "/usr/share/lib/tmac/tmac.an"
+.Bl -tag -width "/usr/share/tmac/tmac.groff_an"
+.It "/usr/share/tmac/tmac.an"
 Initial file defining the
 .Nm
 package.
-.It "/usr/share/lib/tmac/tmac.groff_an"
+.It "/usr/share/tmac/tmac.groff_an"
 .Nm groff
 source for macro definitions.
-.It "/usr/share/lib/tmac/man.local"
+.It "/usr/share/tmac/man.local"
 local modifications to the
 .Nm
 package.
@@ -339,5 +339,4 @@
 .Xr mdoc.samples 7
 .Sh HISTORY
 This manual page was written by
-.An "Joseph Koshy"
-.Ad Aq jkoshy@freebsd.org .
+.An Joseph Koshy Aq jkoshy@FreeBSD.org .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/mdoc.7 man7/mdoc.7
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/mdoc.7	Sat Oct 16 18:49:14 1999
+++ man7/mdoc.7	Fri Nov 19 19:38:02 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.4 1999/09/14 16:35:16 phantom Exp $
+.\" $FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.6 1999/11/02 13:56:47 phantom Exp $
 .\"
 .Dd December 30, 1993
 .Os
@@ -302,7 +302,10 @@
 .It Li \&Op Ta Yes Ta Yes Ta "Option (also .Oo and .Oc)."
 .It Li \&Ot Ta Yes Ta Yes Ta "Old style function type (Fortran only)."
 .It Li \&Pa Ta Yes Ta Yes Ta "Pathname or file name."
-.It Li \&St Ta Yes Ta Yes Ta "Standards (-p1003.2, -p1003.1 or -ansiC)"
+.It Li \&St Ta Yes Ta Yes Ta "Standard; see"
+.Xr mdoc.samples 7 ,
+.Sx Standards
+section for complete list of known standards
 .It Li \&Ta Ta Yes Ta Yes Ta "Tab align next table column."
 .It Li \&Va Ta Yes Ta Yes Ta "Variable name."
 .It Li \&Vt Ta Yes Ta Yes Ta "Variable type (Fortran only)."
@@ -391,25 +394,21 @@
 would exceed the
 .Xr troff
 limitation of nine arguments.
-.Sh CONFIGURATION
-For site specific configuration of the macro package,
-see the file
-.Pa /usr/src/share/tmac/README .
 .Sh FILES
 .Bl -tag -width "tmac.doc-ditroff" -compact
 .It Pa tmac.doc
 Manual and general text domain macros.
-.It Pa tmac.doc-common
+.It Pa doc-common
 Common structural macros and definitions.
-.It Pa tmac.doc-nroff
+.It Pa doc-nroff
 Site dependent
 .Xr nroff
 style file.
-.It Pa tmac.doc-ditroff
+.It Pa doc-ditroff
 Site dependent
 .Xr troff
 style file.
-.It Pa tmac.doc-syms
+.It Pa doc-syms
 Special defines (such as the standards macro).
 .El
 .Sh SEE ALSO
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/mdoc.samples.7 man7/mdoc.samples.7
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man7/mdoc.samples.7	Sat Oct 16 18:49:14 1999
+++ man7/mdoc.samples.7	Fri Nov 19 19:38:02 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.4 1999/08/29 16:47:00 peter Exp $
+.\" $FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.6 1999/11/02 13:56:47 phantom Exp $
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
@@ -148,6 +148,7 @@
 .It "Names" .
 .It "Options" .
 .It "Pathnames" .
+.It "Standards" .
 .It "Variables" .
 .It "Cross References" .
 .El
@@ -156,7 +157,7 @@
 .Bl -tag -width flag -compact -offset indent
 .It "AT&T Macro" .
 .It "BSD Macro" .
-.It "FreeBSD Macro" .
+.It "FreeBSD/NetBSD/OpenBSD Macro" .
 .It "UNIX Macro" .
 .It "Enclosure/Quoting Macros"
 .Bl -tag -width flag -compact -offset indent
@@ -1350,6 +1351,56 @@
 The
 .Ql \&.Pa
 macro is parsed and is callable.
+.Ss Standards
+The
+.Ql \&.St
+macro replaces standard abbreviature with its formal name.
+.Pp
+.Dl Usage: .St abbreviature
+.Pp
+Available pairs for
+.Dq Abbreviature/Formal Name
+are:
+.Bl -tag -width "-p1003.2-92XX." -compact -offset indent
+.It Li "-ansiC"
+.St -ansiC
+.It Li "-ansiC-89"
+.St -ansiC-89
+.It Li "-ieee754"
+.St -ieee754
+.It Li "-iso8802-3"
+.St -iso8802-3
+.It Li "-iso9899"
+.St -iso9899
+.It Li "-iso9945-1"
+.St -iso9945-1
+.It Li "-isoC"
+.St -isoC
+.It Li "-p1003.1"
+.St -p1003.1
+.It Li "-p1003.1-88"
+.St -p1003.1-88
+.It Li "-p1003.1-90"
+.St -p1003.1-90
+.It Li "-p1003.1b"
+.St -p1003.1b
+.It Li "-p1003.1b-93"
+.St -p1003.1b-93
+.It Li "-p1003.1g"
+.St -p1003.1g
+.It Li "-p1003.2"
+.St -p1003.2
+.It Li "-p1003.2-92"
+.St -p1003.2-92
+.It Li "-susv2"
+.St -susv2
+.It Li "-xpg3"
+.St -xpg3
+.It Li "-xpg4"
+.St -xpg4
+.It Li "-xpg4.2"
+.St -xpg4.2
+.El
 .Ss Variables
 Generic variable reference:
 .Pp
@@ -1430,22 +1481,40 @@
 The
 .Ql \&.Bx
 macro is parsed and is callable.
-.Ss FreeBSD Macro
+.Ss FreeBSD/NetBSD/OpenBSD Macros
 .Bd -literal -offset indent -compact
-Usage: .Fx Version.release ... \*(Pu
+Usage: .Fx [ Version.release ] ... \*(Pu
 .Ed
 .Bl -tag -width ".Fx 2.2 ) ," -compact -offset 14n
 .It Li ".Fx 2.2 ."
 .Fx 2.2 .
 .El
 .Pp
+.Bd -literal -offset indent -compact
+Usage: .Nx [ Version.release ] ... \*(Pu
+.Ed
+.Bl -tag -width ".Nx 1.4 ) ," -compact -offset 14n
+.It Li ".Nx 1.4 ."
+.Nx 1.4 .
+.El
+.Pp
+.Bd -literal -offset indent -compact
+Usage: .Ox [ Version.release ] ... \*(Pu
+.Ed
+.Bl -tag -width ".Ox 2.5 ) ," -compact -offset 14n
+.It Li ".Ox 2.5 ."
+.Ox 2.5 .
+.El
+.Pp
 The
-.Ql \&.Fx
-macro is
+.Ql \&.Fx ,
+.Ql \&.Nx ,
+.Ql \&.Ox
+macros are
 .Em not
 parsed and
 .Em not
-callable. It accepts at most two arguments.
+callable. They accept at most two arguments.
 .Ss UNIX Macro
 .Dl Usage: .Ux ... \*(Pu
 .Bl -tag -width ".Ux 4.3 ) ," -compact -offset 14n
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/apmd.8 man8/apmd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/apmd.8	Sat Oct 16 18:50:52 1999
+++ man8/apmd.8	Fri Nov 19 19:39:30 1999
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
-.\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.2.2.3 1999/09/12 01:06:32 iwasaki Exp $
+.\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.2.2.4 1999/10/30 19:43:42 mpp Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8
@@ -137,16 +137,12 @@
 .Pp
 will cause
 .Nm apmd
-to recieve the APM event
+to receive the APM event
 .Ql SUSPENDREQ 
 (which may be posted by an LCD close), run the
 .Ql sync
 command 3 times and wait for a while, then execute
-.Nm zzz 
-(
-.Nm apm
-.Fl z
-)
+.Nm zzz ( Ns Nm apm Fl z )
 to put the system in the suspend state.
 .Pp
 .Bl -bullet
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/camcontrol.8	Sat Oct 16 18:48:36 1999
+++ man8/camcontrol.8	Fri Nov 19 19:37:31 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.7 1999/08/29 15:12:35 peter Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.8 1999/10/28 17:20:07 mph Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
@@ -640,9 +640,9 @@
 .Sh SEE ALSO
 .Xr cam 3 ,
 .Xr cam_cdbparse 3 ,
+.Xr cam 4 ,
 .Xr pass 4 ,
-.Xr cam 9 ,
-.Xr xpt 9
+.Xr xpt 4
 .Sh HISTORY
 The
 .Nm camcontrol
@@ -663,9 +663,6 @@
 .Sh AUTHORS
 .An Kenneth Merry Aq ken@FreeBSD.org
 .Sh BUGS
-Most of the man page cross references don't exist yet.  This will be fixed
-soon.
-.Pp
 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:
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/inetd.8 man8/inetd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/inetd.8	Sat Oct 16 18:50:28 1999
+++ man8/inetd.8	Fri Nov 19 19:39:08 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.4 1999/08/29 15:42:33 peter Exp $
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -351,14 +351,46 @@
 should be just as arguments
 normally are, starting with argv[0], which is the name of
 the program.  If the service is provided internally, the
-word
+.Em service-name
+of the service (and any arguments to it) or the word
 .Dq internal
 should take the place of this entry.
 .Pp
+Currently, the only internal service to take arguments is
+.Dq auth .
+Without options, the service will always return
+.Dq ERROR\ : HIDDEN-USER .
+The available arguments to this service that alter its behaviour are:
+.Bl -tag -width indent
+.It Fl r
+Offer a real
+.Dq auth
+service, as per RFC 1413. All the following flags apply only in this case.
+.It Fl f
+If the file
+.Pa .fakeid
+exists in the home directory of the identified user, report the username
+found in that file instead of the real username.
+.It Fl n
+If the file
+.Pa .noident
+exists in the home directory of the identified user, return
+.Dq ERROR\ : HIDDEN-USER .
+instead.
+.It Fl o Ar osname
+Use
+.Ar osname
+instead of the name of the system implementation
+returned by
+.Xr uname 3 .
+.It Fl t Ar sec[.usec]
+Specify a timeout for the service. The default timeout is 10.0 seconds.
+.El
+.Pp
 The
 .Nm
 program
-provides several
+also provides several other
 .Dq trivial
 services internally by use of
 routines within itself.  These services are
@@ -597,6 +629,11 @@
 .Xr rshd 8 ,
 .Xr telnetd 8 ,
 .Xr tftpd 8
+.Rs
+.%A Michael C. St. Johns
+.%T Identification Protocol
+.%O RFC1413
+.Re
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/ipfw.8 man8/ipfw.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/ipfw.8	Sat Oct 16 18:48:42 1999
+++ man8/ipfw.8	Fri Nov 19 19:37:36 1999
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.8 1999/08/29 15:13:45 peter Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp $
 .\"
 .Dd July 20, 1996
 .Dt IPFW 8
@@ -771,8 +771,6 @@
 are reassembled before delivery to the socket, whereas fragments diverted via
 .Ar tee
 are not.
-.Pp
-Port aliases containing dashes cannot be first in a list.
 .Pp
 The
 .Dq tee
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdnd.8 man8/isdnd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdnd.8	Sat Oct 16 18:50:54 1999
+++ man8/isdnd.8	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,18 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.2 1999/08/29 15:41:40 peter Exp $ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.3 1999/11/15 22:40:55 joe Exp $ 
 .\"
-.\"	last edit-date: [Sat Dec 12 21:13:59 1998]
+.\"	last edit-date: [Thu May 20 14:37:42 1999]
 .\"
-.Dd November 3, 1998
-.Dt isdnd 8
+.Dd February 23, 1999
+.Dt ISDND 8
+.Os
 .Sh NAME
 .Nm isdnd
 .Nd isdn4bsd ISDN connection management daemon
 .Sh SYNOPSIS
 .Nm isdnd
-.Op Fl b
 .Op Fl c Ar configfile
 .Op Fl d Ar debuglevel
 .Op Fl f
@@ -53,9 +53,6 @@
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl b
-Bell: in full-screen mode, ring the bell when connecting 
-or disconnecting a call.
 .It Fl c
 Use 
 .Ar configfile
@@ -89,6 +86,8 @@
 isdn4bsd kernel i/o calls.
 .It Ar 0x100
 controller and channel busy/free messages.
+.It Ar 0x200
+isdnd.rc configuration file processing.
 .El
 .Pp
 The value can be specified in any number base supported by the
@@ -132,7 +131,10 @@
 .It Fl L
 Specifies the name of the logfile which is used when the option
 .Em -l
-is set.
+is set. See also the keyword
+.Em rotatesuffix
+in the system section of
+.Xr isdnd.rc 5 .
 .It Fl P
 This option prints out the parsed and verified isdnd configuration in the same
 format as the isdnd.rc file. This output can be used as an isdnd.rc file. This 
@@ -277,11 +279,11 @@
 .Pp
 The call is terminated by either the local site timing out or the remote
 side hanging up the connection or the local side actively sending a
-.Em DISCONNECT_REQ
+.Em I4B_DISCONNECT_REQ
 ioctl message, both events are signaled to the
 .Nm
 by the kernel sending the
-.Em DISCONNECT_IND
+.Em I4B_DISCONNECT_IND
 message and the CDID corresponding to the call is no longer valid.
 .Pp
 .Ss INCOMING CALLS
@@ -294,23 +296,23 @@
 With the information contained in this message, the
 .Nm
 searches the entry section of its configuration database and if a match is
-found, it accepts or rejects the call or, of no match is found, it ignores the
+found, it accepts or rejects the call or, if no match is found, it ignores the
 call - all by issuing a
 .Em I4B_CONNECT_RESP
 ioctl message with the appropriate parameters to the kernel.
 .Pp
-In case the daemon decided to accept the message, the kernel signal the then 
-active connection by sending a
+In case the daemon decided to accept the call, the kernel signals this
+by sending a
 .Em MSG_CONNECT_ACTIVE_IND
 message to the daemon.
 .Pp
 The call is terminated by either the local site timing out or the remote
 side hanging up the connection or the local side actively sending a
-.Em DISCONNECT_REQ
+.Em I4B_DISCONNECT_REQ
 ioctl message, both events are signaled to the
 .Nm
 by the kernel sending the
-.Em DISCONNECT_IND
+.Em I4B_DISCONNECT_IND
 message and the CDID corresponding to the call is no longer valid.
 .Pp
 
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdndebug.8 man8/isdndebug.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdndebug.8	Sat Oct 16 18:50:54 1999
+++ man8/isdndebug.8	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,19 +22,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.2 1999/08/29 15:41:52 peter Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.3 1999/11/15 22:41:02 joe Exp $
 .\"
-.\"	last edit-date: [Sat Dec  5 18:13:34 1998]
+.\"	last edit-date: [Sat May 29 11:03:15 1999]
 .\"
-.\"	-hm	writing manual pages
-.\"	-hm	getting uptodate
-.\"
-.\"
-.Dd July 9, 1998
-.Dt isdndebug 8
+.Dd May, 29, 1999
+.Dt ISDNDEBUG 8
+.Os
 .Sh NAME
 .Nm isdndebug
-.Nd control debugging handling inside isdn4bsd kernel
+.Nd display and control isdn4bsd kernel variables and statistics
 .Sh SYNOPSIS
 .Nm
 .Op Fl e
@@ -42,20 +39,27 @@
 .Op Fl h
 .Op Fl l Ar layer
 .Op Fl m
+.Op Fl q
 .Op Fl r
 .Op Fl s Ar value
 .Op Fl u Ar unit
 .Op Fl z
 .Op Fl H
+.Op Fl Q
 .Sh DESCRIPTION
 .Nm isdndebug
-is part of the isdn4bsd package and is used to control debugging output
-of the isdn4bsd kernel part. Every layer of the isdn4bsd kernel uses a
-debugging mask which can be manipulated using this utility.
+is part of the isdn4bsd package and is used to control the level of 
+debugging output of the isdn4bsd kernel part.
+Every layer of the isdn4bsd kernel uses a debugging mask which can be
+manipulated using this utility.
 .Pp
 A second usage of
 .Nm
-is to display and reset the HSCX error counters.
+is to display and reset the HSCX (the HSCX is the chip responsible for 
+the B-channel handling in the
+.Xr isic 4
+driver) error counters and and to display and reset the D-channel layer 2
+(Q.921 LAPD protocol) statistics and error counters.
 .Pp
 The following options are available:
 .Bl -tag -width Ds
@@ -64,12 +68,14 @@
 .It Fl g
 Get the debugging mask for the selected layer(s).
 .It Fl h
-Display the the HSCX error counters.
+Display the HSCX error counters.
 .It Fl l
 Specify the layer for which a command applies. Default is all layers.
 .It Fl m
 Set debugging mask for the selected layer(s) to display all possible
 debugging messages (maximum output).
+.It Fl q
+Display the Q.921 (D-channel layer 2) frame receive/transmit statistics.
 .It Fl r
 Set debugging mask for the selected layer(s) to the compiled in default
 (reset).
@@ -78,11 +84,14 @@
 specified in any number base supported by
 .Xr sscanf 3 .
 .It Fl u
-Set the unit numbers for the -h and -H flags.
+Set the unit numbers for the -h, -q, -H and -Q flags.
 .It Fl z
 Set debugging mask for the selected layer(s) to no output at all (zero).
 .It Fl H
 Reset the HSCX error counters to zero.
+.It Fl Q
+Reset the Q.921 (D-channel layer 2) frame receive/transmit statistics to zero.
+.El
 .Pp
 .Sh FILES
 /dev/i4bctl
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdndecode.8 man8/isdndecode.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdndecode.8	Sat Oct 16 18:50:55 1999
+++ man8/isdndecode.8	Fri Nov 19 19:39:33 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1998, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.2 1999/08/29 15:41:56 peter Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.3 1999/11/15 22:41:05 joe Exp $
 .\"
-.\"	last edit-date: [Fri Dec 18 18:11:31 1998]
+.\"	last edit-date: [Sun Feb 14 10:16:25 1999]
 .\"
 .\"	-hm	writing manual page
 .\"
@@ -129,6 +129,7 @@
 Use
 .Ar unit
 as the transmitting interface unit number in analyze mode.
+.El
 
 .Pp
 When the USR1 signal is sent to a
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntel.8 man8/isdntel.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntel.8	Sat Oct 16 18:50:55 1999
+++ man8/isdntel.8	Fri Nov 19 19:39:32 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	last edit-date: [Sat Dec  5 18:16:19 1998]
+.\"	last edit-date: [Sun Feb 14 10:19:44 1999]
 .\"	
-.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.2 1999/08/29 15:42:10 peter Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.3 1999/11/15 22:41:11 joe Exp $
 .\"
 .Dd July 11, 1998
 .Dt ISDNTEL 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntelctl.8 man8/isdntelctl.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntelctl.8	Sat Oct 16 18:50:55 1999
+++ man8/isdntelctl.8	Fri Nov 19 19:39:33 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,12 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.1 1999/08/29 15:42:12 peter Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.2 1999/11/15 22:41:12 joe Exp $
 .\"
-.\"	last edit-date: [Mon Dec 14 11:34:51 1998]
+.\"	last edit-date: [Wed Apr 21 11:27:34 1999]
 .\"
-.Dd December 14, 1998
-.Dt isdntelctl 8
+.Dd April 21, 1999
+.Dt ISDNTELCTL 8
+.Os
 .Sh NAME
 .Nm isdntelctl
 .Nd control isdn4bsd telephone sound format conversion
@@ -38,6 +39,7 @@
 .Op Fl u Ar unit
 .Op Fl A
 .Op Fl U
+.Op Fl N
 .Sh DESCRIPTION
 .Nm isdntelctl
 is part of the isdn4bsd package and is used to configure the sound format
@@ -53,16 +55,27 @@
 Set the /dev/i4btel unit number. The default value is zero to access
 device /dev/i4btel0.
 .It Fl A
-Set sound format to A-Law.
+Do A-law (ISDN line) -> u-law (userland) conversion.
 .It Fl U
-Set sound format to u-Law.
+Do u-law (ISDN line) -> A-law (userland) conversion.
+.It Fl N
+Set sound conversion to do no format conversion.
+.El
+.Pp
+The telephony data stream comes out of the line in a bit-reversed format,
+so the
+.Xr i4btel 4
+driver does the bit-reversion process in any case.
+.Pp
+Additionally, the user can specify to do A-law to u-law, u-law to A-law
+or no conversion at all in the i4btel driver by using the
+.Nm
+utility.
 .Pp
 .Sh FILES
 /dev/i4btel<n>
-
 .Sh STANDARDS
 A-Law and u-Law are specified in ITU Recommendation G.711.
-
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
@@ -70,9 +83,13 @@
 .Ed
 .Pp
 displays the currently used sound format for device /dev/i4btel0.
-
-.Sh AUTHOR
+.Sh SEE ALSO
+.Xr g711conv 1 ,
+.Xr i4btel 4 ,
+.Xr isdnd.rc 5 ,
+.Xr isdnd 8   
+.Sh AUTHORS
 The
 .Nm
-utility and this manpage were written by Hellmuth Michaelis. He can be
-contacted at hm@kts.org.
+utility and this manpage were written by
+.An Hellmuth Michaelis Aq hm@kts.org
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntrace.8 man8/isdntrace.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/isdntrace.8	Sat Oct 16 18:50:54 1999
+++ man8/isdntrace.8	Fri Nov 19 19:39:31 1999
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.2 1999/08/29 15:42:17 peter Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.3 1999/11/15 22:41:15 joe Exp $
 .\"
-.\"	last edit-date: [Sat Dec  5 18:18:59 1998]
+.\"	last edit-date: [Sun Feb 14 10:22:24 1999]
 .\"
 .Dd October 19, 1998
 .Dt ISDNTRACE 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/loader.4th.8 man8/loader.4th.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/loader.4th.8	Sat Oct 16 18:49:25 1999
+++ man8/loader.4th.8	Fri Nov 19 19:38:13 1999
@@ -22,10 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.1.2.4 1999/08/29 16:20:38 peter Exp $
+.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.1.2.5 1999/10/30 15:59:18 phantom Exp $
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd May 16, 1999
 .Dt LOADER.4TH 8
 .Os
@@ -191,4 +189,3 @@
 .An Daniel C. Sobral Aq dcs@freebsd.org .
 .Sh BUGS
 A british espionage series.
-
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/mixer.8 man8/mixer.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/mixer.8	Sat Oct 16 18:50:56 1999
+++ man8/mixer.8	Fri Nov 19 19:39:34 1999
@@ -25,6 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.1 1999/10/30 19:38:52 mpp Exp $
 .Dd January 9, 1997
 .Dt MIXER 8
 .Os
@@ -130,7 +131,7 @@
 .An Craig Metz Aq cmetz@thor.tjhsst.edu
 and
 .An Hannu Savolainen .
-Mostly rewriten by
+Mostly rewritten by
 .An John-Mark Gurney Aq jmg@FreeBSD.org .
 This
 manual page was written by
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/natd.8 man8/natd.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/natd.8	Sat Oct 16 18:48:47 1999
+++ man8/natd.8	Fri Nov 19 19:37:40 1999
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" $FreeBSD: src/sbin/natd/natd.8,v 1.16.2.5 1999/08/29 15:14:49 peter Exp $
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.16.2.6 1999/10/28 18:55:35 ru Exp $
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
@@ -129,12 +129,12 @@
 (all ports).
 For example, the argument
 
-.Ar tcp inside1:telnet 6666
+.Dl Ar tcp inside1:telnet 6666
 
-means that tcp packets destined for port 6666 on this machine will
+means that incoming tcp packets destined for port 6666 on this machine will
 be sent to the telnet port on the inside1 machine.
 
-.Ar tcp inside2:2300-2399 3300-3399
+.Dl Ar tcp inside2:2300-2399 3300-3399
 
 will redirect incoming connections on ports 3300-3399 to host
 inside2, ports 2300-2399.
@@ -270,7 +270,11 @@
 
 is synonomous with
 .Fl log .
-Empty lines and lines beginning with '#' are ignored.
+.Pp
+Trailing spaces and empty lines are ignored.
+A
+.Ql \&#
+sign will mark the remaining of the line as a comment.
 
 .It Fl reverse
 Reverse operation of natd. This can be useful in some 
@@ -389,10 +393,13 @@
 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
 .Nm
-sees all packets before they are dropped by the firewall.  The firewall
-rules will be run again on each packet after translation by
+sees all packets before they are dropped by the firewall.
+.Pp
+After translation by
 .Nm natd ,
-minus any divert rules.
+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
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/route.8 man8/route.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/route.8	Sat Oct 16 18:48:50 1999
+++ man8/route.8	Fri Nov 19 19:37:43 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" $FreeBSD: src/sbin/route/route.8,v 1.12.2.2 1999/08/29 15:15:22 peter Exp $
+.\" $FreeBSD: src/sbin/route/route.8,v 1.12.2.4 1999/10/16 21:03:24 nsayer Exp $
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
@@ -69,7 +69,7 @@
 when reporting actions.  (The process of translating between symbolic
 names and numerical equivalents can be quite time consuming, and
 may require correct operation of the network; thus it may be expedient
-to forgot this, especially when attempting to repair networking operations).
+to forgo this, especially when attempting to repair networking operations).
 .It Fl v
 (verbose) Print additional details.
 .It Fl q
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/sicontrol.8 man8/sicontrol.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/sicontrol.8	Sat Oct 16 18:51:00 1999
+++ man8/sicontrol.8	Fri Nov 19 19:39:37 1999
@@ -1,5 +1,5 @@
-.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.1 1999/08/29 15:48:15 peter Exp $
-.\" The following requests are required for all man pages.
+.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.2 1999/10/30 15:59:35 phantom Exp $
+.\"
 .Dd September 26,1995
 .Dt SICONTROL 8
 .Os FreeBSD
@@ -67,11 +67,6 @@
 Show the current "tty" structure that the kernel has for the specified port.
 This is not much use outside of debugging the driver.
 .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 FILES
 .Bl -tag -width /dev/si_control -compact
 .It Pa /dev/si_control
@@ -86,20 +81,14 @@
 locked termios state devices, for use by
 .Xr stty 1
 .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 DIAGNOSTICS
 Generally self explanatory.....
-.\" The next request is for sections 2 and 3 error and signal handling only.
-.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr stty 1 ,
 .Xr si 4 ,
 .Xr termios 4 ,
 .Xr tty 4 ,
 .Xr comcontrol 8 .
-.\" .Sh STANDARDS
 .Sh HISTORY
 .Nm Sicontrol
 is loosely based on a utility called
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/trpt.8 man8/trpt.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/trpt.8	Sat Oct 16 18:50:46 1999
+++ man8/trpt.8	Fri Nov 19 19:39:24 1999
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
+.\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.4.2.1 1999/10/30 15:59:35 phantom Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
@@ -130,8 +131,6 @@
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr setsockopt 2
-.\".Xr setsockopt 2 ,
-.\".Xr trsp 8
 .Sh DIAGNOSTICS
 .Bl -tag -width Ds
 .It Sy no namelist
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/watch.8 man8/watch.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991016-STABLE/man/man8/watch.8	Sat Oct 16 18:50:48 1999
+++ man8/watch.8	Fri Nov 19 19:39:25 1999
@@ -1,5 +1,6 @@
 .\"
 .\" @(#)watch.8		1.1 (FreeBSD) 2/17/95
+.\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.14.2.1 1999/10/30 14:57:33 phantom Exp $
 .\"
 .Dd February 17, 1995
 .Dt WATCH 8
@@ -10,7 +11,7 @@
 .Sh SYNOPSIS
 .Nm watch
 .Op Fl ciotnW
-.Ar tty
+.Op Ar tty
 .\"  watch [-ciotnW] [<tty name>]
 .Sh DESCRIPTION
 .Nm Watch

----Next_Part(Sat_Nov_20_23:59:36_1999_518)----
