From owner-man-jp-reviewer@jp.freebsd.org  Sun Dec 19 22:47:25 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA61504;
	Sun, 19 Dec 1999 22:47:25 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from serio.al.rim.or.jp (serio.al.rim.or.jp [202.247.191.251])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA61494
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 19 Dec 1999 22:47:24 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from mail-relay.rim.or.jp by serio.al.rim.or.jp (8.8.8/3.7W/HMX-12) with ESMTP id WAA27148 for <man-jp-reviewer@jp.freebsd.org>; Sun, 19 Dec 1999 22:47:24 +0900 (JST)
Received: from localhost (pppa75.yk.rim.or.jp [202.247.186.75]) by mail-relay.rim.or.jp (3.7W/HMX-12) id WAA22265 for <man-jp-reviewer@jp.freebsd.org>; Sun, 19 Dec 1999 22:47:12 +0900 (JST)
To: man-jp-reviewer@jp.freebsd.org
In-Reply-To: Your message of "Wed, 15 Dec 1999 01:57:52 +0900"
	<19991215015752R.k-horik@yk.rim.or.jp>
References: <19991215015752R.k-horik@yk.rim.or.jp>
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Sun_Dec_19_22:39:30_1999_518)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19991219224633W.k-horik@yk.rim.or.jp>
Date: Sun, 19 Dec 1999 22:46:33 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 2716
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 1830
Subject: [man-jp-reviewer 1830] diff to 3.3-19991217-STABLE
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

