svn commit: r44716 - head/ja_JP.eucJP/books/handbook/kernelconfig

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Apr 30 10:34:50 UTC 2014


Author: ryusuke
Date: Wed Apr 30 10:34:49 2014
New Revision: 44716
URL: http://svnweb.freebsd.org/changeset/doc/44716

Log:
  - Merge the following from the English version:
  
  	r44287 -> r44288	head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Wed Apr 30 04:32:38 2014	(r44715)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Wed Apr 30 10:34:49 2014	(r44716)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44287
+     Original revision: r44288
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -320,6 +320,17 @@ ath_hal(4)               - Atheros Hardw
       Íý²ò¤·¤Æ¤¤¤Ê¤¤¹Ô¤ËÂФ·¤Æ¤Ï¡¢<literal>#</literal>
       ¤òÄɲä·¤¿¤êºï½ü¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
 
+    <warning>
+      <para>¥Ç¥Ð¥¤¥¹¤ä¥ª¥×¥·¥ç¥ó¤Î¥µ¥Ý¡¼¥È¤ò³°¤¹¤³¤È¤Ï´Êñ¤Ç¡¢
+	¤½¤Î·ë²Ì¡¢¥«¡¼¥Í¥ë¤ò²õ¤¹¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð &man.ata.4;
+	¥É¥é¥¤¥Ð¤ò¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤«¤é½ü¤¯¤È¡¢
+	<acronym>ATA</acronym>
+	¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ð¤òÍѤ¤¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ïµ¯Æ°¤·¤Þ¤»¤ó¡£
+	³Î¿®¤¬»ý¤Æ¤Ê¤¤¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	¥«¡¼¥Í¥ë¤Ë¥µ¥Ý¡¼¥È¤ò»Ä¤·¤¿¤Þ¤Þ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </warning>
+
       <para>¤³¤Î¥Õ¥¡¥¤¥ë¤ÇÍ¿¤¨¤é¤ì¤ëÀâÌÀ¤Î¾¤Ë¡¢
       ¤½¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î <filename>GENERIC</filename>
       ¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë
@@ -1194,30 +1205,8 @@ device          fwe           # Ethernet
   <sect1 xml:id="kernelconfig-building">
     <title>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¹½Ãۤȥ¤¥ó¥¹¥È¡¼¥ë</title>
 
-    <para>ÊÔ½¸¤·¤¿ÆâÍƤòÊݸ¤·¤¿¤é¡¢
-      ¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <note>
-      <para>ºÇ¿·¤Î¥½¡¼¥¹¤È <link linkend="svn">¥½¡¼¥¹¥Ä¥ê¡¼¤òƱ´ü</link> ¤·¤¿¤é¡¢
-	²¿¤é¤«¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¦Á°¤Ë¡¢<emphasis>ɬ¤º</emphasis>
-	<filename>/usr/src/UPDATING</filename>
-	¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢
-	¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥½¡¼¥¹¥³¡¼¥É¤Ë´Ø¤¹¤ë½ÅÍפÊÌäÂê¤äÆÃÊ̤ËÃí°Õ¤¹¤Ù¤­ÅÀ¤¬¤¹¤Ù¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-	<filename>/usr/src/UPDATING</filename> ¤Ï¾ï¤Ë &os;
-	¤Î¥½¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó¤ÈƱ´ü¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
-	¥Ï¥ó¥É¥Ö¥Ã¥¯¤Îµ­½Ò¤è¤ê¤â¿·¤·¤¤ÆâÍƤò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£</para>
-    </note>
-
-    <warning>
-      <para>¥Ç¥Ð¥¤¥¹¤ä¥ª¥×¥·¥ç¥ó¤Î¥µ¥Ý¡¼¥È¤ò³°¤¹¤³¤È¤Ï´Êñ¤Ç¡¢
-	¤½¤Î·ë²Ì¡¢¥«¡¼¥Í¥ë¤ò²õ¤¹¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢&man.ata.4;
-	¥É¥é¥¤¥Ð¤ò¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤«¤é½ü¤¯¤È¡¢
-	<acronym>ATA</acronym> ¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ð¤òÍѤ¤¤ë¥·¥¹¥Æ¥à¤Ïµ¯Æ°¤·¤Þ¤»¤ó¡£
-	³Î¿®¤¬»ý¤Æ¤Ê¤¤¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	¥«¡¼¥Í¥ë¤Ë¥µ¥Ý¡¼¥È¤ò»Ä¤·¤¿¤Þ¤Þ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </warning>
+    <para>ÊÔ½¸¤·¤¿¥«¥¹¥¿¥à¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¤é¡¢
+      ¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¥³¡¼¥É¤ò°Ê²¼¤Î¼ê½ç¤Ç¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <procedure>
       <title>¥«¡¼¥Í¥ë¤Î¹½ÃÛ</title>
