From owner-doc-jp-work@jp.FreeBSD.org Thu May 30 09:42:38 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g4U0gcC82712;
	Thu, 30 May 2002 09:42:38 +0900 (JST)
	(envelope-from owner-doc-jp-work@jp.FreeBSD.org)
Received: from mail4.nec.com (dns4.nec.com [131.241.15.4])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g4U0gbv82707
	for <doc-jp-work@jp.FreeBSD.org>; Thu, 30 May 2002 09:42:37 +0900 (JST)
	(envelope-from hino@ccrl.sj.nec.com)
Received: from netkeeper2.sj.nec.com (netkeeper2.sj.nec.com [131.241.31.10])
	by mail4.nec.com (/) with ESMTP id g4U0fha13546
	for <doc-jp-work@jp.FreeBSD.org>; Wed, 29 May 2002 17:41:44 -0700 (PDT)
Received: from renoir.ccrl.sj.nec.com (localhost [127.0.0.1])
	by netkeeper2.sj.nec.com (8.9.1a/8.9.1) with ESMTP id RAA09076
	for <doc-jp-work@jp.FreeBSD.org>; Wed, 29 May 2002 17:41:35 -0700 (PDT)
Received: from localhost (alfa.ccrl.sj.nec.com [131.241.79.205])
	by renoir.ccrl.sj.nec.com (8.9.3+Sun/8.9.3) with ESMTP id RAA07814
	for <doc-jp-work@jp.FreeBSD.org>; Wed, 29 May 2002 17:41:36 -0700 (PDT)
Date: Wed, 29 May 2002 17:41:36 -0700 (PDT)
Message-Id: <20020529.174136.56559854.hino@ccrl.sj.nec.com>
To: doc-jp-work@jp.FreeBSD.org
From: Koji Hino <hino@ccrl.sj.nec.com>
In-Reply-To: <7mznyjax8k.wl@black.imgsrc.co.jp>
References: <20020528.203135.92586028.rushani@bl.mmtr.or.jp>
	<20020529.024358.112630370.rushani@bl.mmtr.or.jp>
	<7mit57d7zd.wl@black.imgsrc.co.jp>
	<20020529.193454.78701832.rushani@bl.mmtr.or.jp>
	<7mznyjax8k.wl@black.imgsrc.co.jp>
Organization: C&C Research Laboratories (CCRL), NEC USA, Inc.
X-Mailer: Mew version 2.2 on Emacs 21.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Transfer-Encoding: 7bit
Reply-To: doc-jp-work@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: doc-jp-work 381
Subject: [doc-jp-work 381] Re: Release Notes for 4.6-RELEASE
Errors-To: owner-doc-jp-work@jp.FreeBSD.org
Sender: owner-doc-jp-work@jp.FreeBSD.org
X-Originator: hino@ccrl.sj.nec.com

From: Jun Kuriyama <kuriyama@imgsrc.co.jp>
 Date: Wed, 29 May 2002 22:40:11 +0900
 ID: <7mznyjax8k.wl@black.imgsrc.co.jp>
