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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Apr  9 09:05:32 2014
New Revision: 44498
URL: http://svnweb.freebsd.org/changeset/doc/44498

Log:
  - Merge the following from the English version:
  
  	r43817 -> r44287	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  9 04:10:47 2014	(r44497)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Wed Apr  9 09:05:32 2014	(r44498)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43817
+     Original revision: r44287
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -286,26 +286,13 @@ ath_hal(4)               - Atheros Hardw
       ´·½¬¤È¤·¤Æ¡¢¤³¤Î̾Á°¤Ï¤¹¤Ù¤ÆÂçʸ»ú¤Ç¤Ä¤Å¤é¤ì¤Þ¤¹¡£¤â¤·¡¢
       ¤¤¤¯¤Ä¤«¤Î°Û¤Ê¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î &os; ¥Þ¥·¥ó¤ò°·¤¦¤Ê¤é¡¢
       ¤³¤Î̾Á°¤Ë¥Û¥¹¥È̾¤ò´Þ¤á¤ë¤È¤è¤¤¤Ç¤·¤ç¤¦¡£¤³¤³¤Ç¤Ï¡¢Îã¤È¤·¤Æ
-      <literal>amd64</literal>
-      ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¥«¥¹¥¿¥à¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£</para>
+      <filename>MYKERNEL</filename> ¤È¤¤¤¦Ì¾Á°¤Î
+      <literal>amd64</literal> ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΠ<filename>GENERIC</filename>
+      ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤òºîÀ®¤·¤Þ¤¹¡£</para>
 
     <screen>&prompt.root; <userinput>cd /usr/src/sys/amd64/conf</userinput>
 &prompt.root; <userinput>cp GENERIC MYKERNEL</userinput></screen>
 
-    <tip>
-      <para>¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¤ò½ª¤¨¤¿¤é¡¢
-	¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò <filename>/usr/src</filename>
-	°Ê³°¤Î¾ì½ê¤ËÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>¤â¤·¤¯¤Ï¡¢¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¾¤Î¾ì½ê¤Ë¤ª¤¤¤Æ¡¢
-	¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òÄ¥¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/amd64/conf</userinput>
-&prompt.root; <userinput>mkdir /root/kernels</userinput>
-&prompt.root; <userinput>cp GENERIC /root/kernels/MYKERNEL</userinput>
-&prompt.root; <userinput>ln -s /root/kernels/MYKERNEL</userinput></screen>
-    </tip>
-
     <para>¤³¤ì¤Ç¡¢¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë
       <filename>MYKERNEL</filename>
       ¤ò ASCII ¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤Ç¤­¤Þ¤¹¡£
@@ -340,12 +327,27 @@ ath_hal(4)               - Atheros Hardw
       ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
       <filename>/usr/src/sys/conf/NOTES</filename> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
+    <tip>
+      <para>¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¤ò½ª¤¨¤¿¤é¡¢
+	¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò <filename>/usr/src</filename>
+	°Ê³°¤Î¾ì½ê¤ËÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <para>¤â¤·¤¯¤Ï¡¢¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¾¤Î¾ì½ê¤Ë¤ª¤¤¤Æ¡¢
+	¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òÄ¥¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/amd64/conf</userinput>
+&prompt.root; <userinput>mkdir /root/kernels</userinput>
+&prompt.root; <userinput>cp GENERIC /root/kernels/MYKERNEL</userinput>
+&prompt.root; <userinput>ln -s /root/kernels/MYKERNEL</userinput></screen>
+    </tip>
+
     <para>¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ç¤Ï <literal>include</literal>
       ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÍøÍѤǤ­¤Þ¤¹¡£
       ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë¾¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê¹þ¤à¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
       ¤¹¤Ç¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¾®¤µ¤ÊÊѹ¹¤ò´Êñ¤Ë°Ý»ý¤Ç¤­¤Þ¤¹¡£
-      ¤¿¤È¤¨¤Ð¡¢¥ª¥×¥·¥ç¥ó¤ä¥É¥é¥¤¥Ð¤ÎÄɲ䬾¯¤·¤À¤±¤Î¾ì¹ç¤Ë¤Ï¡¢
-      °Ê²¼¤Î¤è¤¦¤Ë GENERIC ¤«¤é¤Îº¹Ê¬¤À¤±¤Î´ÉÍý¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+      ¥ª¥×¥·¥ç¥ó¤ä¥É¥é¥¤¥Ð¤ÎÄɲ䬾¯¤·¤À¤±¤Î¾ì¹ç¤Ë¤Ï¡¢
+      °Ê²¼¤ÎÎã¤Î¤è¤¦¤Ë <filename>GENERIC</filename>
+      ¤«¤é¤Îº¹Ê¬¤À¤±¤Î´ÉÍý¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
     <programlisting>include GENERIC
 ident MYKERNEL
@@ -373,11 +375,14 @@ options         IPDIVERT
       <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>arch</replaceable>/conf && make LINT</userinput></screen>
     </note>
 
+<!--
     <indexterm>
       <primary>¥«¡¼¥Í¥ë¥ª¥×¥·¥ç¥ó</primary>
       <secondary>ident</secondary>
     </indexterm>
 
+This is outdated and specific to one architecture.
+
     <programlisting>ident          GENERIC</programlisting>
 
     <para>¤³¤ì¤Ï¥«¡¼¥Í¥ë¤Î¼±ÊÌ̾¤Ç¤¹¡£
@@ -1099,7 +1104,10 @@ device          fwe           # Ethernet
     <para>¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤È¡¢&os; ¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤ë¾¤Î¥Ç¥Ð¥¤¥¹¤Ë¤Ä¤¤¤Æ¤Ï
       <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
       ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
-
+      -->
+      
+  <!--
+  This section refers to ancient hardware.
       <sect2>
         <title>ÂçÍÆÎÌ¥á¥â¥ê¹½À® (<acronym>PAE</acronym>)</title>
 	<indexterm>
@@ -1180,6 +1188,7 @@ device          fwe           # Ethernet
 	  &man.pae.4; ¤Ï¡¢&os; ¤Î <acronym>PAE</acronym>
 	  ¥µ¥Ý¡¼¥È¤Ë´Ø¤¹¤ëºÇ¿·¤Î¾ðÊó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£</para>
     </sect2>
+-->
   </sect1>
 
   <sect1 xml:id="kernelconfig-building">