----Next_Part(Sun_Dec_19_22:39:30_1999_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 3.3-19991217-STABLE $B$X$N:9J,$G$9!#(B
 
o $B?75,%^%K%e%"%k(B dnskeygen.1 $B$O4^$^$l$^$;$s!#(B


----Next_Part(Sun_Dec_19_22:39:30_1999_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.3-19991217-STABLE
Content-Disposition: attachment; filename=diff_3.3-19991217-STABLE

diff -ur man/man1/apply.1 man/man1/apply.1
--- man/man1/apply.1	Fri Dec 10 19:46:33 1999
+++ man/man1/apply.1	Sun Dec 19 21:30:15 1999
@@ -107,7 +107,7 @@
 .Bl -tag -width SHELL
 .It Ev SHELL
 $BMxMQ$9$k(B shell $B$N%Q%9L>$G$9!#(B
-$B$3$NJQ?t$,Dj5A$5$l$F$$$J$$>l9g$O(B Bourne shell $B$,;H$o$l$^$9!#(B
+$B$3$NJQ?t$,Dj5A$5$l$F$$$J$$>l9g$O(B Bourne $B%7%'%k$,;H$o$l$^$9!#(B
 .El
 .Sh $B;HMQNc(B
 .Bl -tag -width apply -compact
diff -ur man/man1/chpass.1 man/man1/chpass.1
--- man/man1/chpass.1	Sun Nov 28 21:05:40 1999
+++ man/man1/chpass.1	Sun Dec 19 21:30:16 1999
@@ -202,7 +202,7 @@
 $B%U%#!<%k%I$O%f!<%6$N9%$`%3%^%s%I%$%s%?%W%j%?$G$9!#(B
 $B$b$7(B
 .Ar shell
-$B%U%#!<%k%I$,6u$G$"$l$P!"%\!<%s%7%'%k(B
+$B%U%#!<%k%I$,6u$G$"$l$P!"(BBourne $B%7%'%k(B
 .Pa /bin/sh 
 $B$G$"$k$H2>Dj$7$^$9!#(B
 $B%m%0%$%s%7%'%k$rJQ99$9$k$H$-$K!"%9!<%Q%f!<%6$G$O$J$$%f!<%6$O!"(B
diff -ur man/man1/cvs.1 man/man1/cvs.1
--- man/man1/cvs.1	Sun Dec 12 00:59:28 1999
+++ man/man1/cvs.1	Sun Dec 19 21:30:20 1999
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/contrib/cvs/man/cvs.1,v 1.11.2.3 1999/12/13 20:56:50 peter Exp %
 .de Id
 .\" jpman %Id: cvs.1,v 1.4 1997/09/23 13:05:40 jsakai Stab %
 .ds Rv \\$3
@@ -237,6 +238,9 @@
 $B$3$l$K$h$j!"(B
 anoncvs $B%5!<%P>e$J$I$NFI$_=P$7@lMQ%j%]%8%H%j$+$i$N%A%'%C%/%"%&%H$d!"(B
 CDROM $B>e$N%j%]%8%H%j$+$i$N%A%'%C%/%"%&%H$,2DG=$K$J$j$^$9!#(B
+$B4D6-JQ?t(B
+.SM CVSREADONLYFS
+$B$,%;%C%H$5$l$F$$$k>l9g$HF1$88z2L$r;}$A$^$9!#(B
 $B$^$?!"(B
 .B \-R
 $B$r;HMQ$9$k$H(B NFS $B$r2p$7$?%A%'%C%/%"%&%H$,9bB.$K$J$j$^$9!#(B
@@ -323,6 +327,15 @@
 .` "cvs diff"
 $B$r<B9T$9$k$H(B $BA4$F$K$*$$$F(B context diff $B7A<0$,@8@.$5$l$k$H$$$&(B
 $B8z2L$r;}$A$^$9(B)$B!#(B
+.SP
+$BBg0hE*$J%*%W%7%g%s$O!"(B\fBcvs\fP $B%-!<%o!<%I$r;HMQ$7$F;XDj$7$^$9!#(B
+$BNc$($P<!$N(B
+.SP
+cvs \-q
+.SP
+$B$O!"Bg0hE*%*%W%7%g%s(B \-q $B$,;XDj$5$l$?$+$N$h$&$KA4(B
+.` "cvs"
+$B%3%^%s%I$,F0:n$9$k$3$H$r0UL#$7$^$9!#(B
 .SH "CVS COMMAND $B$N$^$H$a(B"
 $B0J2<$OA4(B
 .B cvs
@@ -1996,6 +2009,13 @@
 $B$3$l$,%;%C%H$5$l$F$$$J$$$H$-$O!"%G%U%)%k%H$G$O:n6H%U%!%$%k$N(B
 $BJQ99$,5v2D$5$l$^$9!#(B
 .TP
+.SM CVSREADONLYFS
+$B$3$l$,%;%C%H$5$l$F$$$k$H!"(B
+.B \-R
+$B%*%W%7%g%s$,2>Dj$5$l!"(B
+.B cvs
+$B$NF0:n$,FI$_=P$7@lMQ%j%]%8%H%j%b!<%I$K$J$j$^$9!#(B
+.TP
 .SM RCSBIN
 .BR co ( 1 )
 $B$d(B
@@ -2022,6 +2042,13 @@
 .B cvs
 $B$O(B CVS/Root $B%U%!%$%kCf$N%j%b!<%H$N%j%]%8%H%j$X$N;2>H$rA4$F(B
 $BL5;k$7$^$9!#(B
+.TP
+.SM CVS_OPTIONS
+.B cvs
+$B$N%G%U%)%k%H%*%W%7%g%s$r;XDj$7$^$9!#(B
+$B$3$l$i$N%*%W%7%g%s$O!"(B
+$B%9%?!<%H%"%C%W%U%!%$%k(B (\fI~/.cvsrc\fP) $B$NFI$_9~$_A0$K2r<a$5$l$^$9!#(B
+$B$^$?!"%3%^%s%I%i%$%s%Q%i%a!<%?$K$h$jL@<(E*$K>e=q$-2DG=$G$9!#(B
 .TP
 .SM CVS_RSH
 .B cvs
diff -ur man/man1/date.1 man/man1/date.1
--- man/man1/date.1	Sun Sep  5 01:36:15 1999
+++ man/man1/date.1	Sun Dec 19 21:30:21 1999
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.3 1999/08/29 14:12:03 peter Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp %
 .\"
 .\" jpman %Id: date.1,v 1.2 1997/03/31 23:25:55 mutoh Stab %
 .Dd November 17, 1993
@@ -51,7 +51,7 @@
 .Op Fl t Ar minutes_west
 .Op Fl v Ns Ar [+|-]val Ns Op ymwdHMS
 .Ar ...
-.Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
+.Op Fl f Ar fmt Ar date | [[[[[cc]yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
 .Sh $B2r@b(B
 $B0z?t$J$7$G<B9T$9$k$H!"(B
@@ -89,7 +89,7 @@
 .Fl n
 $B%*%W%7%g%s$r;XDj$7$?>l9g$K$O!"B>$N%^%7%s$N;~9o$OJQ99$7$^$;$s!#(B
 .It Fl r
-$B%(%]%C%/(B (1970$BG/(B1$B7n(B1$BF|(B) $B$+$i(B
+$B4p=`;~E@(B (1970 $BG/(B 1 $B7n(B 1 $BF|(B) $B$+$i(B
 .Ar seconds
 $BIC7P2a$7$?F|;~$rI=<($7$^$9!#(B
 .It Fl t
@@ -132,8 +132,8 @@
 $B$N$$$:$l$+$r;HMQ$7$F!";~9o$N$I$NItJ,$r=$@5$9$k$N$+$r;XDj$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 $BMKF|$b$7$/$O7n$O?tCM$NBe$j$KL>A0$G;XDj2DG=$G$9!#(B
-$BL>A0$H6&$K%W%i%9(B($B$b$7$/$O%^%$%J%9(B)$B5-9f$r;HMQ$7$?>l9g!"(B
-$BF|IU$OE,9g$9$k<!$N(B($BA0$N(B)$BMKF|$b$7$/$O7n$K?J$_$^$9(B($BLa$j$^$9(B)$B!#(B
+$BL>A0$H6&$K%W%i%9(B ($B$b$7$/$O%^%$%J%9(B) $B5-9f$r;HMQ$7$?>l9g!"(B
+$BF|IU$OE,9g$9$k<!$N(B ($BA0$N(B) $BMKF|$b$7$/$O7n$K?J$_$^$9(B ($BLa$j$^$9(B)$B!#(B
 $BMKF|$b$7$/$O7n$,8=:_$N$b$N$HJQ$i$J$$>l9g!"F|$O=$@5$7$^$;$s!#(B
 .Pp
 $B>\:Y$K4X$7$F$O!"2<5-$NNc$r;2>H$7$F2<$5$$!#(B
@@ -153,23 +153,26 @@
 .Pp
 $B$H$7$?$b$N$HF1$8$G$9!#(B
 .Pp
-$B$b$7!"0z?t$,(B``+''$B5-9f$G;O$^$kJ8;zNs$G$J$1$l$P!"$=$l$O%7%9%F%`$K(B
+$B$b$7!"0z?t$,(B ``+'' $B5-9f$G;O$^$kJ8;zNs$G$J$1$l$P!"$=$l$O%7%9%F%`$K(B
 $BF|;~$r@_Dj$9$k$?$a$NCM$H2r<a$5$l$^$9!#F|;~$r@_Dj$9$k$?$a$N@5<0$J(B
 $BI=8=$O0J2<$N$H$*$j$G$9(B:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
+.It Ar cc
+$B@$5*(B (19 $B$^$?$O(B 20 $B$N$$$:$l$+(B) $B$G$"$j!"@>Nq$N>JN,I=8=$NA0$KIU$-$^$9!#(B
 .It Ar yy
-$B@>Nq$N>JN,I=8=$G$9!#@>Nq$N(B 10$B$N0L$H(B 1 $B$N0L$G$9(B(1989$BG/$J$i(B89$B!"(B06$B$J$i(B2006)$B!#(B
+$B@>Nq$N>JN,I=8=$G$9!#@>Nq$N(B 10 $B$N0L$H(B 1 $B$N0L$G$9(B
+(1989 $BG/$J$i(B 89$B!"(B06 $B$J$i(B 2006)$B!#(B
 .It Ar mm
-$B7n$N?t;zI=8=$G$9!#(B1$B$+$i(B12$B$^$G$N?t;z$G$9!#(B
+$B7n$N?t;zI=8=$G$9!#(B1 $B$+$i(B 12 $B$^$G$N?t;z$G$9!#(B
 .It Ar dd
-$BF|$G$9!#(B1$B$+$i(B31$B$^$G$N?t;z$G$9!#(B
+$BF|$G$9!#(B1 $B$+$i(B 31 $B$^$G$N?t;z$G$9!#(B
 .It Ar HH
-$B;~$G$9!#(B0$B$+$i(B23$B$^$G$N?t;z$G$9!#(B
+$B;~$G$9!#(B0 $B$+$i(B 23 $B$^$G$N?t;z$G$9!#(B
 .It Ar MM
-$BJ,$G$9!#(B0$B$+$i(B59$B$^$G$N?t;z$G$9!#(B
+$BJ,$G$9!#(B0 $B$+$i(B 59 $B$^$G$N?t;z$G$9!#(B
 .It Ar .ss
-$BIC$G$9!#(B0$B$+$i(B61$B$^$G$N?t;z$G$9!#(B (59 $BIC(B + 2 $BIC$^$G$N$&$k$&IC(B)
+$BIC$G$9!#(B0 $B$+$i(B 61 $B$^$G$N?t;z$G$9!#(B (59 $BIC(B + 2 $BIC$^$G$N$&$k$&IC(B)
 .El
 .Pp
 $BJ,$N;XDj0J30$O$9$Y$F>JN,2DG=$G$9!#(B
@@ -229,7 +232,7 @@
 .Ed
 .Pp
 $B$O!"(B
-.Dq Li "1985$BG/(B6$B7n(B13$BF|8a8e(B4$B;~(B27$BJ,(B"
+.Dq Li "1985 $BG/(B 6 $B7n(B 13 $BF|8a8e(B 4 $B;~(B 27 $BJ,(B"
 $B$KF|;~$r@_Dj$7$^$9!#(B
 .Pp
 $B0J2<$N%3%^%s%I(B:
@@ -239,7 +242,7 @@
 .Ed
 .Pp
 $B$O!"F|$r=$@5$9$k$3$H$J$/!";~$@$1$r(B
-.Li "$B8a8e(B2$B;~(B32$BJ,(B"
+.Li "$B8a8e(B 2 $B;~(B 32 $BJ,(B"
 $B$K@_Dj$7$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Nm
@@ -279,7 +282,7 @@
 $B%f!<%F%#%j%F%#$O!"(B
 $B@.8y$7$?>l9g$O(B 0 $B$r!"F|;~$r@_Dj$G$-$J$+$C$?>l9g$O(B 1 $B$r!"(B
 $B%m!<%+%k%^%7%s$N@_Dj$O$G$-$?$,!"%0%k!<%W$N%^%7%sA4BN$N@_Dj$K<:GT$7$?(B
-$B>l9g$O(B2$B$rJV$7$^$9!#(B
+$B>l9g$O(B 2 $B$rJV$7$^$9!#(B
 .Pp
 timed $B$,B??t$N%^%7%s$N;~7W$r$"$o$;$k>l9g$K$O!"?7$7$$;~9o$N%;%C%H$K(B
 $B?tIC$+$+$k$3$H$,$"$j$^$9!#$3$N$H$-(B
diff -ur man/man1/dig.1 man/man1/dig.1
--- man/man1/dig.1	Fri Nov 19 23:09:21 1999
+++ man/man1/dig.1	Sun Dec 19 21:53:34 1999
@@ -1,4 +1,4 @@
-.\" %Id: dig.1,v 8.3 1998/03/21 01:01:23 halley Exp %
+.\" %FreeBSD: src/contrib/bind/doc/man/dig.1,v 1.1.1.1.2.1 1999/12/13 15:05:44 peter Exp %
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -131,7 +131,8 @@
 $B%j%>%k%P8GM-$N$b$N$G!"I8=`$N%j%>%k%P$G$O(B
 $B;2>H$5$l$^$;$s(B
 .Pc $B!#(B
-.Ev LOCALRES $BJQ?t$,@_Dj$5$l$F$$$J$$$+!"(B
+.Ev LOCALRES
+$BJQ?t$,@_Dj$5$l$F$$$J$$$+!"(B
 $B@_Dj$5$l$?%U%!%$%k$,FI$_9~$a$J$$>l9g$O!"(B
 .Pa /etc/resolv.conf
 $B$,;H$o$l$^$9!#(B
@@ -287,6 +288,8 @@
 $BLd$$9g$o$;$N%/%i%9$r;XDj$7$^$9!#%/%i%9%U%#!<%k%IFb$N@0?tCM$+!"(B
 $B>e$G=R$Y$?%K!<%b%K%C%/I=8=(B ($B$D$^$j(B in = C_IN) $B$G(B
 $B;XDj$9$k$3$H$,$G$-$^$9!#(B
+.It Fl k Ar keydir:keyname
+$B%G%#%l%/%H%j(B keydir $BCf$N(B TSIG $B%-!<L>(B keyname $B$G!"Ld$$9g$o$;$^$9!#(B
 .It Fl envsav
 $B$3$N%U%i%0$r;XDj$9$k$H!"$9$Y$F$N0z?t$,2r@O$5$l$?8e$G(B
 .Ic dig $B4D6-(B ($B%G%U%)%k%H$dI=<(%*%W%7%g%sEy(B) $B$r(B
diff -ur man/man1/dnsquery.1 man/man1/dnsquery.1
--- man/man1/dnsquery.1	Sat Sep 26 15:19:55 1998
+++ man/man1/dnsquery.1	Sun Dec 19 21:30:22 1999
@@ -1,6 +1,6 @@
-.\" %Id: dnsquery.1,v 8.2 1997/03/14 02:29:41 vixie Exp %
+.\" %Id: dnsquery.1,v 8.3 1999/01/08 18:54:21 vixie Exp %
 .\"
-.\"Copyright (c) 1995, 1996 by Internet Software Consortium
+.\"Copyright (c) 1995,1996,1999 by Internet Software Consortium
 .\"
 .\"Permission to use, copy, modify, and distribute this software for any
 .\"purpose with or without fee is hereby granted, provided that the above
diff -ur man/man1/passwd.1 man/man1/passwd.1
--- man/man1/passwd.1	Fri Nov 19 23:09:21 1999
+++ man/man1/passwd.1	Sun Dec 19 21:56:32 1999
@@ -143,7 +143,7 @@
 $B$O!"%7%9%F%`$N%G%U%)%k%H%I%a%$%sL>$r;H$$$^$9!#$3$N%U%i%0$O<g$K(B
 NIS $B%^%9%?%5!<%P$N%9!<%Q%f!<%6$,;HMQ$9$k$b$N$G$9!#0l$D$N(B NIS 
 $B%^%9%?%5!<%P$,J#?t$N%I%a%$%s$r07$C$F$$$k>l9g$d!"(BNIS $B%^%9%?%5!<%P$G$O(B
-$B%I%a%$%sL>$,@_Dj$5$l$F$$$J$$(B (NIS $B%5!<%P!<$OI,$:$7$b%/%i%$%"%s%H$K$J$k(B
+$B%I%a%$%sL>$,@_Dj$5$l$F$$$J$$(B (NIS $B%5!<%P$OI,$:$7$b%/%i%$%"%s%H$K$J$k(B
 $BI,MW$O$"$j$^$;$s(B) $B>l9g$K!"(B
 .Nm passwd
 $B%3%^%s%I$,$I$N%I%a%$%s$r07$&$N$+$r;XDj$9$kI,MW$,$"$j$^$9!#(B
diff -ur man/man1/rmdir.1 man/man1/rmdir.1
--- man/man1/rmdir.1	Sun Sep  5 01:36:18 1999
+++ man/man1/rmdir.1	Sun Dec 19 21:30:23 1999
@@ -69,9 +69,8 @@
 .It Fl p
 $B3F(B
 .Ar directory
-$B0z?t$r9=@.$9$k3F%G%#%l%/%H%j$K4X$7$F$b!"(B
-$B$=$N%G%#%l%/%H%j$,6u$N>l9g!":o=|$r9T$$$^$9!#(B
-$B:o=|$O:G8e$NMWAG$+$i9T$$$^$9!#(B(
+$B0z?t$K4X$7!";XDj$7$?%Q%9L>$r9=@.$9$kA4$F$N%G%#%l%/%H%j$K$D$$$F!"(B
+$B$=$l$,6u$J$i$P:o=|$7$^$9!#:o=|$O$=$N%Q%9L>$N:G8e$NMWAG$+$i9T$$$^$9!#(B(
 .Xr rm 1
 $B$N40A4$JL5:9JL:F5":o=|$r;2>H$7$F2<$5$$!#(B)
 .El
diff -ur man/man1/script.1 man/man1/script.1
--- man/man1/script.1	Sun Sep  5 01:36:18 1999
+++ man/man1/script.1	Sun Dec 19 21:30:23 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.1 1999/08/29 15:32:37 peter Exp %
+.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.2 1999/12/13 23:47:12 billf Exp %
 .\" jpman %Id: script.1,v 1.2 1997/03/29 08:26:02 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -87,7 +87,7 @@
 .Pp
 .Nm
 $B$O!"%U%)!<%/$7$?%7%'%k(B($B$^$?$O%3%^%s%I(B)$B$r=*N;$7$?$H$-(B (
-$B%\!<%s!&%7%'%k(B
+Bourne $B%7%'%k(B
 .Pf ( Xr sh 1 )
 $B$J$i(B
 .Em control-D
@@ -118,7 +118,7 @@
 .Nm
 $B$,%U%)!<%/$9$k%7%'%k$r;XDj$7$^$9!#(B
 .Ev SHELL
-$B$,@_Dj$5$l$F$$$J$$>l9g$O%\!<%s!&%7%'%k$,;H$o$l$^$9!#(B
+$B$,@_Dj$5$l$F$$$J$$>l9g$O(B Bourne $B%7%'%k$,;H$o$l$^$9!#(B
 ($B$[$H$s$I$N%7%'%k$O$3$NJQ?t$r<+F0E*$K@_Dj$7$^$9(B)
 .El
 .Sh $B4XO"9`L\(B
diff -ur man/man1/test.1 man/man1/test.1
--- man/man1/test.1	Wed Dec  8 00:34:03 1999
+++ man/man1/test.1	Sun Dec 19 21:30:24 1999
@@ -33,18 +33,22 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.1 1999/08/29 14:14:30 peter Exp %
+.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp %
+.\"
 .\" jpman %Id: test.1,v 1.2 1997/03/31 03:43:49 ryo2 Stab %
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
 .Os
 .Sh $BL>>N(B
-.Nm test
+.Nm test ,
+.Nm \&[
 .Nd $B>r7o<0I>2A%f!<%F%#%j%F%#(B
 .Sh $B=q<0(B
 .Nm test
 .Ar expression
+.Nm [
+.Ar expression Cm ]
 .Sh $B2r@b(B
 .Nm
 $B%f!<%F%#%j%F%#$O!"<0$rI>2A$7!"7k2L$,??$J$i(B 0 (true) $B$r!"(B
@@ -56,7 +60,7 @@
 $B%f!<%F%#%j%F%#$KEO$7$^$9!#(B
 .Pp
 $B<0$O0J2<$N4pK\MWAG$+$i9=@.$5$l$^$9(B:
-.Bl -tag -width indent
+.Bl -tag -width Ar
 .It Fl b Ar file
 .Ar file
 $B$,B8:_$7!"$=$l$,%V%m%C%/FC<l%U%!%$%k$G$"$k$J$i$P??$K$J$j$^$9!#(B
@@ -74,10 +78,18 @@
 $B$,B8:_$7!"$=$l$,DL>o%U%!%$%k$G$"$k$J$i$P??$K$J$j$^$9!#(B
 .It Fl g Ar file
 .Ar file
-$B$,B8:_$7!"$=$l$K(B setgid ($B%U%i%0$,N)$C$F$$$l$P??$K$J$j$^$9!#(B
+$B$,B8:_$7!"$=$l$K(B setgid $B%U%i%0$,N)$C$F$$$l$P??$K$J$j$^$9!#(B
 .It Fl h Ar file
 .Ar file
 $B$,B8:_$7!"$=$l$,%7%s%\%j%C%/%j%s%/$G$"$k$J$i$P??$K$J$j$^$9!#(B
+$B$3$N1i;;;R$O!"K\%W%m%0%i%`$N0JA0$N%P!<%8%g%s$H$N8_49@-$N$?$a$K$"$j$^$9!#(B
+$B$3$N1i;;;R$,$"$k$3$H$K0MB8$7$J$$$h$&$K$7$F$/$@$5$$!#(B
+$BBe$j$K(B
+.Fl L
+$B$r;HMQ$7$F$/$@$5$$!#(B
+.It Fl k Ar file
+.Ar file
+$B$,B8:_$7!"$=$l$K%9%F%#%C%-!<%S%C%H$,N)$C$F$$$l$P??$K$J$j$^$9!#(B
 .It Fl n Ar string
 .Ar string
 $B$ND9$5$,(B 0 $B$G$J$1$l$P??$K$J$j$^$9!#(B
@@ -86,19 +98,16 @@
 $B$,L>A0$D$-%Q%$%W(B
 .Po Tn FIFO Pc
 $B$G$"$k$J$i$P??$K$J$j$^$9!#(B
-.It Fl S Ar file
-.Ar file
-$B$,%=%1%C%H$N>l9g$K??$K$J$j$^$9!#(B
 .It Fl r Ar file
 .Ar file
 $B$,B8:_$7!"$=$l$,FI$_9~$_2DG=$G$"$l$P??$K$J$j$^$9!#(B
 .It Fl s Ar file
 .Ar file
 $B$,B8:_$7!"$=$N%U%!%$%k%5%$%:$,(B 0 $B$h$jBg$-$1$l$P??$K$J$j$^$9!#(B
-.It Fl t Ar [file_descriptor]
+.It Fl t Op Ar file_descriptor
 $B%U%!%$%k%G%#%9%/%j%W%?HV9f$,(B
 .Ar file_descriptor
-($B%G%U%)%k%H$G$O(B1) $B$G$"$k%U%!%$%k$,%*!<%W%s$5$l$F$*$j!"$3$l$,C<Kv$K(B
+$B$G$"$k%U%!%$%k$,%*!<%W%s$5$l$F$*$j!"$3$l$,C<Kv$K(B
 $B7k$S$D$1$i$l$F$$$l$P(B
 $B??$K$J$j$^$9!#(B
 .It Fl u Ar file
@@ -121,9 +130,38 @@
 .It Fl z Ar string
 .Ar string
 $B$ND9$5$,(B 0 $B$G$"$l$P??$K$J$j$^$9!#(B
+.It Fl L Ar file
+.Ar file
+$B$,B8:_$7!"%7%s%\%j%C%/%j%s%/$N>l9g$K??$K$J$j$^$9!#(B
+.It Fl O Ar file
+.Ar file
+$B$,B8:_$7!"(B
+$B$=$N=jM-<T$HK\%W%m%;%9$N<B8z%f!<%6(B ID $B$H$,%^%C%A$9$k>l9g$K??$K$J$j$^$9!#(B
+.It Fl G Ar file
+.Ar file
+$B$,B8:_$7!"(B
+$B$=$N%0%k!<%W$HK\%W%m%;%9$N<B8z%0%k!<%W(B ID $B$H$,%^%C%A$9$k>l9g$K??$K$J$j$^$9!#(B
+.It Fl S Ar file
+.Ar file
+$B$,B8:_$7!"%=%1%C%H$N>l9g$K??$K$J$j$^$9!#(B
+.It Ar file1 Fl nt Ar file2
+.Ar file1
+$B$,B8:_$7!"(B
+.Ar file2
+$B$h$j$b?7$7$$>l9g$K??$K$J$j$^$9!#(B
+.It Ar file1 Fl ot Ar file2
+.Ar file1
+$B$,B8:_$7!"(B
+.Ar file2
+$B$h$j$b8E$$>l9g$K??$K$J$j$^$9!#(B
+.It Ar file1 Fl ef Ar file2
+.Ar file1
+$B$H(B
+.Ar file2
+$B$,B8:_$7!"$3$l$i$,F10l$N%U%!%$%k$r;2>H$9$k>l9g$K??$K$J$j$^$9!#(B
 .It Ar string
 .Ar string
-$B$,%J%kJ8;zNs$G$J$1$l$P??$K$J$j$^$9!#(B
+$B$,6uJ8;zNs$G$J$1$l$P??$K$J$j$^$9!#(B
 .It Ar \&s\&1 Cm \&= Ar \&s\&2
 $BJ8;zNs(B
 .Ar \&s\&1
@@ -136,6 +174,22 @@
 $B$H(B 
 .Ar \&s\&2
 $B$,F10l$G$J$1$l$P??$K$J$j$^$9!#(B
+.It Ar \&s\&1 Cm \&< Ar \&s\&2
+$BJ8;zNs(B
+.Ar \&s\&1
+$B$,J8;zNs(B
+.Ar \&s\&2
+$B$KBP$7!"J8;z$N(B ASCII $B=g$K$*$$$FA0$KMh$k>l9g$K??$K$J$j$^$9!#(B
+.It Ar \&s\&1 Cm \&> Ar \&s\&2
+$BJ8;zNs(B
+.Ar \&s\&1
+$B$,J8;zNs(B
+.Ar \&s\&2
+$B$KBP$7!"J8;z$N(B ASCII $B=g$K$*$$$F8e$KMh$k>l9g$K??$K$J$j$^$9!#(B
+.It Ar \&s\&1
+$BJ8;zNs(B
+.Ar \&s\&1
+$B$,6uJ8;zNs$G$J$$>l9g$K??$K$J$j$^$9!#(B
 .It Ar \&n\&1 Fl \&eq Ar \&n\&2 
 $B@0?t(B 
 .Ar \&n\&1
@@ -221,6 +275,6 @@
 .Xr sh 1
 .Sh $B5,3J(B
 .Nm
-$B$N5!G=$O!"(B
+$B%f!<%F%#%j%F%#$O!"(B
 .St -p1003.2
-$B8_49$rA[Dj$7$F$$$^$9!#(B
+$B;EMM$N>e0L8_49<BAu$G$9!#(B
Only in man: man1aout
Only in man: man3
diff -ur man/man8/camcontrol.8 man/man8/camcontrol.8
--- man/man8/camcontrol.8	Tue Dec 14 23:45:41 1999
+++ man/man8/camcontrol.8	Sun Dec 19 21:35:38 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.8 1999/10/28 17:20:07 mph Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp %
 .\"
 .\" jpman %Id: camcontrol.8,v 1.4 1998/12/22 02:35:45 oku Stab %
 .\" WORD: defect list		$B%G%#%U%'%/%H%j%9%H(B[camcontrol.8]
@@ -712,7 +712,7 @@
 $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
-camcontrol -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
+camcontrol cmd -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
 .Ed
 .Pp
 $B$N$h$&$J$3$H$r;n$_$?>l9g!"(Btest unit ready $B%3%^%s%I$GF@$i$l$k%;%s%9>pJs$O(B
diff -ur man/man8/moused.8 man/man8/moused.8
--- man/man8/moused.8	Sun Oct 31 17:50:00 1999
+++ man/man8/moused.8	Sun Dec 19 21:35:40 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.5 1999/10/15 13:03:50 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.7 1999/12/17 09:59:07 sheldonh Exp %
 .\"
 .\" jpman %Id: moused.8,v 1.3 1997/07/22 16:52:17 horikawa Stab %
 .Dd December 3, 1997
diff -ur man/man8/named-xfer.8 man/man8/named-xfer.8
--- man/man8/named-xfer.8	Sat Sep 26 15:20:19 1998
+++ man/man8/named-xfer.8	Sun Dec 19 21:35:40 1999
@@ -49,6 +49,24 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\" -
+.\" Portions Copyright (c) 1999 by Check Point Software Technologies, Inc.
+.\" 
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies, and that
+.\" the name of Check Point Software Technologies Incorporated not be used 
+.\" in advertising or publicity pertaining to distribution of the document 
+.\" or software without specific, written prior permission.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND CHECK POINT SOFTWARE TECHNOLOGIES 
+.\" INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.   
+.\" IN NO EVENT SHALL CHECK POINT SOFTWARE TECHNOLOGIES INCORPRATED
+.\" BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR 
+.\" ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\" 
 .\" --Copyright--
 .\"
 .\"	from named.8	6.6 (Berkeley) 2/14/89
@@ -66,10 +84,14 @@
 .Fl s Ar serial_no
 .Op Fl d Ar debuglevel
 .Op Fl l Ar debug_log_file
+.Op Fl i Ar ixfr_file
 .Op Fl t Ar trace_file
 .Op Fl p Ar port#
 .Op Fl S 
-.Ar nameserver ...
+.Ar nameserver 
+.Op Ar [ Sy axfr 
+| 
+.Op Sy ixfr ]
 .Sh $B2r@b(B
 .Nm
 $B$O!"(B
@@ -90,7 +112,7 @@
 .Ar db_file
 $B$N%U%!%$%kL>$r;XDj$7$^$9!#(B
 .It Fl s Ar serial_no
-$BE>Aw$5$l$k%>!<%s$N>pJs$N%7%j%"%kHV9f$r;XDj$7$^$9!#%W%i%$%^%j%5!<%P!<$+$i(B
+$BE>Aw$5$l$k%>!<%s$N>pJs$N%7%j%"%kHV9f$r;XDj$7$^$9!#%W%i%$%^%j%5!<%P$+$i(B
 $BF@$?(B
 .Sy SOA RR
 $B$,!"$3$N%7%j%"%kHV9f$h$j$b9b$$%7%j%"%kHV9f$r;}$?$J$$(B
@@ -108,11 +130,17 @@
 $B$G$9!#$3$N%*%W%7%g%s$O(B
 .Fl d
 $B$HF1;~$K;XDj$5$l$?$H$-$N$_E,MQ$5$l$^$9$N$GCm0U$7$F$/$@$5$$!#(B
+.It Fl i Ar ixfr_file
+.Ar ixfr_file 
+$B$NL>A0$r;XDj$7$^$9!#(B
+Incremental Zone Transfer (IXFR) $B$K$h$j%>!<%sJQ99FbMF$r(B
+$B%W%i%$%^%j%5!<%P$+$i<u?.$9$k$H!"(B
+$B$3$N%>!<%sJQ99FbMF$r$3$N%U%!%$%k$K%@%s%W(B ($B3JG<(B) $B$7$^$9!#(B
 .It Fl t Ar trace_file
 $B%>!<%s>pJsE>Aw$N%W%m%H%3%k%H%l!<%9$r3JG<$9$k%H%l!<%9%U%!%$%k(B
 .Ar trace_file
 $B$r;XDj$7$^$9!#(B
-$B$3$N%*%W%7%g%s$O%M!<%`%5!<%P!<$=$N$b$N$r%G%P%C%0$9$k?M$K$H$C$F$N$_(B
+$B$3$N%*%W%7%g%s$O%M!<%`%5!<%P$=$N$b$N$r%G%P%C%0$9$k?M$K$H$C$F$N$_(B
 $BM-1W$J$N$+$b$7$l$^$;$s!#(B
 .It Fl p Ar port#
 $B%G%U%)%k%H0J30$N%]!<%HHV9f$r;HMQ$9$k$H$-$K;XDj$7$^$9!#(B
@@ -134,18 +162,29 @@
 $B$r;2>H$7$F$/$@$5$$!#(B
 .El
 .Pp
-$BIU2CE*$J0z?t$H$7$F%M!<%`%5!<%P!<$N%"%I%l%9$r!"$$$o$f$k(B
+$BIU2CE*$J0z?t$H$7$F%M!<%`%5!<%P$N%"%I%l%9$r!"$$$o$f$k(B
 .Dq dotted-quad
 $B9=J8$G(B
 .Em $B$N$_(B
 $B!"$H$j$^$9!#%M!<%`%5!<%P$N%"%I%l%9$N>JN,$O5v$5$l$^$;$s!#(B
 $B>/$J$/$H$b0l$D$N%"%I%l%9$r;XDj$7$J$/$F$O$J$j$^$;$s!#(B
-$B%M!<%`%5!<%P!<$N%"%I%l%9$,J#?t;XDj$5$l$k$H!":G=i$N%5!<%P!<$,E>Aw$r<:GT$9$k$H!"(B
-$B=gHV$K%5!<%P!<$r@ZBX$($FE>Aw$r;n$_$^$9!#(B
+$B%M!<%`%5!<%P$N%"%I%l%9$,J#?t;XDj$5$l$k$H!":G=i$N%5!<%P$,E>Aw$r<:GT$9$k$H!"(B
+$B=gHV$K%5!<%P$r@ZBX$($FE>Aw$r;n$_$^$9!#(B
+$B%M!<%`%5!<%P%"%I%l%9$N8e$N(B
+.Sy axfr 
+$B$^$?$O(B
+.Sy ixfr 
+$B$O!"<B9T$9$k%>!<%sE>Aw%?%$%W$r;XDj$7$^$9!#(B
+$BA4%>!<%sE>Aw$K$O(B
+.Sy axfr  
+$B$r;HMQ$7!"%$%s%/%j%a%s%?%k%>!<%sE>Aw$K$O(B
+.Sy ixfr 
+$B$r;HMQ$7$F$/$@$5$$!#(B
 .Sh $B4XO"9`L\(B
 .Xr hostname 7,
 .Xr named 8 ,
 .Xr resolver 3 ,
 .Xr resolver 5 ,
-RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, 
+RFC 1123, RFC 1995
 .Dq Name Server Operations Guide for Sy BIND .
diff -ur man/man8/named.8 man/man8/named.8
--- man/man8/named.8	Fri Nov 19 23:09:24 1999
+++ man/man8/named.8	Sun Dec 19 21:35:41 1999
@@ -69,7 +69,7 @@
 .Pc
 .Ar config_file
 .Oc
-.Op Fl f q r
+.Op Fl f q r v
 .Op Fl u Ar user_name
 .Op Fl g Ar group_name
 .Op Fl t Ar directory
@@ -119,7 +119,7 @@
 $B$h$j$b$+$J$j@vN}$5$l$F$$$^$9!#(B
 $B@_Dj%U%!%$%k$N(B
 .Dq Li logging
-$B@k8@$O(B($BLd$$9g$o$;$dFb(B/$B30$X$NE>Aw$J$I$N(B)$BB?$/$N<oN`$K$o$?$k%$%Y%s%H(B
+$B@k8@$O(B ($BLd$$9g$o$;$dFb(B/$B30$X$NE>Aw$J$I$N(B) $BB?$/$N<oN`$K$o$?$k%$%Y%s%H(B
 $B$=$l$>$l$KBP$7$F!"J#?t$NJL!9$J%G%P%C%0%l%Y%k$r@_Dj$9$k$3$H$,$G$-$^$9!#(B
 $B$3$l$i$N9-HO0O$K$o$?$k?7$7$$5!G=$K4X$9$k99$J$k>pJs$O!"$3$N(B
 .Sy BIND
@@ -167,7 +167,7 @@
 .It Fl f
 $B$3$N%W%m%;%9$rI=$GF0$+$7!"(B
 .Xr fork 2
-$B$d%G!<%b%s2=$r$7$^$;$s(B($B%G%U%)%k%H$G$O%G!<%b%s2=$r$7$^$9(B)$B!#(B
+$B$d%G!<%b%s2=$r$7$^$;$s(B ($B%G%U%)%k%H$G$O%G!<%b%s2=$r$7$^$9(B)$B!#(B
 .It Fl q
 .Nm NAMED 
 $B$,(B
@@ -187,7 +187,7 @@
 $BG[I[J*$K4^$^$l$k@_Dj%U%!%$%k%,%$%I$r;2>H$7$F$/$@$5$$!#(B
 .It Fl r
 $B:F5"E*$J%M!<%`%5!<%P$NLd$$9g$o$;$rM^;_$7$^$9!#(B
-$BLd$$9g$o$;$KBP$7$F$O%m!<%+%k%>!<%s(B($B%W%i%$%^%j$b$7$/$O%;%+%s%@%j(B)$B$+$i$N$_(B
+$BLd$$9g$o$;$KBP$7$F$O%m!<%+%k%>!<%s(B ($B%W%i%$%^%j$b$7$/$O%;%+%s%@%j(B) $B$+$i$N$_(B
 $B2sEz$5$l$^$9!#(B
 $B$3$N;XDj$O%k!<%H%5!<%P$K$F;HMQ$9$k$3$H$,$G$-$^$9!#(B
 $B%G%U%)%k%H$G$O:F5"E*$JLd$$9g$o$;$r9T$J$$$^$9!#(B
@@ -198,6 +198,8 @@
 $B@k8@$N(B
 .Dq Li recursion 
 $B@a$K$h$C$F>e=q$-$5$l!"$^$?$=$A$i$N$[$&$,?d>)$5$l$F$$$^$9!#(B
+.It Fl v
+$B%P!<%8%g%s$rJs9p$7!"=*N;$7$^$9!#(B
 .It Fl u Ar user_name
 $B%f!<%6$r;XDj$9$k$H!"=i4|2=8e$N%5!<%P$,$3$N%f!<%6$GF0:n$7$^$9!#(B
 $BCM$O%f!<%6L>$^$?$O?t;z$N%f!<%6(B ID $B$I$A$i$G$b9=$$$^$;$s!#(B
@@ -243,6 +245,7 @@
 .Bd -literal -offset indent
 $INCLUDE <filename> <opt_domain>
 $ORIGIN <domain>
+$TTL <ttl>
 <domain> <opt_ttl> <opt_class> <type> <resource_record_data>
 .Ed
 .Pp
@@ -274,11 +277,14 @@
 $B%U%#!<%k%I$d%$%s%/%k!<%I%U%!%$%kCf$N(B
 .Li $ORIGIN 
 $B@k8@$O$=$N%U%!%$%k<+?H$N8=:_$N5/E@$rJQ99$9$k$3$H$O$"$j$^$;$s!#(B
+.It Ar ttl
+$BL@<(E*$J(B TTL (time-to-live) $B$r;}$?$J$$(B
+$B>-Mh$N%l%3!<%I$N$?$a$N%G%U%)%k%H$N(B TTL $B$r!"@0?tCM$G;XDj$7$^$9!#(B
 .It Ar opt_ttl
 $B$3$N%U%#!<%k%I$O%*%W%7%g%s$G$"$j!"(B
 time-to-live $B$r@0?tCM$G;XDj$7$^$9!#(B
-$B$3$N%G%U%)%k%HCM$O(B 0 $B$G$"$j!"(B
-$B$=$N%>!<%s$N(B SOA $B%l%3!<%I$K;XDj$5$l$?:G>.CM$r0UL#$7$^$9!#(B
+$B@_Dj$5$l$J$$>l9g!"(BTTL $B$O:G8e$N(B $TTL $BJ8$+$i<hF@$5$l$^$9!#(B
+$TTL $BJ8$,B8:_$7$J$$>l9g!"(BSOA $B$N:G>.CM$,;HMQ$5$l!"7Y9p$,@8@.$5$l$^$9!#(B
 .It opt_class
 $B%*%V%8%'%/%H$N%"%I%l%9$N7?$r;XDj$7$^$9!#(B
 $B8=:_$O(BDARPA$B%$%s%?!<%M%C%H$K@\B3$9$k%*%V%8%'%/%H$G$"$k(B
@@ -303,7 +309,8 @@
 .It Dv SOA
 $B%*!<%=%j%F%#%>!<%s%G!<%?$N3+;O$r<($7$^$9!#(B
 ($B%[%9%H$NB0$9$k%I%a%$%s!"%a%s%F%J$N%I%a%$%s%"%I%l%9!"(B
-$B%7%j%"%kHV9f!"$=$N8e$K%j%U%l%C%7%e!"%j%H%i%$!"M-8z4|8B!":G>.(B TTL (RFC 883$B$r;2>H(B)
+$B%7%j%"%kHV9f!"$=$N8e$K%j%U%l%C%7%e!"%j%H%i%$!"M-8z4|8B!":G>.(B TTL
+(RFC 883 $B$H(B RFC 2308 $B$r;2>H(B)
 $B$N3FCM$rIC$G;XDj$7$?%Q%i%a!<%?$,B3$/(B)$B!#(B
 .It Dv NULL
 $B%L%k%j%=!<%9%l%3!<%I(B ($B7A<0$d%G!<%?$O$"$j$^$;$s(B)
@@ -362,9 +369,6 @@
 $B%j%H%i%$;~4V(B (retry) $B$N4V3V$G%j%U%l%C%7%e$,;n$_$i$l$^$9!#(B
 $B4|8B@Z$l;~4V(B (expire) $B$,2a$.$F%^%9%?%5!<%P$K@\B3$G$-$J$$>l9g$O!"(B
 $B%;%+%s%@%j%5!<%P$O$=$N%>!<%s$N$9$Y$F$N%G!<%?$rGK4~$7$^$9!#(B
-$B:G>.CM(B (minimum) $B$O%U%!%$%kCf$N@8B8;~4V(B
-.Pq Dq TTL
-$B$,L@<(E*$K;XDj$5$l$F$$$J$$%l%3!<%I$N@8B8;~4V$H$J$j$^$9!#(B
 .Sh $BCm(B
 $B%V!<%H%U%!%$%k$G$N(B
 .Dq Li domain
@@ -410,9 +414,7 @@
 .Pa /var/tmp
 $B$K%@%s%W$7$^$9!#(B
 .It Dv SIGTERM
-$B%W%i%$%^%j$*$h$S%;%+%s%@%j$N%G!<%?%Y!<%9%U%!%$%k$r%@%s%W$7$^$9!#(B
-$B%5!<%P$,F0E*99?7$rM-8z$K$7$F%3%s%Q%$%k$5$l$F$$$l$P!"(B
-$B%7%c%C%H%@%&%s;~$K99?7$5$l$?%G!<%?$r%;!<%V$9$k$?$a$K;HMQ$5$l$^$9!#(B
+$B99?7$5$l$?%G!<%?$,B8:_$9$l$P$3$l$rJ]B8$7!"%5!<%P$r%7%c%C%H%@%&%s$7$^$9(B
 .It Dv SIGUSR1
 $B%G%P%C%05!G=$rM-8z$K$7$^$9!#(B
 .Dv SIGUSR1
@@ -459,4 +461,5 @@
 .Xr resolver 5 , 
 .Xr signal 2 ,
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 2308
 .Dq Name Server Operations Guide for Sy BIND
diff -ur man/man8/named.reload.8 man/man8/named.reload.8
--- man/man8/named.reload.8	Sat Jul 31 20:16:07 1999
+++ man/man8/named.reload.8	Sun Dec 19 21:35:42 1999
@@ -52,8 +52,8 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" %FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.1.2.1 1999/12/13 15:08:25 peter Exp %
 .\"
-.\" Original Revision: 1.1
 .\" jpman %Id: named.reload.8,v 1.2 1997/05/17 16:55:28 horikawa Stab %
 .\"
 .TH NAMED.RELOAD 8 "June 26, 1993"
diff -ur man/man8/named.restart.8 man/man8/named.restart.8
--- man/man8/named.restart.8	Sat Jul 31 20:16:07 1999
+++ man/man8/named.restart.8	Sun Dec 19 21:35:42 1999
@@ -52,8 +52,8 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" %FreeBSD: src/usr.sbin/named.restart/named.restart.8,v 1.1.2.1 1999/12/13 15:08:27 peter Exp %
 .\"
-.\" Original Revision: 1.1
 .\" jpman %Id: named.restart.8,v 1.2 1997/05/17 16:56:47 horikawa Stab %
 .\"
 .TH NAMED.RESTART 8 "June 26, 1993"
diff -ur man/man8/ndc.8 man/man8/ndc.8
--- man/man8/ndc.8	Sat Sep 26 15:20:19 1998
+++ man/man8/ndc.8	Sun Dec 19 21:35:42 1999
@@ -1,143 +1,137 @@
-.\" Copyright (c) 1994
-.\"    The Regents of the University of California.  All rights reserved.
-.\" 
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\" 	This product includes software developed by the University of
-.\" 	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 1998,1999 by Internet Software Consortium
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+.\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+.\" CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+.\" SOFTWARE.
 .\"
 .\" jpman %Id: ndc.8,v 1.3 1997/09/07 14:10:53 horikawa Stab %
-.Dd November 27, 1994
+.Dd December 31, 1998
 .Dt NDC 8 
 .Os BSD 4
 .Sh $BL>>N(B
 .Nm ndc 
-.Nd $B%M!<%`%5!<%P%G!<%b%s@)8f%$%s%?%U%'!<%9(B
+.Nd $B%M!<%`%5!<%P%G!<%b%s@)8f%W%m%0%i%`(B
 .Sh $B=q<0(B
 .Nm ndc
-.Ar directive
-.Op Ar ... 
+.Op Fl c Ar channel
+.Op Fl l Ar localsock
+.Op Fl p Ar pidfile
+.Op Fl d
+.Op Fl q
+.Op Fl s
+.Op Fl t
+.Op Ar command
 .Sh $B2r@b(B
-$B$3$N%3%^%s%I$r;HMQ$9$k;v$K$h$j!"%M!<%`%5!<%P$N4IM}<T$O%M!<%`%5!<%P$K(B
-$B3F<o%7%0%J%k$rAw$C$?$j!"%M!<%`%5!<%P$r%j%9%?!<%H$9$k;v$,$G$-$^$9!#(B
-$B0J2<$N%j%9%H$N(B 0 $B8D0J>e$NL?Na$r;XDj$9$k;v$,$G$-$^$9!#(B
-.Bl -tag -width "querylog"
-.It Ic status
-.Xr ps 1
-$B$GF@$i$l$k(B
-.Xr named 8
-$B$N8=:_$N>uBV$rI=<($7$^$9!#(B
-.It Ic dumpdb
-.Ic named
-$B$N%G!<%?%Y!<%9$*$h$S%-%c%C%7%e$r(B
-.Pa /var/tmp/named_dump.db
-$B$K=PNO$7$^$9!#(B
-(
-.Dv INT
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-.It Ic reload
-.Ic named
-$B$NA4$F$N%W%i%$%^%j$*$h$S%;%+%s%@%j%>!<%s$N%7%j%"%kHV9f$rD4$Y!"(B
-$BJQ99$N$"$C$?$b$N$r%j%m!<%I$7$^$9!#(B
-(
-.Dv HUP
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-.It Ic stats
-.Ic named
-$B$N8=:_$NE}7WE*$J>u67$r(B
-.Pa /var/tmp/named.stats
-$B$K=PNO$7$^$9!#(B
-(
-.Dv IOT
-$B$J$$$7(B
-.Dv ABRT
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-.It Ic trace
-.Ic named
-$B$N(B
-.Dq $B%H%l!<%9%l%Y%k(B
-$B$r(B 1 $B$@$1A}2C$5$;$^$9!#%H%l!<%9%l%Y%k$,(B 0 $B0J>e$N;~!"(B
-$B%H%l!<%9>pJs$O(B
-.Pa /var/tmp/named.run
-$B$K=PNO$7$^$9!#%H%l!<%9%l%Y%k$,9b$$Dx!">\:Y$J>pJs$,F@$i$l$^$9!#(B
-(
-.Dv USR1
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-.It Ic notrace
-.Ic named
-$B$N(B
-.Dq $B%H%l!<%9%l%Y%k(B
-$B$r(B 0 $B$K$7!"(B
-.Pa /var/tmp/named.run
-$B$,%*!<%W%s$5$l$F$$$l$P%/%m!<%:$7$^$9!#(B
-(
-.Dv USR2
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-.It Ic querylog
-.Ic named
-$B$N(B
-.Dq $BLd$$9g$o$;5-O?(B
-$B$r!"8=:_M-8z$K$J$C$F$$$l$PL58z$X!"(B
-$B8=:_L58z$K$J$C$F$$$l$PM-8z$XJQ99$7$^$9!#(B
-(
-.Dv WINCH
-$B%7%0%J%k$rMQ$$$^$9!#(B)
-$BLd$$9g$o$;5-O?$,M-8z$K$J$C$F$$$k>l9g!"(B
-$B%M!<%`%5!<%P$X$NLd$$9g$o$;>pJs$r(B
-.Xr syslog 2
-$B$G5-O?$7$^$9!#(B
-$BLd$$9g$o$;5-O?$rM-8z$K$9$k$HHs>o$KB?$/$N>pJs$,%m%0%U%!%$%k$K(B
-$B5-O?$5$l$k$3$H$KCm0U$7$F2<$5$$!#$3$NL?Na$O(B
-.Ic qrylog
-$B$H;XDj$9$k$3$H$b2DG=$G$9!#(B
-.It Ic start
-.Ic named
-$B$,<B9TCf$G$J$1$l$P!"<B9T$r3+;O$7$^$9!#(B
-.It Ic stop
-.Ic named
-$B$,<B9TCf$G$"$l$P!"Dd;_$7$^$9!#(B
-.It Ic restart
-.Ic named
-$B$rDd;_$5$;$?8e!":FEY<B9T$7$^$9!#(B
-.El
-.Sh $B%P%0(B
-.Ic named
-$B$X$N0z?t$O!"(B
-.Ic restart
-$B$G$OJ]B8$5$l$:!"(B
-.Ic start
-$B$G$O;XDj$G$-$^$;$s!#(B
+$B$3$N%3%^%s%I$r;HMQ$9$k;v$K$h$j!"%7%9%F%`4IM}<T$O%M!<%`%5!<%P$r@)8f2DG=$G$9!#(B
+.Ar command
+$B$r;XDj$7$J$$$H!"(B
+.Ic ndc
+$B$O!"(BEOF $B$rFI$_9~$`$^$G$N4V%3%^%s%IF~NO$rB%$7$^$9!#(B
 .Pp
-$B%Q%i%a!<%?$d4D6-$r@)8f$9$k2?$i$+$NJ}K!$,I,MW$G$7$g$&!#(B
-.Pp
-.Xr sh 1
-$B%9%/%j%W%H$K$h$j:n@.$5$l$F$$$^$9!#(B
+$B%*%W%7%g%s$O<!$NDL$j$G$9(B:
+.Bl -tag -width Fl
+.It Fl c Ar channel
+$B@)8f%A%c%M%k$N%i%s%G%V%]%$%s%H$r;XDj$7$^$9!#(B
+$B%G%U%)%k%H$O(B
+.Pa /var/run/ndc
+$B$G$9(B (UNIX $B%I%a%$%s%=%1%C%H$G$"$j!"%5!<%P$N%G%U%)%k%H$N@)8f%A%c%M%k$G$9(B)$B!#(B
+$BMW5a$9$k@)8f%A%c%M%k$,(B TCP/IP $B%=%1%C%H$N>l9g!"(B
+.Ar channel
+$B0z?t$N=q<0$O(B
+.Sy ipaddr/port
+$B$K$J$j$^$9(B ($BNc$($P(B
+.Sy 127.0.0.1/54
+$B$O!"%m!<%+%k%[%9%H$N(B TCP $B%]!<%H(B 54 $B$K$J$j$^$9!#(B)
+.It Fl l Ar localsock
+$BK\%*%W%7%g%s$O!"%/%i%$%"%s%HB&$N@)8f%A%c%M%k$rFCDj$N%"%I%l%9$K(B
+.Xr bind 2
+$B$7$^$9!#(B
+$BFCDj$N%"%I%l%90J30$+$i$N@\B3$r5qH]$9$k$h$&$K!"%5!<%P$r@_Dj2DG=$G$9!#(B
+$B=q<0$O(B
+.Ar channel
+$B$N$b$N$HF1$8$G$9(B ($B>e=R;2>H(B)$B!#(B
+.It Fl p Ar pidfile
+$B8E$$%M!<%`%5!<%P$H$N8eJ}8_49@-$N$?$a!"@)8fDL?.MQ$K(B
+.Ic ndc
+$B$O(B UNIX $B%7%0%J%k$r;HMQ2DG=$G$9!#(B
+$B$3$N5!G=$O8=:_$N%M!<%`%5!<%P$G$O%*%W%7%g%s$G$"$j!"$$$D$+$9$Y$F>CLG$7$^$9!#(B
+$B;HMQ2DG=$J(B
+.Ar command
+$B$N=89g$O!"(B
+$B%7%0%J%k$K$h$k%$%s%?%U%'!<%9$r;HMQ$7$?>l9g$NJ}$,69$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$*$=$i$/(B
+.Ar pidfile
+$B0z?t$O(B
+.Pa /var/run/named.pid
+$B$N$h$&$J$b$N$G$9!#(B
+.It Fl d
+$B%G%P%C%0=PNO$rM-8z$K$7$^$9!#<g$K3+H/<T$,6=L#$r;}$D$b$N$G$9!#(B
+.It Fl q
+$B%W%m%s%W%H$H7k2L$N%F%-%9%H=PNO$rM^@)$7$^$9!#(B
+.It Fl s
+$BCWL?E*$G$J$$%(%i!<=PNO$rM^@)$7$^$9!#(B
+.It Fl t
+$B%W%m%H%3%k$H%7%9%F%`$N%H%l!<%9$rM-8z$K$7$^$9!#(B
+$B%$%s%9%H!<%k;~$N%G%P%C%0$KM-MQ$G$9!#(B
+.El
+.Sh $B%3%^%s%I(B
+$B$$$/$D$+$N%3%^%s%I$O(B
+.Ic ndc
+$B$KAH$_9~$^$l$F$$$^$9!#(B
+$B%M!<%`%5!<%P$,%5%]!<%H$9$k40A4$J%3%^%s%I%;%C%H$OF0E*$G$"$j!"$3$l$O(B
+.Ar help
+$B%3%^%s%I(B ($B8e=R;2>H(B) $B$G3NG'$G$-$k$O$:$G$9!#(B
+$BAH$_9~$_%3%^%s%I$O<!$NDL$j$G$9(B:
+.Bl -tag -width Fl
+.It Ar /help
+$BAH$_9~$_%3%^%s%IMQ$N%X%k%W$rDs6!$7$^$9!#(B
+.It Ar /exit
+.Ic ndc
+$B%3%^%s%I%$%s%?%W%j%?$+$iH4$1$^$9!#(B
+.It Ar /trace
+$B%H%l!<%95!G=$r@Z$jBX$($^$9(B ($BA0=R$N(B
+.Fl t
+$B$N5-=R$r;2>H(B)$B!#(B
+.It Ar /debug
+$B%G%P%C%05!G=$r@Z$jBX$($^$9(B ($BA0=R$N(B
+.Fl d
+$B$N5-=R$r;2>H(B)$B!#(B
+.It Ar /quiet
+$B@E<d5!G=$r@Z$jBX$($^$9(B ($BA0=R$N(B
+.Fl q
+$B$N5-=R$r;2>H(B)$B!#(B
+.It Ar /silent
+$BD@L[5!G=$r@Z$jBX$($^$9(B ($BA0=R$N(B
+.Fl s
+$B$N5-=R$r;2>H(B)$B!#(B
+.El
+.Sh $BCm<a(B
+.Ar pidfile
+$B%b!<%I$G<B9T$9$k$H!"(B
+.Ar start
+$B$H(B
+.Ar restart
+$B$N%3%^%s%I$X$N0z?t$O!"?7$7$$(B
+.Ic named
+$B$KBP$9$k%3%^%s%I%i%$%s$H$7$FEO$5$l$^$9!#(B
+.Ar channel
+$B%b!<%I$G<B9T$9$k$H!"(B
+.Ar start
+$B%3%^%s%I$OL5$/!"(B
+.Ar restart
+$B%3%^%s%I$OC1$K%M!<%`%5!<%P$KBP$7$F<+8J$r(B
+.Xr execvp 2
+$B$9$k$h$&DLCN$7$^$9!#(B
 .Sh $B:n<T(B
 Paul Vixie (Internet Software Consortium)
-.SH $B4XO"9`L\(B
-.Xr named 8 ,
-.Xr named.reload 8 ,
-.Xr named.restart 8 .
+.Sh $B4XO"9`L\(B
+.Xr named 8
diff -ur man/man8/rpc.rstatd.8 man/man8/rpc.rstatd.8
--- man/man8/rpc.rstatd.8	Sun Sep  5 01:36:21 1999
+++ man/man8/rpc.rstatd.8	Sun Dec 19 21:57:17 1999
@@ -39,12 +39,12 @@
 .Os BSD 4.3
 .Sh $BL>>N(B
 .Nm rpc.rstatd 
-.Nd $B%+!<%M%kE}7W%5!<%P!<(B
+.Nd $B%+!<%M%kE}7W%5!<%P(B
 .Sh $B=q<0(B
 .Nm /usr/libexec/rpc.rstatd
 .Sh $B2r@b(B
 .Nm
-$B$O%+!<%M%k$+$i@-G=E}7W$r<hF@$9$k%5!<%P!<$G$9!#(B
+$B$O%+!<%M%k$+$i@-G=E}7W$r<hF@$9$k%5!<%P$G$9!#(B
 $B$3$NE}7W$O!"(B
 .Xr rup 1
 $B%3%^%s%I$r;H$C$FFI$`$3$H$,$G$-$^$9!#(B
Only in man: whatis

----Next_Part(Sun_Dec_19_22:39:30_1999_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ediff_3.3-19991217-STABLE
Content-Disposition: attachment; filename=ediff_3.3-19991217-STABLE

diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/[.1 man1/[.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/[.1	Mon Dec 13 19:59:33 1999
+++ man1/[.1	Fri Dec 17 21:27:13 1999
@@ -33,20 +33,23 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/test/test.1,v 1.8.2.1 1999/08/29 14:14:30 peter Exp $
+.\" $FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
 .Os
 .Sh NAME
-.Nm test
+.Nm test ,
+.Nm \&[
 .Nd condition evaluation utility
 .Sh SYNOPSIS
 .Nm test
 .Ar expression
+.Nm [
+.Ar expression Cm ]
 .Sh DESCRIPTION
 The
-.Nm
+.Nm test
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -54,11 +57,11 @@
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm
+.Nm test
 utility.
 .Pp
 The following primaries are used to construct expression:
-.Bl -tag -width indent
+.Bl -tag -width Ar
 .It Fl b Ar file
 True if
 .Ar file
@@ -90,6 +93,14 @@
 True if
 .Ar file
 exists and is a symbolic link.
+This operator is retained for compatibility with previous versions of
+this program. Do not rely on its existence; use
+.Fl L
+instead.
+.It Fl k Ar file
+True if
+.Ar file
+exists and its sticky bit is set.
 .It Fl n Ar string
 True if the length of
 .Ar string
@@ -99,25 +110,20 @@
 .Ar file
 is a named pipe
 .Po Tn FIFO Pc .
-.It Fl S Ar file
-True if
-.Ar file
-is a socket. 
 .It Fl r Ar file
 True if
-.Ar file
+.Ar file 
 exists and is readable.
 .It Fl s Ar file
 True if
 .Ar file
 exists and has a size greater
 than zero.
-.It Fl t Ar [file_descriptor]
+.It Fl t Op Ar file_descriptor
 True if the file whose file descriptor number
 is
 .Ar file_descriptor
-(default 1) is open and is
-associated with a terminal.
+is open and is associated with a terminal.
 .It Fl u Ar file
 True if
 .Ar file
@@ -146,6 +152,38 @@
 True if the length of
 .Ar string
 is zero.
+.It Fl L Ar file
+True if 
+.Ar file
+exists and is a symbolic link.
+.It Fl O Ar file
+True if
+.Ar file
+exists and its owner matches the effective user id of this process.
+.It Fl G Ar file
+True if
+.Ar file
+exists and its group matches the effective group id of this process.
+.It Fl S Ar file
+True if
+.Ar file
+exists and is a socket.
+.It Ar file1 Fl nt Ar file2
+True if
+.Ar file1
+exists and is newer than
+.Ar file2 .
+.It Ar file1 Fl ot Ar file2
+True if
+.Ar file1
+exists and is older than
+.Ar file2 .
+.It Ar file1 Fl ef Ar file2
+True if
+.Ar file1
+and
+.Ar file2
+exist and refer to the same file.
 .It Ar string
 True if
 .Ar string
@@ -163,6 +201,23 @@
 and
 .Ar \&s\&2
 are not identical.
+.It Ar \&s\&1 Cm \&< Ar \&s\&2
+True if string
+.Ar \&s\&1
+comes before
+.Ar \&s\&2
+based on the ASCII value of their characters.
+.It Ar \&s\&1 Cm \&> Ar \&s\&2
+True if string
+.Ar \&s\&1
+comes after
+.Ar \&s\&2
+based on the ASCII value of their characters.
+.It Ar \&s\&1
+True if
+.Ar \&s\&1
+is not the null
+string.
 .It Ar \&n\&1 Fl \&eq Ar \&n\&2 
 True if the integers
 .Ar \&n\&1
@@ -232,7 +287,7 @@
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm
+.Nm test
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -242,7 +297,7 @@
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm
+.Nm test
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -258,7 +313,7 @@
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm
-function is expected to be
+.Nm test
+utility implements a superset of the
 .St -p1003.2
-compatible.
+specification.
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/cvs.1 man1/cvs.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/cvs.1	Mon Dec 13 20:00:32 1999
+++ man1/cvs.1	Fri Dec 17 21:28:08 1999
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.11.2.2 1999/09/11 13:36:09 obrien Exp $
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.11.2.3 1999/12/13 20:56:50 peter Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
@@ -233,7 +233,10 @@
 .B \-R
 Turns on read-only repository mode.  This allows one to check out from a
 read-only repository, such as within an anoncvs server, or from a CDROM
-repository.  Using
+repository.
+Same effect as if the
+.SM CVSREADONLYFS
+environment variable is set.  Using
 .B \-R
 can also considerably speed up checkout's over NFS.
 .TP
@@ -318,6 +321,15 @@
 all executions of
 .` "cvs diff"
 ).
+.SP
+Global options are specified using the \fBcvs\fP keyword.  For example,
+the following:
+.SP
+cvs \-q
+.SP
+will mean that all
+.` "cvs"
+commands will behave as thought he \-q global option had been supplied.
 .SH "CVS COMMAND SUMMARY"
 Here are brief descriptions of all the
 .B cvs
@@ -2047,6 +2059,13 @@
 When this is not set, the default behavior is to permit modification
 of your working files.
 .TP
+.SM CVSREADONLYFS
+If this is set, the
+.B \-R
+option is assumed, and
+.B cvs
+operates in read-only repository mode.
+.TP
 .SM RCSBIN
 Specifies the full pathname where to find
 .SM RCS
@@ -2071,6 +2090,12 @@
 If this variable is set then
 .B cvs
 will ignore all references to remote repositories in the CVS/Root file.
+.TP
+.SM CVS_OPTIONS
+Specifies a set of default options for
+.B cvs.
+These options are interpreted before the startup file (\fI~/.cvsrc\fP) is read
+and can be overridden by explicit command line parameters.
 .TP
 .SM CVS_RSH
 .B cvs
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/date.1 man1/date.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/date.1	Mon Dec 13 19:59:27 1999
+++ man1/date.1	Fri Dec 17 21:27:07 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.26.2.3 1999/08/29 14:12:03 peter Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -49,7 +49,7 @@
 .Op Fl t Ar minutes_west
 .Op Fl v Ns Ar [+|-]val Ns Op ymwdHMS
 .Ar ...
-.Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
+.Op Fl f Ar fmt Ar date | [[[[[cc]yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm Date
@@ -74,7 +74,7 @@
 .Ar fmt
 as the format string to parse the date provided rather than using
 the default
-.Ar [[[[yy]mm]dd]HH]MM[.ss]
+.Ar [[[[[cc]yy]mm]dd]HH]MM[.ss]
 format.  Parsing is done using
 .Xr strptime 3 .
 .It Fl n
@@ -162,6 +162,8 @@
 The canonical representation for setting the date and time is:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
+.It Ar cc
+Century (either 19 or 20) prepended to the abbreviated year.
 .It Ar yy
 Year in abbreviated form (e.g. 89 for 1989, 06 for 2006).
 .It Ar mm
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dig.1 man1/dig.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dig.1	Mon Dec 13 20:02:32 1999
+++ man1/dig.1	Fri Dec 17 21:30:35 1999
@@ -1,4 +1,5 @@
-.\" $Id: dig.1,v 8.3 1998/03/21 01:01:23 halley Exp $
+.\" $FreeBSD: src/contrib/bind/doc/man/dig.1,v 1.1.1.1.2.1 1999/12/13 15:05:44 peter Exp $
+.\" $Id: dig.1,v 8.4 1999/10/15 21:29:58 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -99,7 +100,7 @@
 Internet address. If this optional field is omitted, 
 .Ic dig
 will attempt to use the default name server for your machine.
-.sp 1
+.Pp
 .Em Note:
 If a domain name is specified, this will be resolved
 using the domain name system resolver (i.e., BIND). If your
@@ -128,11 +129,10 @@
 to name a file which is to
 be used instead of 
 .Pa /etc/resolv.conf 
-.Po Ns Ev LOCALRES 
+.Ns Ev (LOCALRES 
 is specific to the 
 .Ic dig
-resolver and is not referenced by the standard resolver
-.Pc .
+resolver and is not referenced by the standard resolver).
 If the 
 .Ev LOCALRES 
 variable is not set or the specified file
@@ -297,6 +297,9 @@
 integer value to be included in the class field
 or use the abbreviated mnemonic as discussed
 above (i.e., in = C_IN).
+.It Fl k Ar keydir:keyname
+Sign the query with the TSIG key named keyname
+that is in the directory keydir.
 .It Fl envsav
 This flag specifies that the 
 .Ic dig
@@ -622,7 +625,8 @@
 .Sh ENVIRONMENT
 .Bl -tag -width "LOCALRES  " -compact
 .It Ev LOCALRES
-file to use in place of Pa /etc/resolv.conf
+file to use in place of 
+.Pa /etc/resolv.conf
 .It Ev LOCALDEF
 default environment file
 .El
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dnskeygen.1 man1/dnskeygen.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dnskeygen.1	Thu Jan  1 09:00:00 1970
+++ man1/dnskeygen.1	Fri Dec 17 21:30:35 1999
@@ -0,0 +1,132 @@
+.\" Copyright (c) 1996,1999 by Internet Software Consortium
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+.\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+.\" CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+.\" SOFTWARE.
+.\"
+.\" $Id: dnskeygen.1,v 8.5 1999/02/23 05:20:18 vixie Exp $
+.\"
+.Dd December 2, 1998
+.Dt DNSKEYGEN 1
+.Os BSD 4
+.Sh NAME
+.Nm dnskeygen 
+.Nd generate public, private, and shared secret keys for DNS Security
+.Sh SYNOPSIS
+.Nm dnskeygen
+.Oo Fl
+.Op Cm DHR
+.Ar size
+.Oc
+.Op Fl F
+.Fl Op Cm zhu
+.Op Cm Fl a
+.Op Cm Fl c
+.Op Cm Fl p Ar num
+.Op Cm Fl s Ar num
+.Fl n Ar name
+.Sh DESCRIPTION
+.Ic Dnskeygen
+(DNS Key Generator) is a tool to generate and maintain keys for DNS Security
+within the DNS (Domain Name System).
+.Nm Dnskeygen
+can generate public and private keys to authenticate zone data, and shared
+secret keys to be used for Request/Transaction signatures.
+.Bl -tag -width Fl
+.It Fl D
+Dnskeygen will generate a
+.Ic DSA/DSS
+key.
+.Dq size
+must be one of [512, 576, 640, 704, 768, 832, 896, 960, 1024].
+.It Fl H
+Dnskeygen will generate an
+.Ic HMAC-MD5
+key.
+.Dq size
+must be between 128 and 504.
+.It Fl R
+Dnskeygen will generate an
+.Ic RSA
+key.
+.Dq size
+must be between 512 and 4096.
+.It Fl F
+.Ic (RSA only)
+Use a large exponent for key generation.
+.It Fl z Fl h Fl u
+These flags define the type of key being generated: Zone (DNS validation) key,
+Host (host or service) key or User (e.g. email) key, respectively.
+Each key is only allowed to be one of these.
+.It Fl a 
+Indicates that the key
+.Ic CANNOT
+be used for authentication.
+.It Fl c 
+Indicates that the key
+.Ic CANNOT
+be used for encryption.
+.It Fl p Ar num
+Sets the key's protocol field to
+.Ar num
+; the default is
+.Ic 3
+(DNSSEC) if
+.Dq Fl z
+or
+.Dq Fl h
+is specified and
+.Ic 2
+(EMAIL) otherwise.  Other accepted values are
+.Ic 1
+(TLS),
+.Ic 4
+(IPSEC), and
+.Ic 255
+(ANY).
+.It Fl s Ar num
+Sets the key's strength field to
+.Ar num;
+the default is
+.Sy 0.
+.It Fl n Ar name
+Sets the key's name to
+.Ar name.
+.El
+.Ss DETAILS
+.Ic Dnskeygen
+stores each key in two files:
+.Pa K<name>+<alg>+<footprint>.private
+and 
+.Pa K<name>+<alg>+<footprint>.key
+The file 
+.Pa K<name>+<alg>+<footprint>.private
+contains the private key in a portable format.  The file 
+.Pa K<name>+<alg>+<footprint>.key
+contains the public key in the DNS zone file format:
+.Pp
+.D1 Ar <name> IN KEY <flags> <algorithm> <protocol> <exponent|modulus>
+.Pp
+.Sh ENVIRONMENT
+No environmental variables are used.
+.Sh SEE ALSO
+.Em RFC 2065
+on secure DNS and the
+.Em TSIG
+Internet Draft.
+.Sh AUTHOR
+Olafur Gudmundsson (ogud@tis.com).
+.Sh ACKNOWLEDGMENTS
+The underlying cryptographic math is done by the DNSSAFE and/or Foundation
+Toolkit libraries.
+.Sh BUGS
+None are known at this time
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dnsquery.1 man1/dnsquery.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/dnsquery.1	Mon Dec 13 20:02:33 1999
+++ man1/dnsquery.1	Fri Dec 17 21:30:36 1999
@@ -1,6 +1,6 @@
-.\" $Id: dnsquery.1,v 8.2 1997/03/14 02:29:41 vixie Exp $
+.\" $Id: dnsquery.1,v 8.3 1999/01/08 18:54:21 vixie Exp $
 .\"
-.\"Copyright (c) 1995, 1996 by Internet Software Consortium
+.\"Copyright (c) 1995,1996,1999 by Internet Software Consortium
 .\"
 .\"Permission to use, copy, modify, and distribute this software for any
 .\"purpose with or without fee is hereby granted, provided that the above
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/script.1 man1/script.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/script.1	Mon Dec 13 20:02:55 1999
+++ man1/script.1	Fri Dec 17 21:30:23 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/script/script.1,v 1.6.2.1 1999/08/29 15:32:37 peter Exp $
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.6.2.2 1999/12/13 23:47:12 billf Exp $
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
@@ -149,6 +149,6 @@
 .Pp
 When running in
 .Fl k
-mode, echo cancelling far from ideal.  The slave terminal mode is checked
+mode, echo cancelling is far from ideal.  The slave terminal mode is checked
 for ECHO mode to check when to avoid manual echo logging.  This does not
 work when in a raw mode where the program being run is doing manual echo.
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/test.1 man1/test.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man1/test.1	Mon Dec 13 19:59:33 1999
+++ man1/test.1	Fri Dec 17 21:27:13 1999
@@ -33,20 +33,23 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/test/test.1,v 1.8.2.1 1999/08/29 14:14:30 peter Exp $
+.\" $FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
 .Os
 .Sh NAME
-.Nm test
+.Nm test ,
+.Nm \&[
 .Nd condition evaluation utility
 .Sh SYNOPSIS
 .Nm test
 .Ar expression
+.Nm [
+.Ar expression Cm ]
 .Sh DESCRIPTION
 The
-.Nm
+.Nm test
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -54,11 +57,11 @@
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm
+.Nm test
 utility.
 .Pp
 The following primaries are used to construct expression:
-.Bl -tag -width indent
+.Bl -tag -width Ar
 .It Fl b Ar file
 True if
 .Ar file
@@ -90,6 +93,14 @@
 True if
 .Ar file
 exists and is a symbolic link.
+This operator is retained for compatibility with previous versions of
+this program. Do not rely on its existence; use
+.Fl L
+instead.
+.It Fl k Ar file
+True if
+.Ar file
+exists and its sticky bit is set.
 .It Fl n Ar string
 True if the length of
 .Ar string
@@ -99,25 +110,20 @@
 .Ar file
 is a named pipe
 .Po Tn FIFO Pc .
-.It Fl S Ar file
-True if
-.Ar file
-is a socket. 
 .It Fl r Ar file
 True if
-.Ar file
+.Ar file 
 exists and is readable.
 .It Fl s Ar file
 True if
 .Ar file
 exists and has a size greater
 than zero.
-.It Fl t Ar [file_descriptor]
+.It Fl t Op Ar file_descriptor
 True if the file whose file descriptor number
 is
 .Ar file_descriptor
-(default 1) is open and is
-associated with a terminal.
+is open and is associated with a terminal.
 .It Fl u Ar file
 True if
 .Ar file
@@ -146,6 +152,38 @@
 True if the length of
 .Ar string
 is zero.
+.It Fl L Ar file
+True if 
+.Ar file
+exists and is a symbolic link.
+.It Fl O Ar file
+True if
+.Ar file
+exists and its owner matches the effective user id of this process.
+.It Fl G Ar file
+True if
+.Ar file
+exists and its group matches the effective group id of this process.
+.It Fl S Ar file
+True if
+.Ar file
+exists and is a socket.
+.It Ar file1 Fl nt Ar file2
+True if
+.Ar file1
+exists and is newer than
+.Ar file2 .
+.It Ar file1 Fl ot Ar file2
+True if
+.Ar file1
+exists and is older than
+.Ar file2 .
+.It Ar file1 Fl ef Ar file2
+True if
+.Ar file1
+and
+.Ar file2
+exist and refer to the same file.
 .It Ar string
 True if
 .Ar string
@@ -163,6 +201,23 @@
 and
 .Ar \&s\&2
 are not identical.
+.It Ar \&s\&1 Cm \&< Ar \&s\&2
+True if string
+.Ar \&s\&1
+comes before
+.Ar \&s\&2
+based on the ASCII value of their characters.
+.It Ar \&s\&1 Cm \&> Ar \&s\&2
+True if string
+.Ar \&s\&1
+comes after
+.Ar \&s\&2
+based on the ASCII value of their characters.
+.It Ar \&s\&1
+True if
+.Ar \&s\&1
+is not the null
+string.
 .It Ar \&n\&1 Fl \&eq Ar \&n\&2 
 True if the integers
 .Ar \&n\&1
@@ -232,7 +287,7 @@
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm
+.Nm test
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -242,7 +297,7 @@
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm
+.Nm test
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -258,7 +313,7 @@
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm
-function is expected to be
+.Nm test
+utility implements a superset of the
 .St -p1003.2
-compatible.
+specification.
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/camcontrol.8	Mon Dec 13 20:01:29 1999
+++ man8/camcontrol.8	Fri Dec 17 21:29:03 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.8 1999/10/28 17:20:07 mph Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
@@ -667,7 +667,7 @@
 some of the subcommands take multiple arguments.  So if, for instance, you
 tried something like this:
 .Bd -literal -offset foobar
-camcontrol -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
+camcontrol cmd -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
 .Ed
 .Pp
 The sense information from the test unit ready command would not get
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/moused.8 man8/moused.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/moused.8	Mon Dec 13 20:03:23 1999
+++ man8/moused.8	Fri Dec 17 21:30:52 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.5 1999/10/15 13:03:50 phantom Exp $
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.7 1999/12/17 09:59:07 sheldonh Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named-xfer.8 man8/named-xfer.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named-xfer.8	Mon Dec 13 20:01:24 1999
+++ man8/named-xfer.8	Fri Dec 17 21:29:01 1999
@@ -49,6 +49,24 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\" -
+.\" Portions Copyright (c) 1999 by Check Point Software Technologies, Inc.
+.\" 
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies, and that
+.\" the name of Check Point Software Technologies Incorporated not be used 
+.\" in advertising or publicity pertaining to distribution of the document 
+.\" or software without specific, written prior permission.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND CHECK POINT SOFTWARE TECHNOLOGIES 
+.\" INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.   
+.\" IN NO EVENT SHALL CHECK POINT SOFTWARE TECHNOLOGIES INCORPRATED
+.\" BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR 
+.\" ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\" 
 .\" --Copyright--
 .\"
 .\"	from named.8	6.6 (Berkeley) 2/14/89
@@ -66,10 +84,14 @@
 .Fl s Ar serial_no
 .Op Fl d Ar debuglevel
 .Op Fl l Ar debug_log_file
+.Op Fl i Ar ixfr_file
 .Op Fl t Ar trace_file
 .Op Fl p Ar port#
 .Op Fl S 
-.Ar nameserver ...
+.Ar nameserver 
+.Op Ar [ Sy axfr 
+| 
+.Op Sy ixfr ]
 .Sh DESCRIPTION
 .Ic Named-xfer
 is an ancillary program executed by
@@ -107,6 +129,11 @@
 Note that this only applies if
 .Dq Fl d
 is also specified.
+.It Fl i Ar ixfr_file
+Specifies the name of the 
+.Ar ixfr_file 
+into which the zone changes from Incremental Zone Transfer (IXFR)
+should be dumped when it is received from the primary server.
 .It Fl t Ar trace_file
 Specifies a 
 .Ar trace_file 
@@ -138,10 +165,21 @@
 no host name are allowed here.  At least one address must be specified.  
 Any additional addresses will be tried, in order, if the first one fails 
 to transfer to us successfully.
+The 
+.Sy axfr 
+or 
+.Sy ixfr 
+after name server address designates the type of zone transfer to perform.
+Use 
+.Sy axfr  
+for a full zone transfer or
+.Sy ixfr 
+for an incremental zone transfer.
 .Sh SEE ALSO
 .Xr hostname 7 ,
 .Xr named 8 ,
 .Xr resolver 3 ,
 .Xr resolver 5 ,
-RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, 
+RFC 1123, RFC 1995
 .Dq Name Server Operations Guide for Sy BIND .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.8 man8/named.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.8	Mon Dec 13 20:03:25 1999
+++ man8/named.8	Fri Dec 17 21:31:07 1999
@@ -68,7 +68,7 @@
 .Pc
 .Ar config_file
 .Oc
-.Op Fl f q r
+.Op Fl f q r v
 .Op Fl u Ar user_name
 .Op Fl g Ar group_name
 .Op Fl t Ar directory
@@ -189,6 +189,8 @@
 clause of the configuration file's
 .Dq Li options
 statement.
+.It Fl v
+Report the version and exit. 
 .It Fl u Ar user_name
 Specifies the user the server should run as after it initializes.  The value
 specified may be either a username or a numeric user id.  If the
@@ -232,6 +234,7 @@
 .Bd -literal -offset indent
 $INCLUDE <filename> <opt_domain>
 $ORIGIN <domain>
+$TTL <ttl>
 <domain> <opt_ttl> <opt_class> <type> <resource_record_data>
 .Ed
 .Pp
@@ -261,10 +264,14 @@
 field nor 
 .Li $ORIGIN 
 statements in the included file modify the current origin for this file.
+.It Ar ttl
+A integer number that sets the default time-to-live for future records without
+an explicit ttl.
 .It Ar opt_ttl
 An optional integer number for the time-to-live field.
-It defaults to zero, meaning the minimum value specified in the SOA
-record for the zone.
+If not set the ttl is taken from the last $TTL statement.
+If no $TTL statement has occured then the SOA minimum value is used and a
+warning is generated.
 .It Ar opt_class
 The object address type; currently only one type is supported,
 .Dv IN ,
@@ -286,7 +293,8 @@
 .It Dv SOA
 marks the start of a zone of authority (domain of originating host,
 domain address of maintainer, a serial number and the following
-parameters in seconds: refresh, retry, expire and minimum TTL (see RFC 883)).
+parameters in seconds: refresh, retry, expire and minimum TTL (see RFC 883
+and RFC 2308)).
 .It Dv NULL
 a null resource record (no format or data)
 .It Dv RP
@@ -342,9 +350,7 @@
 the retry time specifies the interval at which refreshes should be attempted.
 If a master server cannot be contacted within the interval given by the
 expire time, all data from the zone is discarded by secondary servers.  The
-minimum value is the time-to-live 
-.Pq Dq TTL 
-used by records in the file with no explicit time-to-live value.
+minimum value is the cache time-to-live for negative answers (RFC 2308).
 .Sh NOTES
 The boot file directives 
 .Dq Li domain 
@@ -389,9 +395,7 @@
 .Pa /var/tmp 
 if the server is compiled with profiling (server forks, chdirs and exits).
 .It Dv SIGTERM
-Dumps the primary and secondary database files.
-Used to save modified data on shutdown if the
-server is compiled with dynamic updating enabled.
+Saves any modified dynamic zones to the file system, and shuts down the server.
 .It Dv SIGUSR1
 Turns on debugging; each 
 .Dv SIGUSR1 
@@ -433,4 +437,5 @@
 .Xr resolver 5 , 
 .Xr signal 2 ,
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 2308
 .Dq Name Server Operations Guide for Sy BIND
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.reload.8 man8/named.reload.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.reload.8	Mon Dec 13 20:03:25 1999
+++ man8/named.reload.8	Fri Dec 17 21:31:07 1999
@@ -52,6 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.1.2.1 1999/12/13 15:08:25 peter Exp $
 .\"
 .TH NAMED.RELOAD 8 "June 26, 1993"
 .UC 5
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.restart.8 man8/named.restart.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.restart.8	Mon Dec 13 20:03:25 1999
+++ man8/named.restart.8	Fri Dec 17 21:31:07 1999
@@ -52,6 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" $FreeBSD: src/usr.sbin/named.restart/named.restart.8,v 1.1.2.1 1999/12/13 15:08:27 peter Exp $
 .\"
 .TH NAMED.RESTART 8 "June 26, 1993"
 .UC 5
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/ndc.8 man8/ndc.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/ndc.8	Mon Dec 13 20:03:26 1999
+++ man8/ndc.8	Fri Dec 17 21:31:07 1999
@@ -1,142 +1,133 @@
-.\" Copyright (c) 1994
-.\"    The Regents of the University of California.  All rights reserved.
-.\" 
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\" 	This product includes software developed by the University of
-.\" 	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 1998,1999 by Internet Software Consortium
 .\"
-.Dd November 27, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+.\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+.\" CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+.\" SOFTWARE.
+.\"
+.Dd December 31, 1998
 .Dt NDC 8 
 .Os BSD 4
 .Sh NAME
-.Nm ndc 
-.Nd name daemon control interface
+.Nm ndc
+.Nd name daemon control program
 .Sh SYNOPSIS
 .Nm ndc
-.Ar directive
-.Op Ar ... 
+.Op Fl c Ar channel
+.Op Fl l Ar localsock
+.Op Fl p Ar pidfile
+.Op Fl d
+.Op Fl q
+.Op Fl s
+.Op Fl t
+.Op Ar command
 .Sh DESCRIPTION
-This command allows the name server administrator to send various signals
-to the name server, or to restart it.  Zero or more directives may be given,
-from the following list:
-.Bl -tag -width "querylog"
-.It Ic status
-Displays the current status of
-.Xr named 8
-as shown by
-.Xr ps 1 .
-.It Ic dumpdb
-Causes
-.Ic named
-to dump its database and cache to
-.Pa /var/tmp/named_dump.db
-(uses the 
-.Dv INT 
-signal.)
-.It Ic reload
-Causes
-.Ic named
-to check the serial numbers of all primary and secondary zones
-and to reload those that have changed (uses the 
-.Dv HUP 
-signal.)
-.It Ic stats
-Causes
-.Ic named
-to dump its statistics to
-.Pa /var/tmp/named.stats
-(uses the 
-.Dv IOT 
-or 
-.Dv ABRT 
-signal.)
-.It Ic trace
-Causes
-.Ic named
-to increment its 
-.Dq tracing level 
-by one.  Whenever the tracing level
-is nonzero, trace information will be written to
-.Pa /var/tmp/named.run .
-Higher tracing levels result in more detailed information.
-(Uses the 
-.Dv USR1 
-signal.)
-.It Ic notrace
-Causes
-.Ic named
-to set its 
-.Dq tracing level 
-to zero, closing 
-.Pa /var/tmp/named.run , 
-if it is open (uses the 
-.Dv USR2 
-signal.)
-.It Ic querylog
-Causes
-.Ic named
-to toggle the 
-.Dq query logging 
-feature, which while on will result in a
-.Xr syslog 2
-of each incoming query (uses the 
-.Dv WINCH 
-signal.)  Note that query logging
-consumes quite a lot of log file space.  This directive may also be given as
-.Ic qrylog .
-.It Ic start
-Causes
-.Ic named
-to be started, as long as it isn't already running.
-.It Ic stop
-Causes
-.Ic named
-to be stopped, if it is running.
-.It Ic restart
-Causes
-.Ic named
-to be killed and restarted.
-.El
-.Sh BUGS
-Arguments to
-.Ic named
-are not preserved by
-.Ic restart ,
-or known by
-.Ic start .
-.Pp
-Some mechanism for controlling the parameters and environment should exist.
+This command allows the system administrator to control the operation
+of a name server.  If no
+.Ar command
+is given,
+.Ic ndc
+will prompt for commands until it reads EOF.
 .Pp
-Implemented as a
-.Xr sh 1
-script.
+Options are:
+.Bl -tag -width Fl
+.It Fl c Ar channel
+Specifies the rendezvous point for the control channel.  The default is
+.Pa /var/run/ndc
+(a UNIX domain socket which is also the server's default control channel).
+If the desired control channel is a TCP/IP socket, then the format of the
+.Ar channel
+argument is
+.Sy ipaddr/port
+(for example,
+.Sy 127.0.0.1/54
+would be TCP port 54 on the local host.)
+.It Fl l Ar localsock
+This option will
+.Xr bind 2
+the client side of the control channel to a specific address.  Servers can
+be configured to reject connections which do not come from specific addresses.
+The format is the same as for
+.Ar channel
+(see above).
+.It Fl p Ar pidfile
+For backward compatibility with older name servers,
+.Ic ndc
+is able to use UNIX signals for control communications.  This capability is
+optional in modern name servers and will disappear altogether at some future
+time.  Note that the available
+.Ar command
+set is narrower when the signal interface is used.  A likely
+.Ar pidfile
+argument would be something like
+.Pa /var/run/named.pid .
+.It Fl d
+Turns on debugging output, which is of interest mainly to developers.
+.It Fl q
+Suppresses prompts and result text.
+.It Fl s
+Suppresses nonfatal error announcements.
+.It Fl t
+Turns on protocol and system tracing, useful in installation debugging.
+.El
+.Sh COMMANDS
+Several commands are built into
+.Ic ndc ,
+but the full set of commands supported by the name server is dynamic and
+should be discovered using the
+.Ar help
+command (see below).  Builtin commands are:
+.Bl -tag -width Fl
+.It Ar /help
+Provides help for builtin commands.
+.It Ar /exit
+Exit from
+.Ic ndc
+command interpreter.
+.It Ar /trace
+Toggle tracing (see
+.Fl -t
+description above).
+.It Ar /debug
+Toggle debugging (see
+.Fl d
+description above).
+.It Ar /quiet
+Toggle quietude (see
+.Fl q
+description above).
+.It Ar /silent
+Toggle silence (see
+.Fl s
+description above).
+.El
+.Sh NOTES
+If running in
+.Ar pidfile
+mode, any arguments to
+.Ar start
+and
+.Ar restart
+commands are passed to the new
+.Ic named
+on its command line.  If running in
+.Ar channel
+mode, there is no
+.Ar start
+command and the
+.Ar restart
+command just tells the name server to
+.Xr execvp 2
+itself.
 .Sh AUTHOR
 Paul Vixie (Internet Software Consortium)
 .Sh SEE ALSO
 .Xr named 8 ,
-.Xr named.reload 8 ,
-.Xr named.restart 8 .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/camcontrol.8	Mon Dec 13 20:01:29 1999
+++ man8/camcontrol.8	Fri Dec 17 21:29:03 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.8 1999/10/28 17:20:07 mph Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
@@ -667,7 +667,7 @@
 some of the subcommands take multiple arguments.  So if, for instance, you
 tried something like this:
 .Bd -literal -offset foobar
-camcontrol -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
+camcontrol cmd -n da -u 1 -c "00 00 00 00 00 v" 0x00 -v
 .Ed
 .Pp
 The sense information from the test unit ready command would not get
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/moused.8 man8/moused.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/moused.8	Mon Dec 13 20:03:23 1999
+++ man8/moused.8	Fri Dec 17 21:30:52 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.5 1999/10/15 13:03:50 phantom Exp $
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.6 1999/12/16 21:20:16 yokota Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
@@ -38,7 +38,7 @@
 .Nd pass mouse data to the console driver
 .Sh SYNOPSIS
 .Nm
-.Op Fl 3DPRcdfs
+.Op Fl DPRcdfs
 .Op Fl I Ar file
 .Op Fl F Ar rate
 .Op Fl r Ar resolution
@@ -48,6 +48,7 @@
 .Op Fl w Ar N
 .Op Fl z Ar target
 .Op Fl t Ar mousetype
+.Op Fl 3 Op Fl E Ar timeout
 .Fl p Ar port
 .Pp
 .Nm
@@ -106,6 +107,16 @@
 to operate in the
 .Ar mousesystems
 mode.
+.It Fl E Ar timeout
+When the third button emulation is enabled
+.Pq see above ,
+the
+.Nm
+daemon waits
+.Ar timeout
+msec at maximum before deciding if two buttons are pressed
+simultaneously.
+The default timeout is 200 msec.
 .It Fl F Ar rate
 Set the report rate (reports/sec) of the device if supported.
 .It Fl I Ar file
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named-xfer.8 man8/named-xfer.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named-xfer.8	Mon Dec 13 20:01:24 1999
+++ man8/named-xfer.8	Fri Dec 17 21:29:01 1999
@@ -49,6 +49,24 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\" -
+.\" Portions Copyright (c) 1999 by Check Point Software Technologies, Inc.
+.\" 
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies, and that
+.\" the name of Check Point Software Technologies Incorporated not be used 
+.\" in advertising or publicity pertaining to distribution of the document 
+.\" or software without specific, written prior permission.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND CHECK POINT SOFTWARE TECHNOLOGIES 
+.\" INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.   
+.\" IN NO EVENT SHALL CHECK POINT SOFTWARE TECHNOLOGIES INCORPRATED
+.\" BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR 
+.\" ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\" 
 .\" --Copyright--
 .\"
 .\"	from named.8	6.6 (Berkeley) 2/14/89
@@ -66,10 +84,14 @@
 .Fl s Ar serial_no
 .Op Fl d Ar debuglevel
 .Op Fl l Ar debug_log_file
+.Op Fl i Ar ixfr_file
 .Op Fl t Ar trace_file
 .Op Fl p Ar port#
 .Op Fl S 
-.Ar nameserver ...
+.Ar nameserver 
+.Op Ar [ Sy axfr 
+| 
+.Op Sy ixfr ]
 .Sh DESCRIPTION
 .Ic Named-xfer
 is an ancillary program executed by
@@ -107,6 +129,11 @@
 Note that this only applies if
 .Dq Fl d
 is also specified.
+.It Fl i Ar ixfr_file
+Specifies the name of the 
+.Ar ixfr_file 
+into which the zone changes from Incremental Zone Transfer (IXFR)
+should be dumped when it is received from the primary server.
 .It Fl t Ar trace_file
 Specifies a 
 .Ar trace_file 
@@ -138,10 +165,21 @@
 no host name are allowed here.  At least one address must be specified.  
 Any additional addresses will be tried, in order, if the first one fails 
 to transfer to us successfully.
+The 
+.Sy axfr 
+or 
+.Sy ixfr 
+after name server address designates the type of zone transfer to perform.
+Use 
+.Sy axfr  
+for a full zone transfer or
+.Sy ixfr 
+for an incremental zone transfer.
 .Sh SEE ALSO
 .Xr hostname 7 ,
 .Xr named 8 ,
 .Xr resolver 3 ,
 .Xr resolver 5 ,
-RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, 
+RFC 1123, RFC 1995
 .Dq Name Server Operations Guide for Sy BIND .
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.8 man8/named.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.8	Mon Dec 13 20:03:25 1999
+++ man8/named.8	Fri Dec 17 21:31:07 1999
@@ -68,7 +68,7 @@
 .Pc
 .Ar config_file
 .Oc
-.Op Fl f q r
+.Op Fl f q r v
 .Op Fl u Ar user_name
 .Op Fl g Ar group_name
 .Op Fl t Ar directory
@@ -189,6 +189,8 @@
 clause of the configuration file's
 .Dq Li options
 statement.
+.It Fl v
+Report the version and exit. 
 .It Fl u Ar user_name
 Specifies the user the server should run as after it initializes.  The value
 specified may be either a username or a numeric user id.  If the
@@ -232,6 +234,7 @@
 .Bd -literal -offset indent
 $INCLUDE <filename> <opt_domain>
 $ORIGIN <domain>
+$TTL <ttl>
 <domain> <opt_ttl> <opt_class> <type> <resource_record_data>
 .Ed
 .Pp
@@ -261,10 +264,14 @@
 field nor 
 .Li $ORIGIN 
 statements in the included file modify the current origin for this file.
+.It Ar ttl
+A integer number that sets the default time-to-live for future records without
+an explicit ttl.
 .It Ar opt_ttl
 An optional integer number for the time-to-live field.
-It defaults to zero, meaning the minimum value specified in the SOA
-record for the zone.
+If not set the ttl is taken from the last $TTL statement.
+If no $TTL statement has occured then the SOA minimum value is used and a
+warning is generated.
 .It Ar opt_class
 The object address type; currently only one type is supported,
 .Dv IN ,
@@ -286,7 +293,8 @@
 .It Dv SOA
 marks the start of a zone of authority (domain of originating host,
 domain address of maintainer, a serial number and the following
-parameters in seconds: refresh, retry, expire and minimum TTL (see RFC 883)).
+parameters in seconds: refresh, retry, expire and minimum TTL (see RFC 883
+and RFC 2308)).
 .It Dv NULL
 a null resource record (no format or data)
 .It Dv RP
@@ -342,9 +350,7 @@
 the retry time specifies the interval at which refreshes should be attempted.
 If a master server cannot be contacted within the interval given by the
 expire time, all data from the zone is discarded by secondary servers.  The
-minimum value is the time-to-live 
-.Pq Dq TTL 
-used by records in the file with no explicit time-to-live value.
+minimum value is the cache time-to-live for negative answers (RFC 2308).
 .Sh NOTES
 The boot file directives 
 .Dq Li domain 
@@ -389,9 +395,7 @@
 .Pa /var/tmp 
 if the server is compiled with profiling (server forks, chdirs and exits).
 .It Dv SIGTERM
-Dumps the primary and secondary database files.
-Used to save modified data on shutdown if the
-server is compiled with dynamic updating enabled.
+Saves any modified dynamic zones to the file system, and shuts down the server.
 .It Dv SIGUSR1
 Turns on debugging; each 
 .Dv SIGUSR1 
@@ -433,4 +437,5 @@
 .Xr resolver 5 , 
 .Xr signal 2 ,
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
+RFC 2308
 .Dq Name Server Operations Guide for Sy BIND
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.reload.8 man8/named.reload.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.reload.8	Mon Dec 13 20:03:25 1999
+++ man8/named.reload.8	Fri Dec 17 21:31:07 1999
@@ -52,6 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.1.2.1 1999/12/13 15:08:25 peter Exp $
 .\"
 .TH NAMED.RELOAD 8 "June 26, 1993"
 .UC 5
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.restart.8 man8/named.restart.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/named.restart.8	Mon Dec 13 20:03:25 1999
+++ man8/named.restart.8	Fri Dec 17 21:31:07 1999
@@ -52,6 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
+.\" $FreeBSD: src/usr.sbin/named.restart/named.restart.8,v 1.1.2.1 1999/12/13 15:08:27 peter Exp $
 .\"
 .TH NAMED.RESTART 8 "June 26, 1993"
 .UC 5
diff -urNP /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/ndc.8 man8/ndc.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991213-STABLE/man/man8/ndc.8	Mon Dec 13 20:03:26 1999
+++ man8/ndc.8	Fri Dec 17 21:31:07 1999
@@ -1,142 +1,133 @@
-.\" Copyright (c) 1994
-.\"    The Regents of the University of California.  All rights reserved.
-.\" 
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\" 	This product includes software developed by the University of
-.\" 	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" Copyright (c) 1998,1999 by Internet Software Consortium
 .\"
-.Dd November 27, 1994
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+.\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+.\" CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+.\" SOFTWARE.
+.\"
+.Dd December 31, 1998
 .Dt NDC 8 
 .Os BSD 4
 .Sh NAME
-.Nm ndc 
-.Nd name daemon control interface
+.Nm ndc
+.Nd name daemon control program
 .Sh SYNOPSIS
 .Nm ndc
-.Ar directive
-.Op Ar ... 
+.Op Fl c Ar channel
+.Op Fl l Ar localsock
+.Op Fl p Ar pidfile
+.Op Fl d
+.Op Fl q
+.Op Fl s
+.Op Fl t
+.Op Ar command
 .Sh DESCRIPTION
-This command allows the name server administrator to send various signals
-to the name server, or to restart it.  Zero or more directives may be given,
-from the following list:
-.Bl -tag -width "querylog"
-.It Ic status
-Displays the current status of
-.Xr named 8
-as shown by
-.Xr ps 1 .
-.It Ic dumpdb
-Causes
-.Ic named
-to dump its database and cache to
-.Pa /var/tmp/named_dump.db
-(uses the 
-.Dv INT 
-signal.)
-.It Ic reload
-Causes
-.Ic named
-to check the serial numbers of all primary and secondary zones
-and to reload those that have changed (uses the 
-.Dv HUP 
-signal.)
-.It Ic stats
-Causes
-.Ic named
-to dump its statistics to
-.Pa /var/tmp/named.stats
-(uses the 
-.Dv IOT 
-or 
-.Dv ABRT 
-signal.)
-.It Ic trace
-Causes
-.Ic named
-to increment its 
-.Dq tracing level 
-by one.  Whenever the tracing level
-is nonzero, trace information will be written to
-.Pa /var/tmp/named.run .
-Higher tracing levels result in more detailed information.
-(Uses the 
-.Dv USR1 
-signal.)
-.It Ic notrace
-Causes
-.Ic named
-to set its 
-.Dq tracing level 
-to zero, closing 
-.Pa /var/tmp/named.run , 
-if it is open (uses the 
-.Dv USR2 
-signal.)
-.It Ic querylog
-Causes
-.Ic named
-to toggle the 
-.Dq query logging 
-feature, which while on will result in a
-.Xr syslog 2
-of each incoming query (uses the 
-.Dv WINCH 
-signal.)  Note that query logging
-consumes quite a lot of log file space.  This directive may also be given as
-.Ic qrylog .
-.It Ic start
-Causes
-.Ic named
-to be started, as long as it isn't already running.
-.It Ic stop
-Causes
-.Ic named
-to be stopped, if it is running.
-.It Ic restart
-Causes
-.Ic named
-to be killed and restarted.
-.El
-.Sh BUGS
-Arguments to
-.Ic named
-are not preserved by
-.Ic restart ,
-or known by
-.Ic start .
-.Pp
-Some mechanism for controlling the parameters and environment should exist.
+This command allows the system administrator to control the operation
+of a name server.  If no
+.Ar command
+is given,
+.Ic ndc
+will prompt for commands until it reads EOF.
 .Pp
-Implemented as a
-.Xr sh 1
-script.
+Options are:
+.Bl -tag -width Fl
+.It Fl c Ar channel
+Specifies the rendezvous point for the control channel.  The default is
+.Pa /var/run/ndc
+(a UNIX domain socket which is also the server's default control channel).
+If the desired control channel is a TCP/IP socket, then the format of the
+.Ar channel
+argument is
+.Sy ipaddr/port
+(for example,
+.Sy 127.0.0.1/54
+would be TCP port 54 on the local host.)
+.It Fl l Ar localsock
+This option will
+.Xr bind 2
+the client side of the control channel to a specific address.  Servers can
+be configured to reject connections which do not come from specific addresses.
+The format is the same as for
+.Ar channel
+(see above).
+.It Fl p Ar pidfile
+For backward compatibility with older name servers,
+.Ic ndc
+is able to use UNIX signals for control communications.  This capability is
+optional in modern name servers and will disappear altogether at some future
+time.  Note that the available
+.Ar command
+set is narrower when the signal interface is used.  A likely
+.Ar pidfile
+argument would be something like
+.Pa /var/run/named.pid .
+.It Fl d
+Turns on debugging output, which is of interest mainly to developers.
+.It Fl q
+Suppresses prompts and result text.
+.It Fl s
+Suppresses nonfatal error announcements.
+.It Fl t
+Turns on protocol and system tracing, useful in installation debugging.
+.El
+.Sh COMMANDS
+Several commands are built into
+.Ic ndc ,
+but the full set of commands supported by the name server is dynamic and
+should be discovered using the
+.Ar help
+command (see below).  Builtin commands are:
+.Bl -tag -width Fl
+.It Ar /help
+Provides help for builtin commands.
+.It Ar /exit
+Exit from
+.Ic ndc
+command interpreter.
+.It Ar /trace
+Toggle tracing (see
+.Fl -t
+description above).
+.It Ar /debug
+Toggle debugging (see
+.Fl d
+description above).
+.It Ar /quiet
+Toggle quietude (see
+.Fl q
+description above).
+.It Ar /silent
+Toggle silence (see
+.Fl s
+description above).
+.El
+.Sh NOTES
+If running in
+.Ar pidfile
+mode, any arguments to
+.Ar start
+and
+.Ar restart
+commands are passed to the new
+.Ic named
+on its command line.  If running in
+.Ar channel
+mode, there is no
+.Ar start
+command and the
+.Ar restart
+command just tells the name server to
+.Xr execvp 2
+itself.
 .Sh AUTHOR
 Paul Vixie (Internet Software Consortium)
 .Sh SEE ALSO
 .Xr named 8 ,
-.Xr named.reload 8 ,
-.Xr named.restart 8 .

----Next_Part(Sun_Dec_19_22:39:30_1999_518)----