@@ -1226,12 +1215,8 @@ device          fwe           # Ethernet
       <secondary>¹½ÃÛ / ¥¤¥ó¥¹¥È¡¼¥ë</secondary>
     </indexterm>
 
-      <note>
-	<para>¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢&os; ¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£</para>
-      </note>
-
       <step>
-	<para><command>cd</command> ¤òÍѤ¤¤Æ <filename>/usr/src</filename> ¤Ë°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>°Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
       </step>
@@ -1239,61 +1224,51 @@ device          fwe           # Ethernet
       <step>
 	<para>¥«¥¹¥¿¥à¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>make buildkernel KERNCONF=MYKERNEL</userinput></screen>
+	<screen>&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
       </step>
 
       <step>
-	<para>¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+	<para>»ØÄꤷ¤¿¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ÇºîÀ®¤µ¤ì¤¿¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò
+	<filename>/boot/kernel/kernel</filename> ¤Ë¡¢
+	º£¤Þ¤Ç¤Î¥«¡¼¥Í¥ë¤ò <filename>/boot/kernel.old/kernel</filename>
+	¤È¤¤¤¦Ì¾Á°¤ÇÊݸ¤·¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>make installkernel KERNCONF=MYKERNEL</userinput></screen>
+	<screen>&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
+      </step>
+
+      <step>
+	<para>¿·¤·¤¤¥«¡¼¥Í¥ë¤ò»È¤¦¤¿¤á¤Ë¡¢
+	  ¥·¥¹¥Æ¥à¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¤ÆºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¤¦¤Þ¤¯¹Ô¤«¤Ê¤¤¾ì¹ç¤Ï¡¢<xref
+	    linkend="kernelconfig-noboot"/>
+	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </step>
     </procedure>
 
-    <tip>
-      <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤È
-	<emphasis>¤¹¤Ù¤Æ</emphasis> ¤Î¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤¬ºÆ¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
+      <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤È¡¢
+	¤¹¤Ù¤Æ¤Î¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤¬ºÆ¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
 	¥«¡¼¥Í¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¤è¤êÁ᤯¹Ô¤¤¤¿¤¤¡¢¤Þ¤¿¤Ï¡¢
 	¥«¥¹¥¿¥à¥â¥¸¥å¡¼¥ë¤Î¤ß¤ò¹½ÃÛ¤·¤¿¤¤¤È¤¤¤Ã¤¿¾ì¹ç¤Ï¡¢
 	¥«¡¼¥Í¥ë¤Î¹½ÃÛ¤ò³«»Ï¤¹¤ëÁ°¤Ë¡¢°Ê²¼¤Î¤è¤¦¤Ë
 	<filename>/etc/make.conf</filename> ¤òÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <programlisting>MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting>
-
-      <para>¤³¤ÎÊÑ¿ô¤Ï¡¢
-	¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ò¹½ÃÛ¤¹¤ë¤È¤¤¤¦¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ë¤«¤ï¤ê¡¢
+      <para>Îã¤È¤·¤Æ¡¢°Ê²¼¤ÎÊÑ¿ô¤Ï¡¢
+	¥Ç¥Õ¥©¥ë¥È¤Î¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ò¹½ÃÛ¤¹¤ëÀßÄê¤òÊѹ¹¤·¡¢
 	¹½ÃÛ¤¹¤ë¥â¥¸¥å¡¼¥ë°ìÍ÷¤ò»ØÄꤷ¤Þ¤¹¡£</para>
 
+      <programlisting>MODULES_OVERRIDE = linux acpi ntfs</programlisting>
+
+      <para>¤Þ¤¿¡¢°Ê²¼¤ÎÊÑ¿ô¤Ï¡¢
+	¹½ÃÛ¤ò¹Ô¤ï¤Ê¤¤¥È¥Ã¥×¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤ò»ØÄꤷ¤Þ¤¹¡£</para>
+
       <programlisting>WITHOUT_MODULES = linux acpi sound ntfs</programlisting>
 
