From owner-man-jp-reviewer@jp.freebsd.org  Fri May 14 00:00:38 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id AAA94346;
	Fri, 14 May 1999 00:00:38 +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 AAA94341
	for <man-jp-reviewer@jp.freebsd.org>; Fri, 14 May 1999 00:00:38 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp947.yk.rim.or.jp [202.247.185.198])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id AAA08352
	for <man-jp-reviewer@jp.freebsd.org>; Fri, 14 May 1999 00:00: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(Thu_May_13_23:54:38_1999_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990513235949B.k-horik@yk.rim.or.jp>
Date: Thu, 13 May 1999 23:59:49 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 1365
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990430
X-Sequence: man-jp-reviewer 1375
Subject: [man-jp-reviewer 1375] 3.2-19990512-BETA
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(Thu_May_13_23:54:38_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

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

 3.2-19990512-BETA $B$X$N:9J,$G$9!#(B
 $BF|K\8l$N:9J,$NJ}$O!"0lIt0JA0$N:9J,$b4^$s$G$$$^$9!#(B



----Next_Part(Thu_May_13_23:54:38_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: Japanese diff
Content-Disposition: attachment; filename=jdiff

diff -ur man/man1/cvs.1 man/man1/cvs.1
--- man/man1/cvs.1	Sun Jan 31 00:44:14 1999
+++ man/man1/cvs.1	Thu May 13 23:10:26 1999
@@ -37,18 +37,18 @@
 .IX  "release control system"  "cvs command"  ""  "\fLcvs\fP \- concurrent versions system"
 .IX  "source control system"  "cvs command"  ""  "\fLcvs\fP \- concurrent versions system"
 .IX  revisions  "cvs command"  ""  "\fLcvs\fP \- source control"
-.B cvs
-$B$O(B
-.BR rcs ( 1 )
-$B%j%S%8%g%s4IM}%7%9%F%`$N%U%m%s%H%(%s%I$G!"(B
-$B%j%S%8%g%s4IM}$N35G0$rJ#?t%U%!%$%k$r=8$a$?C10l%G%#%l%/%H%j$+$i(B
-$B%j%S%8%g%s4IM}$5$l$kJ#?t%U%!%$%k$r4^$`J#?t$N3,AX9=B$$r;}$D(B
-$B%G%#%l%/%H%j$X$H3HD%$7$^$9!#(B
-$B$=$l$i$N%G%#%l%/%H%j$H%U%!%$%k$r$R$H$^$H$^$j$K$7$F%=%U%H%&%'%"%j%j!<%9$r(B
-$B7A@.$9$k$3$H$,2DG=$K$J$j$^$9!#(B
-.B cvs
-$B$O!"$=$l$i$N%=%U%H%&%'%"%j%j!<%9$N4IM}$HJ#?t$N%=%U%H%&%'%"3+H/<T$,(B
-$BJB9T$7$F%=!<%9%U%!%$%k$rJT=8$9$k>l9g$N@)8f$KI,MW$J5!G=$rDs6!$9$k$b$N$G$9!#(B
+CVS $B$O%P!<%8%g%s@)8f%7%9%F%`$G$"$j!"(BRCS $B$d(B SCCS $B$N$h$&$K!"(B
+$B%U%!%$%k(B ($BDL>o$O%=!<%9%3!<%I(B) $B$N8E$$%P!<%8%g%s$NJ];}$H(B
+$BC/$,2?;~2?8NJQ99$r;\$7$?$+$J$I$N5-O?$NJ];}$r2DG=$K$7$^$9!#(B
+$BF1MM$N%7%9%F%`$H$O0[$J$j!"(B
+CVS $B$O0l;~$K(B 1 $B%U%!%$%k$d(B 1 $B%G%#%l%/%H%j$N$_$rA`:nBP>]$H$9$k$N$G$O$J$/!"(B
+$B%P!<%8%g%s4IM}$5$l$?%U%!%$%k$r;}$D%G%#%l%/%H%j=89g$+$i$J$k3,AX$r(B
+$BA`:nBP>]$H$7$^$9!#(B
+CVS $B$O!"%j%j!<%94IM}$r=u$1!"(B
+$B$^$?J#?t$N:n<T$K$h$kJB9TE*$J%=!<%9%U%!%$%kJT=8$r=u$1$^$9!#(B
+CVS $B$O!"(B
+$BMM!9$JA`:n$rM-8z$K$7$?$j5-O?$7$?$j@)8f$7$?$j$9$k$?$a$K%H%j%,$r;HMQ2DG=$G$"$j!"(B
+$B9-0h%M%C%H%o!<%/$G$&$^$/F0:n$7$^$9!#(B
 .SP
 .B cvs
 $B$O%^%9%?!<%=!<%9$NC10l$N%3%T!<$rJ];}$7$^$9!#(B
@@ -174,7 +174,7 @@
 .SM RCS
 $B%W%m%0%i%`$,CV$+$l$F$$$k%G%#%l%/%H%j$H$7$F(B
 .I bindir
-$B$r;H$$$^$9!#(B
+$B$r;H$$$^$9(B (CVS 1.9 $B$*$h$S$=$l0JA0(B)$B!#(B
 $B4D6-JQ?t(B
 .SM RCSBIN
 $B$N@_Dj$h$jM%@h$5$l$^$9!#(B
@@ -182,7 +182,6 @@
 .TP
 \fB\-d\fP \fICVS_root_directory\fP
 $B%^%9%?$H$J$k(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$N%k!<%H%G%#%l%/%H%j$X$N%Q%9L>$H$7$F(B
 .I CVS_root_directory
 $B$r;H$$$^$9!#(B
@@ -338,8 +337,7 @@
 .TP
 .B admin
 $B%=!<%9%j%]%8%H%j$KBP$7$F(B
-.SM RCS
-$B$N@)8f%3%^%s%I$r<B9T$7$^$9!#(B($B%j%]%8%H%j$rD>@\$KJQ99$7$^$9!#(B 
+$B@)8f%3%^%s%I$r<B9T$7$^$9!#(B($B%j%]%8%H%j$rD>@\$KJQ99$7$^$9!#(B 
 $B:n6H%G%#%l%/%H%j$r;HMQ$7$^$9$,JQ99$O9T$$$^$;$s!#(B)
 .TP
 .B checkout
@@ -383,8 +381,7 @@
 $B<h$j9~$_$^$9!#(B($B%j%]%8%H%j$rJQ99$7$^$9!#(B)
 .TP
 .B log
-.SM RCS
-$B$N%m%0>pJs$rI=<($7$^$9!#(B
+$B%m%0>pJs$rI=<($7$^$9!#(B
 ($B%j%]%8%H%j$b:n6H%G%#%l%/%H%j$bJQ99$7$^$;$s!#(B)
 .TP
 .B rdiff
@@ -453,12 +450,9 @@
 \fB\-D\fP \fIdate_spec\fP
 \fIdate_spec\fP $B0JA0$N$b$N$NCf$G:G$b:G6a$N%j%S%8%g%s$r;H$$$^$9(B ($BC1FH$N(B
 $B0z?t$G!"F|;~$NI=5-$O2a5n$NF|;~$r;XDj$7$^$9(B)$B!#(B
-$B2<@A$1$N(B
-.SM RCS
-$B$N5!G=$K$h$j(B
-.BR co ( 1 )
-$B$K@bL@$5$l$F$$$k$N$HF1MM$NB?<oB?MM$JF|;~$N%U%)!<%^%C%H$,(B
-$B%5%]!<%H$5$l$^$9$,!"$^$C$?$/F1$8$H$$$&$o$1$G$O$"$j$^$;$s!#(B
+$BB?<oB?MM$JF|;~$N%U%)!<%^%C%H$,!"(B
+$BFC$K(B ISO ("1972-09-24 20:05") $B$^$?$O(B Internet ("24 Sep 1972 20:05") $B$,(B
+$B%5%]!<%H$5$l$^$9!#(B
 $BFCDj$N%?%$%`%>!<%s$,;XDj$5$l$F$$$J$1$l$P!"(B\fIdate_spec\fP $B$O(B
 $B%m!<%+%k%?%$%`%>!<%s$G2r<a$5$l$^$9!#(B
 $B%=!<%9%U%!%$%k$N8D?ME*$J%3%T!<$r:n$k$H$-$K;H$&$H!";XDj$O(B ``sticky'' $B$H(B
@@ -511,12 +505,8 @@
 .TP
 \fB\-k\fP \fIkflag\fP
 $B%G%U%)%k%H$N(B
-.SM RCS
-$B$N%-!<%o!<%I=hM}$rJQ99$7$^$9!#(B
-.BR co ( 1 )
-$B$K@bL@$5$l$F$$$kA4$F$N(B
-.B \-k
-$B%*%W%7%g%s$,;HMQ$G$-$^$9!#(B\fB\-k\fP $B%*%W%7%g%s$O(B
+$B%-!<%o!<%I=hM}$rJQ99$7$^$9!#(B
+\fB\-k\fP $B%*%W%7%g%s$O(B
 .BR add ", " checkout ", " diff ", " export ", "
 .BR rdiff ", " update
 $B%3%^%s%I$G;HMQ$G$-$^$9!#(B
@@ -526,9 +516,8 @@
 \fBcvs\fP $B$O;XDj$7$?(B \fIkflag\fP $B$r%U%!%$%k$K4XO"IU$1!"(B
 $BB>$N$b$N$r;XDj$9$k$^$G!"0J9_$N(B \fBupdate\fP $B%3%^%s%I$G$=$l$r;H$$B3$1$^$9!#(B
 .SP
-$B$h$jM-MQ$J(B \fIkflag\fP $B$H$7$F$O(B \-ko $B$H(B \-kb ($B%P%$%J%j%U%!%$%kMQ!"(B
-.SM RCS
-$B%P!<%8%g%s(B 5.7 $B0J9_$G$N$_MxMQ2D(B)$B!"$H(B \-kv $B$,$"$j$^$9!#(B\-kv $B$O(B
+$B$h$jM-MQ$J(B \fIkflag\fP $B$H$7$F$O(B \-ko $B$H(B \-kb ($B%P%$%J%j%U%!%$%kMQ(B)
+$B$H(B \-kv $B$,$"$j$^$9!#(B\-kv $B$O(B
 .B export
 $B$N:]!"$I$3$+JL$N%5%$%H$G8e$K(B
 .B import
@@ -617,8 +606,7 @@
 $B;XDj$9$k$^$G!"$=$l$r;H$$B3$1$^$9!#(B
 .I tag
 $B$H$7$F$O(B
-.SM RCS
-$B%9%?%$%k$N%7%s%\%j%C%/$^$?$OHV9f$K$h$k$b$N$,;HMQ$G$-$^$9!#(B
+$B%7%s%\%j%C%/$^$?$OHV9f$K$h$k$b$N$,;HMQ$G$-$^$9!#(B
 .SM RCS
 $B%U%!%$%k$,;XDj$5$l$?%?%0$r4^$s$G$$$J$$$H$-$K7Y9p%a%C%;!<%8$rM^;_$9$k$?$a(B
 $BA4BN$K:nMQ$9$k(B
@@ -674,7 +662,6 @@
 .br
 .B add
 $B%3%^%s%I$r;H$C$F(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$K?7$7$$%U%!%$%k$^$?$O%G%#%l%/%H%j$r:n@.$7$^$9!#(B
 .B add
 $B$G;XDj$5$l$k%U%!%$%k$^$?$O%G%#%l%/%H%j$O!"$9$G$K(B
@@ -690,7 +677,6 @@
 .SP
 .` "cvs add"
 $B$N0z?t$,D>2<$N%5%V%G%#%l%/%H%j$r;X$7$F$$$k$J$i!"$=$N%G%#%l%/%H%j$,(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$N8=0LCV$K:n@.$5$l!"I,MW$J(B
 .B cvs
 $B4IM}%U%!%$%k$,:n6H%G%#%l%/%H%j$K:n@.$5$l$^$9!#(B
