svn commit: r47923 - head/ja_JP.eucJP/books/handbook/boot

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Dec 29 13:27:22 2015
New Revision: 47923
URL: https://svnweb.freebsd.org/changeset/doc/47923

Log:
  - Merge the following from the English version:
  
  	r44628 -> r46039	head/ja_JP.eucJP/books/handbook/boot/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/boot/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Tue Dec 29 07:01:44 2015	(r47922)
+++ head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Tue Dec 29 13:27:22 2015	(r47923)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44628
+     Original revision: r46039
      $FreeBSD$
 -->
 
@@ -85,7 +85,7 @@
       Åоì¿Íʪ¤¬¥Þ¥ó¥Û¡¼¥ë¤Î²¼¤ËȾʬÍî¤Ã¤³¤Á¤Æ¡¢
       ·¤É³ (¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×) ¤ò¤Ä¤«¤ó¤Ç¼«Ê¬¤ò°ú¤Ã¤Ñ¤ê¡¢»ý¤Á¾å¤²¤ë¤Î¤Ç¤¹¡£
       ·×»»µ¡¤ÎóÕÌÀ´ü¤Ë¤Ï¡¢<firstterm>¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×</firstterm>
-      ¤È¤¤¤¦ÍѸì¤Ç¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥í¡¼¥É¤¹¤ëµ¡¹½¤Î¤³¤È¤ò»Ø¤·¤Æ¤¤¤¿¤Î¤Ç¤¹¤¬¡¢
+      ¤È¤¤¤¦ÍѸì¤Ç¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥í¡¼¥É¤¹¤ëµ¡¹½¤Î¤³¤È¤ò»Ø¤·¤Æ¤¤¤Þ¤·¤¿¡£
       ¤¤¤Þ¤Ï¤³¤ì¤ò½Ì¤á¤Æ <quote>¥Ö¡¼¥È (µ¯Æ°)</quote> ¤È¸À¤¤¤Þ¤¹¡£</para>
 
     <indexterm><primary><acronym>BIOS</acronym></primary></indexterm>
@@ -107,17 +107,16 @@
       <acronym>MBR</acronym> ¤¬¼Â¹Ô¤Ç¤­¤ë¤³¤È¤ò²¾Äꤷ¤Æ¤¤¤Þ¤¹¡£</para>
 
    <note>
