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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu May  1 10:30:10 2014
New Revision: 44727
URL: http://svnweb.freebsd.org/changeset/doc/44727

Log:
  - Merge the following from the English version:
  
  	r44289 -> r44620	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 21:29:03 2014	(r44726)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Thu May  1 10:30:10 2014	(r44727)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44289
+     Original revision: r44620
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -290,12 +290,11 @@ ath_hal(4)               - Atheros Hardw
       <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>
+    <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>amd64</replaceable>/conf</userinput>
+&prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen>
 
-    <para>¤³¤ì¤Ç¡¢¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë
-      <filename>MYKERNEL</filename>
-      ¤ò ASCII ¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤Ç¤­¤Þ¤¹¡£
+    <para>¤³¤ì¤Ç¡¢<filename><replaceable>MYKERNEL</replaceable></filename>
+      ¤ò <acronym>ASCII</acronym> ¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤Ç¤­¤Þ¤¹¡£
       ½é¿´¼Ô¤ËÂФ·¤Æ¤è¤ê´Êñ¤Ê¥¨¥Ç¥£¥¿¤Ç¤¢¤ë
       <application>ee</application> ¤â &os;
       ¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
@@ -398,7 +397,7 @@ This is outdated and specific to one arc
     <programlisting>ident          GENERIC</programlisting>
 
     <para>¤³¤ì¤Ï¥«¡¼¥Í¥ë¤Î¼±ÊÌ̾¤Ç¤¹¡£
-      ¤¿¤È¤¨¤Ð¡¢<literal>MYKERNEL</literal>
+      ¤¿¤È¤¨¤Ð¡¢<literal><replaceable>MYKERNEL</replaceable></literal>
       ¤Î¤è¤¦¤Ë¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ËÉÕ¤±¤¿¤¤Ì¾Á°¤Ë½ñ¤­´¹¤¨¤Æ²¼¤µ¤¤¡£
       <literal>ident</literal> ¤Ë½ñ¤¤¤¿Ãͤϥ«¡¼¥Í¥ë¤òµ¯Æ°¤¹¤ë»þ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
 
@@ -1258,12 +1257,12 @@ device          fwe           # Ethernet
       ¥Ç¥Õ¥©¥ë¥È¤Î¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤ò¹½ÃÛ¤¹¤ëÀßÄê¤òÊѹ¹¤·¡¢
       ¹½ÃÛ¤¹¤ë¥â¥¸¥å¡¼¥ë°ìÍ÷¤ò»ØÄꤷ¤Þ¤¹¡£</para>
 
-    <programlisting>MODULES_OVERRIDE = linux acpi ntfs</programlisting>
+    <programlisting>MODULES_OVERRIDE = linux acpi</programlisting>
 
     <para>¤Þ¤¿¡¢°Ê²¼¤ÎÊÑ¿ô¤Ï¡¢
       ¹½ÃÛ¤ò¹Ô¤ï¤Ê¤¤¥È¥Ã¥×¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤ò»ØÄꤷ¤Þ¤¹¡£</para>
 
-    <programlisting>WITHOUT_MODULES = linux acpi sound ntfs</programlisting>
+    <programlisting>WITHOUT_MODULES = linux acpi sound</programlisting>
 
     <para>¾¤ÎÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.make.conf.5; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -1309,9 +1308,8 @@ device          fwe           # Ethernet
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>¥«¡¼¥Í¥ë¤¬µ¯Æ°¤·¤Ê¤¤<anchor
-	    xml:id="kernelconfig-noboot"/></term>
+      <varlistentry xml:id="kernelconfig-noboot">
+	<term>¥«¡¼¥Í¥ë¤¬µ¯Æ°¤·¤Ê¤¤</term>
 
 	<listitem>
 	  <para>¿·¤·¤¤¥«¡¼¥Í¥ë¤¬µ¯Æ°¤·¤Ê¤«¤Ã¤¿¤ê¡¢
@@ -1323,7 +1321,7 @@ device          fwe           # Ethernet
 	    <quote>Escape to a loader prompt</quote>
 	    ¥ª¥×¥·¥ç¥ó¤òÁªÂò¤¹¤ë¤È¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
 	    ¥×¥í¥ó¥×¥È¤Ç
-	    <command>boot kernel.old</command>
+	    <command>boot <replaceable>kernel.old</replaceable></command>
 	    ¤«Â¾¤ÎÀµ¾ï¤Ëµ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	  <para>ÌäÂê¤Î¤Ê¤¤¥«¡¼¥Í¥ë¤Çµ¯Æ°¤·¤¿¸å¡¢
@@ -1347,8 +1345,8 @@ device          fwe           # Ethernet
 	      ¤Ç¤­¤ë¸Â¤êÁ᤯°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¡¢
 	      Àµ¤·¤¯µ¯Æ°¤¹¤ë¥«¡¼¥Í¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê̾¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	    <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
-&prompt.root; <userinput>mv /boot/kernel.good /boot/kernel</userinput></screen>
+	    <screen>&prompt.root; <userinput>mv /boot/kernel <replaceable>/boot/kernel.bad</replaceable></userinput>
+&prompt.root; <userinput>mv /boot/<replaceable>kernel.good</replaceable> /boot/kernel</userinput></screen>
 	  </note>
 	</listitem>
       </varlistentry>