@@ -733,7 +719,6 @@
 .SP
 .` "cvs commit"
 $B$GJQ99$,915WE*$J$b$N$H$5$l$k$^$G!"DI2C$5$l$?%U%!%$%k$O(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$K$OCV$+$l$^$;$s!#(B
 .` "cvs remove"
 $B%3%^%s%I$G:o=|$5$l$?%U%!%$%k$KBP$7$F(B
@@ -765,8 +750,7 @@
 .` "cvs admin"
 $B$GJQ99$9$k$3$H$,$G$-$^$9!#(B
 $BE83+$5$l$?(B
-.SM RCS
-ID $BJ8;zNs$r;}$?$J$$$G$"$m$&%P%$%J%j$r%A%'%C%/%$%s$9$k>l9g$K$O(B
+$B%-!<%o!<%I$r;}$?$J$$$G$"$m$&%P%$%J%j$r%A%'%C%/%$%s$9$k>l9g$K$O(B
 .` "-ko"
 $B$r;XDj$9$k$HJXMx$G$9!#(B
 .TP
@@ -782,15 +766,10 @@
 .br
 $B$3$l$O(B
 .BR rcs ( 1 )
-$B$GJ8=q2=$5$l$F$$$k(B
-.SM RCS
-$B$N4IM}5!9=$HBP1~$9$k(B
+$B$K;w$?4IM}5!9=$HBP1~$9$k(B
 .B cvs
 $B$N%$%s%?%U%'!<%9$G$9!#(B
-.` "cvs admin"
-$B$O(B $B$=$NA4$F$N%*%W%7%g%s$H0z?t$rC1=c$K(B
-.B rcs
-$B%3%^%s%I$KEO$7$^$9!#(B $B$J$s$N%U%#%k%?$dJQ49$b9T$$$^$;$s!#(B
+$B$J$s$N%U%#%k%?$dJQ49$b9T$$$^$;$s!#(B
 $B$7$+$7$J$,$i!"$3$N%3%^%s%I$O:F5"E*$KF/$-$^$9!#$h$C$F;HMQ$K$O(B
 $BFCJL$JCm0U$rJ'$o$J$1$l$P$$$1$^$;$s!#(B
 .TP
@@ -827,7 +806,6 @@
 $BJT=8$7$F$$$k$+$I$&$+$r5$$K$9$k$3$H$J$/(B) $B$3$l$i$N%=!<%9%U%!%$%k$rJT=8$7$?$j!"(B
 $BB>$N?M$K$h$C$F%=!<%9%j%]%8%H%j$K9T$o$l$??7$7$$JQ99$r<h$j9~$`$?$a$K(B
 $B$3$l$i$r99?7(B (update) $B$7$?$j!"(B
-.SM RCS
 $B$"$J$?$N:n6H$r915WE*$JJQ99$H$7$F%j%]%8%H%j$K(B
 $BEPO?(B (commit) $B$9$k$3$H$,$G$-$^$9!#(B
 .SP
@@ -985,7 +963,6 @@
 $BA4$F$,$&$^$/$$$/$H!"%m%0%a%C%;!<%8$rF~NO$9$k$?$a$K%(%G%#%?$,(B
 $B8F$S=P$5$l$^$9!#%m%0%a%C%;!<%8$O0l$D$+$=$l0J>e$N%m%0$r<h$k(B
 $B%W%m%0%i%`$K=q$-9~$^$l$F(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$N%U%!%$%k$KCV$+$l$^$9!#(B
 $BBe$o$j$K%3%^%s%I%i%$%s$G(B
 .B \-m
@@ -997,11 +974,9 @@
 .SP
 .B \-r
 $B%*%W%7%g%s$GFCDj$N%7%s%\%j%C%/$^$?$OHV9f$G;XDj$5$l$k(B
-.SM RCS
-$B%U%!%$%kCf$N%j%S%8%g%s$H$7$F%3%_%C%H$G$-$^$9!#(B
+$B%j%S%8%g%s$H$7$F%3%_%C%H$G$-$^$9!#(B
 $BNc$($P!"A4%U%!%$%k$r(B
-.SM RCS
-$B%j%S%8%g%s$N(B ``3.0'' $B$K>e$2$k(B ($BJQ99$5$l$F$$$J$$$b$N$b4^$a$F(B) 
+$B%j%S%8%g%s(B ``3.0'' $B$K>e$2$k(B ($BJQ99$5$l$F$$$J$$$b$N$b4^$a$F(B) 
 $B$K$O!"0J2<$N$h$&$K$7$^$9(B:
 .SP
 .in +1i
@@ -1147,7 +1122,6 @@
 .B \-kv
 $B%*%W%7%g%s$,M-MQ$G$9!#(B
 $B$3$l$K$h$C$F(B
-.SM RCS
 $B%-!<%o!<%I$,!"$I$3$+JL$N%5%$%H$G(B
 .B import
 $B$,9T$o$l$?$H$-$K%j%S%8%g%s>pJs$,<:$o$l$J$$$h$&$J7A$KE83+$5$l$k$h$&$K(B
@@ -1318,7 +1292,6 @@
 Cederqvist $BCx$N%^%K%e%"%k$r;2>H$7$F2<$5$$!#(B
 .SP
 $B30It$+$i$N%=!<%9$OBh0l%l%Y%k$N(B
-.SM RCS
 $B%V%i%s%A!"%G%U%)%k%H$G$O(B
 .` "1.1.1" $B$KJ]B8$5$l$^$9!#(B
 $B0J9_$N99?7$O(B $B$3$N%V%i%s%A$N%j!<%U$K$J$j$^$9!#(B
@@ -1369,13 +1342,7 @@
 .B rlog
 .br
 \fIfiles\fP $B$N%m%0>pJs$rI=<($7$^$9!#(B
-.` "cvs log"
-$B$O(B
-.SM RCS
-$B%f!<%F%#%j%F%#$N(B \fBrlog\fP $B$r8F$S=P$7$^$9!#(B
-.BR rlog ( 1 )
-$B$G@bL@$5$l$F$$$kA4$F$N%*%W%7%g%s$,;HMQ$G$-$^$9!#(B
-\fBrlog\fP $B$N%*%W%7%g%s$NCf$G$bM-MQ$J$b$N$H$7$F$O!"0J2<$N$b$N$,$"$j$^$9(B:
+\fBrlog\fP $B$N%*%W%7%g%s$NCf$G$bM-MQ$J$b$N$H$7$F$O!"<!$N$b$N$,$"$j$^$9(B:
 $B%X%C%@(B ($B%?%0$NDj5A$r4^$`$,!"%m%0$NBgItJ,$O>JN,$5$l$k(B) $B$N$_I=<($9$k(B
 \fB\-h\fP ; $BFCDj$N%j%S%8%g%s$^$?$O%j%S%8%g%s$NHO0O$G%m%0$rA*Br$9$k(B
 \fB\-r\fP; $B$=$7$FFCDj$NF|;~$^$?$O;~9o$NHO0O$rA*Br$9$k(B \fB\-d\fP $B$,(B
@@ -1422,14 +1389,6 @@
 .B patch
 $B%3%^%s%I$K;XDj$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
 .SP
-\fB\-V\fP \fIvn\fP $B%*%W%7%g%s$r;H$&$H!"(B
-.SM RCS
-$B$N%-!<%o!<%I$,(B \fIvn\fP $B$G;XDj$5$l$?(B
-.SM RCS
-$B$N%P!<%8%g%s$K9g$o$;$FE83+$5$l$^$9(B ($BE83+%U%)!<%^%C%H$O(B
-.SM RCS
-$B$N%P!<%8%g%s(B 5 $B$GJQ99$5$l$^$7$?(B)$B!#(B
-.SP
 $BI8=`%*%W%7%g%s$N(B \fIflags\fP \fB\-f\fP$B!"(B\fB\-l\fP $B$,(B
 $B$3$N%3%^%s%I$GMxMQ2DG=$G$9!#B>$K$b$$$/$D$+$N(B
 $BFCJL$J%*%W%7%g%s%U%i%0$,$"$j$^$9(B:
@@ -1742,7 +1701,6 @@
 file $B$KBP$7$F(B
 .` "cvs commit"
 $B$r<B9T$7$?$H$-$K(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$KDI2C$5$l$^$9!#(B
 $B$3$l$OEv3:%U%!%$%k$r(B commit $B$9$kI,MW$,$"$k$H$$$&=u8@$G$9!#(B
 .TP 1i
@@ -1751,7 +1709,6 @@
 file $B$KBP$7$F(B
 .` "cvs commit"
 $B$r<B9T$9$k$H(B
-.SM RCS
 $B%=!<%9%j%]%8%H%j$+$i:o=|$5$l$k$3$H$r<($7$^$9!#(B
 $B$3$l$OEv3:%U%!%$%k$r(B commit $B$9$kI,MW$,$"$k$H$$$&=u8@$G$9!#(B
 .TP 1i
@@ -1769,14 +1726,12 @@
 \fIfile\fP $B$X$N$"$J$?$NJQ99$H%=!<%9%j%]%8%H%j$+$i$NJQ99$H$N(B
 $BM;9g$r;n$_$k4V$K(B \fI$B>WFM(B (conflict)\fP $B$,8!=P$5$l$^$7$?!#(B
 $B8=:_(B \fIfile\fP ($B$"$J$?$N:n6H%G%#%l%/%H%j$N%3%T!<(B) $B$O(B
-.BR rcsmerge ( 1 )
-$B%3%^%s%I$r(B 2 $B$D$N%P!<%8%g%s$KE,MQ$7$?=PNO$K$J$C$F$$$^$9!#(B
+2 $B$D$N%P!<%8%g%s$r%^!<%8$7$?7k2L$K$J$C$F$$$^$9!#(B
 $BJQ99$5$l$F$$$J$$(B $B$"$J$?$N%U%!%$%k$N%3%T!<$b:n6H%G%#%l%/%H%j$K!"(B
 `\fB.#\fP\fIfile\fP\fB.\fP\fIversion\fP' $B$H$$$&L>A0$GCV$+$l$^$9!#(B
 $B$3$3$G(B
 .I version
 $B$O(B $B$"$J$?$NJQ99$7$?%U%!%$%k$N=PH/E@$H$J$C$?(B
-.SM RCS
 $B%j%S%8%g%s$G$9!#(B
 ($B$"$k<o$N%7%9%F%`$G$O!"(B
 \&
@@ -1994,7 +1949,6 @@
 $B:o=|$5$l$?%=!<%9%U%!%$%k$N$?$a$N%G%#%l%/%H%j!#(B
 .TP
 #cvs.lock
-.SM RCS
 $B%=!<%9%j%]%8%H%j$KHyL/$JJQ99$r9T$C$F$$$k$H$-$K(B
 .B cvs
 $B$,:n@.$9$k%m%C%/%G%#%l%/%H%j!#(B
@@ -2039,9 +1993,8 @@
 .BR ci ( 1 )
 $B$H$$$C$?(B
 .SM RCS
-$B$N%W%m%0%i%`$,CV$+$l$F$$$k>l=j$X$N%U%k%Q%9L>$r;XDj$7$^$9!#(B
-$B%;%C%H$5$l$J$$$H!"%3%s%Q%$%k;~$K@_Dj$5$l$?CM$,;HMQ$5$l$^$9!#(B
-.` "cvs \-v" $B$GI=<($5$l$kFbMF$r;2>H$7$F2<$5$$!#(B
+$B$N%W%m%0%i%`$,CV$+$l$F$$$k>l=j$X$N%U%k%Q%9L>$r;XDj$7$^$9(B 
+(CVS 1.9 $B$^$?$O$=$l0JA0(B)$B!#(B
 .TP
 .SM CVSEDITOR
 .BR commit
@@ -2110,6 +2063,8 @@
 $B%7%'%k%9%/%j%W%H(B (
 .` "cvs import" $B$NAD@h(B)
 $B$N:n<T$G$b$"$j$^$9!#(B
+.TP
+$B$3$3$K=q$/$K$OB?$/$N?M$,B>$K$b$$$^$9!#(B
 .SH "$B4XO"9`L\(B"
 CVS $B$N:G$bJq3gE*$J%^%K%e%"%k$O(B
 Per Cederqvist $B$i$K$h$k(B Version Management with CVS $B$G$9!#(B
diff -ur man/man1/mt.1 man/man1/mt.1
--- man/man1/mt.1	Sat May  8 16:59:09 1999
+++ man/man1/mt.1	Tue May 11 23:15:08 1999
@@ -32,6 +32,7 @@
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
 .\" jpman %Id: mt.1,v 1.3 1997/06/16 09:29:17 taku Stab %
+.\" jpman original revision: 1.12.2.3
 .\"
 .Dd June 6, 1993
 .Dt MT 1
@@ -56,7 +57,7 @@
 $B$G;XDj$7$?2s?t$@$17+$jJV$7<B9T$G$-$^$9!#(B
 $B$J$*!"(B
 .Ar tapename
-$B$O@8$N(B( $B%V%m%C%/7?$G$J$$(B )$B%F!<%W%G%P%$%9$r;X$7$F$$$J$1$l$P$J$j$^$;$s!#(B
+$B$O@8$N(B ($B%V%m%C%/7?$G$J$$(B) $B%F!<%W%G%P%$%9$r;X$7$F$$$J$1$l$P$J$j$^$;$s!#(B
 .Pp
 $B;HMQ2DG=$J%3%^%s%I$O2<5-$N$h$&$K$J$C$F$$$^$9!#(B
 $B%3%^%s%I$N;XDj$K$"$?$C$F!"(B
@@ -112,16 +113,16 @@
 $B$3$N5!G=$r%5%]!<%H$7$J$$%I%i%$%V$b$"$j$^$9!#(B
 count $B0z?t$O!"%F!<%W0\F0@h$N(B SCSI $BO@M}%V%m%C%/$G$"$k$H2r<a$5$l$^$9!#(B
 .It Cm rewind
-$B%F!<%W$r4,$-La$7$^$9(B( $B%+%&%s%H$OL5;k(B )$B!#(B
+$B%F!<%W$r4,$-La$7$^$9(B ($B%+%&%s%H$OL5;k(B)$B!#(B
 .It Cm offline , rewoffl
 $B%F!<%W$r4,$-La$7$F!"(B
-$B%F!<%W%f%K%C%H$r%*%U%i%$%s>uBV$K$7$^$9(B( $B%+%&%s%H$OL5;k(B )$B!#(B
+$B%F!<%W%f%K%C%H$r%*%U%i%$%s>uBV$K$7$^$9(B ($B%+%&%s%H$OL5;k(B)$B!#(B
 .It Cm erase
 $B%F!<%W$r>C5n$7$^$9!#(B
 $B%+%&%s%H(B 0 $B$OD9$$>C5n$rL58z$K$7$^$9!#$3$l$,%G%U%)%k%H$G$9!#(B
 .It Cm retension
-$B%F!<%W$N$?$k$_$r<h$j$^$9(B( $B0lEY:G8e$^$GAaAw$j$7$F!"(B
-$B$^$?4,$-La$7$^$9!#%+%&%s%H$OL5;k(B )$B!#(B
+$B%F!<%W$N$?$k$_$r<h$j$^$9(B ($B0lEY:G8e$^$GAaAw$j$7$F!"(B
+$B$^$?4,$-La$7$^$9!#%+%&%s%H$OL5;k(B)$B!#(B
 .It Cm status
 $B%F!<%W%f%K%C%H$N>uBV>pJs$r=PNO$7$^$9!#(B
 SCSI $B<'5$%F!<%W%I%i%$%V$KBP$7$F$O!"(B
@@ -157,8 +158,27 @@
 $BM?$($i$l$?J8;zNs$H@5$7$$L)EYL>>N$rD4$Y$?7k2L$,@53N$K9gCW$7$J$$$N$G$"$l$P!"(B
 $BM?$($i$l$?J8;zNs$,$I$&2r<a$5$l$?$+$K$D$$$F!"(B
 $BDLCN%a%C%;!<%8$,=PNO$5$l$^$9!#(B
+.It Cm geteotmodel
+$B8=:_$N(B EOF $B%U%!%$%k%^!<%/%b%G%k$r!"<hF@$7$FI=<($7$^$9!#(B
+$B%b%G%k>uBV$H$O!"(B
+$B%F!<%W$,=q$-9~$^$l$k>l9g!"(B
+$B=q$-9~$_%/%m!<%:;~$K2?8D$N%U%!%$%k%^!<%/$,=q$-9~$^$l$k$+$rI=8=$7$^$9!#(B
+.It Cm seteotmodel
+$B8=:_$N(B EOT $B%U%!%$%k%^!<%/%b%G%k$r!"(B(
+.Ar count
+$B0z?t$K(B) $B@_Dj$7$FI=<($7$^$9!#(B
+$BE57?E*$K$O!"$3$l$O%U%!%$%k%^!<%/(B
+.Ar 2
+$B8D$G$9$,!"%G%P%$%9$K$h$C$F$O(B ($BE57?E*$K$O(B QIC $B%+!<%H%j%C%8%I%i%$%V$G$O(B)$B!"(B
+$B%U%!%$%k%^!<%/$r(B
+.Ar 1
+$B8D$@$1=q$-9~$_2DG=$G$9!#8=:_$N$H$3$m!"CM$O(B
+.Ar 1
+$B$^$?$O(B
+.Ar 2
+$B$@$1$+$iA*Br2DG=$G$9!#(B
 .It Cm eom
-$B5-O?$5$l$?%a%G%#%"$N=*C<$^$GAaAw$j$7$^$9(B( $B%+%&%s%H$OL5;k(B )$B!#(B
+$B5-O?$5$l$?%a%G%#%"$N=*C<$^$GAaAw$j$7$^$9(B ($B%+%&%s%H$OL5;k(B)$B!#(B
 .It Cm eod
 $B%G!<%?$N=*C<$^$GAaAw$j$7$^$9!#(B
 .Cm eom
diff -ur man/man1/pax.1 man/man1/pax.1
--- man/man1/pax.1	Sat Sep 26 15:19:58 1998
+++ man/man1/pax.1	Thu May 13 23:06:07 1999
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	%Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp %
+.\"	%Id: pax.1,v 1.8.2.1 1999/05/08 10:42:21 kris Exp %
 .\" jpman %Id: pax.1,v 1.4 1997/08/25 03:45:37 horikawa Stab %
 .\"
 .Dd April 18, 1994
@@ -1126,7 +1126,7 @@
 .Sh $B:n<T(B
 .An Keith Muller
 at the University of California, San Diego
-.Sh $B%(%i!<(B
+.Sh $B?GCG(B
 .Nm
 $B$O!"0J2<$NCM$N$$$:$l$+$G=*N;$7$^$9(B:
 .Bl -tag -width 2n
Only in man: man1aout
diff -ur man/man5/hosts_options.5 man/man5/hosts_options.5
--- man/man5/hosts_options.5	Sun May  9 10:34:28 1999
+++ man/man5/hosts_options.5	Thu May 13 23:34:28 1999
@@ -1,4 +1,4 @@
-.\" jpman %Id: hosts_options.5,v 1.2 1999/05/07 11:25:58 horikawa Stab %
+.\" jpman %Id: hosts_options.5,v 1.3 1999/05/11 15:59:25 kuma Stab %
 .\" WORD: severity	$B=EMWEY(B [syslog.conf.5]
 .\" WORD: facility	$B%U%!%7%j%F%#(B [syslog.conf.5]
 .TH HOSTS_OPTIONS 5
@@ -11,7 +11,7 @@
 $BNc$($P!"(BMakefile $B$rJT=8$7!"(B
 $B%3%s%Q%$%k;~%*%W%7%g%s(B PROCESS_OPTIONS $B$rM-8z$K$7$^$9!#(B
 .PP
-$B$3$N3HD%2DG=$J8@8l$O!"<!$N=q<0$r;HMQ$7$^$9(B:
+$B$3$N3HD%2DG=$J8@8l$O!"<!$N=q<0$r;HMQ$7$^$9!#(B
 .sp
 .ti +3
 daemon_list : client_list : option : option ...
@@ -43,7 +43,7 @@
 $B$9$Y$F$N%"%/%;%9@)8f%k!<%k$rC10l$N%U%!%$%k$K!"(B
 $BNc$($P(B \fIhosts.allow\fR $B%U%!%$%k$K!"CV$/$3$H$,2DG=$H$J$j$^$9!#(B
 .sp
-$BFCDj$N%[%9%H$@$1$+$i$N%"%/%;%9$r5v2D$9$k$K$O!"<!$N$h$&$K$7$^$9(B:
+$BFCDj$N%[%9%H$@$1$+$i$N%"%/%;%9$r5v2D$9$k$K$O!"<!$N$h$&$K$7$^$9!#(B
 .sp
 .ne 2
 .ti +3
@@ -51,7 +51,7 @@
 .ti +3
 ALL: ALL: DENY
 .sp
-$B>/?t$N%H%i%V%k%a!<%+0J30$+$i$N%"%/%;%9$r$9$Y$F5v2D$9$k$K$O!"<!$N$h$&$K$7$^$9(B:
+$B>/?t$N%H%i%V%k%a!<%+0J30$+$i$N%"%/%;%9$r$9$Y$F5v2D$9$k$K$O!"<!$N$h$&$K$7$^$9!#(B
 .sp
 .ne 2
 .ti +3
@@ -66,7 +66,7 @@
 $B;XDj$7$?%7%'%k%3%^%s%I$r;R%W%m%;%9$G<B9T$7$^$9!#(B
 $B%3%^%s%I$N<B9T$O(B stdin, stdout, stderr $B$r(B null $B%G%P%$%9$K@\B3$7$F(B
 $B9T$o$l$^$9$N$G!"(B
-$B%/%i%$%"%s%H%[%9%H$H$N2qOC$,:.Mp$9$k$3$H$O$"$j$^$;$s!#Nc$($P(B:
+$B%/%i%$%"%s%H%[%9%H$H$N2qOC$,:.Mp$9$k$3$H$O$"$j$^$;$s!#Nc$($P!"(B
 .sp
 .nf
 .ti +3
@@ -81,7 +81,7 @@
 "safe_finger" $B%3%^%s%I$r;HMQ$7$F$$$^$9!#(B
 $B$3$l$K$h$j!"(B
 finger $B%5!<%P$+$iAw$i$l$k%G!<%?$K5/0x$7$FH/@8$7F@$k%@%a!<%8$r8BDj$7$^$9!#(B
-"safe_finger" $B%3%^%s%I$O!"%G!<%b%s%i%C%Q%Q%C%1!<%8$N0lIt$G$9(B;
+"safe_finger" $B%3%^%s%I$O!"%G!<%b%s%i%C%Q%Q%C%1!<%8$N0lIt$G$9!#(B
 $B$3$l$O!"DL>o$N(B finger $B%3%^%s%I$rJq$s$G!"(B
 $B%j%b!<%H%[%9%H$+$iAw$i$l$k%G!<%?$r%U%#%k%?$7$^$9!#(B
 .IP "twist shell_command"
@@ -111,8 +111,8 @@
 .sp
 $B7Y9p(B: UDP $B%5!<%S%9$G$O!"(B
 $BI8=`(B I/O $B$d(B read(2)/write(2) $B%k!<%A%s$r;HMQ$7$F%/%i%$%"%s%H%W%m%;%9$H(B
-$BDL?.$9$k%W%m%0%i%`$r!"(Btwist $B$NBP>]$H$7$F$O$J$j$^$;$s(B;
-UDP $B$G$O!"B>$N(B I/O $B%W%j%_%F%#%V$rI,MW$H$7$^$9!#(B
+$BDL?.$9$k%W%m%0%i%`$r!"(Btwist $B$NBP>]$H$7$F$O$J$j$^$;$s!#(B
+UDP $B$G$O!"B>$N(B I/O $B%W%j%_%F%#%V$rI,MW$H$9$k$+$i$G$9!#(B
 .SH $B%M%C%H%o!<%/%*%W%7%g%s(B
 .IP "keepalive"
 $B%5!<%P$,%/%i%$%"%s%H$KBP$7$FDj4|E*$K%a%C%;!<%8$rAw$k$h$&$K$7$^$9!#(B
@@ -128,8 +128,9 @@
 RFC 931 (TAP, IDENT, RFC 1413) $B$r;HMQ$7$F!"(B
 $B%/%i%$%"%s%H$N%f!<%6L>$r8!:w$7$^$9!#(B
 $B%5!<%S%9$,(B TCP $B0J30$NG[Aw$r%Y!<%9$K$7$F$$$k>l9g$K$O!"(B
-$B$3$N%*%W%7%g%s$OL[$C$FL5;k$5$l$^$9!#(B
-$B%/%i%$%"%s%H%7%9%F%`$,(B RFC 931 (IDENT $B$J$I(B) $B8_49$N%G!<%b%s$r<B9T$9$k$3$H$r(B
+$B$3$N%*%W%7%g%s$O$H$/$KCG$j$J$/L5;k$5$l$^$9!#(B
+$B$3$N%*%W%7%g%s$r;XDj$9$k$3$H$K$h$j!"(B
+$B%/%i%$%"%s%H%7%9%F%`$,(B RFC 931 (IDENT $B$J$I(B) $B=`5r$N%G!<%b%s$r<B9T$9$k$3$H$r(B
 $BI,MW$H$7!"Hs(B UNIX $B%/%i%$%"%s%H$+$i$N@\B3$KBP$7$F$OBg$-$JCY1d$r@8$8$5$;F@$^$9!#(B
 $B%?%$%`%"%&%H4|4V$N;XDj$O!">JN,2DG=$G$9!#(B
 $B%?%$%`%"%&%HCM$r;XDj$7$J$$$H!"(B
@@ -146,7 +147,8 @@
 tcp $B%i%C%Q$N%=!<%9%3!<%IG[I[$G$O!"(B
 banners $B$N4IM}$KM-MQ$J%5%s%W%k(B makefile (Banners.Makefile) $B$rDs6!$7$F$$$^$9!#(B
 .sp
-$B7Y9p(B: banners $B$O!"@\B3;X8~(B (TCP) $B%M%C%H%o!<%/%5!<%S%9$N$_$G%5%]!<%H$5$l$^$9!#(B
+$B7Y9p(B: banners $B$O!"%3%M%/%7%g%s;X8~(B (TCP) $B%M%C%H%o!<%/%5!<%S%9$N$_$G(B
+$B%5%]!<%H$5$l$^$9!#(B
 .IP "nice [ number ]"
 $B%W%m%;%9$N(B nice $BCM(B ($B%G%U%)%k%H$O(B 10 $B$G$9(B) $B$rJQ99$7$^$9!#(B
 $BB>$N%W%m%;%9$K$h$jB?$/$N(B CPU $B;q8;$r;H$&$K$O!"@5$NCM$r;XDj$7$F$/$@$5$$!#(B
@@ -165,12 +167,12 @@
 .IP "user nobody"
 .IP "user nobody.kmem"
 "nobody" $B$N%f!<%6(B id ($B$^$?$O%f!<%6(B "nobody" $B$G%0%k!<%W(B "kmem")
-$B$N8"8B$r2>Dj$7$F$$$^$9!#(B
+$B$N8"8B$r%W%m%;%9$K@_Dj$7$^$9!#(B
 $B:G=i$N7A<0$O!"A4%5!<%S%9$r(B root $B8"8B$G<B9T$9$k(B inetd $B$N<BAu$K$*$$$FM-MQ$G$9!#(B
 2 $BHVL\$N7A<0$O!"FC<l$J%0%k!<%W8"8B$N$_$rI,MW$H$9$k%5!<%S%9$KM-MQ$G$9!#(B
 .SH $B?GCG(B
 $B%"%/%;%9@)8f%k!<%k$KJ8K!%(%i!<$,$"$k$H$-!"(B
-$B%(%i!<$O(B syslog $B%G!<%b%s$KJs9p$5$l$^$9(B;
+$B%(%i!<$O(B syslog $B%G!<%b%s$KJs9p$5$l$^$9!#$3$N$H$-!"(B
 $B$=$N8e$N%*%W%7%g%s$OL5;k$5$l!"%5!<%S%9$O5qH]$5$l$^$9!#(B
 .SH $B4XO"9`L\(B
 hosts_access(5), $B%G%U%)%k%H$N%"%/%;%9@)8f8@8l(B
diff -ur man/man5/loader.conf.5 man/man5/loader.conf.5
--- man/man5/loader.conf.5	Sun May  9 10:34:29 1999
+++ man/man5/loader.conf.5	Thu May 13 23:34:28 1999
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	%Id: loader.conf.5,v 1.1.2.1 1999/04/24 17:44:35 dcs Exp %
-.\" jpman %Id: loader.conf.5,v 1.2 1999/05/07 11:30:43 horikawa Stab %
+.\" jpman %Id: loader.conf.5,v 1.4 1999/05/13 05:58:04 horikawa Stab %
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
@@ -38,22 +38,22 @@
 .Nm
 $B$O!"%7%9%F%`$N%V!<%H%9%H%i%C%W$K4X$9$k5-=RE*$J>pJs$r4^$_$^$9!#(B
 $B$3$l$rDL$8$F!"%V!<%H$9$Y$-%+!<%M%k!"%+!<%M%k$KEO$9%Q%i%a!<%?!"(B
-$B%m!<%I$9$Y$-DI2C$N%b%8%e!<%k!"(B
+$B%m!<%I$9$Y$-DI2C$N%b%8%e!<%k$r;XDj2DG=$G$"$j!"$^$?!"0lHLE*$K!"(B
 .Xr loader 8
-$B$G5-=R$5$l$F$$$k$9$Y$F$NJQ?t$N0lHLE*$J@_Dj$r!";XDj2DG=$G$9!#(B
+$B$G5-=R$5$l$F$$$k$9$Y$F$NJQ?t$r@_Dj2DG=$G$9!#(B
 .Pp
 .Nm
-$B$,<+F0E*$K=hM}$5$l$k$h$&$K!"(B
+$B$,<+F0E*$K=hM}$5$l$k$h$&$K$9$k$?$a$K!"(B
 $B%U%!%$%k(B
 .Pa /boot/loader.rc
-$B$O<!$N(B 2 $B9T$r4^$s$G$$$k$G$7$g$&(B:
+$B$O<!$N(B 2 $B9T$r4^$`I,MW$,$"$j$^$9!#(B
 .Pp
 .Dl include /boot/loader.4th
 .Dl start
 .Pp
 $B%$%s%9%H!<%k;~$K(B
 .Pa /boot/loader.rc
-$B$,B8:_$7$J$$>l9g!"A0=R$N9T$r4^$`$b$N$,%$%s%9%H!<%k$5$l$k$G$7$g$&!#(B
+$B$,B8:_$7$J$$>l9g!"A0=R$N9T$r4^$`$b$N$,AH$_9~$^$l$k$3$H$K$J$j$^$9!#(B
 .Sh $BJ8K!(B
 .Nm loader.conf
 $B$N=q<0$O!"L@$i$+$K(B
diff -ur man/man8/camcontrol.8 man/man8/camcontrol.8
--- man/man8/camcontrol.8	Sun May  9 16:43:30 1999
+++ man/man8/camcontrol.8	Tue May 11 23:15:29 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: camcontrol.8,v 1.9.2.2 1999/05/07 00:42:43 ken Exp %
+.\"	%Id: camcontrol.8,v 1.9.2.3 1999/05/10 23:32:47 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]
@@ -40,6 +40,7 @@
 .Sh $B=q<0(B
 .Nm camcontrol
 .Aq command
+.Op device id
 .Op generic args
 .Op command args
 .Nm camcontrol
@@ -47,25 +48,31 @@
 .Op Fl v
 .Nm camcontrol
 periphlist
+.Op device id
 .Op Fl n Ar dev_name
 .Op Fl u Ar unit_number
 .Nm camcontrol
 tur
+.Op device id
 .Op generic args
 .Nm camcontrol
 inquiry 
+.Op device id
 .Op generic args
 .Op Fl D
 .Op Fl S
 .Op Fl R
 .Nm camcontrol
 start
+.Op device id
 .Op generic args
 .Nm camcontrol
 stop
+.Op device id
 .Op generic args
 .Nm camcontrol
 eject
+.Op device id
 .Op generic args
 .Nm camcontrol
 rescan
@@ -75,12 +82,14 @@
 .Aq bus Ns Op :target:lun
 .Nm camcontrol
 defects
+.Op device id
 .Op generic args
 .Aq Fl f Ar format
 .Op Fl P
 .Op Fl G
 .Nm camcontrol
 modepage
+.Op device id
 .Op generic args
 .Aq Fl m Ar page
 .Op Fl P Ar pgctl
@@ -88,6 +97,7 @@
 .Op Fl d
 .Nm camcontrol
 cmd
+.Op device id
 .Op generic args
 .Aq Fl c Ar cmd Op args
 .Op Fl i Ar len Ar fmt
@@ -103,12 +113,14 @@
 .Aq all|off|bus Ns Op :target Ns Op :lun
 .Nm camcontrol
 tags
+.Op device id
 .Op generic args
 .Op Fl N Ar tags
 .Op Fl q
 .Op Fl v
 .Nm camcontrol
 negotiate
+.Op device id
 .Op generic args
 .Op Fl c
 .Op Fl D Ar enable|disable
@@ -119,6 +131,8 @@
 .Op Fl U
 .Op Fl W Ar bus_width
 .Op Fl v
+.Nm camcontrol
+help
 .Sh $B2r@b(B
 .Nm camcontrol
 $B$O!"%f!<%6$,(B
@@ -133,8 +147,43 @@
 $B$*4+$a$7$^$9!#AG?M$5$s$O$3$N%f!<%F%#%j%F%#$K6aIU$$$F$O$$$1$^$;$s!#(B
 .Pp
 .Nm camcontrol
-$B$O$$$/$D$+$N<g5!G=$r;}$C$F$$$^$9!#$=$NB?$/$O2<$K<($9(B
-$B6&DL$N0z?t(B(generic argument)$B$N$$$/$D$+$r<h$j$^$9!#(B
+$B$O$$$/$D$+$N<g5!G=$r;}$C$F$$$^$9!#(B
+$B$=$NB?$/$O!">JN,2DG=$J%G%P%$%9<1JL;R$r%5%]!<%H$7$^$9!#(B
+$B%G%P%$%9<1JL;R$O!"<!$N(B 3 $B<oN`$N=q<0$N$$$:$l$+$r<h$jF@$^$9(B:
+.Bl -tag -width 01234567890123
+.It deviceUNIT
+$B%G%P%$%9L>$H%G%P%$%9HV9f$NAH$_9g$o$;$r!"(B"da5" $B$d(B "cd3" $B$N$h$&$K;XDj$7$^$9!#(B
+$B%-%c%i%/%?%G%P%$%9%N!<%IL>(B ($BNc$($P(B /dev/rsd0.ctl) $B$O!"$3$3$G$O5v$5$l(B
+.Em $B$J$$(B
+$B$3$H$KCm0U$7$F$/$@$5$$!#(B
+.It bus:target
+$B%P%9HV9f$H%?!<%2%C%H(B id $B$r;XDj$7$^$9!#(B
+$B%P%9HV9f$O(B
+.Dq camcontrol devlist
+$B$N=PNO$K$h$j7hDj2DG=$G$9!#(B
+$BO@M}%f%K%C%HHV9f(B (lun) $B$O%G%U%)%k%H$N(B 0 $B$K$J$j$^$9!#(B
+.It bus:target:lun
+$B%G%P%$%9$N%P%9(B (bus) $B$H%?!<%2%C%H(B (target) $B$HO@M}%f%K%C%HHV9f(B (lun) $B$r!"(B
+($BNc$($P(B 1:2:0 $B$N$h$&$K(B) $B;XDj$7$^$9!#(B
+.El
+.Pp
+$B%G%P%$%9<1JL;R$O!";XDj$5$l$?>l9g$K$O!"(B
+$B5!G=L>$ND>8e$K$+$D!"$9$Y$F$N6&DL0z?t$^$?$O5!G=8GM-0z?t$NA0$KCV$+$l$k$3$H$,(B
+.Em $BI,MW(B
+$B$G$9!#(B
+$B8e=R$9$k(B
+.Fl n
+$B$H(B
+.Fl u
+$B$N0z?t$O!"$=$NA0$K;XDj$5$l$k%G%P%$%9L>$d%f%K%C%HHV9f$r%*!<%P%i%$%I$9$k$3$H$K(B
+$BCm0U$7$F$/$@$5$$!#$7$+$7!"(B
+.Fl n
+$B$H(B
+.Fl u
+$B$N0z?t$O!"(Bbus:target $B$^$?$O(B bus:target:lun $B$N;XDj$O%*!<%P%i%$%I$7$^$;$s!#(B
+.Pp
+.Nm camcontrol
+$B$N<g5!G=$NB?$/$O2<$K<($96&DL0z?t(B (generic argument) $B$r%5%]!<%H$7$^$9(B:
 .Bl -tag -width 01234567890123
 .It Fl C Ar count
 SCSI $B%3%^%s%I$N%j%H%i%$%+%&%s%H!#$3$N5!G=$,F0:n$9$k$?$a$K$O!"%(%i!<%j%+%P%j(B
@@ -495,6 +544,8 @@
 .Fl a
 $B%9%$%C%A$O!"8r>D%Q%i%a!<%?$,8z2L$r$"$i$o$9$h$&$K$9$k$?$a!"(B
 $B<+F0E*$K(B Test Unit Ready $B$r%G%P%$%9$KAw$j$^$9!#(B
+.It help
+$B>iD9$J!";HMQJ}K!$K4X$9$k>pJs$rI=<($7$^$9!#(B
 .El
 .Sh $B4D6-JQ?t(B
 $BJQ?t(B
@@ -532,7 +583,7 @@
 $BI=<($7$^$;$s!#(B
 .Pp
 .Bd -literal -offset foobar
-camcontrol tur -n da -u 1 -E -C 4 -t 50 -v
+camcontrol tur da1 -E -C 4 -t 50 -v
 .Ed
 .Pp
 SCSI test unit ready $B%3%^%s%I$r(B da1 $B$KAw?.$7$^$9!#%+!<%M%k%(%i!<%j%+%P%j(B
@@ -563,7 +614,7 @@
 $B;HMQ$7$?>l9g!"%G!<%?$,GK2u$5$l$k$+$b$7$l$^$;$s!#(B
 .Pp
 .Bd -literal -offset foobar
-camcontrol modepage -n da -u 3 -m 1 -e -P 3
+camcontrol modepage da3 -m 1 -e -P 3
 .Ed
 .Pp
 da3 $B$N%b!<%I%Z!<%8(B 1 (Read-Write Error Recover $B%Z!<%8(B)$B$rJT=8$7!"JT=87k2L$r(B
@@ -579,7 +630,7 @@
 SCSI $B%P%9(B 0, $B%?!<%2%C%H(B 1, $BO@M}%f%K%C%HHV9f(B 0 $B$r:F%9%-%c%s$7!"$=$N%G%P%$%9$,(B
 $BDI2C!":o=|!"JQ99$5$l$?$+$I$&$+$rD4$Y$^$9!#(B
 .Pp
-.Dl camcontrol tags -n da -u 5 -N 24
+.Dl camcontrol tags da5 -N 24
 .Pp
 da5 $B$NF1;~%H%i%s%6%/%7%g%s?t$r(B 24 $B$K@_Dj$7$^$9!#(B
 .Pp
@@ -683,7 +734,7 @@
 $B%$%s%?%U%'!<%9$rJQ99$9$k$+$N$I$A$i$+$,I,MW$G$7$g$&!#(B
 $B$3$NLdBj$r2sHr$9$k$b$C$H$bNI$$J}K!$O!">o$K(B
 .Nm camcontrol
-$B6&DL$N0z?t$r%3%^%s%I8GM-$N0z?t$NA0$K;XDj$7$F$$$k$3$H$r3NG'$9$k$3$H$G$9!#(B
+$B6&DL0z?t$r%3%^%s%I8GM-$N0z?t$NA0$K;XDj$7$F$$$k$3$H$r3NG'$9$k$3$H$G$9!#(B
 .Pp
-bus/target/lun $B$+!"%G%P%$%9L>(B ($B$?$H$($P(B "da1" $B$J$I$N(B)$B$G%G%P%$%9$r(B
+bus/target/lun $B$+!"%G%P%$%9L>(B ($B$?$H$($P(B "da1" $B$J$I$N(B) $B$G%G%P%$%9$r(B
 $B;XDj$G$-$k$h$&$K$9$k$[$&$,$h$$$+$b$7$l$^$;$s!#(B
diff -ur man/man8/dhclient-script.8 man/man8/dhclient-script.8
--- man/man8/dhclient-script.8	Sun May  9 10:34:35 1999
+++ man/man8/dhclient-script.8	Thu May 13 23:07:06 1999
@@ -36,8 +36,8 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" jpman %Id: dhclient-script.8,v 1.3 1999/04/26 13:26:54 mzaki Stab %
-.TH dhclient 8
+.\" jpman %Id: dhclient-script.8,v 1.4 1999/05/13 14:01:25 horikawa Stab %
+.TH dhclient-script 8
 .SH $BL>>N(B
 dhclient-script - DHCP $B%/%i%$%"%s%H$N%M%C%H%o!<%/@_Dj%9%/%j%W%H(B
 .SH $B=q<0(B
@@ -52,17 +52,56 @@
 $BM-8z$J%j!<%9$,H=L@$7$J$+$C$?>l9g$K$b$b$&(B 1 $B2s$3$N%9%/%j%W%H$,8F$P$l$^$9!#(B
 .PP
 $BK\%9%/%j%W%H$O!"%(%s%I%f!<%6$K%+%9%?%^%$%:$5$l$k$3$H$r0U?^$7$F$$$^$;$s!#(B
-$B$7$+$7!"K\%9%/%j%W%H$OFCDj$N%*%Z%l!<%F%#%s%0%7%9%F%`$NFCDj$N%P!<%8%g%s$G(B
-$BF0:n$7$J$$$+$b$7$l$^$;$s$N$G(B
-($B<B:]!"%*%Z%l!<%F%#%s%0%7%9%F%`$K$h$C$F$OI8=`%9%/%j%W%H$,L5$$$b$N$b$"$j$^$9(B)$B!"(B
+$B%m!<%+%k$J%+%9%?%^%$%:$,I,MW$J>l9g!"(B
+$B$3$l$OF~(B (enter) $B$H=P(B (exit) $B$H$$$&%U%C%/$r;HMQ$9$k$3$H$G2DG=$H$J$j$^$9(B
+($B>\:Y$O%U%C%/;2>H(B)$B!#(B
+$B$3$l$i$N%U%C%/$O!"(B
+.B /etc/resolv.conf
+$B:n@.;~$K!"(B
+$B%/%i%$%"%s%H$N%G%U%)%k%HF0:n$r%f!<%6$,%*!<%P%i%$%I$G$-$k$h$&$K$7$^$9!#(B
+.PP
+$BFCDj$N%*%Z%l!<%F%#%s%0%7%9%F%`$G$O!"(B
+$B%/%i%$%"%s%H$N<BBN$OF0:n$9$k$H$7$F$b!"(B
+$BI8=`$N%9%/%j%W%H$,F0:n$7$J$$$+$b$7$l$^$;$s!#(B
 $B@h6nE*$J%f!<%6$,?75,%9%/%j%W%H$r:n@.$7$?$j4{B8$N$b$N$r=$$7$?$j$9$kI,MW$,$"$k(B
 $B$3$H$O$b$C$H$b$J$3$H$G$9!#(B
 $B0lHLE*$K$O!"$=$l$>$l$N%3%s%T%e!<%?$K8GM-$N%+%9%?%^%$%:$O(B
 .B /etc/dhclient.conf
 $B%9%/%j%W%H$G9T$&$Y$-$G$9!#(B
-$B$=$N$h$&$J%+%9%?%^%$%:$G(B
-dhclient-script $B$r=q$-49$($:$K$O$G$-$J$$$b$N$K5$$E$$$?>l9g$K$O!"(B
+.B /etc/dhclient.conf
+$B$N%+%9%?%^%$%:L5$7$K$G$-$J$$%+%9%?%^%$%:$d!"(B
+$BF~$H=P$N%U%C%/$N;HMQ$G$O$G$-$J$$%+%9%?%^%$%:$K5$$E$$$?>l9g$K$O!"(B
 $B%P%0%l%]!<%H$rAw$C$F$/$@$5$$!#(B
+.SH $B%U%C%/(B
+$B3+;O;~$K!"%/%i%$%"%s%H%9%/%j%W%H$O$^$:%7%'%k4X?t$rDj5A$7$^$9!#$=$N4X?t$O(B
+.B make_resolv_conf
+$B$G$"$j!"8e$K(B
+.B /etc/resolv.conf
+$B%U%!%$%k$r:n@.$9$k$?$a$K;HMQ$5$l$^$9!#(B
+$B%G%U%)%k%HF0:n$r%*!<%P%i%$%I$9$k$K$O!"(B
+$B$3$N4X?t$rF~$N%U%C%/%9%/%j%W%H$G:FDj5A$7$F$/$@$5$$!#(B
+.PP
+make_resolv_conf $B4X?t$NDj5A$N8e!"%/%i%$%"%s%H%9%/%j%W%H$O(B
+$B<B9T2DG=$J(B
+.B /etc/dhclient-enter-hooks
+$B%9%/%j%W%H$NB8:_$r8!::$7!"(B
+$BB8:_$9$k>l9g$K$O(B Bourne $B%7%'%k$N(B '.' $B%3%^%s%I$r;HMQ$7$F(B
+$BK\%9%/%j%W%H$r%$%s%i%$%s$G5/F0$7$^$9!#(B
+$BA`:n$G5-=R$5$l$F$$$k$9$Y$F$N4D6-$,K\%9%/%j%W%H$G;HMQ2DG=$G$"$j!"(B
+$B%9%/%j%W%H$NF0:n$NJQ99$,I,MW$J>l9g$K$O4D6-$N=$@5$,5v$5$l$F$$$^$9!#(B
+$B%9%/%j%W%H<B9TCf$K%(%i!<$,H/@8$?>l9g!"(B
+exit_status $BJQ?t$rHs(B 0 $BCM$K@_Dj$9$k$3$H$,2DG=$G$"$j!"(B
+$B%/%i%$%"%s%H%9%/%j%W%H=*N;D>8e$K(B
+.B /sbin/dhclient-script
+$B$O$=$N%(%i!<%3!<%I$G=*N;$7$^$9!#(B
+.PP
+$B$9$Y$F$N=hM}$N40N;8e$K!"(B
+.B /sbin/dhclient-script
+$B$O<B9T2DG=$J(B
+.B /sbin/dhclient-exit-hooks
+$B%9%/%j%W%H$NB8:_$r8!::$7!"B8:_$9$k>l9g$K$O(B '.' $B%3%^%s%I$G$3$l$r5/F0$7$^$9!#(B
+$B=*N;>uBV$O(B exit_status $B%7%'%kJQ?t$KEO$5$l!"(B
+$B5/F0$5$l$?;E;v$K%9%/%j%W%H$,@.8y$7$?>l9g$K$OCM$O>o$K(B 0 $B$K$J$j$^$9!#(B
 .SH $BA`:n(B
 dhclient $B$,%/%i%$%"%s%H@_Dj%9%/%j%W%H$r5/F0$9$kI,MW$,$"$k$H$-!"(B
 $BMM!9$JJQ?t$rDj5A$9$k%7%'%k%9%/%j%W%H$r(B /tmp $B$K=q$-9~$_$^$9!#(B
@@ -195,7 +234,7 @@
 $B$I$A$i$N%5!<%P$+$iDs6!$5$l$k>pJs$bM-8z$G$"$k>l9g$K$O!"(B
 $B<B:]>eLdBj$H$O$J$i$J$$$b$N$N!":.Mp$N$b$H$K$J$j$($^$9!#(B
 .SH $B4XO"9`L\(B
-dhclient.conf(5), dhclient.leases(5), dhclient(8)
+dhclient.conf(5), dhclient.leases(5), dhclient(8), dhcpd(8), dhcrelay(8)
 .SH $B:n<T(B
 .B dhclient-script(8)
 $B$O(B Ted Lemon <mellon@fugue.com> $B$,(B
diff -ur man/man8/pccardc.8 man/man8/pccardc.8
--- man/man8/pccardc.8	Mon May 10 22:25:46 1999
+++ man/man8/pccardc.8	Thu May 13 23:07:06 1999
@@ -26,9 +26,9 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\"	%Id: pccardc.8,v 1.1.2.1 1999/05/03 11:20:37 kuriyama Exp %
+.\"	%Id: pccardc.8,v 1.1.2.2 1999/05/10 22:04:17 kuriyama Exp %
 .\"
-.\" jpman %Id: pccardc.8,v 1.2 1999/05/08 07:48:11 horikawa Stab %
+.\" jpman %Id: pccardc.8,v 1.3 1999/05/13 14:04:07 horikawa Stab %
 .\" $B86J8$G$"$k(B PAO $B$N(B pccardc.8 $B$r$[$\$=$N$^$^MxMQ$7$F$$$^$9(B
 .Dd November 14, 1998
 .Dt PCCARDC 8

----Next_Part(Thu_May_13_23:54:38_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: English diff
Content-Disposition: attachment; filename=diff

diff -u man1/cvs.1 man1/cvs.1
--- man1/cvs.1	Wed May  5 19:01:44 1999
+++ man1/cvs.1	Thu May 13 14:29:06 1999
@@ -35,19 +35,15 @@
 .IX  "release control system"  "cvs command"  ""  "\fLcvs\fP \- concurrent versions system"
 .IX  "source control system"  "cvs command"  ""  "\fLcvs\fP \- concurrent versions system"
 .IX  revisions  "cvs command"  ""  "\fLcvs\fP \- source control"
-.B cvs
-is a front end to the
-.BR rcs ( 1 )
-revision control system which extends
-the notion of revision control from a collection of files in a single
-directory to a hierarchical collection of directories consisting of
-revision controlled files.
-These directories and files can be combined together to form a software
-release.
-.B cvs
-provides the functions necessary to manage these software releases and to
-control the concurrent editing of source files among multiple software
-developers.
+CVS is a version control system, which allows you to keep old versions
+of files (usually source code), keep a log of who, when, and why
+changes occurred, etc., like RCS or SCCS.  Unlike the simpler systems,
+CVS does not just operate on one file at a time or one directory at a
+time, but operates on hierarchical collections of directories
+consisting of version controlled files.  CVS helps to manage releases
+and to control the concurrent editing of source files among multiple
+authors.  CVS allows triggers to enable/log/control various
+operations and works well over a wide area network.
 .SP
 .B cvs
 keeps a single copy of the master sources.
@@ -175,7 +171,7 @@
 .I bindir
 as the directory where
 .SM RCS
-programs are located.
+programs are located (CVS 1.9 and older).
 Overrides the setting of the
 .SM RCSBIN
 environment variable.
@@ -185,7 +181,6 @@
 Use
 .I CVS_root_directory
 as the root directory pathname of the master
-.SM RCS
 source repository.
 Overrides the setting of the
 .SM CVSROOT
@@ -337,7 +332,6 @@
 .TP
 .B admin
 Execute
-.SM RCS
 control functions on the source repository.  (Changes
 repository directly; uses working directory without changing it.)
 .TP
@@ -385,7 +379,6 @@
 .TP
 .B log
 Display
-.SM RCS
 log information.
 (Does not change repository or working directory.)
 .TP
@@ -454,11 +447,8 @@
 \fB\-D\fP \fIdate_spec\fP
 Use the most recent revision no later than \fIdate_spec\fP (a single
 argument, date description specifying a date in the
-past).  A wide variety of date formats are supported by the underlying
-.SM RCS
-facilities, similar to those described in
-.BR co ( 1 ),
-but not exactly the same.
+past).  A wide variety of date formats are supported, in particular
+ISO ("1972-09-24 20:05") or Internet ("24 Sep 1972 20:05").
 The \fIdate_spec\fP is interpreted as being in the local timezone, unless a
 specific timezone is specified.
 The specification is ``sticky'' when you use it to make a
@@ -511,12 +501,8 @@
 .TP
 \fB\-k\fP \fIkflag\fP
 Alter the default
-.SM RCS
-processing of keywords; all the
-.B \-k
-options described in
-.BR co ( 1 )
-are available.  The \fB\-k\fP option is available with the
+processing of keywords.
+The \fB\-k\fP option is available with the
 .BR add ", " checkout ", " diff ", " export ", "
 .BR rdiff ", and " update
 commands.  Your \fIkflag\fP specification is ``sticky'' when you use
@@ -526,10 +512,8 @@
 continues to use it with future \fBupdate\fP commands on the same file
 until you specify otherwise.
 .SP
-Some of the more useful \fIkflag\fPs are \-ko and \-kb (for binary files,
-only compatible with
-.SM RCS
-version 5.7 or later), and \-kv which is useful for an
+Some of the more useful \fIkflag\fPs are \-ko and \-kb (for binary files),
+and \-kv which is useful for an
 .B export
 where you wish to retain keyword information after an
 .B import
@@ -619,9 +603,7 @@
 continues to use it on future \fBupdate\fP commands, until you specify
 otherwise.
 .I tag
-can be either a symbolic or numeric tag, in
-.SM RCS
-fashion.
+can be either a symbolic or numeric tag.
 Specifying the
 .B \-q
 global option along with the
@@ -678,7 +660,6 @@
 Use the
 .B add
 command to create a new file or directory in the
-.SM RCS
 source repository.
 The files or directories specified with
 .B add
@@ -695,7 +676,6 @@
 .` "cvs add"
 refers to an immediate sub-directory, the directory is
 created at the correct place in the
-.SM RCS
 source repository, and the necessary
 .B cvs
 administration files are created in your working directory.
@@ -738,7 +718,6 @@
 .` "cvs update -d".)
 .SP
 The added files are not placed in the
-.SM RCS
 source repository until you use
 .` "cvs commit"
 to make the change permanent.
@@ -776,9 +755,8 @@
 Specifying
 .` "-ko"
 is useful for checking in binaries that
-shouldn't have the
-.SM RCS
-id strings expanded.
+shouldn't have
+keywords expanded.
 .TP
 \fBadmin\fP [\fIrcs-options\fP] \fIfiles.\|.\|.\fP
 .I Requires:
@@ -793,14 +771,9 @@
 This is the
 .B cvs
 interface to assorted administrative
-.SM RCS
-facilities, documented in
+facilities, similar to
 .BR rcs ( 1 ).
-.` "cvs admin"
-simply passes all its options and arguments to the
-.B rcs
-command; it does no filtering or other processing.
-This command does work recursively, however, so extreme care should be
+This command works recursively, so extreme care should be
 used.
 .TP
 \fBcheckout\fP [\fBoptions\fP] \fImodules\fP.\|.\|.
@@ -839,7 +812,6 @@
 other software developers are editing their own copies of the sources);
 update them to include new changes applied by others to the source
 repository; or commit your work as a permanent change to the
-.SM RCS
 repository.
 .SP
 Note that
@@ -1006,7 +978,6 @@
 .SP
 When all is well, an editor is invoked to allow you to enter a log
 message that will be written to one or more logging programs and placed in the
-.SM RCS
 source repository file.
 You can instead specify the log message on the command line with the
 .B \-m
@@ -1016,12 +987,8 @@
 .SP
 The
 .B \-r
-option can be used to commit to a particular symbolic or numeric revision
-within the
-.SM RCS
-file.
+option can be used to commit to a particular symbolic or numeric revision.
 For example, to bring all your files up to the
-.SM RCS
 revision ``3.0'' (including those that haven't changed), you might do:
 .SP
 .in +1i
@@ -1173,7 +1140,6 @@
 .B export
 is used.
 This causes any
-.SM RCS
 keywords to be expanded such that an
 .B import
 done at some other site will not lose the keyword revision information.
@@ -1349,7 +1315,6 @@
 described in the SEE ALSO section of this manpage).
 .SP
 The outside source is saved in a first-level
-.SM RCS
 branch, by default
 .` "1.1.1".
 Updates are leaves of this
@@ -1409,13 +1374,7 @@
 .B rlog
 .br
 Display log information for \fIfiles\fP.
-.` "cvs log"
-calls
-the
-.SM RCS
-utility \fBrlog\fP; all the options described in
-.BR rlog ( 1 )
-are available.  Among the more useful \fBrlog\fP options are \fB\-h\fP
+Among the more useful options are \fB\-h\fP
 to display only the header (including tag definitions, but omitting
 most of the full log); \fB\-r\fP to select logs on particular
 revisions or ranges of revisions; and \fB\-d\fP to select particular
@@ -1463,14 +1422,6 @@
 .B patch
 is able to find the files that are located in other directories.
 .SP
-If you use the option \fB\-V\fP \fIvn\fP,
-.SM RCS
-keywords are expanded according to the rules current in
-.SM RCS
-version \fIvn\fP (the expansion format changed with
-.SM RCS
-version 5).
-.SP
 The standard option \fIflags\fP \fB\-f\fP, and \fB\-l\fP
 are available with this command.  There are also several
 special options flags:
@@ -1788,7 +1739,6 @@
 \fBA\fP \fIfile\fP
 The file has been \fIadded\fP to your private copy of the sources, and
 will be added to the
-.SM RCS
 source repository when you run
 .` "cvs commit"
 on the file.
@@ -1797,7 +1747,6 @@
 \fBR\fP \fIfile\fP
 The file has been \fIremoved\fP from your private copy of the sources, and
 will be removed from the
-.SM RCS
 source repository when you run
 .` "cvs commit"
 on the file.
@@ -1816,14 +1765,12 @@
 \fBC\fP \fIfile\fP
 A \fIconflict\fP was detected while trying to merge your changes to
 \fIfile\fP with changes from the source repository.  \fIfile\fP (the
-copy in your working directory) is now the output of the
-.BR rcsmerge ( 1 )
-command on the two versions; an unmodified copy of your file is also
+copy in your working directory) is now the result of merging
+the two versions; an unmodified copy of your file is also
 in your working directory, with the name `\fB.#\fP\fIfile\fP\fB.\fP\fIversion\fP',
 where
 .I version
 is the
-.SM RCS
 revision that your modified file started from.
 (Note that some systems automatically purge files that begin with
 \&
@@ -2056,7 +2003,6 @@
 A lock directory created by
 .B cvs
 when doing sensitive changes to the
-.SM RCS
 source repository.
 .TP
 #cvs.tfl.\fIpid\fP
@@ -2099,9 +2045,8 @@
 programs, such as
 .BR co ( 1 )
 and
-.BR ci ( 1 ).
-If not set, a compiled-in value is used; see the display from
-.` "cvs \-v".
+.BR ci ( 1 )
+(CVS 1.9 and older).
 .TP
 .SM CVSEDITOR
 Specifies the program to use for recording log messages during
@@ -2167,6 +2112,8 @@
 .BR checkin ( 1 )
 shell script (the ancestor of
 .` "cvs import").
+.TP
+And many others too numerous to mention here.
 .SH "SEE ALSO"
 The most comprehensive manual for CVS is
 Version Management with CVS by Per Cederqvist et al.  Depending on
diff -u man1/pax.1 man1/pax.1
--- man1/pax.1	Wed May  5 19:01:06 1999
+++ man1/pax.1	Thu May 13 14:28:27 1999
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp $
+.\"	$Id: pax.1,v 1.8.2.1 1999/05/08 10:42:21 kris Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -1124,7 +1124,7 @@
 .Sh AUTHORS
 .An Keith Muller
 at the University of California, San Diego
-.Sh ERRORS
+.Sh DIAGNOSTICS
 .Nm Pax
 will exit with one of the following values:
 .Bl -tag -width 2n
diff -u man5/dhclient.conf.5 man5/dhclient.conf.5
--- man5/dhclient.conf.5	Wed May  5 19:03:01 1999
+++ man5/dhclient.conf.5	Thu May 13 14:30:14 1999
@@ -259,14 +259,15 @@
  \fBprepend { [ \fIoption declaration\fR ]
 [\fB,\fI ... \fIoption declaration\fR ]\fB}\fR
 .PP
-If for some set of options the client should first a value it
-supplies, and then use the values supplied by
+If for some set of options the client should use a value you
+supply, and then use the values supplied by
 the server, if any, these values can be defined in the
 .B prepend
 statement.   The
 .B prepend
 statement can only be used for options which
-allow more than one value to be given.
+allow more than one value to be given.   This restriction is not
+enforced - if violated, the results are unpredictable.
 .PP
 .I The
 .B append
@@ -275,14 +276,15 @@
  \fBappend { [ \fIoption declaration\fR ]
 [\fB,\fI ... \fIoption declaration\fR ]\fB}\fR
 .PP
-If for some set of options the client should first a value it
-supplies, and then use the values supplied by
-the server, if any, these values can be defined in the
+If for some set of options the client should first use the values
+supplied by the server, if any, and then use values you supply, these
+values can be defined in the
 .B append
 statement.   The
 .B append
 statement can only be used for options which
-allow more than one value to be given.
+allow more than one value to be given.   This restriction is not
+enforced - if you ignore it, the behaviour will be unpredictable.
 .SH LEASE DECLARATIONS
 .PP
 .I The
@@ -292,7 +294,7 @@
  \fBlease {\fR \fIlease-declaration\fR [ ... \fIlease-declaration ] \fB}\fR
 .PP
 The DHCP client may decide after some period of time (see \fBPROTOCOL
-TIMING\fR) decide that it is not going to succeed in contacting a
+TIMING\fR) that it is not going to succeed in contacting a
 server.   At that time, it consults its own database of old leases and
 tests each one that has not yet timed out by pinging the listed router
 for that lease to see if that lease could work.   It is possible to
@@ -392,7 +394,7 @@
 argument is passed on the ifconfig command line when configuring te
 interface.
 .PP
-The dhcp client automatically declares this parameter if it used a
+The dhcp client automatically declares this parameter if it uses a
 media type (see the
 .B media
 statement) when configuring the interface in order to obtain a lease.
@@ -430,8 +432,8 @@
 should generally be four digits except for really long leases.  The
 month is specified as a number starting with 1 for January.  The day
 of the month is likewise specified starting with 1.  The hour is a
-number between 0 and 23, the minute a number between 0 and 69, and the
-second also a number between 0 and 69.
+number between 0 and 23, the minute a number between 0 and 59, and the
+second also a number between 0 and 59.
 .SH ALIAS DECLARATIONS
  \fBalias { \fI declarations ... \fB}\fR
 .PP
@@ -455,7 +457,9 @@
 .SH OTHER DECLARATIONS
  \fBreject \fIip-address\fB;\fR
 .PP
-The reject statement causes the DHCP client to reject offers from
+The
+.B reject
+statement causes the DHCP client to reject offers from
 servers who use the specified address as a server identifier.   This
 can be used to avoid being configured by rogue or misconfigured dhcp
 servers, although it should be a last resort - better to track down
@@ -486,7 +490,7 @@
 probably right (no guarantees).
 .PP
 The media setup is only used for the initial phase of address
-acquisition (the DHCPDISCOVER and DHCPOFFER packtes).   Once an
+acquisition (the DHCPDISCOVER and DHCPOFFER packets).   Once an
 address has been acquired, the dhcp client will record it in its lease
 database and will record the media type used to acquire the address.
 Whenever the client tries to renew the lease, it will use that same
diff -u man8/dhclient-script.8 man8/dhclient-script.8
--- man8/dhclient-script.8	Wed May  5 19:03:01 1999
+++ man8/dhclient-script.8	Thu May 13 14:30:14 1999
@@ -35,7 +35,7 @@
 .\" Enterprises.  To learn more about the Internet Software Consortium,
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
-.TH dhclient 8
+.TH dhclient-script 8
 .SH NAME
 dhclient-script - DHCP client network configuration script
 .SH DESCRIPTION
@@ -47,15 +47,49 @@
 lease is acquired, the script is used to test predefined leases, if
 any, and also called once if no valid lease can be identified.
 .PP
-This script is not meant to be customized by the end user.  However,
-the script may not work on particular versions of particular operating
-systems (indeed, no standard script exists for some operating
-systems), so a pioneering user may well need to create a new script or
-modify an existing one.  In general, customizations specific to a
-particular computer should be done in the
-.B /etc/dhclient.conf
-script.   If you find that you can't make such a customization without
-customizing dhclient-script, please submit a bug report.
+This script is not meant to be customized by the end user.  If local
+customizations are needed, they should be possible using the enter and
+exit hooks provided (see HOOKS for details).   These hooks will allow the
+user to override the default behaviour of the client in creating a
+.B /etc/resolv.conf
+file.
+.PP
+No standard client script exists for some operating systems, even though
+the actual client may work, so a pioneering user may well need to create
+a new script or modify an existing one.  In general, customizations specific
+to a particular computer should be done in the
+.B /sbin/dhclient.conf
+file.   If you find that you can't make such a customization without
+customizing
+.B /sbin/dhclient.conf
+or using the enter and exit hooks, please submit a bug report.
+.SH HOOKS
+When it starts, the client script first defines a shell function,
+.B make_resolv_conf ,
+which is later used to create the
+.B /etc/resolv.conf
+file.   To override the default behaviour, redefine this function in
+the enter hook script.
+.PP
+On after defining the make_resolv_conf function, the client script checks
+for the presence of an executable
+.B /etc/dhclient-enter-hooks
+script, and if present, it invokes the script inline, using the Bourne
+shell '.' command.   The entire environment documented under OPERATION
+is available to this script, which may modify the environment if needed
+to change the behaviour of the script.   If an error occurs during the
+execution of the script, it can set the exit_status variable to a nonzero
+value, and
+.B /sbin/dhclient-script
+will exit with that error code immediately after the client script exits.
+.PP
+After all processing has completed,
+.B /sbin/dhclient-script
+checks for the presence of an executable
+.B /sbin/dhclient-exit-hooks
+script, which if present is invoked using the '.' command.   The exit status
+is passed in the exit_status shell variable, and will always be zero if the
+script succeeded at the task for which it was invoked.
 .SH OPERATION
 When dhclient needs to invoke the client configuration script, it
 writes a shell script into /tmp which defines a variety of variables.
@@ -177,7 +211,7 @@
 valid, this shouldn't cause any real problems, but it could be
 confusing.
 .SH SEE ALSO
-dhclient.conf(5), dhclient.leases(5), dhclient(8)
+dhclient.conf(5), dhclient.leases(5), dhclient(8), dhcpd(8), and dhcrelay(8).
 .SH AUTHOR
 .B dhclient-script(8)
 has been written for the Internet Software Consortium

----Next_Part(Thu_May_13_23:54:38_1999_809)----