:> $B!!$[$$!"$D$$$G$K(B 1.22.2.246 $B$^$G(B sync $B$5$;$F!"(Bre@ $B$K(B approve request
:> $B$rEj$2$F$*$-$^$7$?!#(B

CVSweb$B$G=&$C$F$-$?(B1.5.2.19$B$KBP$7$F@V%Z%s@h@8$7$F$_$^$7$?!#(B
$B!&F|K\8l$NJ}$r$h$s$G!"5$$K$J$C$?$H$3$m$@$1$7$+%A%'%C%/$7$F$^$;$s(B
  ($B86J8$NA4$F$H$D$-$"$o$;$F%A%'%C%/$7$?$o$1$G$O$"$j$^$;$s(B)
$B!&F|Ln$N<qL#$K$h$kJQ99$b$+$J$j$"$j$^$9(B ($B$G$b(Bfull$B$K$O$d$C$F$^$;$s!DG=F0(B
  $BBV$KA4LLE*$KJQ$($k$H$+(B)
$B!&(Bfirewall$B$O!VKI2PJI!W$GNI$$$s$G$7$?$+!)$=$l$H$b%U%!%$%"%&%)!<%k!)(B($BJQ(B
  $B99$7$F$^$;$s(B)
$B!&(Bls $B$N(B -h flag$B$N$H$3$m!"(B'number of digits printed is less than three'
  $B$J$N$G$9$,!"!VC10L!W$H$$$&$N$,(BK/M/G/T$B$N$3$H$J$i!"(B'less than or equal
  to three' or 'less than four' $B$G$O$J$$$G$7$g$&$+$M(B > $B86J8(B
  $BF|K\8lLu$O!V(B3 $B0J2<$N7e?t!W$@$C$?$N$GJQ99$7$F$$$^$;$s!#$,!"C10L$K(B'B'
  $B$,4^$^$l$k$N$G$7$g$&$+(B? ($BLuCm$NItJ,!D(B billion? $B0c$&$h$J$!(B) $B$9$$$^$;(B
  $B$s!"%=!<%9%A%'%C%/$7$F$^$;$s!#(B
$B!&(BSSH$B$N(B'key pair'$B$O(Bjman$B$r;29M$K!V80$NBP!W$H$7$^$7$?(B
$B!&(B'denial of service'$B$O:4F#$5$s$N$$$D$b$NLu$r;29M$K!V%5!<%S%9K832967b!W(B
  $B$K$7$^$7$?(B
$B!&(B'Ports'$B$N0l$D0l$D$O(B'port'$B$GNI$$$s$G$7$?$C$1(B? (XFree86 4.2.0$B$X$NJQ99(B
  $B$N$H$3$m!DLuCm$G$9$,(B)
$B!&(Bbackup$B$O%P%C%/%"%C%W$K$7$F$7$^$$$^$7$?$,(B($B85$O!VBTHr!W(B)$B!"2?$+7h$a$F$^(B
  $B$7$?$C$1(B?
$B!&$7$P$i$/(Bdoc-jp$B$N$*;E;v$d$C$F$J$$$N$G!"!V%]%j%7!W$J$N$+!V%]%j%7!<!W$J(B
  $B$N$+!"$I$C$A$@$C$?$+;W$$=P$;$J$$!D(B

$BF|Ln(B


--- new.sgml?rev=1.5.2.19	Tue May 28 19:04:04 2002
+++ new.sgml	Wed May 29 17:12:06 2002
@@ -99,21 +99,21 @@
     <title>$B%+!<%M%k$NJQ99E@(B</title>
 
     <para arch="i386">&man.puc.4;
-      (PCI <quote>$B%f%K%P!<%5%k(B</quote> $B%3%_%e%s%1!<%7%g%s(B)
+      (PCI <quote>$B%f%K%P!<%5%k(B</quote> $B%3%_%e%K%1!<%7%g%s(B)
       $B%I%i%$%P$,DI2C$5$l$^$7$?!#(B
       $B$3$l$O(B PCI $B%Y!<%9$N%7%j%"%k%]!<%H$r(B
-      &man.sio.4; $B%I%i%$%P$X@\B3$9$k$N$KLrN)$A$^$9!#(B</para>
+      &man.sio.4; $B%I%i%$%P$X4X78IU$1$k$N$KLrN)$A$^$9!#(B</para>
 
-    <para>$B?7$7$/%m!<%@$+$iJQ992DG=$JJQ?t(B <varname>dumpdev</varname>
+    <para>$B%m!<%@$+$iJQ992DG=$J?75,$NJQ?t(B <varname>dumpdev</varname>
       $B$,DI2C$5$l!"%+!<%M%k%@%s%W%G%P%$%9$,@_Dj$G$-$k$h$&$K$J$j$^$7$?!#(B
       $B$3$l$K$h$j!"%+!<%M%k=i4|2=$N8e$NJ}(B ($B%7%9%F%`$,%7%s%0%k%f!<%6%b!<%I$KF~$kA0(B)
       $B$GH/@8$7$?(B panic $B$N%/%i%C%7%e%@%s%W$r<hF@$9$k$3$H$,2DG=$K$J$C$F$$$^$9!#(B</para>
 
-    <para>&man.snp.4; $B%I%i%$%P$O%9%?%F%#%C%/$J$b$N$G$O$J$/$J$j!"(B
+    <para>&man.snp.4; $B%I%i%$%P$r@EE*$K%+!<%M%k$KAH$_9~$`I,MW$O$J$/$J$j!"(B
       $B%b%8%e!<%k$H$7$F%3%s%Q%$%k$G$-$k$h$&$K$J$j$^$7$?!#(B</para>
 
-    <para arch="i386">Sony $B$N(B laptop $B$G!"(B
-      $B%8%g%0%@%$%"%k$X%"%/%;%9$9$k5!G=$rDs6!$9$k(B
+    <para arch="i386">Sony $B$N$$$/$D$+$N%i%C%W%H%C%W5!$,Ek:\$9$k(B
+      $B%8%g%0%@%$%"%k$X%"%/%;%9$9$k$?$a$N(B
       &man.spic.4; $B%I%i%$%P$,DI2C$5$l$^$7$?!#(B
       $BF1MM$K!"$3$N%G%P%$%9$KBP$9$k(B
       &man.moused.8 $B$N%5%]!<%H$bDI2C$5$l$^$7$?!#(B</para>
@@ -133,17 +133,17 @@
 	BIOS $B$GL58z$K$5$l$F$$$?>l9g$KM-8z2=$7$h$&$H;n$_$k$b$N$G$9!#(B</para>
 
       <para arch="i386">$B$$$/$D$+$N%7%9%F%`$G$O!"(B
-	BIOS $B$,%G%P%$%9$N(B I/O $B%]!<%H$d%a%b%j$r3hF0$5$;$:!"(B
+	BIOS $B$,%G%P%$%9$N(B I/O $B%]!<%H$d%a%b%j$rF0:n2DG=$K@_Dj$7$J$$$?$a!"(B
 	$BMxMQ$9$k$3$H$,$G$-$^$;$s!#(B
 	$B%+!<%M%k%*%W%7%g%s(B <literal>PCI_ENABLE_IO_MODES</literal> $B$O(B
-	$B%G%P%$%9$rMxMQ$9$k$?$a$K(B &os; $B$K6/@)E*$KM-8z2=$5$;$^$9!#(B</para>
+	$B$=$l$i$N%G%P%$%9$rMxMQ$G$-$k$h$&$K$9$k$?$a$K!"(B&os; $B$,$=$l$i$r6/@)E*$KM-8z2=$9$k$h$&$K$7$^$9!#(B</para>
     </sect3>
 
     <sect3>
       <title>$B5/F0%m!<%@4XO"(B</title>
 
-      <para arch="i386"><filename>boot2</filename>$B$,(B
-	$B%-!<%\!<%IA`:n$K$h$k(B boot $BCfCG$rL58z2=$9$k(B
+      <para arch="i386"><filename>boot2</filename>$B$,!"(B
+	$B%-!<%\!<%IA`:n$K$h$C$F(B boot $B$,CfCG$5$l$k$3$H$rKI$0(B
 	<option>-n</option> $B%*%W%7%g%s$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B</para>
       
 <!-- Above this line, order boot loader changes by manpage/variable name-->
@@ -153,8 +153,9 @@
     <sect3>
       <title>$B%M%C%H%o!<%/%$%s%?!<%U%'%$%9$NBP1~>u67(B</title>
       
-      <para>&man.an.4; $B%I%i%$%P$,?7$7$/(B Cisco LEAP $B$*$h$S(B
-        <quote>Home</quote> WEP $B0E9f80$KBP1~$7$^$7$?!#(B
+      <para>&man.an.4; $B%I%i%$%P$,(B
+        <quote>Home</quote> WEP $B0E9f80$K2C$($F(B
+        $B?7$7$/(B Cisco LEAP $B$K$bBP1~$7$^$7$?!#(B
         Linux Aironet $B%f!<%F%#%j%F%#$O8=:_!"(B
         $B%(%_%e%l!<%7%g%s4D6-2<$G$NF0:n$KBP1~$7$F$$$^$9!#(B</para>
 
@@ -203,7 +204,7 @@
         $B$=$7$F(B sysctl $BJQ?t(B <varname>kern.polling.enable</varname>
         $B$r@_Dj$9$k$3$H$G!"%]!<%j%s%0%b!<%I$rM-8z$K$9$k$3$H$,$G$-$^$9!#(B
         $B$3$N;~!"(B<varname>kern.polling.user_frac</varname> sysctl $BJQ?t$O(B
-        $B%f!<%6%i%s%IMQ$KM=Ls$5$l$?(B CPU $B;~4V$NI4J,N($r<($7$^$9!#(B
+        $B%f!<%6%i%s%IMQ$KM=Ls$5$l$?(B CPU $B;~4V$N3d9g$rI4J,N($G<($7$^$9!#(B
         $B%]!<%j%s%0$KBP1~$7$?%G%P%$%9$O:#$N$H$3$m(B
         &man.dc.4;$B!"(B&man.fxp.4;$B!"(B&man.rl.4;$B!"(B&man.sis.4; $B$G$9!#(B
         $B>\:Y$K$D$$$F$O(B &man.polling.4; $B$N%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B</para>
@@ -251,11 +252,11 @@
     <sect3>
       <title>$B%U%!%$%k%7%9%F%`(B</title>
 
-      <para>soft updates $B$K$*$$$F!"(B
+      <para>
 	$B?7$7$$%+!<%M%k$d%=%U%H%&%'%"$r%$%s%9%H!<%k$9$k$H$$$C$?(B
 	$B%U%!%$%k%7%9%F%`$KIi2Y$N$+$+$k:n6H$r9T$C$?D>8e$K(B
 	$B%7%9%F%`$r%7%c%C%H%@%&%s$7$?>l9g!"(B
-	$B%U%!%$%k%7%9%F%`$,$^$l$K1x@w$r0z$-5/$3$92DG=@-$,$"$k%P%0$,=$@5$5$l$^$7$?!#(B</para>
+	$B%U%!%$%k%7%9%F%`$,GK2u$5$l$k2DG=@-$,$"$k(B soft updates $B$N%P%0$,=$@5$5$l$^$7$?!#(B</para>
     </sect3>
 
     <sect3>
@@ -311,42 +312,42 @@
     <title>$B%f!<%6%i%s%I$NJQ99E@(B</title>
 
     <para>&man.atacontrol.8; $B$,(B &man.ata.4; $B%I%i%$%P$N(B
-      $BMM!9$NB&LL$r@)8f$9$k$?$a$KDI2C$5$l$^$7$?!#(B</para>
+      $BMM!9$J?6$kIq$$$r@)8f$9$k$?$a$KDI2C$5$l$^$7$?!#(B</para>
 
-    <para>ATAPI CDROM $B%I%i%$%V$K$*$$$F!"(B
-      &man.cdcontrol.1; $B$,(B $B%I%i%$%V$N:GBgB.EY$r@)8f$9$k$?$a$K(B
+    <para>ATAPI CDROM $B%I%i%$%V$KBP$7$F!"(B
+      &man.cdcontrol.1; $B$,(B $B%I%i%$%V$N:GBgB.EY$r@_Dj$9$k$?$a$N(B
       <literal>speed</literal> $B%3%^%s%I$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
-    <para>&man.ctags.1; $B$,!"%=!<%9%U%!%$%k$,(B (C++ $B%9%?%$%k$N(B)
-      <literal>//</literal> $B%3%a%s%H$,;HMQ$7$F$$$k>l9g$K(B
-      $BIe$C$?%?%0%U%!%$%k$r@8@.$7$J$/$J$j$^$7$?!#(B</para>
+    <para>&man.ctags.1; $B$,!"%=!<%9%U%!%$%k$K(B (C++ $B%9%?%$%k$N(B)
+      <literal>//</literal> $B%3%a%s%H$,;HMQ$5$l$F$$$k>l9g$G$b(B
+      $B2u$l$?%?%0%U%!%$%k$r@8@.$7$J$/$J$j$^$7$?!#(B</para>
 
     <para>&man.dump.8; $B$O?J9T>u67$r%W%m%;%9%?%$%H%k$K=PNO$9$k$h$&$K$J$j$^$7$?!#(B
       $B$3$l$O<+F02=$7$?%P%C%/%"%C%W$r4F;k$9$k:]$KM-MQ$G$9!#(B</para>
 
     <para><filename>/etc/rc.firewall</filename> $B$H(B
-      <filename>/etc/rc.firewall6</filename> $B$O(B
-      <varname>firewall_type</varname> $BJQ?t$K%;%C%H$7$?%k!<%k%U%!%$%k$d(B
+      <filename>/etc/rc.firewall6</filename> $B$O!"(B
+      <varname>firewall_type</varname> $BJQ?t$K%k!<%k%U%!%$%k$,@_Dj$5$l$?>l9g$H(B
       $BB8:_$7$J$$KI2PJI$N<oN`$,;XDj$5$l$?>l9g$K(B
       $B%O!<%I%3!<%G%#%s%0$5$l$?%k!<%k$rDI2C$7$J$/$J$j$^$7$?(B
-      ($B$3$NJQ99$r$9$k$3$H$K$J$C$?$-$C$+$1$O(B
-      $B%5%$%H$NKI2PJI$N%]%j%7!<$K$D$$$F$N2>Dj$K=>$&F0:n$r2sHr$9$k$?$a$G$9(B)$B!#(B
-      $B$5$i$K!"(B<literal>closed</literal> $B$H@_Dj$5$l$?KI2PJI$O(B
+      ($B$3$NJQ99$NL\E*$O!"(B
+      $B%5%$%H$NKI2PJI$K4X$9$k%]%j%7!<$r(B ($BLuCm(B: $B>!<j$K(B) $B2>Dj$7$FF0:n$7$F$7$^$&$3$H$rHr$1$k$3$H$G$9(B)$B!#(B
+      $B$5$i$K!"(B<literal>closed</literal> $B7?$K@_Dj$5$l$?KI2PJI$O(B
       &man.rc.firewall.8; $B$N%^%K%e%"%k$K5-=R$5$l$F$$$k$h$&$KF0:n$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>$B%m!<%+%k$G$N%+%9%?%^%$%:$dJ]<i$N<j4V$r7Z8:$9$k$?$a!"(B
       <filename>/etc/security</filename> $B$N5!G=$,(B
-      &man.periodic.8; $B%U%l!<%`%o!<%/$K$*$1$k%9%/%j%W%H72$KE}9g$5$l$^$7$?!#(B
+      &man.periodic.8; $B%U%l!<%`%o!<%/$K$*$1$k%9%/%j%W%H72$K0\F0$5$l$^$7$?!#(B
       $B8=:_!"$3$l$i$N%9%/%j%W%H$O(B
       <filename>/etc/periodic/security/</filename> $B$KCV$+$l$F$$$^$9!#(B</para>
 
     <para>&man.ifconfig.8; $B$N(B
       <option>ether</option> $B%"%I%l%9%U%!%_%j!<$,(B
       $B$h$j0lHLE*$J(B <option>link</option> $B%U%!%_%j!<$KJQ99$5$l$^$7$?(B
-      (<option>ether</option> $B$O8eJ}8_49@-$N$?$a$K$^$?5vMF$5$l$F$$$^$9(B)$B!#(B</para>
+      (<option>ether</option> $B$O8eJ}8_49@-$N$?$a$K$^$@MxMQ$G$-$^$9(B)$B!#(B</para>
 
     <para>&man.fsdb.8; $B$,(B
-      $BFCDj$N(B inode $B$K$h$C$FG[J,$5$l$k%V%m%C%/$r0lMw$K$9$k$?$a$K!"(B
+      $BFCDj$N(B inode $B$K$h$C$F3d$jEv$F$i$l$?%V%m%C%/0lMw$rI=<($9$k$?$a$N!"(B
       <literal>blocks</literal> $B%3%^%s%I$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>&man.ispppcontrol.8; $B$,:o=|$5$l!"(B
@@ -365,29 +366,28 @@
 
     <para>&man.last.1; $B$,(B
       <option>-y</option> $B%U%i%0$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B
-      $B%;%C%7%g%s$N3+;O;~9o$K4^$^$l$k$Y$-G/$r$b$?$i$9$b$N$G$9!#(B</para>
+      $B%;%C%7%g%s$N3+;O;~9o$H$7$FG/$NI=<($r4^$a$k$h$&$K$7$^$9!#(B</para>
 
     <para><filename>libstand</filename> $B$,(B
       $B$$$/$D$+$NJ*M}%a%G%#%"$r$^$?$,$C$FJ,3d$5$l$?(B
-      $BBg$-$J%+!<%M%k$H%b%8%e!<%k$r%m!<%I$G$-$k$h$&$K$J$j$^$7$?!#(B</para>
+      $BBg$-$J%+!<%M%k$d%b%8%e!<%k72$r%m!<%I$G$-$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para><filename>libusb</filename> $B$NL>A0$,(B
       <filename>libusbhid</filename> $B$KJQ99$5$l$^$7$?!#(B
       $B$3$l$O(B NetBSD $B$NL?L>5,B'$K=>$C$?$b$N$G$9!#(B</para>
 
     <para>&man.lpd.8; $B$,(B
-      <option>-p</option> $B%U%i%0$K$H$C$F$h$j9%$^$l$kN`5A8l$H$7$F(B
+      <option>-p</option> $B%U%i%0$HF1$80UL#$r;}$A!"$h$j9%$^$7$$(B
       <option>-s</option> $B%U%i%0$rG'<1$9$k$h$&$K$J$j$^$7$?(B
       ($B$3$l$i$N%U%i%0$O(B &man.lpd.8; $B$K(B
-      $B%M%C%H%o!<%/%W%j%s%?%8%g%V$XBP$9$k%=%1%C%H$r%*!<%W%s$5$;$^$;$s(B)$B!#(B</para>
+      $B%M%C%H%o!<%/7PM3$N%W%j%s%H%8%g%VMQ%=%1%C%H$rJD$8$5$;$^$9(B)$B!#(B</para>
 
     <para>&man.lpd.8; $B$X(B
       $B?7$?$K(B <literal>rc</literal> printcap $B%*%W%7%g%s$,<BAu$5$l$^$7$?!#(B
-      $B%j%b!<%H%[%9%H$N%W%j%s%H%-%e!<$K;XDj$5$l$k$H!"(B
-      $B%V!<%k%*%W%7%g%s$K$h$j(B
+      $B$3$N(B bool $B%*%W%7%g%s$,%j%b!<%H%[%9%H$N%W%j%s%H%-%e!<$K;XDj$5$l$k$H!"(B
       <command>lpr -#<replaceable>n</replaceable></command>
-      $B$rDL$7$F%f!<%6$,%j%/%(%9%H$7$?%G!<%?%U%!%$%k$N%3%T!<$r(B
-      &man.lpd.8; $B$K:FAw$5$;$^$9!#(B</para>
+      $B$K$h$k%f!<%6MW5a$KBP$7$F!"I,MW$J2s?tJ,7+$jJV$7$F%G!<%?%U%!%$%k$,(B
+      &man.lpd.8; $B$K$h$jE>Aw$5$l$^$9!#(B</para>
 
     <para>&man.ls.1; $B$,(B
       <option>-h</option> $B%U%i%0$r<u$1IU$1$k$h$&$K$J$j$^$7$?!#(B
@@ -395,37 +395,36 @@
       $B%U%!%$%k$KC10L(B ($BLuCm(B: B, KB, MB $B$J$I(B) $B$r$D$1$F(B
       3 $B0J2<$N7e?t$G%U%!%$%k%5%$%:$r=PNO$5$;$k$3$H$,$G$-$^$9!#(B</para>
 
-    <para>&man.m4.1; $B$,(B &man.cpp.1; $B$GMxMQ$9$k$?$a$K(B
-      <literal>#line</literal> $B%G%#%l%/%F%#%V$r=PNO$9$k(B
+    <para>&man.m4.1; $B$,!"(B&man.cpp.1; $B$GMxMQ$9$k$?$a$N(B
+      <literal>#line</literal> $B%G%#%l%/%F%#%V$r=PNO$9$k$h$&$K;X<($9$k(B
       <option>-s</option> $B%U%i%0$r<u$1IU$1$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>&man.mergemaster.8; $B$,?7$?$K(B
       2 $B$D$N%U%i%0$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B
-      <option>-p</option> $B%U%i%0$O(B
-      $B%7%9%F%`$N%"%C%W%0%l!<%I%9%F%C%W$N(B
+      <option>-p</option> $B%U%i%0$O!"(B
       <literal>buildworld</literal> $B$H(B
-      <literal>installworld</literal> $B$N(B
-      $B@.8y$KIT2D7g$H$7$FCN$i$l$F$$$k%U%!%$%k$K(B
+      <literal>installworld</literal> $B$H$$$&(B
+      $B%7%9%F%`$N%"%C%W%0%l!<%I%9%F%C%W$,@.8y$9$k$?$a$K=EMW$G$"$k$H(B
+      $B$o$+$C$F$$$k%U%!%$%k72$rHf3S$9$k$?$a$N(B
       <quote>pre-<literal>buildworld</literal></quote>
       $B%b!<%I$rM-8z$K$7$^$9!#(B
       <option>-C</option> $B%U%i%0$O(B &man.mergemaster.8; $B$,$&$^$/F0:n$7$?8e!"(B
-      <filename>/etc/rc.conf</filename> $B$H(B
-      $B%G%U%)%k%H$N%*%W%7%g%s$,Dj5A$5$l$F$$$k(B
-      <filename>/etc/defaults/rc.conf</filename> $B$N%*%W%7%g%s$rHf3S$7$^$9!#(B</para>
+      <filename>/etc/rc.conf</filename> $B$G;XDj$5$l$F$$$k%*%W%7%g%s$H(B
+      <filename>/etc/defaults/rc.conf</filename> $B$GDj5A$5$l$F$$$k%G%U%)%k%H$N%*%W%7%g%s$rHf3S$7$^$9!#(B</para>
 
     <para>&man.ngctl.8; $B$,?7$7$/(B <option>write</option>
       $B%3%^%s%I$KBP1~$7$^$7$?!#(B
-      $B$3$l$O%G!<%?%Q%1%C%H$r;XDj$7$?%U%C%/$KAw$j$^$9!#(B</para>
+      $B$3$l$O;XDj$7$?%U%C%/$K%G!<%?%Q%1%C%H$rAw$j$^$9!#(B</para>
 
     <para>&man.patch.1; $B$,(B
-      $BI8=`F~NO$h$j$b%U%!%$%k$+$i%Q%C%A$rFI$_9~$`$?$a$K(B
+      $BI8=`F~NO$G$O$J$/%U%!%$%k$+$i%Q%C%A$rFI$_9~$`$3$H$r;XDj$9$k(B
       <option>-i</option> $B%3%^%s%I%i%$%s%U%i%0$r<u$1IU$1$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>&man.pam.ssh.8; $B%b%8%e!<%k$,(B
-      SSH $B%Q%9%U%l!<%:$H80G'>Z$NMxMQ$r<u$1IU$1$k$?$a$KDI2C$5$l$^$7$?!#(B
-      $B$3$N%b%8%e!<%k$O(B &man.ssh-agent.1; $B$rMQ$$$k%;%C%7%g%s4IM}$b=hM}$7$^$9!#(B</para>
+      SSH $B$N%Q%9%U%l!<%:$H80$NBP$r;H$C$?G'>Z$r<u$1IU$1$k$?$a$KDI2C$5$l$^$7$?!#(B
+      $B$3$N%b%8%e!<%k$O(B &man.ssh-agent.1; $B$r5/F0$9$k$3$H$K$h$j%;%C%7%g%s4IM}$b=hM}$7$^$9!#(B</para>
 
-    <para>&man.pr.1; $B$,C<Kv$X$N=PNO$rDd;_$9$k$?$a$K(B
+    <para>&man.pr.1; $B$,!"C<Kv$X$N=PNO$r0l;~Dd;_$9$k$h$&;X<($9$k(B
       <option>-f</option>$B!"(B<option>-p</option>
       $B%U%i%0$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
@@ -433,18 +432,18 @@
       ($B;XDj$7$?%9%o%C%W%G%P%$%9$+$i>pJs$rCj=P$9$k(B) $B$,:o=|$5$l$^$7$?!#(B
       $B$3$N%*%W%7%g%s$O>/$7A0$+$i;H$($J$/$J$C$F$$$?$b$N$G$9!#(B</para>
 
-    <para>&man.reboot.8; $B$,<!$N5/F0;~$N%+!<%M%k$r;XDj$9$k$?$a$K(B
-      <option>-k</option> $B$r$D$1$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B</para>
+    <para>&man.reboot.8; $B$O<!$N5/F0;~$N%+!<%M%k$r;XDj$9$k$?$a$N(B
+      <option>-k</option> $B%*%W%7%g%s$r<u$1IU$1$k$h$&$K$J$j$^$7$?!#(B</para>
 
-    <para>&man.sshd.8; $B$,(B S/Key $B$,M-8z2=$5$l$F$$$J$$%/%i%$%"%s%H$K(B
-      $B56$N(B S/Key $B%A%c%l%s%8$KBP$9$k1~Ez$r$7$J$$$h$&$K$J$j$^$7$?!#(B
-      $B:G6a$N(B SSH $B%/%i%$%"%s%H$,(B &os; $B%7%9%F%`$K@\B3$7$?;~$K(B
-      one-time-password $B$rB%$5$J$$8B$j!"(B
-      $B>e=R$N?6Iq$$$O:.Mp$r$b$?$i$9$+$i$G$9!#(B</para>
+    <para>&man.sshd.8; $B$O(B S/Key $B$,M-8z2=$5$l$F$$$J$$%f!<%6$KBP$7$F(B
+      $B56$N(B S/Key $B%A%c%l%s%8$r=PNO$7$J$$$h$&$K$J$j$^$7$?!#(B
+      $B0JA0$N?6$kIq$$$O!"(B
+      $BHf3SE*?7$7$$$$$/$D$+$N(B SSH $B%/%i%$%"%s%H$,(B &os; $B%7%9%F%`$K@\B3$7$?;~$K(B
+      $BLr$KN)$?$:%f!<%6$r:.Mp$5$;$k$h$&$J(B one-time-password $B$r=PNO$7$F$$$^$7$?!#(B</para>
 
-    <para>$BL$40@.$G$9$,!"(B&man.sysinstall.8; $B$,(B
+    <para>$BIT40A4$G$9$,!"(B&man.sysinstall.8; $B$,(B
       ($BJ#?t$N(B CD $B$K$h$kG[I[$N$h$&$J(B)
-      $BJ#?t$N%\%j%e!<%`$N@5$7$$%\%j%e!<%`$+$i(B
+      $BJ#?t$N%\%j%e!<%`$rMxMQ$9$k%$%s%9%H!<%k$K$*$$$F!"@5$7$$%\%j%e!<%`$+$i(B
       package $B$r=&$$=P$95!G=$r%5%]!<%H$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>&man.tftp.1; $B$H(B &man.tftpd.8; $B$,(B
@@ -457,7 +456,7 @@
       <option>-o</option> $B%*%W%7%g%s$r<u$1IU$1$k$h$&$K$J$j$^$7$?!#(B
       $B$^$?!"(B<option>-m</option> $B%U%i%0$,M?$($i$l$?;~$K(B
       &man.uuencode.1; $B$,(B base64 $B%(%s%3!<%G%#%s%0$r$9$k$h$&$J$j!"(B
-      $B0lJq!"(B&man.uudecode.1; $B$O<+F0E*$K(B
+      $B0lJ}$G!"(B&man.uudecode.1; $B$O<+F0E*$K(B
       base64 $B%U%!%$%k$r%G%3!<%I$9$k$h$&$K$J$j$^$7$?!#(B</para>
 
     <para>&man.watch.8; $B$,(B
@@ -470,17 +469,17 @@
       <literal>*.euc??</literal> $B7A<0$X2~L>$5$l$^$7$?!#(B
       $BNc$($P!"(B<literal>ja_JP.EUC</literal> $B$O(B
       <literal>ja_JP.eucJP</literal> $B$K$J$j$^$9!#(B
-      $B$3$l$O(B &os; CURRENT$B!"(BX11R6 $B$*$h$S$?$/$5$s$N(B UNIX $B$N%P!<%8%g%s$H$N(B
+      $B$3$l$O(B &os; CURRENT$B!"(BX11R6 $B$*$h$S$?$/$5$s$NB>$N(B UNIX $B$N%P!<%8%g%s$H$N(B
       locale $BL>$N8_49@-$r2~A1$9$k$b$N$G$9!#(B</para>
 
     <para>locale $B$N%5%]!<%H$,(B &os; -CURRENT $B$N%3!<%I$HF14|$7$^$7$?!#(B
-      $B$3$NJQ99$O(B
+      $B$3$NJQ99$K$h$j(B
+      &man.strftime.3; $B$,2~A1$7!"(B
+      locale $B$NDj5A$,2~D{$5$l!"(B
+      $BB?$/$N%Y!<%9%7%9%F%`%W%m%0%i%`$NCO0h2=$,2~A1$7!"$5$i$K(B
       <literal>LC_NUMERIC</literal>$B!"(B
       <literal>LC_MONETARY</literal> $B$*$h$S(B
-      <literal>LC_MESSAGES</literal> $B%+%F%4%j$N%5%]!<%H$r$b$?$i$9$b$N$G!"(B
-      &man.strftime.3; $B$N2~A1$HF1MM$K!"(B
-      locale $B$NDj5A$r2~D{$7!"(B
-      $BB?$/$N%Y!<%9%7%9%F%`%W%m%0%i%`$NCO0h2=$N2~A1$7$^$7$?!#(B</para>
+      <literal>LC_MESSAGES</literal> $B%+%F%4%j$,%5%]!<%H$5$l$^$7$?!#(B</para>
 
     <sect3>
       <title>$B4sB#%=%U%H%&%'%"(B</title>
@@ -510,17 +509,17 @@
 	<para><application>sendmail</application> $B$,(B
 	  8.12.3 $B$K99?7$5$l$^$7$?!#(B
 	  &man.sendmail.8; $B$O(B root $B$K(B set-user-ID $B$5$l$?%P%$%J%j$H$7$F(B
-	  $B%$%s%9%H!<%k$5$l$J$/$J$j$^$7$?(B (smmsp $B$K(B set-group-ID $B$5$l$F$$$^$9(B)$B!#(B
+	  $B%$%s%9%H!<%k$5$l$J$/$J$j$^$7$?(B ($B8=:_$O(B smmsp $B$K(B set-group-ID $B$5$l$F$$$^$9(B)$B!#(B
 	  $B>\:Y$O(B
 	  <filename>/usr/src/contrib/sendmail/RELEASE_NOTES</filename> $B$H(B
 	  <filename>/etc/mail/README</filename>
 	  $B$r$4Mw$/$@$5$$!#(B</para>
 
 	<para>$B$3$N(B <application>sendmail</application> $B$N99?7$KH<$$!"(B
-	  <application>sendmail</application> $B%G!<%b%s(B
-	  ($B30$X=P$F$$$/%a!<%k$r07$&$?$a$K$3$l$rMW5a$9$k$b$N$,$"$j$^$9(B) $B$O(B
+	  $BJ#?t$N(B <application>sendmail</application> $B%G!<%b%s(B
+	  ($B30$X=P$F$$$/%a!<%k$r07$&$?$a$K$$$/$D$+$,I,MW$G$9(B) $B$O(B
 	  <varname>sendmail_enable</varname> $BJQ?t$,(B
-	  <literal>NO</literal> $B$K%;%C%H$5$l$F$$$F$b(B
+	  <literal>NO</literal> $B$K%;%C%H$5$l$F$$$k>l9g$G$"$C$F$b(B
 	  &man.rc.8; $B$K$h$C$F5/F0$5$l$k$h$&$K$J$j$^$7$?!#(B
 	  <application>sendmail</application> $B$r40A4$KL58z2=$9$k$K$O!"(B
 	  <varname>sendmail_enable</varname> $B$r(B
@@ -530,19 +529,19 @@
 	  $B$rMQ$$$F0[$J$k5/F0%9%/%j%W%H$r;XDj$9$k$3$H$,2DG=$G$9(B
 	  ($B>\:Y$O(B &man.rc.sendmail.8; $B$r$4Mw$/$@$5$$(B)$B!#(B</para>
 
-	<para><filename>/etc/mail/Makefile</filename> $B$r$+$i9=C[$5$l$k(B
+	<para><filename>/etc/mail/Makefile</filename> $B$r$+$i9=C[$5$l$k$H$-$N(B
 	  <application>sendmail</application> $B$N%(%$%j%"%9$H(B
-	  map database $B$N%Q!<%_%C%7%g%s$O(B
-	  $B%m!<%+%k$N%5!<%S%95qH]$r%m%C%/$9$k%U%!%$%k$KBP$7$FKI8f$9$k$?$a$K(B
-	  $B%G%U%)%k%H$G%b!<%I(B 0640 $B$K$J$j$^$7$?!#(B
+	  map $B$K4X$9$k%G!<%?%Y!<%9%U%!%$%k$N%Q!<%_%C%7%g%s$O!"(B
+	  $B%m%C%/%U%!%$%k$KBP$9$k%m!<%+%k$+$i$N%5!<%S%9K832967b$rKI$0$?$a$K(B
+	  $B%G%U%)%k%H$,%b!<%I(B 0640 $B$K$J$j$^$7$?!#(B
 	  $B$3$l$O(B <filename>make.conf</filename> $B$N(B
 	  <varname>SENDMAIL_MAP_PERMS</varname>
-	  $B%*%W%7%g%s$r%;%C%H$7$FJQ99$9$k$3$H$,2DG=$G$9!#(B</para>
+	  $B$H$$$&?7$7$$%*%W%7%g%s$r%;%C%H$7$FJQ99$9$k$3$H$,2DG=$G$9!#(B</para>
 
 	<para><application>sendmail</application> $B$NE}7W%U%!%$%k(B
 	  (<filename>/var/log/sendmail.st</filename>)
 	  $B$N%Q!<%_%C%7%g%s$,(B
-	  $B%m!<%+%k$N%5!<%S%95qH]$r%m%C%/$9$k%U%!%$%k$KBP$7$FKI8f$9$k$?$a$K(B
+	  $B%m%C%/%U%!%$%k$KBP$9$k%m!<%+%k$+$i$N%5!<%S%9K832967b$rKI$0$?$a$K(B
 	  $B%b!<%I(B 0644 $B$+$i(B 0640 $B$XJQ99$5$l$^$7$?!#(B</para>
 
       </sect4>
@@ -552,9 +551,9 @@
     <sect3>
       <title>Ports/Packages Collection</title>
 
-      <para>Ports Collection $B$N4pHW$O!"0MB84X78$rK~B-$9$k$?$a$K(B
-	X Window System $B$N%G%U%)%k%H$N%P!<%8%g%s$H$7$F(B
-	<application>XFree86</application> 4.2.0 $B$rMxMQ$9$k$h$&$K$J$j$^$7$?!#(B
+      <para>Ports Collection $B$N4pK\@_Dj$H$7$F!"(B($BLuCm(B: $B3F(B port $B$,(B) $B0MB8$9$k(B
+	X Window System $B$N%G%U%)%k%H$N%P!<%8%g%s$r(B
+	<application>XFree86</application> 4.2.0 $B$XJQ99$7$^$7$?!#(B
 	<application>XFree86</application> 3.3.6 $B$XLa$9$K$O!"(B
 	$B<!$N9T$r(B <filename>/etc/make.conf</filename> $B$X2C$($F$/$@$5$$!#(B</para>
 
@@ -571,8 +570,8 @@
       X Window System $B$N%G%U%)%k%H$N%P!<%8%g%s$K$J$j$^$7$?!#(B
       $BI8=`$N%P%$%J%j%Q%C%1!<%8%;%C%H$H$7$F(B
       <application>XFree86</application> $B$,%$%s%9%H!<%k$5$l$k$N$G!"(B
-      &man.pkg.info.1; $B$N$h$&$JDL>o$N(B package $B%f!<%F%#%j%F%#$O(B
-      $B$3$N%3%s%]!<%M%s%H$rD4$Y!"9*L/$KA`:n$7$FMxMQ$9$k$3$H$,$G$-$^$9!#(B</para>
+      &man.pkg.info.1; $B$N$h$&$JDL>o$N(B package $B%f!<%F%#%j%F%#$r(B
+      $B$=$l$i$N%3%s%]!<%M%s%H$rD4$Y$?$jA`:n$7$?$j$9$k$?$a$KMxMQ$9$k$3$H$,$G$-$^$9!#(B</para>
   </sect2>
 </sect1>
 
@@ -626,6 +625,6 @@
   <important>
     <para>$B$b$A$m$s8@$&$^$G$b$J$$$3$H$G$9$,!"(B
       &os; $B$N%"%C%W%0%l!<%I$O!"%G!<%?$H@_Dj%U%!%$%k$r(B
-      <emphasis>$B$9$Y$F(B</emphasis>$BB`Hr$5$;$?8e$K9T$J$&$Y$-$G$9!#(B</para>
+      <emphasis>$B$9$Y$F(B</emphasis> $B%P%C%/%"%C%W$5$;$?8e$K9T$J$&$Y$-$G$9!#(B</para>
   </important>
 </sect1>