-      <para>¤³¤ÎÊÑ¿ô¤Ï¡¢¹½ÃÛ¤ò¹Ô¤ï¤Ê¤¤¥È¥Ã¥×¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
-	¾¤ÎÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.make.conf.5; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </tip>
+      <para>¾¤ÎÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.make.conf.5; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <indexterm>
       <primary><filename>/boot/kernel.old</filename></primary>
     </indexterm>
-
-    <para>¿·¤·¤¤¥«¡¼¥Í¥ë¤Ï <filename>/boot/kernel</filename> ¤Ë
-      <filename>/boot/kernel/kernel</filename> ¤È¤¤¤¦Ì¾Á°¤Ç¥³¥Ô¡¼¤µ¤ì¡¢
-      º£¤Þ¤Ç¤Î¥«¡¼¥Í¥ë¤Ï <filename>/boot/kernel.old/kernel</filename>
-      ¤È¤¤¤¦Ì¾Á°¤ØÊѹ¹¤µ¤ì¤Þ¤¹¡£
-      ¤Ç¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò»È¤¦¤¿¤á¤Ë¡¢¥·¥¹¥Æ¥à¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¤ÆºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¤¦¤Þ¤¯¹Ô¤«¤Ê¤¤¾ì¹ç¤Ï¡¢
-      <link linkend="kernelconfig-trouble">ÌäÂ꤬µ¯¤­¤¿¾ì¹ç¤Ë¤Ï</link>
-      ¤ä¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤¬
-      <link linkend="kernelconfig-noboot">µ¯Æ°¤·¤Ê¤¤</link>
-      ¾ì¹ç¤Î¥ê¥«¥Ð¥ê¤ÎÊýË¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <note>
-      <para>¥Ö¡¼¥È¥í¡¼¥À (&man.loader.8;)
-	¤äÀßÄê¤Ê¤É¤Î¥Ö¡¼¥È¥×¥í¥»¥¹¤Ë´Ø·¸¤¹¤ë¾¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢
-	<filename>/boot</filename> ¤ËÃÖ¤«¤ì¤Þ¤¹¡£
-	¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤ä¥«¥¹¥¿¥à¥â¥¸¥å¡¼¥ë¤ò
-	<filename>/boot/kernel</filename> ¤ËÃÖ¤¯¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢
-	¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥«¡¼¥Í¥ë¤È¥â¥¸¥å¡¼¥ë¤òƱ´ü¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-	¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥«¡¼¥Í¥ë¤È¥â¥¸¥å¡¼¥ë¤¬Âбþ¤·¤Æ¤¤¤Ê¤¤¤È¡¢
-	¥·¥¹¥Æ¥à¤¬ÉÔ°ÂÄê¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
-    </note>
   </sect1>
 
   <sect1 xml:id="kernelconfig-trouble">
@@ -1307,25 +1282,25 @@ device          fwe           # Ethernet
 	<term><command>config</command> ¥³¥Þ¥ó¥É¤Î¼ºÇÔ</term>
 
 	<listitem>
-	  <para>&man.config.8; ¤¬¼ºÇÔ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-	    ¤ª¤½¤é¤¯Ã±½ã¤Ê¥¨¥é¡¼¤Ç¤¹¡£
-            ¤µ¤¤¤ï¤¤¡¢&man.config.8;
-	    ¤Ï¥È¥é¥Ö¥ë¤Îµ¯¤­¤¿¹ÔÈÖ¹æ¤ò½ÐÎϤ·¤Þ¤¹¡£
-	    Î㤨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë½ÐÎϤµ¤ì¤¿¾ì¹ç</para>
+	  <para><command>config</command> ¤Ç¼ºÇÔ¤·¤¿»þ¤Ë¤Ï¡¢
+	    ¥È¥é¥Ö¥ë¤Îµ¯¤­¤¿¹ÔÈֹ椬½ÐÎϤµ¤ì¤Þ¤¹¡£
+	    ¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë½ÐÎϤµ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
+	    17 ¹ÔÌܤ¬Àµ¤·¤¯ÆþÎϤµ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¡¢
+	    <filename>GENERIC</filename> ¤ä <filename>NOTES</filename>
+	    ¤ÈÈæ³Ó¤·¤Æ½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
             <screen>config: line 17: syntax error</screen>