-      <para>amd64 ¥Ï¡¼¥É¥¦¥§¥¢¤Ï¡¢¾å°Ì¸ß´¹À­¤ò»ý¤Á¡¢
-	<acronym>BIOS</acronym> ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	ºÇ¶á¤Î¿·¤·¤¤¥Ï¡¼¥É¥¦¥§¥¢¤Ç¤Ï <acronym>MBR</acronym> ¤«¤é¡¢
-	GUID Partition Table (<acronym>GPT</acronym>) ¤Ø¤È°Ü¹Ô¤·¤Æ¤¤¤Þ¤¹¡£
-	&os; ¤Ï	<acronym>MBR</acronym> ¤Þ¤¿¤Ï <acronym>GPT</acronym>
-	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤«¤éµ¯Æ°¤Ç¤­¤Þ¤¹¡£
-	<acronym>GPT</acronym> ¤«¤éµ¯Æ°¤¹¤ë¤È¤­¤Ë¤Ï¡¢
-	&os; ¤Ï¥ì¥¬¥·¡¼¤Ê <acronym>BIOS</acronym> ¤Þ¤¿¤Ï Extensible
-	Firmware Interface (<acronym>EFI</acronym>) ¤«¤éµ¯Æ°¤Ç¤­¤Þ¤¹¡£
-	Unified Extensible Firmware Interface (<acronym>UEFI</acronym>)
-	¤Ø¤ÎÂбþ¤Ï¿Ê¹ÔÃæ¤Ç¤¹¡£</para>
+      <para>&os; ¤Ï¸Å¤¤É¸½à¤Î <acronym>MBR</acronym>¡¢
+	¤Þ¤¿¤Ï¿·¤·¤¤ GUID Partition Table (<acronym>GPT</acronym>)
+	¤«¤éµ¯Æ°¤Ç¤­¤Þ¤¹¡£
+	<acronym>GPT</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢Unified
+	Extensible Firmware Interface (<acronym>UEFI</acronym>)
+	¤ËÂбþ¤·¤¿¥³¥ó¥Ô¥å¡¼¥¿¤ÇÎɤ¯ÍѤ¤¤é¤ì¤Þ¤¹¡£
+	¤·¤«¤·¤Ê¤¬¤é¡¢&os; ¤Ï¥ì¥¬¥·¡¼¤Ê <acronym>BIOS</acronym>
+	¤Ë¤Î¤ß¤ËÂбþ¤·¤¿¥³¥ó¥Ô¥å¡¼¥¿¤«¤é¤â¡¢&man.gptboot.8; ¤Ë¤è¤ê¡¢
+	<acronym>GPT</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤«¤éµ¯Æ°¤Ç¤­¤Þ¤¹¡£
+	<acronym>UEFI</acronym> ¤«¤é¤ÎľÀܤε¯Æ°¤Ø¤ÎÂбþ¤Ï¿Ê¹ÔÃæ¤Ç¤¹¡£</para>
     </note>
 
     <indexterm><primary>¥Þ¥¹¥¿¡¼¥Ö¡¼¥È¥ì¥³¡¼¥É (Master Boot Record:
@@ -130,7 +129,7 @@
       (Boot Loader)</primary></indexterm>
 
     <para><acronym>MBR</acronym> ÆâÉô¤Î¥³¡¼¥É¤Ï¡¢
-      Ä̾ï<emphasis>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</emphasis>¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
+      °ìÈÌŪ¤Ë<emphasis>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã</emphasis>¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
       ¤È¤ê¤ï¤±¥æ¡¼¥¶¤È¤ÎÂÐÏ䬤¢¤ë¾ì¹ç¤Ë¤½¤¦¸Æ¤Ð¤ì¤Þ¤¹¡£
       Ä̾ï¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Î¤â¤Ã¤È¿¤¯¤Î¥³¡¼¥É¤¬¡¢
       ¥Ç¥£¥¹¥¯¤ÎºÇ½é¤Î¥È¥é¥Ã¥¯¡¢¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤ª¤«¤ì¤Þ¤¹¡£
@@ -372,7 +371,11 @@ boot:</screen>
 		<emphasis>unload</emphasis> ¤ò¼Â¹Ô¸å¡¢
 		¥«¡¼¥Í¥ë̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 		<emphasis>unload</emphasis> ¤ò¼Â¹Ô¤·¤Ê¤¤¤È¡¢
-		°ìÅÙÆɤ߹þ¤Þ¤ì¤¿¥«¡¼¥Í¥ë¤¬»È¤ï¤ì¤Þ¤¹¡£</entry>
+		°ìÅÙÆɤ߹þ¤Þ¤ì¤¿¥«¡¼¥Í¥ë¤¬»È¤ï¤ì¤Þ¤¹¡£
+		<emphasis>kernelname</emphasis>
+		¤Ç¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë¤Ï¡¢
+		<emphasis>/boot/kernel</emphasis> ¤ª¤è¤Ó
+		<emphasis>/boot/modules</emphasis> ¤«¤éÄ´¤Ù¤é¤ì¤Þ¤¹¡£</entry>
 	    </row>
 
 	    <row>
@@ -411,7 +414,12 @@ boot:</screen>
 		¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¡¢¤¢¤ë¤¤¤Ï
 		type ¤Ë»ØÄꤵ¤ì¤¿¼ïÎà¤Î¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£
 		<replaceable>filename</replaceable>
-		°Ê¹ß¤Ë»ØÄꤵ¤ì¤¿°ú¿ô¤Ï¥Õ¥¡¥¤¥ë¤Ø¤ÈÅϤµ¤ì¤Þ¤¹¡£</entry>
+		°Ê¹ß¤Ë»ØÄꤵ¤ì¤¿°ú¿ô¤Ï¥Õ¥¡¥¤¥ë¤Ø¤ÈÅϤµ¤ì¤Þ¤¹¡£
+		<replaceable>filename</replaceable>
+		¤Ç¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë¤Ï¡¢
+		<emphasis>/boot/kernel</emphasis>
+		¤ª¤è¤Ó <emphasis>/boot/modules</emphasis>
+		¤«¤éÄ´¤Ù¤é¤ì¤Þ¤¹¡£</entry>
 	    </row>
 
 	    <row>
@@ -485,8 +493,7 @@ boot:</screen>
 	¤Þ¤¿¡¢¥·¥¹¥Æ¥à¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤ê¡¢
 	¤â¤·¤¯¤Ï¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òÀßÄꤷ¤¿¾ì¹ç¤Ë¡¢
 	ľÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤¿¥«¡¼¥Í¥ë¤Ï¡¢
-	<filename>kernel.old</filename><indexterm>
-	<primary><filename>kernel.old</filename></primary></indexterm>
+	<filename>kernel.old</filename>
 	¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>ÉáÃʤΥ«¡¼¥Í¥ë¤Ç»È¤Ã¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤ò»ØÄꤷ¤¿¥«¡¼¥Í¥ë¤Ç¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