--- ports/macppc/faq.xml.orig	2010-06-26 14:07:46.000000000 +0900
+++ ports/macppc/faq.xml	2010-06-26 14:07:46.000000000 +0900
@@ -5,10 +5,10 @@
 
 <webpage id="ja-ports-macppc-faq">
 <config param="desc" value="NetBSD/macppc $B$h$/$"$k<ALd(B"/>
-<config param="cvstag" value="$NetBSD: faq.xml,v 1.4 2007/08/29 10:26:21 mishka Exp $"/>
+<config param="cvstag" value="$NetBSD: faq.xml,v 1.5 2009/09/19 20:59:15 snj Exp $"/>
 <!-- Based on english version: -->
-<!-- NetBSD: faq.xml,v 1.4 2007/08/29 10:26:21 mishka Exp   -->
-<config param="rcsdate" value="$Date: 2007/08/29 10:26:21 $"/>
+<!-- NetBSD: faq.xml,v 1.5 2009/09/19 20:59:15 snj Exp   -->
+<config param="rcsdate" value="$Date: 2009/09/19 20:59:15 $"/>
 <head>
 <!-- Copyright (c) 1998-2005
 	The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED. -->
@@ -160,8 +160,7 @@
 <ulink url="../../docs/network/netboot/">Diskless HOW-TO</ulink>$B!"(B
 $BFC$K(B
 <ulink url="../../docs/network/netboot/intro.macppc.html">macppc $B8GM-$JItJ,(B</ulink>
-$B$N>O!"$*$h$S(B netboot $B$G$"$j$,$A$JLdBj(B (<xref
-linkend="netboot-probs" />) $B$G%+%P!<$7$F$$$^$9!#(B</para>
+$B$N>O!"$*$h$S(B <xref linkend="netboot-probs" /> $B$G%+%P!<$7$F$$$^$9!#(B</para>
 
 <screen><prompt>0 &gt; </prompt><emphasis role="bold">boot enet:,ofwboot.xcf</emphasis> file: 192.168.0.11,/ofwboot.xcfloading XCOFF
 tsize=C280 dsize=14AC bsize=2620 entry=600000
@@ -215,7 +214,7 @@
 $B%k!<%H%G%P%$%9$rKd$a9~$s$@%+!<%M%k$r:F9=C[$9$k$H$h$$$+$b$7$l$^$;$s!#(B<xref
 linkend="dash-a" />$B$r$4Mw$/$@$5$$!#(B</para>
 
-<para>$B?7$7$$(B PowerBook $B$,$3$3$G%O%s%0$9$k>l9g!"(B
+<para>PowerBook $B$,$3$3$G%O%s%0$9$k>l9g!"(B
 <xref linkend="powerbook" />$B$r8+$F$/$@$5$$!#(B</para>
 
 <screen>swapctl: adding /dev/sd0b as swap device at priority 0
@@ -227,7 +226,7 @@
 />$B$r8+$F$/$@$5$$!#(B</para>
 
 <para>sysinst $B$r;H$$!"(B<literal>I can not find any
-hard disk for use by NetBSD</literal> $B$H8@$o$l$?>l9g$O!"(B<xref
+hard disks for use by NetBSD</literal> $B$H8@$o$l$?>l9g$O!"(B<xref
 linkend="nodisk" />$B$r;2>H$9$Y$-$G$9!#(B</para>
 
 </sect3>
@@ -339,16 +338,16 @@
 <sect3 id="disk-sharing">
 <title>$B%^%7%s>e$N(B OS $B4V$G%U%!%$%k$r6&M-$9$kJ}K!$O(B ?</title>
 
-<para>$B$3$N9`L\$O(B<ulink url="partitioning.html">$B%Q!<%F%#%7%g%K%s%0(B
-HOW-TO</ulink> $B$KE}9g$5$l$^$7$?!#(B</para>
+<para><ulink url="partitioning.html">$B%Q!<%F%#%7%g%K%s%0(B
+HOW-TO</ulink> $B$r$4Mw$/$@$5$$!#(B</para>
 
 </sect3>
 
 <sect3 id="partitions">
 <title>$B%Q!<%F%#%7%g%s5-K!$N@bL@(B</title>
 
-<para>$B$3$N9`L\$O(B<ulink url="partitioning.html#nomenclature">$B%Q!<%F%#%7%g%K%s%0(B
-HOW-TO</ulink> $B$X0\F0$7$^$7$?!#(B</para>
+<para><ulink url="partitioning.html#nomenclature">$B%Q!<%F%#%7%g%K%s%0(B
+HOW-TO</ulink> $B$r$4Mw$/$@$5$$!#(B</para>
 
 </sect3>
 
@@ -356,7 +355,7 @@
 <title>$B$J$<%F%-%9%H$N2hLL%9%/%m!<%k$,$3$s$J$KCY$$$N(B?</title>
 
 <para>GENERIC $B%+!<%M%k$N%F%-%9%H%3%s%=!<%k$N%3!<%I$O:GE,2=$5$l$F$$$^$;$s!#(B
-NetBSD 1.6 $B0J9_$K$O9bB.2=$5$l$?%F%-%9%H%3%s%=!<%k%3!<%I$,$"$j$^$9$,!"(B
+$B9bB.2=$5$l$?%F%-%9%H%3%s%=!<%k%3!<%I$,$"$j$^$9$,!"(B
 $B$3$l$O%G%U%)%k%H$G$OM-8z$K$J$C$F$$$^$;$s!#(B</para>
 
 <para>$B%+!<%M%k$r:F9=C[$9$kI,MW$,$"$j$^$9!#(B
@@ -414,7 +413,7 @@
 <sect3 id="timedrift">
 <title>PowerComputing $B8_495!$N;~7W$,$:$l$^$/$j$^$9!#(B</title>
 
-<para>$B$"!<!"$3$l$O(B Open Firmware $BFb$N(B <literal>timebase</literal> $B$,%O!<%I%&%'%"$H(B
+<para>$B$3$l$O(B Open Firmware $BFb$N(B <literal>timebase</literal> $B$,%O!<%I%&%'%"$H(B
 $B9gCW$7$F$$$J$$$?$a$G$9!#@5$9I,MW$,$"$j$^$9!#(B</para>
 
 <para>Adam Lebsack $B$K$h$k(B<ulink
@@ -428,7 +427,7 @@
 
 <para>$BB?$/$N?M$,!"(B NetBSD/macppc $B%7%9%F%`$rL5?M$G%V!<%H$5$;$i$l$J$$$HJs9p$7$F$$$^$9!#(B
 Open Firmware $B$O%+!<%M%k$r@5$7$/%m!<%I$9$k$b$N$N!"(B
-$B%+!<%M%k$O%k!<%H%G%P%$%9(B ($B$D$^$j(B / $B%U%!%$%k%7%9%F%`$N=j:_(B)
+$B%+!<%M%k$O%k!<%H%G%P%$%9(B ($B$D$^$j(B <filename>/</filename> $B%U%!%$%k%7%9%F%`$N=j:_(B)
 $B$r8+$D$1$i$l$F$$$J$$$h$&$G$9!#(B</para>
 
 <para>$B%W%m%s%W%H$G!"%k!<%H%G%#%9%/(B ($BBgDq$O(B <literal>sd0a</literal> $B$+(B <literal>wd0a</literal>
@@ -476,7 +475,7 @@
 
 <itemizedlist>
   <listitem>
-    <para><emphasis>Apple PDM</emphasis>: $B$"$i$f$k(B x1xx $B$J%^%7%s!"$?$H$($P(B 6100,
+    <para><emphasis>Apple PDM</emphasis>: $B$"$i$f$k(B x1xx $B$J%^%7%s!"$?$H$($P!"(B 6100,
     6150, 7100, 8100</para>
   </listitem>
 
@@ -491,7 +490,7 @@
   </listitem>
 
   <listitem>
-    <para><emphasis>Power Computing "Power" $B%7%j!<%:(B</emphasis>:
+    <para><emphasis>Power Computing "Power" $B%7%j!<%:(B</emphasis>$B!"(B
     "Power 100" $B$d(B "Power 120" $B$J$I(B</para>
   </listitem>
 </itemizedlist>
@@ -547,17 +546,12 @@
 <sect3 id="powerbook">
 <title>PowerPC $B%Y!<%9$N(B PowerBook $B$O%5%]!<%H$5$l$F$$$^$9$+(B?</title>
 
-<para>$BB?$/$N5!<o$r%5%]!<%H$7$F$$$^$9!#(B <ulink url="models.html">NetBSD/macppc
+<para>$B$[$H$s$I$N5!<o$r%5%]!<%H$7$F$$$^$9!#>\:Y$O(B <ulink url="models.html">NetBSD/macppc
 $BBP1~5!<o$N%j%9%H(B</ulink>$B$r8+$F$/$@$5$$!#(B</para>
 
 <para>PowerBook 1400$B!"(B 2300$B!"(B 5300 $B$O!"(B
 Open Firmware $B$r;}$?$J$$$?$a!"HsBP1~$G$9!#(B</para>
 
-<para>$B?7$7$/H/I=$5$l$?%i%C%W%H%C%W$N5!<o$O!"=>Mh$H0[$J$kFbB"%-!<%\!<%I$r;}$C$F$$$k$3$H$,$"$j!"(B
-NetBSD $B$,BP1~$9$k$N$K$7$P$i$/;~4V$,$+$+$j$^$9!#?7$7$/H/I=$5$l$?5!<o$r$*;}$A$NJ}$O!"(B<ulink
-url="mailto:port-macppc@NetBSD.org">port-macppc@NetBSD.org</ulink>
-$B$XEj9F$7$F$_$F$/$@$5$$!#(B</para>
-
 <para> $B%Q%o!<%^%M!<%8%a%s%H$OL$%5%]!<%H$G$9$N$GCm0U$7$F$/$@$5$$!#(B
 NetBSD $B$NF0:nCf$O(B PowerBook $B$N%5%9%Z%s%I!"%l%8%e!<%`$O$G$-$^$;$s!#(B</para>
 
@@ -617,7 +611,8 @@
 
 <para>L3 $B%-%c%C%7%e$,%G%U%)%k%H$G$OM-8z$K$J$i$J$$>l9g$O!"$3$N(B<ulink
 url="http://mail-index.NetBSD.org/port-macppc/2003/02/27/0000.html">$B5-;v(B</ulink>
-$B$G<($5$l$F$$$kJ}K!$K=>$C$F$/$@$5$$!#(B</para>
+$B$G<($5$l$F$$$kJ}K!$K=>$C$F$/$@$5$$!#(B
+</para>
 
 </sect3>
 
@@ -625,8 +620,8 @@
 <title>$B$I$s$J<~JU5!4o$KBP1~$7$F$$$^$9$+(B ?</title>
 
 <para><ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">
-NetBSD/macppc 3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B "Supported devices"
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD/macppc &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B "Supported devices"
 $B@a$K!"40A4$J0lMw$,:\$C$F$$$^$9!#(B
 $BFC5-$J$$8B$j!"%5!<%I%Q!<%F%#!<@=%G%P%$%9(B (PCI $B$d(B cardbus $B$J$I(B)
 $B$O!"(B NetBSD/macppc $B$N%V!<%HMQ$K$O;H$($^$;$s!#(B</para>
@@ -642,8 +637,8 @@
       </listitem>
 
       <listitem>
-        <para>$B%^%k%A%W%m%;%C%5!<%+!<%I$N%5%]!<%H$O!"(B NetBSD/macppc 2.0
-        $B$*$h$S$=$l0J9_$GMxMQ2DG=$K$J$C$F$$$^$9!#(B
+        <para>$B%^%k%A%W%m%;%C%5!<%+!<%I$N%5%]!<%H$O(B
+        $BMxMQ2DG=$K$J$C$F$$$^$9!#(B
         <filename>GENERIC.MP</filename> $B%+!<%M%k$r;H$&$+!"%+!<%M%k%3%s%U%#%.%e%l!<%7%g%s$K(B "<literal>options
         MULTIPROCESSOR</literal>" $B$rDI2C$9$kI,MW$,$"$j$^$9!#(B
         $B$=$&$7$J$$$H!"(B NetBSD $B$O(B CPU $B$r(B 1 $B8D$7$+;H$$$^$;$s!#(B</para>
@@ -675,7 +670,7 @@
       </listitem>
 
       <listitem>
-        <para>PCI, PCMCIA, cardbus $B$*$h$S(B USB $B$N%$!<%5%M%C%H%G%P%$%9(B
+        <para>PCI, PCMCIA, CardBus $B$*$h$S(B USB $B$N%$!<%5%M%C%H%G%P%$%9(B
         (<emphasis>tlp</emphasis>, <emphasis>epic</emphasis>,
         <emphasis>ex</emphasis>, <emphasis>fxp</emphasis>,
         <emphasis>rtk</emphasis>, <emphasis>vr</emphasis>,
@@ -835,7 +830,7 @@
       </listitem>
 
       <listitem>
-        <para>USB$B!"(B PCI$B!"$*$h$S(B cardbus $B%Y!<%9$N%7%j%"%k%]!<%H!#(B</para>
+        <para>USB$B!"(B PCI$B!"$*$h$S(B CardBus $B%Y!<%9$N%7%j%"%k%]!<%H!#(B</para>
       </listitem>
     </itemizedlist>
   </listitem>
@@ -860,7 +855,7 @@
         <ulink
         url="../../support/hardware/pcmcia.html">$B5!<oFHN)$N(B PCMCIA
         $B%I%i%$%P!<(B</ulink>$B$d!"(B<ulink
-        url="../../support/hardware/cardbus.html">$B5!<oFHN)$N(B Cardbus
+        url="../../support/hardware/cardbus.html">$B5!<oFHN)$N(B CardBus
         $B%I%i%$%P!<(B</ulink>$B$N%Z!<%8$r8+$F$/$@$5$$!#(B</para>
       </listitem>
     </itemizedlist>
@@ -942,8 +937,7 @@
 <sect3 id="airport">
 <title>AirPort $B$"$k$$$O(B AirMac $B%M%C%H%o!<%/$r;H$&J}K!$O(B?</title>
 
-<para>$B%o%$%d%l%9%M%C%H%o!<%-%s%0$O(B NetBSD 1.6 $B$+$iBP1~$7$^$7$?!#(BAirPort
-Extreme $B$O!":#$N$H$3$m%5%]!<%H$5$l$F$$$^$;$s!#(B</para>
+<para>AirPort Extreme $B$O!":#$N$H$3$m%5%]!<%H$5$l$F$$$^$;$s!#(B</para>
 
 <para>$B<jC;$K8@$($P!"I,MW$J$3$H$O!"%o%$%d%l%9%+!<%I$r!"(B DHCP $B$r;H$C$F(B IP $B%"%I%l%9$r(B
 $BF@$k$h$&@_Dj$9$k$3$H$H!"@5$7$$%a%G%#%"%?%$%W(B ($BBgDq$O(B <literal>DS11</literal>)
@@ -1059,9 +1053,9 @@
 <sect3 id="ofw-bugs">
 <title>$B;d$N5!<o$N(B Open Firmware $B$NF0:n$K%P%0$O$"$j$^$9$+(B ?</title>
 
-<para>$B$"$j$($^$9!#(B
-<ulink url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">
-NetBSD/macppc 3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$K!"$=$N$h$&$J%P%0$r(B
+<para>$B$"$j$($^$9!#(B<ulink
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD/macppc &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$K!"$=$N$h$&$J%P%0$r(B
 $B2sHr$9$k$?$a$N%Q%C%AE,MQ$d%"%C%W%0%l!<%I$K$D$$$F$N@bL@$,$"$j$^$9!#(B
 Open Firmware 3 $B$N%7%9%F%`$K$D$$$F$O(B "Updating your BootROM" $B$N@a$r!"(B
 Open Firmware 1.0.5$B!"(B 2.0.x$B!"(B 2.4 $B$N%7%9%F%`$K$D$$$F$O(B
@@ -1073,8 +1067,8 @@
 <title>Open Firmware $B%W%m%s%W%H$KF~$kJ}K!$O(B?</title>
 
 <para><ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">NetBSD 
-3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$rFI$s$G$/$@$5$$!#FC$K!"$*;H$$$N(B Open
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$rFI$s$G$/$@$5$$!#FC$K!"$*;H$$$N(B Open
 Firmware $B$N%P!<%8%g%s8~$1$N(B
 "Getting to Open Firmware" $B$N@a$^$GFI$s$G$/$@$5$$!#(B</para>
 
@@ -1090,8 +1084,8 @@
 $B%b%K%?!<$K2?$bI=<($5$l$J$/$J$j$^$9!#(B</title>
 
 <para><ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">NetBSD 
-3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$rFI$_$^$;$s$G$7$?$M(B? $BFC$K!"(B
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$rFI$_$^$;$s$G$7$?$M(B? $BFC$K!"(B
 "Getting to the Open Firmware Prompt on Older Models" $B$N@a$OFI$s$G$/$@$5$$!#(B
 $B$d$dD9$?$i$7$$$G$9$,!"(B Open Firmware $B$r%;%C%H%"%C%W$9$k$?$a$NE,@Z$J<j=g$rHs>o$KL@2r$K@bL@$7$F$$$^$9!#(B</para>
 
@@ -1255,7 +1249,7 @@
 $B%-!<$K9o0u$5$l$F$$$kJ8;z$H$O0lCW$7$J$$$3$H$,$"$j$^$9!#(B</para>
 
 <para>$B4JC1$G$9$,H~$7$/$J$$2r7hK!$O!"J8;z$N==O;?JI=8=$r;H$&$3$H$G$9!#(B
-$B%3%^%s%IA4BN$rFs=E0zMQId(B <literal>"</literal> $B$G3g$C$?$&$($G!"(B
+$B%3%^%s%IA4BN$rFs=E0zMQId$G3g$C$?$&$($G!"(B
 $BJ8;z$r==O;?J%3!<%I$K$7$F4]%+%C%3$G0O$_!"$=$NA0$KFs=E0zMQId$rCV$-$^$9!#(B
 $B$?$H$($P!"%P%C%/%9%i%C%7%e$O(B <literal>"(5C)</literal> $B$KCV$-49$($^$9!#(B
 $B$3$N$h$&$K$7$FFs=E0zMQId$G3g$C$?%3%^%s%I$N8e$K$O!"$=$N%3%^%s%I$N==O;?JI=8=$r(B
@@ -1284,7 +1278,7 @@
 <anchor id="ofw-misc" />
 
 <para>$B%3%s%T%e!<%?!<$N%V!<%H$K4X$9$k$5$^$6$^$J>uBV$r@_Dj$9$k$3$H$,$G$-$^$9!#(B
-$B$3$NI=$O!"$"$J$?$,;H$&2DG=@-$N$"$k<g$J%3%^%s%I$NC1$J$k0lMw$H$=$NJ8K!$G$9!#(B</para>
+$B0J2<$NI=$G!"<g$J%3%^%s%I$r4JC1$K@bL@$7$^$9!#(B</para>
 
 <table id="ofw-common-commands">
 <title>$B<g$J%3%^%s%I(B</title>
@@ -1667,14 +1661,14 @@
     <entry><literal>real-base</literal></entry>
     <entry><emphasis>Open Firmware $B%P!<%8%g%s$K$h$k(B</emphasis></entry>
     <entry>$B%+!<%M%k$N%a%b%j!<HVCO!#(B<xref linkend="ofw-real-base"
-    />$B!#(B</entry>
+    />$B;2>H!#(B</entry>
   </row>
 
   <row>
     <entry><literal>load-base</literal></entry>
     <entry><emphasis>Open Firmware $B%P!<%8%g%s$K$h$k(B</emphasis></entry>
     <entry>$B%V!<%H%m!<%@!<$N%a%b%j!<HVCO!#(B<xref linkend="ofw-load-base"
-    /></entry>
+    />$B;2>H(B</entry>
   </row>
 
   <row>
@@ -2015,8 +2009,8 @@
 <title>NetBSD/macppc $B$r%V!<%H$9$k$K$O$I$s$JJ}K!$,$"$j$^$9$+(B ?</title>
 
 <para><ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">
-NetBSD/macppc 3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$r8+$F!"(B "Available Boot Media"
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD/macppc &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$r8+$F!"(B "Available Boot Media"
 $B$H$$$&%?%$%H%k$N@a$rFI$s$G$/$@$5$$!#(B</para>
 
 </sect3>
@@ -2027,13 +2021,12 @@
 
 <para>$B$3$l$O(B Open Firmware $B$N%P!<%8%g%s!"$*$h$S!"$I$3$+$i%V!<%H$9$k$+$K(B
 $B40A4$K0MB8$7$^$9!#(B<ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">
-NetBSD/macppc 3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B "Preparing the Bootable
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD/macppc &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B "Preparing the Bootable
 Media" $B$H(B "Open Firmware boot syntax" $B$N@a$rFI$s$G$/$@$5$$!#(B</para>
 
 <para><xref linkend="ofw-version" />$B!"(B
-<literal>ofwboot(8)</literal> $B%^%K%e%"%k%Z!<%8!"(B
-<literal>installboot(8)</literal> $B%^%K%e%"%k%Z!<%8$bJ;$;$F8+$F$/$@$5$$!#(B</para>
+&man.ofwboot.8; $B%^%K%e%"%k%Z!<%8!"(B&man.installboot.8; $B%^%K%e%"%k%Z!<%8$bJ;$;$F8+$F$/$@$5$$!#(B</para>
 
 </sect3>
 
@@ -2175,15 +2168,15 @@
 </sect3>
 
 <sect3 id="cdr-image">
-<title>NetBSD/macppc $B$N8x<0(B CD-R $B%$%a!<%8$O$I$3$K$"$j$^$9$+(B?</title>
+<title>NetBSD/macppc $B$N8x<0(B ISO $B%$%a!<%8$O$I$3$K$"$j$^$9$+(B?</title>
 
 <para>$B:G4s$j$N(B <ulink url="../../mirrors/#iso">NetBSD
 $B%@%&%s%m!<%I%5%$%H(B</ulink>$B$rC5$7$F!"%$%a!<%8$r%@%&%s%m!<%I$7!"(B
 CD-R $B$K>F$$$F$/$@$5$$!#(B</para>
 
 <para><ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-3.1/macppc/INSTALL.html">
-NetBSD/macppc 3.1 $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B
+url="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-&release.latest;/macppc/INSTALL.html">
+NetBSD/macppc &release.latest; $B%$%s%9%H!<%k%N!<%H(B</ulink>$B$N(B
 "Creating the NetBSD/macppc CD-R" $B$N@a$r8+$F$/$@$5$$!#(B</para>
 
 </sect3>
@@ -2318,7 +2311,7 @@
  can't OPEN enet:
  ok</screen>
 
-    <para>bootp $B$^$?$O(B DHCP $B%5!<%P!<$,%/%i%$%"%s%H$NMW5a$KH?1~$7$F$$$^$;$s!#%5!<%P!<$,(B
+    <para>BOOTP $B$^$?$O(B DHCP $B%5!<%P!<$,%/%i%$%"%s%H$NMW5a$KH?1~$7$F$$$^$;$s!#%5!<%P!<$,(B
     $BF0:n$7$F$$$k$+!"%5!<%P!<$,F1$8%$!<%5%M%C%H%5%V%M%C%H>e$K$"$k$+!"$^$?!"%/%i%$%"%s%H$,(B
     $BE,@Z$J%$!<%5%M%C%H%O!<%I%&%'%"(B (MAC) $B%"%I%l%9$G$"$k$+$I$&$+3NG'$7$F$_$F$/$@$5$$!#(B
     $B2<5-$N=PNO7k2L$+$i(B <literal>local-mac-address</literal> $B$rC5$7$F$/$@$5$$(B:</para>
@@ -2558,7 +2551,7 @@
 
 <sect3 id="nodisk">
 <title>$B%G%#%9%/$O$I$3$K9T$C$?(B? ($B$"$k$$$O!"(B sysinst $B$,(B <literal>I can not find any
-hard disk for use by NetBSD</literal> $B$H8@$&(B)</title>
+hard disks for use by NetBSD</literal> $B$H8@$&(B)</title>
 
 <para>$B$&$`!"$h$$<ALd$G$9(B!</para>
 
@@ -2639,32 +2632,10 @@
 
 </sect3>
 
-<sect3 id="elf">
-<title><literal>ldconfig</literal>/<literal>ld.so.conf</literal>
-$B$O$I$3$K$"$j$^$9$+(B ?</title>
-
-<para>NetBSD/macppc $B$O(B ELF $B$r;H$C$F$$$k$N$G!"(B
-<literal>ldconfig</literal> $B$d(B <literal>ld.so.conf</literal> $B$O$"$j$^$;$s!#(B
-$B$h$j>\$7$/$O!"(B<ulink url="../../../docs/elf.html">NetBSD ELF FAQ</ulink>
-$B$r8+$F$/$@$5$$!#(B</para>
-
-</sect3>
-
-<sect3 id="cross-compile">
-<title>$BB>$N%[%9%H$d(B OS $B$G%/%m%9%3%s%Q%$%k$9$kJ}K!$O(B ?</title>
-
-<para>NetBSD 1.6 $B$*$h$S$=$l0J9_$N%7%9%F%`$G$O!"%Y!<%9%7%9%F%`$N%/%m%99=C[$r40A4$K%5%]!<%H$7$F$$$^$9!#(B
-$B$3$l$O!"9=C[$9$k%f!<%6!<$,(B root $B$G$J$/$F$b!"$^$?!"(B NetBSD $B0J30$N%[%9%H>e$G$G$b2DG=$G$9!#(B
-$B>\:Y$O!"(B <ulink url="../../docs/">NetBSD $B%I%-%e%a%s%F!<%7%g%s$N%Z!<%8(B</ulink>
-$B0J2<$K$"$k(B <ulink url="../../docs/cross/">NetBSD $B$N%/%m%99=C[(B</ulink>
-$B$r$4Mw$/$@$5$$!#(B</para>
-
-</sect3>
-
 <sect3 id="linux">
 <title>NetBSD/macppc $B$G(B MkLinux $B$d(B LinuxPPC $B$N%P%$%J%j!<$,F0$-$^$9$+(B ?</title>
 
-<para>$B$O$$!#(B NetBSD 1.6 $B$*$h$S$=$l0J9_$K$O(B PowerPC $B%]!<%H8~$1(B Linux $B%P%$%J%j!<8_495!G=$,(B
+<para>$B$O$$!#(BPowerPC $B%]!<%H8~$1(B Linux $B%P%$%J%j!<8_495!G=$,(B
 $B$"$j$^$9$,!"%G%U%)%k%H$G$OM-8z$K$J$C$F$$$^$;$s!#(B
 <literal>options COMPAT_LINUX</literal> $B$N%3%a%s%H$r30$7$F(B
 <ulink url="../../docs/kernel/#how_to_build_a_kernel">$B%+!<%M%k$r:F9=C[(B</ulink>
@@ -2695,7 +2666,7 @@
 <title>NetBSD/macppc $B$G(B Mac OS $B$N%P%$%J%j!<$,F0$-$^$9$+(B ?</title>
 
 <para>$B$$$:$lC/$+$,(B <ulink
-url="http://www.ibrium.se/linux/mac_on_linux.html">Mac-on-linux</ulink>
+url="http://www.maconlinux.org/">Mac-on-linux</ulink>
 (LinuxPPC $BMQ(B) $B$rF0$+$9$+$b$7$l$^$;$s!#$=$l$^$G$O!"(B 68k Mac $B$r%(%_%e%l!<%H$9$k(B
 <filename role="pkg">emulators/BasiliskII</filename> $B$d(B <ulink url="http://www.vmac.org">VMac</ulink>
 $B$r;H$C$F$_$F$/$@$5$$!#(B</para>
@@ -2705,10 +2676,9 @@
 <sect3 id="macosx">
 <title>NetBSD/macppc $B$G(B Darwin/Mac OS X $B$N%P%$%J%j!<$,F0$-$^$9$+(B ?</title>
 
-<para>$B:n6H$O?J9TCf$G!"(B Darwin $B%P%$%J%j!<$N<B9T%5%]!<%H$N$$$/$D$+$O(B
-NetBSD-current $B$KF~$C$F$$$^$9!#$3$N%W%m%8%'%/%H$N:G?7>pJs$K$D$$$F$O(B
-COMPAT_MACH $B$H(B COMPAT_DARWIN $B$N(B
-<ulink url="http://hcpnet.free.fr/applebsd.html">$B>u67%Z!<%8(B</ulink> $B$G3NG'$7$F$/$@$5$$!#(B</para>
+<para>$B$=$&$$$&<h$jAH$_$O2a5n$K$"$j$^$7$?$,!"$9$G$KJ|4~$5$l$F$$$^$9!#(B
+$B>\:Y$O(B <ulink url="http://hcpnet.free.fr/applebsd.html">
+Mach and Darwin binary compatibility page</ulink> $B$r$4Mw$/$@$5$$!#(B</para>
 
 </sect3>
 
@@ -2769,7 +2739,7 @@
 ADB $B%-!<%\!<%I$N(B "power" $B%-!<$r:F8=$9$k$3$H$,$G$-$^$9!#(B
 $B$9$Y$F$N(B Mac $B$K$O!"K\Ev$NEE8;%9%$%C%A(B ($B%=%U%H$^$?$O%O!<%IEE8;(B) $B$,$"$j$^$9$,!"(B
 $B8+$($J$$$h$&$K$J$C$F$$$k$+$b$7$l$^$;$s!#(B
-$B$3$N:Y9)$r$9$k$HJ]>Z$OL58z$K$J$j$^$9$7!";d$?$A$b@UG$$r;}$F$^$;$s!#(B
+$B$3$N:Y9)$r$9$k$HJ]>Z$OL58z$K$J$j$^$9$N$G!";d$?$A$O@UG$$r;}$F$^$;$s!#(B
 $B$3$N%H%T%C%/$K4X$9$k(B Chris Tribo $B$K$h$k%a!<%j%s%0%j%9%H$N(B
 <ulink url="http://mail-index.NetBSD.org/port-macppc/2001/06/09/0002.html">$B5-;v(B</ulink>
 $B$r;2>H$7$F$/$@$5$$!#(B</para>
@@ -2780,17 +2750,9 @@
 <title>$B$J$<(B wscons $B$K(B ADB $B%-!<%\!<%IMQ$N%^%C%T%s%0(B "us.swapctrlcaps"
 $B$,$J$$$s$G$9$+(B?</title>
 
-<para>ADB $B%-!<%\!<%I$O0[>o$J%-!<%3!<%I$r@8@.$7$^$9(B &mdash; $B%-!<$r2rJ|;~$K2!$9$H(B
-(= caps lock $B%;%C%H(B) $B$"$k%-!<%3!<%I$r@8@.$7!"(B
-$B2!$7$F2rJ|$9$k$H(B (= caps lock $B2rJ|(B) $BJL$N%-!<%3!<%I$r@8@.$7$^$9!#(B
-$B%+!<%M%k%3!<%I(B <filename>sys/arch/macppc/dev/akbd.c</filename> $B$G!"0[>o$J%-!<%3!<%I$O(B
-wscons $B%-!<%3!<%I$XJQ49$5$l$^$9!#(B
-$B$3$NIT6q9g$,$"$k$?$a!";d$?$A$,$G$-$k:GA1$N$3$H$O!";DG0$J$3$H$G$9$,!"(B
-control $B%-!<$r8GDj$9$k$3$H$J$N$G$9!#(B</para>
-
-<para>NetBSD-current (1.6A $B0J9_(B) $B$G$O!"(B <literal>options
-CAPS_IS_CONTROL</literal> $B$G!"(B capslock $B%-!<$r(B control $B%-!<$K%O!<%I%3!<%I$7$^$9!#(B
-(LED $B$NI=<($O$*$+$7$/$J$j$^$9$,!"M-MQ$G$7$g$&(B)</para>
+<para>ADB $B%-!<%\!<%I$O%a%+%K%+%k%m%C%/%-!<$r%(%_%e%l!<%H$7$F$*$j!"$=$N$3$H$,(B
+wscons $B$K$H$C$FLdBj$rFq$7$/$7$F$$$^$9!#(Bcaps lock $B%-!<$r%3%s%H%m!<%k%-!<$H$7$F07$&$K$O!"(B
+$B%+!<%M%k$r(B <literal>options CAPS_IS_CONTROL</literal> $B$D$-$G9=C[$7$F$/$@$5$$!#(B</para>
 
 </sect3>
 