-
-	  <para>17 ¹ÔÌܤΥ­¡¼¥ï¡¼¥É¤¬Àµ¤·¤¯ÆþÎϤµ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¡¢
-	    <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤Î¥Õ¥¡¥¤¥ë¤ä¡¢
-            ¾¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¤ÈÈæ³Ó¤·¤ÆÃí°Õ¿¼¤¯½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</listitem>
       </varlistentry>
 
-      <varlistentry><term><command>make</command> ¥³¥Þ¥ó¥É¤Î¼ºÇÔ</term>
+      <varlistentry>
+	<term><command>make</command> ¥³¥Þ¥ó¥É¤Î¼ºÇÔ</term>
+
 	<listitem>
 	  <para><command>make</command> ¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ë¤Ï¡¢
-	    ¥«¡¼¥Í¥ëÀßÄê¤Ç &man.config.8;
-	    ¤¬¤È¤é¤¨¤é¤ì¤Ê¤«¤Ã¤¿¤è¤¦¤Ê´Ö°ã¤¤¤ò¤·¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤¤è¤¦¤Ç¤¹¡£
+	    Ä̾¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤Æ¡¢
+	    <command>config</command>
+	    ¤¬¤È¤é¤¨¤é¤ì¤Ê¤«¤Ã¤¿¤è¤¦¤Ê´Ö°ã¤¤¤ò¤·¤Æ¤¤¤Þ¤¹¡£
             ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò¸«Ä¾¤·¤Æ¤¯¤À¤µ¤¤¡£
             ¤½¤ì¤Ç¤âÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤±¤ì¤Ð¡¢
             &a.questions;
@@ -1335,6 +1310,7 @@ device          fwe           # Ethernet
 
       <varlistentry>
 	<term>¥«¡¼¥Í¥ë¤¬µ¯Æ°¤·¤Ê¤¤<anchor xml:id="kernelconfig-noboot"/></term>
+
 	<listitem>
 	  <para>¿·¤·¤¤¥«¡¼¥Í¥ë¤¬µ¯Æ°¤·¤Ê¤«¤Ã¤¿¤ê¡¢
 	    ¥Ç¥Ð¥¤¥¹¤Îǧ¼±¤ò¤·¤Ê¤¤¾ì¹ç¤Ç¤â¤¢¤ï¤Æ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!
@@ -1346,10 +1322,7 @@ device          fwe           # Ethernet
 	    ¥ª¥×¥·¥ç¥ó¤òÁªÂò¤¹¤ë¤È¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
 	    ¥×¥í¥ó¥×¥È¤Ç
 	    <command>boot kernel.old</command>
-	    ¤«Â¾¤ÎÀµ¾ï¤Ëµ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¥«¡¼¥Í¥ë¤ÎºÆÀßÄê¤ò¤ª¤³¤Ê¤¦¾ì¹ç¤Ë¤Ï¤¤¤Ä¤â¡¢
-            ³Î¼Â¤ËÆ°¤¯¤³¤È¤¬Ê¬¤«¤Ã¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤òÍÑ°Õ¤·¤Æ¤ª¤¯¤è¤¦¤Ë¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
-          </para>
+	    ¤«Â¾¤ÎÀµ¾ï¤Ëµ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	  <para>ÌäÂê¤Î¤Ê¤¤¥«¡¼¥Í¥ë¤Çµ¯Æ°¤·¤¿¸å¡¢
 	    ¥³¥ó¥Õ¥£¥°¥ì¡¼ ¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¡¢
@@ -1360,16 +1333,17 @@ device          fwe           # Ethernet
 	    &man.dmesg.8; ¤Ï¸½ºß¤Îµ¯Æ°»þ¤Î¥«¡¼¥Í¥ë¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£</para>
 
 	  <note>
-	    <para>¥«¡¼¥Í¥ë¤Î¹½ÃÛÃæ¤Ë¥È¥é¥Ö¥ë¤¬µ¯¤­¤¿»þ¤Ë»È¤¦¤¿¤á¤Ë¡¢
-	      GENERIC ¤ä¾¤Î¥«¡¼¥Í¥ë¤ò¼¡²ó¤Î¹½ÃۤǾ䵤ì¤Ê¤¤¤è¤¦Ê̤Î̾Á°¤ÇÊݸ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£<emphasis remap="tt">kernel.old</emphasis>
+	    <para>¥«¡¼¥Í¥ë¤Î¹½ÃÛÃæ¤Ë¥È¥é¥Ö¥ë¤¬µ¯¤­¤¿»þ¤Ë¤Ï¡¢
+	      ¼¡²ó¤Î¹½ÃۤǾ䵤ì¤Ê¤¤¤è¤¦¤Ë¡¢
+	      <filename>GENERIC</filename>
+	      ¤Î¥³¥Ô¡¼¤ä¾¤ÎÀµ¾ï¤Ëµ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤òÊ̤Î̾Á°¤ÇÊݸ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	      <emphasis remap="tt">kernel.old</emphasis>
 	      ¤Ï¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ë¡¢
 	      ¤½¤Î°ì¤ÄÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¡¢
