From owner-man-jp-reviewer@jp.freebsd.org  Fri Dec 10 23:44:02 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA05154;
	Fri, 10 Dec 1999 23:44:02 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from multi.al.rim.or.jp (multi.al.rim.or.jp [202.247.191.124] (may be forged))
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id XAA05149
	for <man-jp-reviewer@jp.freebsd.org>; Fri, 10 Dec 1999 23:44:02 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from mail-relay.rim.or.jp by multi.al.rim.or.jp (8.8.8/3.7W/HMX-12) with ESMTP id XAA19860 for <man-jp-reviewer@jp.freebsd.org>; Fri, 10 Dec 1999 23:43:13 +0900 (JST)
Received: from localhost (pppb05.yk.rim.or.jp [202.247.186.105]) by mail-relay.rim.or.jp (3.7W/HMX-12) id XAA01731 for <man-jp-reviewer@jp.freebsd.org>; Fri, 10 Dec 1999 23:43:55 +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(Fri_Dec_10_23:33:44_1999_41)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19991210234317Y.k-horik@yk.rim.or.jp>
Date: Fri, 10 Dec 1999 23:43:17 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 1309
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 1780
Subject: [man-jp-reviewer 1780] diff to 3.3-19991210-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(Fri_Dec_10_23:33:44_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 3.3-19991210-STABLE $B$X$N:9J,$G$9!#(B

 $B$$$?$@$$$?%P%0=$@50F(B
 o sh.1 ([man-jp-reviewer 1778])
 o at.1, ci.1, cursor.1, cvs.1, ldconfig.8 ([man-jp 2049])
 o pkg_create.1 ([man-jp 2055] $B$N0lIt(B)
$B$rH?1G$5$;$^$7$?!#(B

----Next_Part(Fri_Dec_10_23:33:44_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.3-19991210-STABLE
Content-Disposition: attachment; filename=diff_3.3-19991210-STABLE

diff -ur man/man1/at.1 man/man1/at.1
--- man/man1/at.1	Sun Sep  5 01:36:15 1999
+++ man/man1/at.1	Fri Dec 10 23:03:12 1999
@@ -5,7 +5,7 @@
 .Os FreeBSD 2.1
 .Sh $BL>>N(B
 .Nm at, batch, atq, atrm
-.Nd $B$"$H$G%8%g%V$r<B9T$5$;$k$?$a$N%-%e!<$N@_Dj!"3NG'!"%8%g%V$N:o=|$r$*$3$J$&(B
+.Nd $B$"$H$G%8%g%V$r<B9T$5$;$k$?$a$N%-%e!<$N@_Dj!"3NG'!"%8%g%V$N:o=|$r9T$J$&(B
 .Sh $B=q<0(B
 .Nm at
 .Op Fl V 
@@ -38,12 +38,10 @@
 .Nm at
 $B$H(B
 .Nm batch
-$B%f!<%F%#%j%F%#$O!"I8=`F~NO$b$7$/$O;XDj$7$?%U%!%$%k$+$i%3%^%s%I$rFI$_(B
+$B$O!"I8=`F~NO$b$7$/$O;XDj$7$?%U%!%$%k$+$i%3%^%s%I$rFI$_(B
 $B9~$_!"$"$H$G(B
 .Xr sh 1
 $B$r;H$C$F<B9T$7$^$9!#(B
-.Pp
-$B%3%^%s%I$N3F5!G=$r0J2<$K<($7$^$9(B:
 .Bl -tag -width indent
 .It Nm at
 $B%3%^%s%I$r!"0z?t$G;XDj$7$?;~4V$K<B9T$7$^$9!#(B
@@ -74,18 +72,18 @@
 .Nm noon ,
 .Nm teatime
 (4pm) $B$b<u$1IU$1$^$9$7!";~9o$N8e$m$K(B
-.Nm am
+.Nm AM
 $B$b$7$/$O(B
-.Nm pm
+.Nm PM
 $B$r$D$1$?;~4V$b<u$1IU$1$^$9!#F|IU$O!"(B 
 .Ar \%month-name day
 $B$*$h$S%*%W%7%g%s$N(B 
 .Ar year
 $B$N7A$G<u$1IU$1$^$9!#(B
 .Ar MMDDYY
-$B!"(B
+$B$d(B
 .Ar MM/DD/YY
-$B!"(B
+$B$d(B
 .Ar DD.MM.YY
 $B$b<u$1IU$1$^$9!#(B
 $BF|IU$N;XDj$O;~9o$N;XDj$N8e$K5-=R$7$^$9!#(B
@@ -99,20 +97,21 @@
 $B$N$$$:$l$+$G$9!#;~4V$N%5%U%#%C%/%9$N(B
 .Nm today
 $B$O%8%g%V$r:#F|$K@_Dj$9$k$3$H!"(B
-.Nm tommorow
+.Nm tomorrow
 $B$O%8%g%V$rL@F|$K@_Dj$9$k$3$H$r0UL#$7$^$9!#(B
-$B$?$H$($P!":#$+$i(B 3 $BF|8e$N8a8e(B 4 $B;~$K%8%g%V$rAv$i$;$k$?$a$K$O(B
-.Nm 4PM + 3 days
-$B$H;XDj$7$^$9!#(B7 $B7n(B 31 $BF|$N8aA0(B 10 $B;~$N>l9g$O(B
-.Nm 10am Jul 31
-$B$H;XDj$7$^$9!#L@F|$N8aA0(B 1 $B;~$O(B 
-.Nm 1am tomorrow
+.Pp
+$BNc$($P!":#$+$i(B 3 $BF|8e$N8a8e(B 4 $B;~$K%8%g%V$rAv$i$;$k$?$a$K$O(B
+.Nm at 4PM + 3 days
+$B$H$7$^$9!#(B7 $B7n(B 31 $BF|$N8aA0(B 10 $B;~$N>l9g$O(B
+.Nm at 10am Jul 31
+$B$H$7$^$9!#L@F|$N8aA0(B 1 $B;~$O(B 
+.Nm at 1am tomorrow
 $B$G$9!#(B
 .Pp
 .Nm at
 $B$H(B
 .Nm batch
-$B$G$O!"I8=`F~NO$^$?$O(B
+$B$O$I$A$i$b!"I8=`F~NO$^$?$O(B
 .Fl f
 $B%*%W%7%g%s$G;XDj$7$?%U%!%$%k$+$i%3%^%s%I$rFI$_9~$_!"<B9T$7$^$9!#(B
 $B%o!<%-%s%0%G%#%l%/%H%j$H4D6-JQ?t(B (
@@ -153,7 +152,7 @@
 .Pp
 $B$b$7(B
 .Pa /var/at/at.allow
-$B$,B8:_$7$J$+$C$?$i!"(B
+$B$,B8:_$7$J$1$l$P!"(B
 .Pa /var/at/at.deny
 $B$,%A%'%C%/$5$l!"$=$NCf$K%f!<%6L>$,5-=R$5$l$F$$$J$$$9$Y$F$N%f!<%6$,(B
 .Nm at
@@ -168,7 +167,6 @@
 .Pa /var/at/at.deny
 $B$OA4$F$N%f!<%6$,$3$l$i$N%3%^%s%I$r;HMQ$G$-$k$3$H$r0UL#$7$^$9!#(B
 .Sh $B%*%W%7%g%s(B
-$B%*%W%7%g%s$H$7$F$O0J2<$N$b$N$,$"$j$^$9(B:
 .Bl -tag -width indent
 .It Fl V
 $BI8=`%(%i!<=PNO$K%P!<%8%g%sHV9f$r=PNO$7$^$9!#(B
@@ -211,7 +209,8 @@
 .Nm batch
 $B$N%(%$%j%"%9!#(B
 .It Fl v
-atq $B$N>l9g$O!"%-%e!<$NCf$N<B9T$5$l$?$,$^$@:o=|$5$l$F$$$J$$%8%g%V$r(B
+.Nm atq
+$B$N>l9g$O!"%-%e!<$NCf$N<B9T$5$l$?$,$^$@:o=|$5$l$F$$$J$$%8%g%V$r(B
 $BI=<($7$^$9!#$5$b$J$1$l$P%8%g%V$,<B9T$5$l$k;~4V$rI=<($7$^$9!#(B
 .It Fl c
 $B%3%^%s%I%i%$%s$K%j%9%H$5$l$?%8%g%V$rI8=`=PNO$K=PNO$7$^$9!#(B
@@ -242,9 +241,9 @@
 $B$,MxMQ$G$-$J$$$+IT@5$G$"$C$?>l9g!"$b$7$/$O(B
 .Nm at
 $B$,<B9T$5$l$?;~$K%f!<%6$,%m%0%$%s$7$F$$$J$$>l9g!"(B
-$B%a!<%k$O4D6-JQ?t(B
+$B4D6-JQ?t(B
 .Nm LOGNAME
-$B$GI=$5$l$k(B userid $B$K=P$5$l$^$9!#(B
+$B$GI=$5$l$k(B userid $B$K%a!<%k$,Aw$i$l$^$9!#(B
 $B$b$7Dj5A$5$l$F$$$J$$$+6u$J$i$P%+%l%s%H$N(B userid $B$K$J$j$^$9!#(B
 .Pp
 $B%f!<%6F1;N$G%j%=!<%9$N6%9g$,$"$k>l9g$O8=<BAu$N(B
@@ -254,7 +253,7 @@
 $B$OE,Ev$G$O$"$j$^$;$s!#(B
 $B$b$7$"$J$?$N%5%$%H$,$3$N$h$&$J>l9g$K$"$F$O$^$k$N$J$i!"(B
 .Nm nqs
-$B$N$h$&$J%P%C%A%7%9%F%`$r8!F$$7$F$/$@$5$$!#(B
+$B$N$h$&$JB>$N%P%C%A%7%9%F%`$r8!F$$7$F$/$@$5$$!#(B
 .Sh $B:n<T(B
 at $B$N$[$H$s$I$NItJ,$O(B
 .An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de
diff -ur man/man1/awk.1 man/man1/awk.1
--- man/man1/awk.1	Wed Dec  8 00:34:03 1999
+++ man/man1/awk.1	Fri Dec 10 23:08:11 1999
@@ -3,7 +3,7 @@
 .ds PX \s-1POSIX\s+1
 .ds UX \s-1UNIX\s+1
 .ds AN \s-1ANSI\s+1
-.TH GAWK 1 "Dec 19 1996" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Apr 28 1999" "Free Software Foundation" "Utility Commands"
 .SH $BL>>N(B
 gawk \- $B%Q%?!<%s8!:w!&=hM}8@8l(B
 .SH $B=q<0(B
@@ -2072,6 +2072,13 @@
 $B6I=jJQ?t$H$7$FMQ$$$i$l$k4X?t0z?t$O!"4X?t5/F0;~$K6uJ8;zNs$*$h$S(B 0 
 $B$K=i4|2=$5$l$^$9!#(B
 .PP
+$B4X?t$+$iCM$rJV$9$K$O(B
+.BI return " expr"
+$B$r;HMQ$7$F$/$@$5$$!#(B
+$BCM$r;XDj$7$J$$>l9g!"$^$?$O4X?t$N=*$j$+$i(B ``$BMn$A$k(B'' 
+($BLuCm(B: $B4X?t$rJD$8$k%V%l!<%9$KE~C#$9$k(B) $B$3$H$K$h$j4X?t$+$iLa$k>l9g!"(B
+$BCM$OL$Dj5A$G$9!#(B
+.PP
 .B \-\^\-lint
 $B$,;XDj$5$l$?$H$-!"(B
 .I gawk
@@ -2449,7 +2456,7 @@
 .SH $B%P!<%8%g%s>pJs(B
 $B$3$N%^%K%e%"%k$O(B
 .IR gawk
-$B%P!<%8%g%s(B 3.0.2 $B$K$D$$$F5-:\$7$F$$$^$9!#(B
+$B%P!<%8%g%s(B 3.0.4 $B$K$D$$$F5-:\$7$F$$$^$9!#(B
 .SH $B:n<T(B
 \*(UX
 .I awk
@@ -2481,9 +2488,9 @@
 .SH $B%P%0%l%]!<%H(B
 .I gawk
 $B$N%P%0$r8+IU$1$?$i!"EE;R%a!<%k$r(B
-.B bug-gnu-utils@prep.ai.mit.edu
+.B bug-gnu-utils@gnu.org
 $B08$KAw$k$H$H$b$K!"%+!<%\%s%3%T!<$r(B
-.B arnold@gnu.ai.mit.edu
+.B arnold@gnu.org
 $B08$KAw$C$F$/$@$5$$!#(B
 $BEE;R%a!<%k$K$O!"%*%Z%l!<%F%#%s%0%7%9%F%`$H$=$N%j%S%8%g%s!"(B
 .I gawk
@@ -2513,7 +2520,7 @@
 $BDs6!$7$F2<$5$$$^$7$?!#(B
 $B46<UCW$7$^$9!#(B
 .SH COPYING PERMISSIONS
-Copyright \(co\) 1996 Free Software Foundation, Inc.
+Copyright \(co) 1996,97,98,99 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of
 this manual page provided the copyright notice and this permission
diff -ur man/man1/ci.1 man/man1/ci.1
--- man/man1/ci.1	Sun Sep  5 01:36:15 1999
+++ man/man1/ci.1	Fri Dec 10 23:03:23 1999
@@ -512,8 +512,8 @@
 $B%*%W%7%g%s$O(B \*r $B%U%!%$%k$K3JG<$5$l$F$$$kF|IU(B ($B>o$K(B \*u $B$G$9(B)
 $B$K$O1F6A$7$^$;$s!#(B
 .SH "$B%U%!%$%kL>5,B'(B"
-\*r $B%U%!%$%k$H%o!<%/%U%!%$%k$NAH$_9g$o$;$O(B3$BDL$j$NJ}K!$G;XDj$9$k$3$H$,$G$-$^$9!#(B
-($B;HMQNc$N9`L\$b;2>H$7$F$/$@$5$$!#(B)
+\*r $B%U%!%$%k$H%o!<%/%U%!%$%k$NAH$_9g$o$;$O(B 3 $BDL$j$NJ}K!$G;XDj$9$k$3$H$,$G$-$^$9(B
+($B;HMQNc$N9`L\$b;2>H$7$F$/$@$5$$(B)$B!#(B
 .PP
 1) \*r $B%U%!%$%k$H%o!<%/%U%!%$%k$NN>J}$r;XDj$9$k!#(B
 \*r $B%U%!%$%k$N%Q%9L>$O(B
@@ -779,7 +779,7 @@
 .fi
 .RE
 .IP \(bu \nn
-$BFCDj$N%f%6!<$@$1$K(B \*r $B%U%!%$%k$NFI$_9~$_$r5v2D$7$?$$>l9g!"(B
+$BFCDj$N%f!<%6$@$1$K(B \*r $B%U%!%$%k$NFI$_9~$_$r5v2D$7$?$$>l9g!"(B
 $B$=$N%f!<%6$r%f!<%6%0%k!<%W(B
 .IR G 
 $B$KF~$l$F!"$5$i$K(B
diff -ur man/man1/cursor.1 man/man1/cursor.1
--- man/man1/cursor.1	Wed Feb 25 13:53:56 1998
+++ man/man1/cursor.1	Fri Dec 10 23:03:23 1999
@@ -34,7 +34,7 @@
 .Dt CURSOR 1
 .Sh $BL>>N(B
 .Nm cursor
-.Nd pcvt VT220 $B%S%G%*%I%i%$%P$G%+!<%=%k$N7A>u$r@_Dj$9$k!#(B
+.Nd pcvt VT220 $B%S%G%*%I%i%$%P$G%+!<%=%k$N7A>u$r@_Dj$9$k(B
 .Sh $B=q<0(B
 .Nm cursor
 .Op Fl d Ar device
@@ -53,9 +53,9 @@
 $B<!$KB3$/JQ?t$G!"2>A[2hLL$NHV9f$r@_Dj$7$^$9!#JQ?t$,@_Dj$5$l$F$$$J$$>l9g!"(B
 $B8=:_$N2>A[C<Kv$+!"(B -d $BJQ?t$G$N2hLL$,2>Dj$5$l$^$9!#(B
 .It Fl s
-$B%+!<%=%k$,;O$^$k(B($B>e$N(B)$B%9%-%c%s%i%$%s$r@_Dj$7$^$9!#(B
+$B%+!<%=%k$,;O$^$k(B ($B>e$N(B) $B%9%-%c%s%i%$%s$r@_Dj$7$^$9!#(B
 .It Fl e
-$B%+!<%=%k$,=*$k(B($B2<$N(B)$B%9%-%c%s%i%$%s$r@_Dj$7$^$9!#(B
+$B%+!<%=%k$,=*$k(B ($B2<$N(B) $B%9%-%c%s%i%$%s$r@_Dj$7$^$9!#(B
 .El
 .Pp
 $BJQ?t$O8=:_;HMQCf$NJ8;z%U%)%s%H$NBg$-$5$K4p$E$$$FD4@0$5$l$kI,MW$,$"$k$3$H$K(B
diff -ur man/man1/cvs.1 man/man1/cvs.1
--- man/man1/cvs.1	Wed Sep 15 20:57:27 1999
+++ man/man1/cvs.1	Fri Dec 10 23:03:32 1999
@@ -14,7 +14,7 @@
 .RB ` "\|\\$1\|" '\\$2
 ..
 .SH "$BL>>N(B"
-cvs \- $B%3%s%+%l%s%H!&%P!<%8%g%s!&%7%9%F%`(B
+cvs \- $B%3%s%+%l%s%H%P!<%8%g%s%7%9%F%`(B
 .SH "$BCm5-(B"
 $B$3$N%^%K%e%"%k%Z!<%8$O(B
 .B cvs
@@ -51,7 +51,7 @@
 $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
+$B$O%^%9%?%=!<%9$NC10l$N%3%T!<$rJ];}$7$^$9!#(B
 $B$3$N%3%T!<$O%=!<%9$N(B``$B%j%]%8%H%j(B''$B$H8F$P$l$^$9!#(B $B$3$l$O!"0JA0$N(B
 $B%=%U%H%&%'%"%j%j!<%9$r$$$D$G$b%7%s%\%j%C%/$J%j%S%8%g%s%?%0$+!"(B
 $B$^$?$O2a5n$NF|IU$N$$$:$l$+$K4p$E$$$F<h$j=P$;$k$h$&$K$9$k$?$a$N(B
@@ -145,7 +145,7 @@
 $B$O!"C;$$%*%W%7%g%s$H6&$K(B
 .SM GNU
 $B%9%?%$%k$ND9$$%*%W%7%g%s$b%5%]!<%H$7$^$9!#(B
-$B8=:_$O$^$@(B 2$B!"(B3$B$ND9$$%*%W%7%g%s$7$+%5%]!<%H$5$l$F$*$i$:!"(B
+$B8=:_$O$^$@(B 2, 3 $B$ND9$$%*%W%7%g%s$7$+%5%]!<%H$5$l$F$*$i$:!"(B
 $B$=$l$i$OF1$80UL#$r;}$DC;$$%*%W%7%g%s$N8e$m$K$+$.3g8L$G0O$s$G(B
 $B<($5$l$F$$$^$9!#(B
 .SP
@@ -164,10 +164,10 @@
 .B \-Q
 $B$O%3%^%s%I$r(B
 .I $B??$K(B
-$B2IL[$K$7$^$9!#(B $B%3%^%s%I$O?<9o$JLdBj$K$D$$$F$N$_=PNO$r9T$$$^$9!#(B
+$B2IL[$K$7$^$9!#%3%^%s%I$O?<9o$JLdBj$K$D$$$F$N$_=PNO$r9T$$$^$9!#(B
 .TP
 .B \-q
-$B$O%3%^%s%I$r$$$/$V$s@E$+$K$7$^$9!#(B $B%5%V%G%#%l%/%H%j$r:F5"E*$K(B
+$B$O%3%^%s%I$r$$$/$V$s@E$+$K$7$^$9!#%5%V%G%#%l%/%H%j$r:F5"E*$K(B
 $B0\F0$9$k:]$NJs9p$N$h$&$JDLCNE*$J%a%C%;!<%8$,M^@)$5$l$^$9!#(B
 .TP
 \fB\-b\fP \fIbindir\fP
@@ -215,7 +215,7 @@
 .B \-n
 $B$$$+$J$k%U%!%$%k$bJQ99$7$^$;$s!#(B
 .IR cvs_command $B$r<B9T$7$h$&$H$7$^$9$,!"(B
-$B7P2aJs9p$N$_$r9T$$$^$9!#(B $B%U%!%$%k$X$N:o=|!"99?7$d%^!<%8$N$$$:$l$b(B
+$B7P2aJs9p$N$_$r9T$$$^$9!#%U%!%$%k$X$N:o=|!"99?7$d%^!<%8$N$$$:$l$b(B
 $B9T$$$^$;$s$7!"?7$7$$%U%!%$%k$b:n@.$7$^$;$s!#(B
 .TP
 .B \-t
@@ -386,7 +386,7 @@
 $B$r;2>H$7$F2<$5$$!#(B
 .TP
 .B import
-$B30It$G9T$o$l$?99?7FbMF$r(B ``$B%Y%s%@!&%V%i%s%A(B'' $B$H$7$F%=!<%9%j%]%8%H%j$K(B
+$B30It$G9T$o$l$?99?7FbMF$r(B ``$B%Y%s%@%V%i%s%A(B'' $B$H$7$F%=!<%9%j%]%8%H%j$K(B
 $B<h$j9~$_$^$9!#(B($B%j%]%8%H%j$rJQ99$7$^$9!#(B)
 .TP
 .B log
@@ -394,7 +394,7 @@
 ($B%j%]%8%H%j$b:n6H%G%#%l%/%H%j$bJQ99$7$^$;$s!#(B)
 .TP
 .B rdiff
-$B%j%]%8%H%j$NCf$N(B 2$B$D$N%j%j!<%9$N4V$N:9J,$N=89g$r%Q%C%A%U%!%$%k$H$7$F(B
+$B%j%]%8%H%j$NCf$N(B 2 $B$D$N%j%j!<%9$N4V$N:9J,$N=89g$r%Q%C%A%U%!%$%k$H$7$F(B
 $BMQ0U$7$^$9!#(B($B%j%]%8%H%j$b:n6H%G%#%l%/%H%j$bJQ99$7$^$;$s!#(B)
 .TP
 .B release
@@ -406,14 +406,14 @@
 $B%=!<%9%j%]%8%H%j$+$i%U%!%$%k$r:o=|$7$^$9!"$=$N%U%!%$%k$K(B
 .` "cvs commit"
 $B$,<B9T$5$l$k$^$GJ]N1$5$l$^$9!#(B($BD>@\%j%]%8%H%j$K$O1F6A$7$^$;$s!#(B
-$B:n6H%G%#%l%/%H%j$rJQ99$7$^$9(B.)
+$B:n6H%G%#%l%/%H%j$rJQ99$7$^$9!#(B)
 .TP
 .B rtag
 $B%=!<%9%j%]%8%H%j$NFCDj$N%j%S%8%g%s$N%U%!%$%k$KL@<(E*$K(B
 $B%7%s%\%j%C%/%?%0$r;XDj$7$^$9!#(B
 .` "cvs tag" $B$b;2>H$7$F2<$5$$!#(B
-($B%j%]%8%H%j$rD>@\JQ99$7$^$9!#(B $B:n6H%G%#%l%/%H%j$OI,MW$J$/(B $B$^$?(B
-$BJQ99$b$7$^$;$s(B.)
+($B%j%]%8%H%j$rD>@\JQ99$7$^$9!#:n6H%G%#%l%/%H%j$OI,MW$J$/$^$?(B
+$BJQ99$b$7$^$;$s!#(B)
 .TP
 .B status
 $B8=:_$N%U%!%$%k$N>uBV$rI=<($7$^$9(B: $B:G?7%P!<%8%g%s!":n6H%G%#%l%/%H%j$N(B
@@ -426,7 +426,7 @@
 $B%j%]%8%H%jCf$N%U%!%$%k$K%7%s%\%j%C%/%?%0$r;XDj$7$^$9!#(B
 $B%G%U%)%k%H$G$O!":n6H%G%#%l%/%H%j$H:G8e$KF14|$r<h$C$?%j%S%8%g%s$K(B
 $B%?%0$r$D$1$^$9!#(B
-($BD>@\%j%]%8%H%j$rJQ99$7$^$9!#(B $B:n6H%G%#%l%/%H%j$r;H$$$^$9$,(B
+($BD>@\%j%]%8%H%j$rJQ99$7$^$9!#:n6H%G%#%l%/%H%j$r;H$$$^$9$,(B
 $BJQ99$O$7$^$;$s!#(B)
 .TP
 .B update
@@ -443,7 +443,7 @@
 .I command_options
 $B$K$D$$$F@bL@$7$^$9!#I,$:$7$bA4$F$N%3%^%s%I$,$3$l$iA4$F$N%*%W%7%g%s$r(B
 $B%5%]!<%H$7$F$$$k$o$1$G$O$"$j$^$;$s!#(B $B%3%^%s%I$N3F%*%W%7%g%s$O!"$=$l$,(B
-$B0UL#$r0Y$9%3%^%s%I$G$N$_%5%]!<%H$5$l$^$9!#$7$+$7$J$,$i!"(B
+$B0UL#$r@.$9%3%^%s%I$G$N$_%5%]!<%H$5$l$^$9!#$7$+$7$J$,$i!"(B
 $B%3%^%s%I$,$=$l$i$N%*%W%7%g%s$N$R$H$D$r;}$D$H$-!"(B
 $BB>$N%3%^%s%I$G$b$=$N%*%W%7%g%s$,F1$80UL#$r;}$D$H9M$($F:9$7;Y$($"$j$^$;$s!#(B
 ($B8D!9$N%3%^%s%I$H6&$KNs5s$7$F$"$kJL$N%*%W%7%g%s$O(B
@@ -597,7 +597,7 @@
 .I tag
 $B$G;XDj$5$l$?%j%S%8%g%s$r;H$$$^$9!#(B
 \fBtag\fP $B$H(B \fBrtag\fP $B%3%^%s%I$G(B
-$BIU$1$i$l$?G$0U$N%?%0$H6&$K!">o$K(B 2$B$D$NFCJL$J%?%0$,;HMQ$G$-$^$9(B:
+$BIU$1$i$l$?G$0U$N%?%0$H6&$K!">o$K(B 2 $B$D$NFCJL$J%?%0$,;HMQ$G$-$^$9(B:
 .` "HEAD"
 $B$O%j%]%8%H%jCf$G:G$b?7$7$$M-8z$J%P!<%8%g%s$r;X$7!"(B
 $B$=$7$F(B
@@ -644,7 +644,7 @@
 $B3F%3%^%s%I$N:G=i$N%5%^%j9T$N@bL@$O(B 3 $B<oN`$N;vJA$r$^$H$a$F$$$^$9(B:
 .TP 1i
 \ \ \ \ $B%3%^%s%I$N%*%W%7%g%s$H0z?t(B
-$BFCJL$J%*%W%7%g%s$,0J2<$G@bL@$5$l$^$9!#(B $B6&DL$N%3%^%s%I%*%W%7%g%s$O(B
+$BFCJL$J%*%W%7%g%s$,0J2<$G@bL@$5$l$^$9!#6&DL$N%3%^%s%I%*%W%7%g%s$O(B
 $B%5%^%j9T$K$7$+8=$l$J$$$+$b$7$l$^$;$s!#(B
 .TP 1i
 \ \ \ \ $B:n6H%G%#%l%/%H%j$+%j%]%8%H%j$+(B?
@@ -1188,7 +1188,7 @@
 $B0J2<$N%3%^%s%I$OC10l$N%l%3!<%I%?%$%W$r;}$A$^$9(B: \fBcheckout\fP
 ($B%?%$%W(B `O')$B!"(B
 \fBrelease\fP ($B%?%$%W(B `F')$B!"(B\fBrtag\fP ($B%?%$%W(B `T')$B!#(B
-\fBupdate\fP $B$O(B 4$B$D$N%l%3!<%I%?%$%W$N$&$A$N(B 1$B$D$K$J$j$^$9(B: `W' $B$O(B
+\fBupdate\fP $B$O(B 4 $B$D$N%l%3!<%I%?%$%W$N$&$A$N(B 1 $B$D$K$J$j$^$9(B: `W' $B$O(B
 $B:n6HMQ$N%U%!%$%k$N%3%T!<$,(B update $B$G(B ($B$=$l$,%j%]%8%H%j$+$iL5$/$J$C$F(B
 $B$$$?$?$a$K(B) $B:o=|$5$l$?>l9g$G$9(B; `U' $B$O:n6H%U%!%$%k$,%j%]%8%H%j$+$i(B
 $B%3%T!<$5$l$?>l9g$G$9(B; `G' $B$OI,MW$J%^!<%8$,L5;v$K=*$C$?>l9g$G$9(B; 'C' $B$O(B
@@ -1273,7 +1273,7 @@
 $B%j%]%8%H%j!#(B
 .br
 .` "cvs import"
-$B$r;H$&$3$H$G30It$N6!5k85(B ($BNc$($P%=!<%9!&%Y%s%@(B) $B$+$i$N%=!<%9G[I[J*(B
+$B$r;H$&$3$H$G30It$N6!5k85(B ($BNc$($P%=!<%9%Y%s%@(B) $B$+$i$N%=!<%9G[I[J*(B
 $BA4BN$r$"$J$?$N%=!<%9%j%]%8%H%j$N%G%#%l%/%H%j$X<h$j9~$a$^$9!#(B
 $B:G=i$N%j%]%8%H%j$N:n@.$H!"30It$N6!5k85$+$i$N%b%8%e!<%k$X$N(B
 $BBg5,LO$J99?7$NN>J}$K$3$N%3%^%s%I$r;H$&$3$H$,$G$-$^$9!#(B
@@ -1448,7 +1448,7 @@
 $B%3%_%C%H$5$l$F$$$J$$JQ99$,B8:_$7$J$$$3$H!"(B
 \fBcvs\fP $B$N:n6H%G%#%l%/%H%j$ND>>e$^$?$OFbIt$+$i<B9T$7$F$$$k$3$H!"(B
 $B%U%!%$%k$,5-O?$5$l$?%j%]%8%H%j$,%b%8%e!<%k%G!<%?%Y!<%9$K(B
-$BDj5A$5$l$?%j%]%8%H%j$HF1$8$G$"$k$3$H!#(B
+$BDj5A$5$l$?%j%]%8%H%j$HF1$8$G$"$k$3$H!"$G$9!#(B
 .SP
 $B$3$l$i$N>r7o$,A4$F??$J$i(B
 .` "cvs release"
@@ -1555,7 +1555,7 @@
 $B;XDj$7$^$9!#(B $B$^$?L@<(E*$K:F5"$r;XDj$9$k$K$O(B \fB\-R\fP $B$r;XDj$7$^$9!#(B
 .SP
 $B%b%8%e!<%k%G!<%?%Y!<%9$G$O%?%0$,;XDj$5$l$?$H$-$KI,$:<B9T$5$l$k(B
-$B%W%m%0%i%`$r;XDj$G$-$^$9!#(B $B$h$/$"$k;H$$J}$O!"6=L#$r;}$C$F$$$k(B
+$B%W%m%0%i%`$r;XDj$G$-$^$9!#$h$/$"$k;H$$J}$O!"6=L#$r;}$C$F$$$k(B
 $B%0%k!<%W$KEE;R%a!<%k$rAw$k$H$$$&$b$N$G$9!#$b$7$=$N%W%m%0%i%`$r(B
 $B%P%$%Q%9$7$?$$>l9g$O!"I8=`$N(B \fB\-n\fP $B%*%W%7%g%s$r;H$$$^$9!#(B
 .SP
@@ -1763,7 +1763,7 @@
 $B%*%W%7%g%s$r%j%;%C%H$G$-$^$9!#(B(\fB\-r\fP, \fB\-D\fP, \fB\-k\fP $B%*%W%7%g%s$N(B
 $B$$$:$l$+$r;H$C$F:n6H%U%!%$%k$N%3%T!<$rF@$k$H!"(B
 \fBcvs\fP $B$OBP1~$9$k%?%0!"F|IU!"(B\fIkflag\fP $B$r5-21$7!"(B
-$B0J9_$N(B update $B$G(B $B$=$l$r;H$$B3$1$^$9!#(B \fB\-A\fP $B%*%W%7%g%s$r;H$C$F(B
+$B0J9_$N(B update $B$G(B $B$=$l$r;H$$B3$1$^$9!#(B\fB\-A\fP $B%*%W%7%g%s$r;H$C$F(B
 \fBcvs\fP $B$K$=$l$i$N;XDj$rK:$l$5$;$k$3$H$G!"%U%!%$%k$N(B
 ``head'' $B%P!<%8%g%s$r<h$j=P$7$^$9(B)$B!#(B
 .SP
@@ -2052,7 +2052,7 @@
 .TP
 Dick Grune
 .B comp.sources.unix
-$B$K%]%9%H$5$l!"(B1986$BG/(B 12$B7n$N%j%j!<%9(B volume6 $B$K<}$a$i$l$?%*%j%8%J%k$N(B
+$B$K%]%9%H$5$l!"(B1986 $BG/(B 12 $B7n$N%j%j!<%9(B volume6 $B$K<}$a$i$l$?%*%j%8%J%k$N(B
 .B cvs
 $B%7%'%k%9%/%j%W%HHG$N:n<T!#(B
 .B cvs
@@ -2061,12 +2061,12 @@
 Brian Berliner
 .B cvs
 $B%W%m%0%i%`<+?H$N%3!<%G%#%s%0$H%G%6%$%s$r(B
-1989$BG/(B 4$B7n$K!"(BDick $B$K$h$k%*%j%8%J%k$r%Y!<%9$K$7$F9T$$$^$7$?!#(B
+1989 $BG/(B 4 $B7n$K!"(BDick $B$K$h$k%*%j%8%J%k$r%Y!<%9$K$7$F9T$$$^$7$?!#(B
 .TP
 Jeff Polk
 Brian $B$r=u$1$F(B
 .B cvs
-$B$N%b%8%e!<%k$H%Y%s%@!&%V%i%s%A$N%5%]!<%H$r%G%6%$%s$7$^$7$?!#(B
+$B$N%b%8%e!<%k$H%Y%s%@%V%i%s%A$N%5%]!<%H$r%G%6%$%s$7$^$7$?!#(B
 $B$=$7$F(B
 .BR checkin ( 1 )
 $B%7%'%k%9%/%j%W%H(B (
@@ -2080,7 +2080,7 @@
 $B%7%9%F%`$K$h$C$F$O!"(B
 .B info cvs
 $B%3%^%s%I$G1\Mw$G$-$?$j!"(B
-cvs.ps (postscript)$B!"(Bcvs.texinfo (texinfo $B$N%=!<%9(B)$B!"(Bcvs.html $B$,(B
+cvs.ps (postscript), cvs.texinfo (texinfo $B$N%=!<%9(B), cvs.html $B$,(B
 $BMxMQ2DG=$+$b$7$l$^$;$s!#(B
 .SP
 CVS $B$N99?7!"%I%-%e%a%s%H$K4X$9$k$5$i$J$k>pJs!"(B
diff -ur man/man1/md5.1 man/man1/md5.1
--- man/man1/md5.1	Sun Jul 26 21:08:22 1998
+++ man/man1/md5.1	Fri Dec 10 23:03:32 1999
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/sbin/md5/md5.1,v 1.7.2.1 1999/12/08 06:30:16 obrien Exp %
 .Dd February 14, 1994
 .Dt MD5 1
 .Os
@@ -6,7 +7,7 @@
 .Nd $B%U%!%$%k$KBP$9$k%U%#%s%,%W%j%s%H(B($B%A%'%C%/%5%`(B)$B$r7W;;$9$k(B
 .Sh $B=q<0(B
 .Nm md5
-.Op Fl ptx
+.Op Fl pqrtx
 .Op Fl s Ar string
 .Op Ar file ...
 .Sh $B2r@b(B
@@ -40,6 +41,15 @@
 $B$N%A%'%C%/%5%`$rI=<($7$^$9!#(B
 .It Fl p
 $BI8=`F~NO$rI8=`=PNO$KAw$j!"(B MD5 $B$N9g7W$rI8=`=PNO$KIU$12C$($^$9!#(B
+.It Fl q
+$B@E$+$J%b!<%I(B - MD5 $B$N9g7W$@$1$rI=<($7$^$9!#(B
+.Fl r
+$B%*%W%7%g%s$KM%@h$7$^$9!#(B
+.It Fl r
+$B=PNO%U%)!<%^%C%H$r5U$K$7$^$9!#(B
+$B;k3P$K$h$k:9J,$N=u$1$K$J$j$^$9!#(B
+.Fl ptx
+$B%*%W%7%g%s$HAH$_9g$o$;$k$H!"$J$K$b$7$^$;$s!#(B
 .It Fl t
 $BAH$_9~$_$N;~4V;n9T$r<B9T$7$^$9!#(B
 .It Fl x
diff -ur man/man1/pkg_create.1 man/man1/pkg_create.1
--- man/man1/pkg_create.1	Fri Nov 19 23:09:21 1999
+++ man/man1/pkg_create.1	Fri Dec 10 23:03:35 1999
@@ -41,7 +41,7 @@
 .Op Fl k Ar dscript
 .Op Fl K Ar pdscript
 .Op Fl r Ar rscript
-.Op Fl s Ar rscript
+.Op Fl s Ar srcdir
 .Op Fl t Ar template
 .Op Fl X Ar excludefile
 .Op Fl D Ar displayfile
@@ -116,9 +116,9 @@
 
 .Cm $BCm(B:
 .Cm Fl I
-$B%*%W%7%g%s$,;XDj$5$l$k$H!"(B
+$B%*%W%7%g%s$,;XDj$5$l$J$$>l9g!"(B
 $BK\%9%/%j%W%H$OEv3:%Q%C%1!<%8$N(B
- pre-install $B$*$h$S(B post-install $B$NN>J}$N%9%/%j%W%H$H$7$FF0:n$7$^$9!#(B
+pre-install $B$*$h$S(B post-install $B$NN>J}$N%9%/%j%W%H$H$7$FF0:n$7$^$9!#(B
 $B%Q%C%1!<%8L>$H$H$b$K%-!<%o!<%I(B
 .Ar PRE-INSTALL
 $B$*$h$S(B
@@ -136,13 +136,13 @@
 $B=i4|$N%Q%C%1!<%80MB8%j%9%H$H$7$F(B
 .Ar pkgs
 $B$rMQ$$$^$9!#(B
-$B$3$l$O%[%o%$%H%9%Z!<%9$G6h@Z$i$l$?%Q%C%1!<%8$NL>A0$H$J$j$^$9!#(B
+$B$3$l$O6uGr$G6h@Z$i$l$?%Q%C%1!<%8$NL>A0$H$J$j$^$9!#(B
 $B$^$?!"(Bpacking list ($B8e=R$N!V(BPACKING LIST $B>\:Y!W%;%/%7%g%s$r;2>H(B) 
 $BFb$NJ#?t$N(B
 .Cm @pkgdep
 $B%G%#%l%/%F%#%V$r;XDj$9$k<j$C<h$jAa$$J}K!$G$b$"$j$^$9!#(B
 .It Fl p Ar prefix
-$B%Q%C%1!<%8$N%U%!%$%k$rA*Br$9$k:]$K4p=`$H$J$k=i4|%G%#%l%/%H%j$H$7$F(B
+$B%Q%C%1!<%8$N%U%!%$%k$rA*Br$9$k:]$K(B ``$B4p=`(B'' $B$H$J$k=i4|%G%#%l%/%H%j$H$7$F(B
 .Ar prefix
 $B$rMQ$$$^$9!#(B
 .It Fl k Ar dscript
@@ -156,7 +156,7 @@
 
 .Cm $BCm(B:
 .Cm Fl K
-$B%*%W%7%g%s$,;XDj$5$l$k$H!"(B
+$B%*%W%7%g%s$,;XDj$5$l$J$$>l9g!"(B
 $BK\%9%/%j%W%H$OEv3:%Q%C%1!<%8$N(B
 de-install $B$*$h$S(B post-deinstall $B$NN>J}$N%9%/%j%W%H$H$7$FF0:n$7$^$9!#(B
 $B%Q%C%1!<%8L>$H$H$b$K%-!<%o!<%I(B
@@ -260,6 +260,7 @@
 .Ar directory
 $B$r;X$9$h$&$K$7$^$9!#0J9_$N%U%!%$%kL>$O$3$N%G%#%l%/%H%j$X$NAjBP%Q%9(B
 $B$G$"$k$H$_$J$5$l$^$9!#(B
+$BCm(B:
 .Cm @cd
 $B$O$3$N%3%^%s%I$NJLL>$G$9!#(B
 .It Cm @srcdir Ar directory
diff -ur man/man1/rm.1 man/man1/rm.1
--- man/man1/rm.1	Fri Dec 10 19:46:34 1999
+++ man/man1/rm.1	Fri Dec 10 23:03:36 1999
@@ -97,7 +97,7 @@
 .Fl R
 $B$HF1$8$G$9!#(B
 .It Fl v
-$B%U%!%$%k$r:o=|$9$k$H$-$K>iD9$K$J$j!":o=|;~$9$k%U%!%$%k$rI=<($7$^$9!#(B
+$B%U%!%$%k$r:o=|$9$k$H$-$K>iD9$K$J$j!":o=|$9$k;~%U%!%$%k$rI=<($7$^$9!#(B
 .It Fl W
 $B:o=|$7$?%U%!%$%k$r2sI|$7$h$&$H$7$^$9!#(B
 $B8=:_$3$N%*%W%7%g%s$O!"(B
@@ -154,7 +154,7 @@
 $B%*%W%7%g%s$,B8:_$7$J$$%U%!%$%k$KBP$9$k%(%i!<$N$_$r%^%9%/$9$kE@$,EAE}E*(B
 $B<BAu$H0[$J$j$^$9!#(B
 .Fl v
-$B$OI8=`$G$O$"$j$^$;$s!#%9%/%j%W%HCf$G$N;HMQ$O$*4+$a$7$^$;$s!#(B
+$B$OI8=`$G$O$"$j$^$;$s$7!"%9%/%j%W%HCf$G$N;HMQ$O$*4+$a$7$^$;$s!#(B
 .Pp
 $B$^$?!"EAE}E*(B
 .Bx
diff -ur man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Fri Dec 10 19:46:34 1999
+++ man/man1/sh.1	Fri Dec 10 23:03:43 1999
@@ -483,10 +483,10 @@
 .It Li [n]<&-
 $BI8=`F~NO(B ($B$^$?$O%U%!%$%k5-=R;R(B n) $B$r%/%m!<%:$7$^$9!#(B
 .It Li [n1]>&n2
-$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$r%U%!%$%k5-=R;R(B n2 $B$KJ#@=$7$^$9(B
-($BLuCm(B: $B%U%!%$%k5-=R;R(B n2 $B$rI8=`=PNO(B ($B$^$?$O(B n1) $B$N%U%!%$%k5-=R;R$K(B
-$BJ#@=$9$k7k2L!"I8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1 $B$X$N=PNO(B) $B$,(B n2 $B$K(B
-$B%j%@%$%l%/%H$5$l$k!"$H$$$&$3$H$G$9(B)$B!#(B
+$BI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$r%U%!%$%k5-=R;R(B n2 $B$KJ#@=$7$^$9!#(B
+($BLuCm(B: $BDL>o$O!V%U%!%$%k5-=R;R(B n2 $B$rI8=`=PNO(B ($B$^$?$O%U%!%$%k5-=R;R(B n1) $B$K(B
+$BJ#@=!W$HI=8=$7$^$9!#(B
+$B7k2L$O!"I8=`=PNO(B ($B$^$?$O(B n1 $B$X$N=PNO(B) $B$N(B n2 $B$X$N%j%@%$%l%/%H$G$9!#(B)
 .\" [man-jp 1544], [man-jp 1827] $B0J9_$N%9%l%C%I;2>H!#(B
 .It Li [n]>&-
 $BI8=`=PNO(B ($B$^$?$O(B n) $B$r%/%m!<%:$7$^$9!#(B
Only in man: man1aout
Only in man: man3
diff -ur man/man5/dhcp-options.5 man/man5/dhcp-options.5
--- man/man5/dhcp-options.5	Sat Sep 11 14:26:48 1999
+++ man/man5/dhcp-options.5	Fri Dec 10 23:03:57 1999
@@ -248,6 +248,11 @@
 $B%m!<%+%k$N%I%a%$%sL>$KE,9g$7$F$b$7$J$/$F$b$+$^$$$;$s(B
 (domain-name $B%*%W%7%g%s$r;HMQ$7$F%I%a%$%sL>$r;XDj$9$kJ}$,NI$$$G$9(B)$B!#(B
 $BJ8;z=89g$N@)Ls$K$D$$$F$O(B RFC 1035 $B$r;2>H$7$F$/$@$5$$!#(B
+$B%/%i%$%"%s%H%^%7%s$N%[%9%HL>$,@_Dj$5$l$F$$$J$$>l9g(B ($B$9$J$o$A(B
+.B rc.conf(5)
+$B$G6uJ8;zNs$K@_Dj$5$l$F$$$k>l9g(B)$B!"(B
+.B dhclient-script(8)
+$B$N$_$,K\%*%W%7%g%s$rB:=E$7$^$9!#(B
 .RE
 .PP
 .B option \fBboot-size\fR \fIuint16\fR\fB;\fR
diff -ur man/man5/elf.5 man/man5/elf.5
--- man/man5/elf.5	Mon Dec  6 00:39:44 1999
+++ man/man5/elf.5	Fri Dec 10 23:04:02 1999
@@ -22,7 +22,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.1.2.2 1999/10/31 04:02:25 green Exp %
+.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.1.2.3 1999/12/07 22:45:18 chris Exp %
 .\"
 .Dd July 31, 1999
 .\" jpman %Id: elf.5,v 1.2 1999/12/02 15:13:16 junkun Chk %
diff -ur man/man5/ttys.5 man/man5/ttys.5
--- man/man5/ttys.5	Sun Sep  5 01:36:19 1999
+++ man/man5/ttys.5	Fri Dec 10 23:04:03 1999
@@ -32,7 +32,7 @@
 .\" WORD: line	$B2s@~(B
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\" %FreeBSD: src/libexec/getty/ttys.5,v 1.9.2.1 1999/08/29 15:03:24 peter Exp %
+.\" %FreeBSD: src/libexec/getty/ttys.5,v 1.9.2.2 1999/12/07 07:57:58 sheldonh Exp %
 .\" jpman %Id: ttys.5,v 1.3 1998/06/17 07:52:43 kumano Stab %
 .\" "
 .Dd November 17, 1996
@@ -59,9 +59,11 @@
 $B%3%a%s%H$O%O%C%7%e5-9f(B (``#'') $B$*$h$S2~9T$K$h$C$F6h@Z$i$l$^$9!#(B
 $B;XDj$5$l$F$$$J$$%U%#!<%k%I$O%G%U%)%k%H$G%J%k$G$9!#(B
 .Pp
-$B:G=i$N%U%#!<%k%I$O(B
+$B:G=i$N%U%#!<%k%I$O!"DL>o$OC<KvFC<l%U%!%$%k$NL>A0$G$"$j!"(B
 .Pa /dev
-$B$K$"$k$h$&$JC<KvFC<l%U%!%$%k$NL>A0$G$9!#(B
+$B$K$"$k$h$&$J$b$N$G$9!#(B
+$B$7$+$7$J$,$i!"4XO"IU$1$i$l$?%3%^%s%I$,(B tty $B$KL54X78$G$"$k>l9g!"(B
+$BG$0U$NJ8;zNs$K$G$-$^$9!#(B
 .Pp
 2 $BHVL\$N%U%#!<%k%I$O$=$N2s@~$KBP$7$F<B9T$9$k%3%^%s%I$G!"(B
 $BDL>o(B
@@ -125,6 +127,15 @@
 $B$J$j$^$9!#(B
 $B0JA0$H$N8_49@-$N$?$a$K!"(B ``group='' $B$O9T$N:G8e$K!"G$0U$N%3%a%s%H$N$9$0A0(B
 $B$K8=$l$J$1$l$P$J$j$^$;$s!#(B
+.Pp
+$BBh(B 2 $B%U%#!<%k%I$H(B ``window='' $B$G;XDj$5$l$k%3%^%s%I$O!"8l$KJ,2r$5$l!"(B
+.Xr execve 2
+$B$r;HMQ$7$F<B9T$5$l$^$9!#(B
+$B8l$O!"%?%V$H%9%Z!<%9$NG$0U$NAH$_9g$o$;$G6h@Z$i$l$^$9!#(B
+$B6uGr$r4^$`0z?t$O!"%7%s%0%k%/%)!<%H(B
+.Pq '
+$B$G6h@Z$k$Y$-$G$9!#(B
+$B%7%'%k%9%?%$%k$N%0%m%V$dB>$NJQ?tCV49$O!"9T$o$l$^$;$s!#(B
 .Sh $B;HMQNc(B
 .Bd -literal
 # 1200 $B%\!<$G%3%s%=!<%k!"(Broot $B$G$N%m%0%$%s2D(B
diff -ur man/man6/fortune.6 man/man6/fortune.6
--- man/man6/fortune.6	Fri Dec 10 19:46:45 1999
+++ man/man6/fortune.6	Fri Dec 10 23:04:15 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\" %FreeBSD: src/games/fortune/fortune/fortune.6,v 1.5.2.3 1999/12/06 01:41:34 chris Exp %
+.\" %FreeBSD: src/games/fortune/fortune/fortune.6,v 1.5.2.4 1999/12/07 02:50:31 chris Exp %
 .\" jpman %Id: fortune.6,v 1.4 1999/01/16 17:08:30 kuma Stab %
 .\"
 .\" $B0J2<$O(B Linux JM $B$N%/%l%8%C%H(B
@@ -184,7 +184,7 @@
 .Pp
 .It Pa /usr/share/games/fortune/*
 fortune $B$N%G!<%?%Y!<%9(B ($BL>A0$,(B
-.Dq Fl o
+.Dq -o
 $B$G=*$k%U%!%$%k$K$O!"(B
 .Bf -symbolic
 $B<*$KDK$$(B
diff -ur man/man7/hier.7 man/man7/hier.7
--- man/man7/hier.7	Sun Oct 31 17:50:00 1999
+++ man/man7/hier.7	Fri Dec 10 23:04:25 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man7/hier.7,v 1.16.2.5 1999/09/20 09:49:54 phantom Exp %
+.\" %FreeBSD: src/share/man/man7/hier.7,v 1.16.2.6 1999/12/08 22:04:43 dcs Exp %
 .\"
 .\" jpman %Id: hier.7,v 1.3 1999/01/04 08:08:08 kuma Stab %
 .Dd June 5, 1993
@@ -47,6 +47,16 @@
 .It Li /bin/
 $B%f!<%6MQ%f!<%F%#%j%F%#$N4pK\E*$J$b$N!#(B
 $B%7%s%0%k%f!<%64D6-!"%^%k%A%f!<%64D6-$I$A$i$G$b;HMQ$9$k!#(B
+.It Li /boot/
+$B%*%Z%l!<%F%#%s%0%7%9%F%`$N%V!<%H%9%H%i%C%WCf$K;HMQ$5$l$k(B
+$B%W%m%0%i%`$H@_Dj%U%!%$%k!#(B
+.Pp
+.Bl -tag -width defaults/ -compact
+.It Li defaults/
+$B%G%U%)%k%H$N%V!<%H%9%H%i%C%WMQ@_Dj%U%!%$%k!#(B
+.Xr loader.conf 5
+$B$r;2>H$7$F$/$@$5$$!#(B
+.El
 .It Li /dev/
 $B%V%m%C%/%G%P%$%9$*$h$S%-%c%i%/%?%G%P%$%9%U%!%$%k!#(B
 .Pp
Only in man/man8: Makefile~
diff -ur man/man8/diskless.8 man/man8/diskless.8
--- man/man8/diskless.8	Sun Sep  5 01:36:20 1999
+++ man/man8/diskless.8	Fri Dec 10 23:05:00 1999
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man8/diskless.8,v 1.2.4.4 1999/08/29 16:47:04 peter Exp %
+.\" %FreeBSD: src/share/man/man8/diskless.8,v 1.2.4.5 1999/12/08 13:19:08 phantom Exp %
 .\"
 .Dd October 2, 1994
 .Dt DISKLESS 8
@@ -232,6 +232,10 @@
 myclient  root=server:/export/myclient/root
 .Ed
 .Pp
+$BCm(B: $B%9%o%C%W%U%!%$%k$r%^%&%s%H2DG=$H$9$k$K$O!"(Bmountd $B$,(B
+.Fl r
+$B%U%i%0IU$-$G3+;O$5$l$F$$$k$3$H$r3NG'$9$k$3$H$,I,MW$G$9!#(B
+
 .It 6.
 myclient $B$N$?$a$N%9%o%C%W%U%!%$%k$r:n@.$7$^$9(B:
 .Bd -literal -offset indent -compact
diff -ur man/man8/init.8 man/man8/init.8
--- man/man8/init.8	Wed Dec  8 00:34:04 1999
+++ man/man8/init.8	Fri Dec 10 23:12:11 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.5 1999/12/04 14:20:51 kato Exp %
+.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.6 1999/12/07 07:57:57 sheldonh Exp %
 .\"
 .\" jpman %Id: init.8,v 1.2 1997/05/27 08:12:44 yugawa Stab %
 .\"
@@ -151,6 +151,10 @@
 .Nm
 $B$O$3$N%U%!%$%k$rFI$_9~$_!"(B2 $BHVL\$N%U%#!<%k%I$K;X<($5$l$?%3%^%s%I$r(B
 $B<B9T$7$^$9!#(B
+$B$?$@$7!"(B1 $BHVL\$N%U%#!<%k%I$,(B
+.Pa /dev
+$BCf$N%G%P%$%9$r;2>H$7!"$=$N%G%P%$%9$,@_Dj$5$l$F$$$J$$>l9g$ONc30$G$9!#(B
+1 $BHVL\$N%U%#!<%k%I$O!"%3%^%s%I$XEO$5$l$k:G8e$N0z?t$K$J$j$^$9!#(B
 $B$=$N%3%^%s%I$ODL>o!"(B
 .Xr getty 8
 $B$G!"(B
@@ -173,6 +177,19 @@
 .Nm getty
 $B$r<B9T$9$k$3$H$G7+$jJV$5$l$^$9!#(B
 .Pp
+.Nm
+$B$OG$0U$N%G!<%b%s$rAv9T$5$;B3$1$k$?$a$K$b;HMQ2DG=$G$"$j!"(B
+$B%G!<%b%s$,;`$s$@>l9g$K$O<+F0E*$K:F3+$7$^$9!#(B
+$B$3$N>l9g!"(B
+.Xr ttys 5
+$B%U%!%$%k$N(B 1 $BHVL\$N%U%#!<%k%I$O!"(B
+$B@_Dj$5$l$?%G%P%$%9%N!<%I$X$N%Q%9$r;2>H$7$F$O$J$i$:!"(B
+$B%G!<%b%s$KBP$9$k:G8e$N%3%^%s%I%i%$%s0z?t$H$7$FEO$5$l$^$9!#(B
+$B$3$l$O(B
+.At V
+.Pa /etc/inittab
+$B$K$"$k5!G=$HF1MM$G$9!#(B
+.Pp
 $B%i%$%s$N>uBV(B (on, off, secure, getty, $B%&%#%s%I%&$N>pJs(B) $B$O!"(B
 .Xr ttys 5
 $B%U%!%$%k$r=q$-49$($F(B
@@ -195,10 +212,8 @@
 .Xr ttys 5
 $B%U%!%$%k$G%*%s$K$5$l$k$H!"(B
 .Nm
-$B$O?7$7$$(B
-.Nm getty
-$B$r5/F0$7$F!"?7$7$$%m%0%$%s$r2DG=$K$7$^$9!#(B
-$B%i%$%s$N(B getty $B$d%&%#%s%I%&%U%#!<%k%I$,JQ99$5$l$?>l9g!"$=$NJQ99$O8=:_(B
+$B$O(B 2 $BHVL\$N%U%#!<%k%I$G;XDj$5$l$k%3%^%s%I$r5/F0$7$^$9!#(B
+$B%i%$%s$N%3%^%s%I$d%&%#%s%I%&%U%#!<%k%I$,JQ99$5$l$?>l9g!"$=$NJQ99$O8=:_(B
 $B$N%m%0%$%s%;%C%7%g%s$,=*N;$9$k$^$GM-8z$K$O$J$j$^$;$s!#(B
 ($BNc$($P!"(B
 .Nm
@@ -231,7 +246,7 @@
 )$B!"(B
 .Nm
 $B$O?7$7$$(B
-.Xr getty
+$B%W%m%;%9(B
 $B$r5/F0$9$k$N$r$d$a!"=y!9$K%7%9%F%`Dd;_2DG=$J>uBV$K$7$^$9!#(B
 $B$=$N8e!"(Bhangup $B%7%0%J%k$G40A4$J%^%k%A%f!<%6%b!<%I$KLa$j!"(Bterminate $B%7%0%J%k(B
 $B$G%7%s%0%k%f!<%6%b!<%I$K0\$j$^$9!#(B
diff -ur man/man8/ldconfig.8 man/man8/ldconfig.8
--- man/man8/ldconfig.8	Sun Sep  5 01:36:21 1999
+++ man/man8/ldconfig.8	Fri Dec 10 23:05:03 1999
@@ -45,8 +45,8 @@
 .Sh $B2r@b(B
 .Nm
 $B$O!"%@%$%J%_%C%/%j%s%+(B
-$B$,!"J#?t$N%G%#%l%/%H%j$+$iMxMQ2DG=$J6&M-%i%$%V%i%j$rB.$/A\$7=P$;$k$h$&(B
-$B$K$D$+$o$l$k(B
+$B$,!"J#?t$N%G%#%l%/%H%j$+$iMxMQ2DG=$J6&M-%i%$%V%i%j$rAGAa$/A\$7=P$9$?$a$K(B
+$B;H$&(B
 .Dq $B%R%s%H(B
 $B$N=89g$r=`Hw$9$k$?$a$K;H$o$l$^$9!#(B
 $B%3%^%s%I$O!"AH$_9~$_$N%7%9%F%`%G%#%l%/%H%j$H(B
@@ -61,7 +61,7 @@
 $B$,MW5a$5$l$?6&M-%i%$%V%i%j$rFI$_9~$`:]$N%G%#%l%/%H%j8!:wA`:n(B
 $B%*!<%P%X%C%I$r$"$i$+$8$aJ'$C$F$$$k$3$H$K$J$j$^$9!#(B
 .Pp
-$B%3%^%s%I%i%$%s$K$F;XDj$9$k%U%!%$%kL>$O6&M-%i%$%V%i%j$r8!::$9$k%G%#%/%H%j(B
+$B%3%^%s%I%i%$%s$K$F;XDj$9$k%U%!%$%kL>$O6&M-%i%$%V%i%j$r8!::$9$k%G%#%l%/%H%j(B
 $B$r4^$`$3$H$,4|BT$5$l$^$9!#(B
 $B3F%G%#%l%/%H%j$N%Q%9L>$O9T$N@hF,$+$i;O$^$kI,MW$,$"$j$^$9!#(B
 $B6u9T$*$h$S%3%a%s%HJ8;z(B
@@ -139,7 +139,7 @@
 $BFC$K!"(B
 .Ev LD_LIBRARY_PATH
 $B$O!"%i%$%V%i%j$rC5$9$?$a$K$O;H$o$l$^$;$s!#(B
-$B$7$?$,$C$F!"(B ldconfig $B$NLr3d$K$OFs$D$"$j$^$9!#(B
+$B=>$C$F!"(Bldconfig $B$NLr3d$K$O(B 2 $B$D$"$j$^$9!#(B
 $BAGAa$$8!:w$N$?$a$K%R%s%H=89g$r:n@.$9$k$3$H$K2C$($F!"(B
 $B6&M-%*%V%8%'%/%H$,6&M-%i%$%V%i%j$r0BA4$KFI$_9~$`$3$H$,$G$-$k(B
 $B%G%#%l%/%H%j$N=8$^$j$rFCDj$9$k$3$H$b!"$=$NLr3d$G$9!#(B
@@ -190,5 +190,5 @@
 .Xr link 5
 .Sh $BNr;K(B
 .Nm
-$B%f!<%F%#%j%F%#!<$O(B SunOS 4.0 $B$G$O$8$a$K8=$l$^$7$?!#(B
-$B8=:_$N7A$O!"(B FreeBSD 1.1 $B$+$i$G$9!#(B
+$B%f!<%F%#%j%F%#$O(B SunOS 4.0 $B$G=i$a$F8=$l$^$7$?!#(B
+$B8=:_$N7A$O!"(BFreeBSD 1.1 $B$+$i$G$9!#(B
Only in man: whatis

----Next_Part(Fri_Dec_10_23:33:44_1999_41)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ediff_3.3-19991210
Content-Disposition: attachment; filename=ediff_3.3-19991210

diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man1/awk.1 man1/awk.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man1/awk.1	Tue Dec  7 19:52:52 1999
+++ man1/awk.1	Fri Dec 10 19:56:50 1999
@@ -1,7 +1,8 @@
+.\" $FreeBSD: src/contrib/awk/doc/awk.1,v 1.3.2.1 1999/12/08 17:58:01 sheldonh Exp $
 .ds PX \s-1POSIX\s+1
 .ds UX \s-1UNIX\s+1
 .ds AN \s-1ANSI\s+1
-.TH GAWK 1 "Dec 19 1996" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Apr 28 1999" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -1213,13 +1214,13 @@
 might be used to represent all of
 ``e,'' ``e\`,'' and ``e\`.''
 In this case,
-.B [[=e]]
+.B [[=e=]]
 is a regexp
 that matches any of
- .BR e ,
- .BR e\' ,
+.BR e ,
+.BR e\' ,
 or
- .BR e\` .
+.BR e\` .
 .PP
 These features are very valuable in non-English speaking locales.
 The library functions that
@@ -2150,6 +2151,12 @@
 Function parameters used as local variables are initialized
 to the null string and the number zero upon function invocation.
 .PP
+Use
+.BI return " expr"
+to return a value from a function. The return value is undefined if no
+value is provided, or if the function returns by ``falling off'' the
+end.
+.PP
 If
 .B \-\^\-lint
 has been provided,
@@ -2535,7 +2542,7 @@
 .SH VERSION INFORMATION
 This man page documents
 .IR gawk ,
-version 3.0.2.
+version 3.0.4.
 .SH AUTHORS
 The original version of \*(UX
 .I awk
@@ -2566,10 +2573,10 @@
 If you find a bug in
 .IR gawk ,
 please send electronic mail to
-.BR bug-gnu-utils@prep.ai.mit.edu ,
+.BR bug-gnu-utils@gnu.org ,
 .I with
 a carbon copy to
-.BR arnold@gnu.ai.mit.edu .
+.BR arnold@gnu.org .
 Please include your operating system and its revision, the version of
 .IR gawk ,
 what C compiler you used to compile it, and a test program
@@ -2598,7 +2605,7 @@
 provided valuable assistance during testing and debugging.
 We thank him.
 .SH COPYING PERMISSIONS
-Copyright \(co\) 1996 Free Software Foundation, Inc.
+Copyright \(co) 1996,97,98,99 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of
 this manual page provided the copyright notice and this permission
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man1/md5.1 man1/md5.1
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man1/md5.1	Tue Dec  7 19:54:25 1999
+++ man1/md5.1	Fri Dec 10 19:58:27 1999
@@ -1,3 +1,4 @@
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.7.2.1 1999/12/08 06:30:16 obrien Exp $
 .Dd February 14, 1994
 .Dt MD5 1
 .Os
@@ -6,7 +7,7 @@
 .Nd calculate a message-digest fingerprint (checksum) for a file
 .Sh SYNOPSIS
 .Nm md5
-.Op Fl ptx
+.Op Fl pqrtx
 .Op Fl s Ar string
 .Op Ar file ...
 .Sh DESCRIPTION
@@ -37,6 +38,15 @@
 .Ar string .
 .It Fl p
 Echo stdin to stdout and appends the MD5 sum to stdout.
+.It Fl q
+Quiet mode - only the MD5 sum is printed out.  Overrides the
+.Fl r
+option.
+.It Fl r
+Reverses the format of the output.  This helps with visual diffs.  Does nothing
+when combined with the 
+.Fl ptx
+options.
 .It Fl t
 Run a built-in time trial.
 .It Fl x
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/dhcp-options.5 man5/dhcp-options.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/dhcp-options.5	Tue Dec  7 19:54:20 1999
+++ man5/dhcp-options.5	Fri Dec 10 19:58:21 1999
@@ -232,7 +232,12 @@
 This option specifies the name of the client.  The name may or may
 not be qualified with the local domain name (it is preferable to use
 the domain-name option to specify the domain name).  See RFC 1035 for
-character set restrictions.
+character set restrictions.  This option is only honored by
+.B dhclient-script(8)
+if the hostname for the client machine is not set (i.e., set to the empty
+string in
+.B rc.conf(5)
+).
 .RE
 .PP
 .B option \fBboot-size\fR \fIuint16\fR\fB;\fR
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/elf.5 man5/elf.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/elf.5	Tue Dec  7 19:54:52 1999
+++ man5/elf.5	Fri Dec 10 19:58:53 1999
@@ -22,7 +22,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\"	$FreeBSD: src/share/man/man5/elf.5,v 1.1.2.2 1999/10/31 04:02:25 green Exp $
+.\"	$FreeBSD: src/share/man/man5/elf.5,v 1.1.2.3 1999/12/07 22:45:18 chris Exp $
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
@@ -295,7 +295,7 @@
 This member holds the size in bytes of one entry in the file's program header
 table; all entries are the same size.
 .It Dv e_phnum
-This member This member holds the number of entries in the program header
+This member holds the number of entries in the program header
 table. Thus the product of
 .Sy e_phentsize
 and
@@ -431,7 +431,7 @@
 ), the
 .Dq extra
 bytes are defined to hold the value 0 and to follow the segment's
-initialised area. The file size may not be larger than the memory size.
+initialized area. The file size may not be larger than the memory size.
 Loadable segment entries in the program header table appear in ascending
 order, sorted on the
 .Sy p_vaddr
@@ -603,7 +603,7 @@
 into the section header string table section, giving the location of
 a null-terminated string.
 .It Dv sh_type
-This member categorises the section's contents and semantics.
+This member categorizes the section's contents and semantics.
 .Pp
 .Bl -tag -width "SHT_PROGBITS" -compact
 .It Dv SHT_NULL
@@ -751,8 +751,8 @@
 Various sections hold program and control information:
 .Bl -tag -width ".shstrtab" -compact
 .It .bss
-This section holds uninitialised data that contributes to the program's
-memory image. By definition, the system initialises the data with zeros
+This section holds uninitialized data that contributes to the program's
+memory image. By definition, the system initializes the data with zeros
 when the program begins to run. This section is of type
 .Sy SHT_NOBITS .
 The attributes types are
@@ -764,7 +764,7 @@
 .Sy SHT_PROGBITS .
 No attribute types are used.
 .It .data
-This section holds initialised data that contribute to the program's
+This section holds initialized data that contribute to the program's
 memory image. This section is of type
 .Sy SHT_PROGBITS .
 The attribute types are
@@ -772,7 +772,7 @@
 and
 .Sy SHF_WRITE .
 .It .data1
-This section holds initialised data that contribute to the program's
+This section holds initialized data that contribute to the program's
 memory image. This section is of type
 .Sy SHT_PROGBITS .
 The attribute types are
@@ -807,7 +807,7 @@
 .Sy SHF_ALLOC .
 .It .fini
 This section holds executable instructions that contribute to the process
-termination code. When a program exists normally the system arranges to
+termination code. When a program exits normally the system arranges to
 execute the code in this section. This section is of type
 .Sy SHT_PROGBITS .
 The attributes used are
@@ -825,12 +825,7 @@
 .Sy SHF_ALLOC .
 .It .init
 This section holds executable instructions that contribute to the process
-initialisation code. When a program starts to run the system arranges to
-execute the code in this section before calling the main program entry point.
-This section is of type
-.Sy SHT_PROGBITS .
-This section holds executable instructions that contribute to the process
-initialisation code. When a program starts to run the system arranges to
+initialization code. When a program starts to run the system arranges to
 execute the code in this section before calling the main program entry point.
 This section is of type
 .Sy SHT_PROGBITS .
@@ -890,7 +885,7 @@
 This section is of type
 .Sy SHT_RELA .
 .It .rodata
-This section hold read-only data that typically contributes to a
+This section holds read-only data that typically contributes to a
 non-writable segment in the process image. This section is of type
 .Sy SHT_PROGBITS .
 The attribute used is
@@ -1035,15 +1030,15 @@
 .It Dv ELF32_ST_BIND(info)
 or
 .Sy ELF64_ST_BIND(info)
-convert a binding and a type into a st_info value.
+extract a binding from an st_info value.
 .It Dv ELF64_ST_TYPE(info)
 or
 .Sy ELF32_ST_TYPE(info)
-extract a binding from a st_info value.
+extract a type from an st_info value.
 .It Dv ELF32_ST_INFO(bind, type)
 or
 .Sy ELF64_ST_INFO(bind, type)
-extract a type from a st_info value.
+convert a binding and a type into an st_info value.
 .El
 .El
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/ttys.5 man5/ttys.5
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man5/ttys.5	Tue Dec  7 19:54:14 1999
+++ man5/ttys.5	Fri Dec 10 19:58:15 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.9.2.1 1999/08/29 15:03:24 peter Exp $
+.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.9.2.2 1999/12/07 07:57:58 sheldonh Exp $
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
@@ -56,9 +56,11 @@
 are delimited by hash marks (``#'') and new lines.
 Any unspecified fields will default to null.
 .Pp
-The first field is the
+The first field is normally the
 name of the terminal special file as it is found in
 .Pa /dev .
+However, it can be any arbitrary string
+when the associated command is not related to a tty.
 .Pp
 The second field of the file is the command to execute for the line,
 usually
@@ -125,6 +127,14 @@
 "none".
 For backwards compatibility, the ``group='' should appear last on the
 line, immediately before the optional comment.
+.Pp
+Both the second field and any command specified with ``window=''
+will be split into words and executed using
+.Xr execve 2 .
+Words are separated by any combinations of tabs and spaces.
+Arguments containing whitespace should be enclosed in single quotes
+.Pq ' .
+Note that no shell-style globbing or other variable substitution occurs.
 .Sh EXAMPLES
 .Bd -literal
 # root login on console at 1200 baud
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man6/fortune.6 man6/fortune.6
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man6/fortune.6	Tue Dec  7 19:52:35 1999
+++ man6/fortune.6	Fri Dec 10 19:56:31 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.5.2.3 1999/12/06 01:41:34 chris Exp $
+.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.5.2.4 1999/12/07 02:50:31 chris Exp $
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
@@ -175,7 +175,7 @@
 .Pp
 .It Pa /usr/share/games/fortune/*
 the fortunes databases (those files ending 
-.Dq Fl o
+.Dq -o
 contain the
 .Bf -symbolic
 offensive
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man7/hier.7 man7/hier.7
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man7/hier.7	Tue Dec  7 19:54:52 1999
+++ man7/hier.7	Fri Dec 10 19:58:54 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man7/hier.7,v 1.16.2.5 1999/09/20 09:49:54 phantom Exp $
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.16.2.6 1999/12/08 22:04:43 dcs Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -45,6 +45,14 @@
 root directory of the filesystem
 .It Li /bin/
 user utilities fundamental to both single-user and multi-user environments
+.It Li /boot/
+programs and configuration files used during operating system bootstrap
+.Pp
+.Bl -tag -width defaults/ -compact
+.It Li defaults/
+default bootstrapping configuration files; see
+.Xr loader.conf 5
+.El
 .It Li /dev/
 block and character device files
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/diskless.8 man8/diskless.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/diskless.8	Tue Dec  7 19:54:52 1999
+++ man8/diskless.8	Fri Dec 10 19:58:54 1999
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.2.4.4 1999/08/29 16:47:04 peter Exp $
+.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.2.4.5 1999/12/08 13:19:08 phantom Exp $
 .\"
 .Dd October 2, 1994
 .Dt DISKLESS 8
@@ -221,6 +221,11 @@
 myclient  root=server:/export/myclient/root
 .Ed
 .Pp
+Note: For the swap file to be mountable, you have to make sure that mountd is
+started with the
+.Fl r
+flag.
+
 .It 6.
 Build the swap file for myclient:
 .Bd -literal -offset indent -compact
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/init.8 man8/init.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/init.8	Tue Dec  7 20:12:42 1999
+++ man8/init.8	Fri Dec 10 20:17:35 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/sbin/init/init.8,v 1.13.2.5 1999/12/04 14:20:51 kato Exp $
+.\" $FreeBSD: src/sbin/init/init.8,v 1.13.2.6 1999/12/07 07:57:57 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
@@ -152,7 +152,11 @@
 processes for the terminal ports found in the file
 .Xr ttys 5 .
 .Nm Init
-reads this file, and executes the command found in the second field.
+reads this file and executes the command found in the second field,
+unless the first field refers to a device in
+.Pa /dev
+which is not configured.
+The first field is supplied as the final argument to the command.
 This command is usually
 .Xr getty 8 ;
 .Nm getty
@@ -182,6 +186,18 @@
 .Nm getty
 for the line.
 .Pp
+.Nm Init
+can also be used to keep arbitrary daemons running,
+automatically restarting them if they die.
+In this case, the first field in the
+.Xr ttys 5
+file must not reference the path to a configured device node
+and will be passed to the daemon
+as the final argument on its command line.
+This is similar to the facility offered in the
+.At V
+.Pa /etc/inittab .
+.Pp
 Line status (on, off, secure, getty, or window information)
 may be changed in the
 .Xr ttys 5
@@ -205,10 +221,8 @@
 .Xr ttys 5
 file and are now on,
 .Nm
-executes a new
-.Nm getty
-to enable a new login.
-If the getty or window field for a line is changed,
+executes the command specified in the second field.
+If the command or window field for a line is changed,
 the change takes effect at the end of the current
 login session (e.g., the next time 
 .Nm
@@ -238,8 +252,7 @@
 will time out after 30 seconds and print a warning message.
 .Pp
 .Nm Init
-will cease creating new
-.Nm getty Ns 's
+will cease creating new processes
 and allow the system to slowly die away, if it is sent a terminal stop
 .Pq Dv TSTP
 signal, i.e.
Only in man8: ng_pptpgre.8
diff -ur /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/ng_vjc.8 man8/ng_vjc.8
--- /home/horikawa/man-jp/work/fbsd-3.3-19991207-STABLE/man/man8/ng_vjc.8	Tue Dec  7 19:55:07 1999
+++ man8/ng_vjc.8	Fri Dec 10 19:59:09 1999
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD: src/sys/modules/netgraph/vjc/ng_vjc.8,v 1.5.2.1 1999/11/17 07:24:00 julian Exp $
+.\" $FreeBSD: src/sys/modules/netgraph/vjc/ng_vjc.8,v 1.5.2.3 1999/12/08 19:44:14 julian Exp $
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -176,18 +176,6 @@
 .Dv NGM_SHUTDOWN
 control message, or when all hooks have been disconnected.
 .Sh BUGS
-When used as a loadable kernel module, this node type requires the file
-.Dv "net/slcompress.c"
-to have been compiled into the kernel. Currently the only way to insure this
-is to include the
-.Dv slip ,
-.Dv ppp ,
-or
-.Dv i4bipr
-pseudo-devices in your kernel compilation. In the future there should
-be a kernel option that causes inclusion of this file without requiring
-one of these drivers.
-.Pp
 Because the initialization routine in the kernel implementation of
 Van Jacobsen compression initializes both compression and decompression
 at once, this node does not allow compression and decompression to
@@ -195,6 +183,14 @@
 the other is already enabled, first both must be disabled, then
 both enabled.  This of course resets the node state.  This restriction
 may be lifted in a later version.
+.Pp
+When built as a loadable kernel module, this module includes the file
+.Dv "net/slcompress.c" .
+Although loading the module should fail if
+.Dv "net/slcompress.c"
+already exists in the kernel, currently it does not, and the duplicate
+copies of the file do not interfere.
+However, this may change in the future.
 .Sh SEE ALSO
 .Xr netgraph 4 ,
 .Xr ng_ppp 8 ,

----Next_Part(Fri_Dec_10_23:33:44_1999_41)----