-	      ¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¥«¡¼¥Í¥ë¤Ç¾å½ñ¤­¤µ¤ì¤Æ¤·¤Þ¤¦¤Î¤ÇÅö¤Æ¤Ë¤Ç¤­¤Þ¤»¤ó¡£
-	      ¤Ç¤­¤ë¸Â¤êÁ᤯ưºî¤·¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤òËÜÍè¤Î
-	      <filename>/boot/kernel</filename> ¤Î°ÌÃ֤˰ÜÆ°¤µ¤»¤Æ¤¯¤À¤µ¤¤¡£
-	      ¤½¤¦¤·¤Ê¤¤¤È
-	      &man.ps.1; ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤¬Àµ¤·¤¯Æ°¤­¤Þ¤»¤ó¡£¤³¤ì¤ò¹Ô¤¦¤Ë¤Ï¡¢
-	      °Ê²¼¤Î¤è¤¦¤ËÀµ¤·¤¯µ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê̾¤ËÊѹ¹¤¹¤ë¤À¤±¤Ç¤¹¡£</para>
+	      ¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¥«¡¼¥Í¥ë¤Ç¾å½ñ¤­¤µ¤ì¤Æ¤·¤Þ¤¦¤¿¤á¡¢
+	      µ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤òÊݸ¤·¤Æ¤ª¤¯¤³¤È¤Ï½ÅÍפǤ¹¡£
+	      ¤Ç¤­¤ë¸Â¤êÁ᤯°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¡¢
+	      Àµ¤·¤¯µ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê̾¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	    <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
 &prompt.root; <userinput>mv /boot/kernel.good /boot/kernel</userinput></screen>
@@ -1383,13 +1357,14 @@ device          fwe           # Ethernet
 
 	<listitem>
 	  <para>¥·¥¹¥Æ¥à¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Î¹½ÃÛ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤È°Û¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¾ì¹ç¡¢
-	    Î㤨¤Ð -CURRENT ¤Î¥«¡¼¥Í¥ë¤ò -RELEASE ¾å¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤Ê¾ì¹ç¡¢
+	    ¤¿¤È¤¨¤Ð -CURRENT ¤Î¥½¡¼¥¹¤«¤é¹½ÃÛ¤·¤¿¥«¡¼¥Í¥ë¤ò
+	    -RELEASE ¥·¥¹¥Æ¥à¾å¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
 	    &man.ps.1; ¤ä &man.vmstat.8;
 	    ¤Î¤è¤¦¤Ê¿¤¯¤Î¥·¥¹¥Æ¥à¥¹¥Æ¡¼¥¿¥¹¥³¥Þ¥ó¥É¤ÏÆ°¤«¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
 	    ½¤Àµ¤¹¤ë¤Ë¤Ï¡¢¥«¡¼¥Í¥ë¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Ç
 	    <link linkend="makeworld">world ¤òºÆ¹½ÃÛ¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë</link>
 	    ¤·¤Æ¤¯¤À¤µ¤¤¡£
-            ¤³¤ì¤Ï¡¢¥«¡¼¥Í¥ë¤È¤½¤ì°Ê³°¤Ç°Û¤Ê¤ë¥Ð¡¼¥¸¥ç¥ó¤òÁȤ߹ç¤ï¤»¤Æ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Ê¤¤Íýͳ¤Î°ì¤Ä¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+            ¤³¤ì¤Ï¡¢¥«¡¼¥Í¥ë¤È¤½¤ì°Ê³°¤Ç°Û¤Ê¤ë¥Ð¡¼¥¸¥ç¥ó¤òÁȤ߹ç¤ï¤»¤Æ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò»ÈÍѤ¹¤ë¤³¤È¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
 	</listitem>
       </varlistentry>
     </variablelist>


More information about the svn-doc-all mailing list