svn commit: r41836 - in head/ja_JP.eucJP/books/handbook: . install

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Jun  4 14:53:17 2013
New Revision: 41836
URL: http://svnweb.freebsd.org/changeset/doc/41836

Log:
  - Merge the following from the English version:
  
  	r41645 -> r41824	head/ja_JP.eucJP/books/handbook/book.xml
  	r41278 -> r41823	head/ja_JP.eucJP/books/handbook/install/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml
  head/ja_JP.eucJP/books/handbook/install/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Tue Jun  4 14:20:37 2013	(r41835)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Tue Jun  4 14:53:17 2013	(r41836)
@@ -11,7 +11,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41645
+     Original revision: r41824
      $FreeBSD$
 -->
 
@@ -73,12 +73,10 @@
       &tm-attrib.nexthop;
       &tm-attrib.opengroup;
       &tm-attrib.oracle;
-      &tm-attrib.powerquest;
       &tm-attrib.realnetworks;
       &tm-attrib.redhat;
       &tm-attrib.sap;
       &tm-attrib.sun;
-      &tm-attrib.symantec;
       &tm-attrib.themathworks;
       &tm-attrib.thomson;
       &tm-attrib.usrobotics;

Modified: head/ja_JP.eucJP/books/handbook/install/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/install/chapter.xml	Tue Jun  4 14:20:37 2013	(r41835)
+++ head/ja_JP.eucJP/books/handbook/install/chapter.xml	Tue Jun  4 14:53:17 2013	(r41836)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41278
+     Original revision: r41823
      $FreeBSD$
 -->
 
@@ -382,15 +382,12 @@
 
       <para>&os; ¤Î¤¿¤á¤Î¥¹¥Ú¡¼¥¹¤òÍÑ°Õ¤¹¤ëºÝ¡¢
 	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥µ¥¤¥º¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë¡¢
-	<application>&partitionmagic;</application>
-	¤Ê¤É¤Î¾¦Íѥġ¼¥ë¤ä <application>GParted</application>
-	¤Ê¤É¤Î¥Õ¥ê¡¼¤Î¥Ä¡¼¥ë¤ò»ÈÍѤǤ­¤Þ¤¹¡£
-	<application>&partitionmagic;</application> ¤È
+	<application>GParted</application>
+	¤Ê¤É¤Î¥Ä¡¼¥ë¤ò»ÈÍѤǤ­¤Þ¤¹¡£
 	<application>GParted</application> ¤Ï¡¢
-	<acronym>NTFS</acronym>	¤Î¥µ¥¤¥º¤òÊѹ¹¤Ç¤­¤ë¤³¤È¤¬ÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
+	<acronym>NTFS</acronym> ¤òÁàºî¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢
 	<ulink url="http://www.sysresccd.org/">SystemRescueCD</ulink>
-	¤È¤¤¤Ã¤¿Â¿¤¯¤Î Live CD Linux ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç
-	<application>GParted</application> ¤òÍøÍѤǤ­¤Þ¤¹¡£</para>
+	¤È¤¤¤Ã¤¿Â¿¤¯¤Î Live CD Linux ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÇÍøÍѤǤ­¤Þ¤¹¡£</para>
 
       <para>µsoft; Vista
 	¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥µ¥¤¥º¤ÎÊѹ¹¤Ë´Ø¤·¤ÆÌäÂ꤬Êó¹ð¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -444,8 +441,8 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Àè¤Ë½Ò¤Ù¤¿ <application>&partitionmagic;</application>
-	      ¤ò¤Ï¤¸¤á¤È¤¹¤ë &windows; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½Ì¾®¤¹¤ë¥Ä¡¼¥ë¤ò»ÈÍѤ¹¤ë¡£</para>
+	    <para>Àè¤Ë½Ò¤Ù¤¿ &windows;
+	      ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½Ì¾®¤¹¤ë¥Ä¡¼¥ë¤ò»ÈÍѤ¹¤ë¡£</para>
 	  </listitem>
 	</orderedlist>
       </example>
@@ -1394,21 +1391,19 @@ Mounting root from ufs:/dev/md0c
       <title>BIOS ¥É¥é¥¤¥Ö¤ÎÈÖ¹æÉÕ¤±</title>
 
       <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤ÆÀßÄꤹ¤ëÁ°¤Ë¡¢
-	ÆäËÊ£¿ô¤Î¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ò»ý¤Ã¤Æ¤¤¤ë¤Ê¤é¤Ðµ¤¤ò¤Ä¤±¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤½ÅÍפʤ³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	&os; ¤¬¤É¤Î¤è¤¦¤Ë BIOS
+	¥É¥é¥¤¥Ö¥Þ¥Ã¥Ô¥ó¥°¤ò¼è¤ê°·¤¦¤«¤òÍý²ò¤·¤Æ¤ª¤¯¤³¤È¤¬½ÅÍפǤ¹¡£</para>
 
       <indexterm><primary>MS-DOS</primary></indexterm>
       <indexterm><primary>Microsoft Windows</primary></indexterm>
       <para>&ms-dos; ¤ä &microsoft.windows; ¤Î¤è¤¦¤Ê BIOS
 	¤Ë°Í¸¤·¤¿¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬Æ°¤¤¤Æ¤¤¤ë PC ¤Ç¤Ï¡¢
 	BIOS ¤¬¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤Î½ç½ø¤ò¹½À®¤Ç¤­¡¢
-	OS ¤Ï¤½¤ÎÊѲ½¤ËÄɽ¾¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤Ï¤¤¤ï¤æ¤ë
-	<quote>¥×¥é¥¤¥Þ¥ê¡¼¥Þ¥¹¥¿</quote>
+	OS ¤Ï¤½¤ÎÊѲ½¤ËÄɽ¾¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢"¥×¥é¥¤¥Þ¥ê¡¼¥Þ¥¹¥¿"
 	°Ê³°¤Î¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¤³¤Î»ÅÁȤߤòÍѤ¤¤ì¤Ð¥·¥¹¥Æ¥à¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ëºÇ¤â´Êñ¤Ç°Â²Á¤ÊÊýË¡¤ò¹½ÃۤǤ­¤Þ¤¹¡£
+	¤³¤Î»ÅÁȤߤòÍѤ¤¤ì¤Ð¥·¥¹¥Æ¥à¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë´Êñ¤ÊÊýË¡¤ò¹½ÃۤǤ­¤Þ¤¹¡£
 	¤â¤¦°ì¤ÄƱ¤¸¥Ç¥£¥¹¥¯¤òÇ㤤¡¢
-	<application><trademark class="registered">Ghost</trademark></application> ¤ä
-	<application>XCOPY</application>
-	¤òÍѤ¤¤Æ°ì¤ÄÌܤΥǥ£¥¹¥¯¤«¤éÆó¤Ä¤á¤Î¥Ç¥£¥¹¥¯¤Ø¤Î¥³¥Ô¡¼¤òÄê´üŪ¤Ë¼è¤ì¤Ð¤¤¤¤¤Î¤Ç¤¹¡£
+	°ì¤ÄÌܤΥǥ£¥¹¥¯¤«¤éÆó¤Ä¤á¤Î¥Ç¥£¥¹¥¯¤Ø¤Î¥³¥Ô¡¼¤òÄê´üŪ¤Ë¼è¤ì¤Ð¤¤¤¤¤Î¤Ç¤¹¡£
 	¤½¤·¤Æ¡¢°ì¤ÄÌܤΥǥ£¥¹¥¯¤Ë¾ã³²¤¬µ¯¤­¤¿¤ê¡¢¥¦¥£¥ë¥¹¤Ë´¶À÷¤·¤¿¤ê¡¢
 	¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÎÉÔ¶ñ¹ç¤Ç¤á¤Á¤ã¤¯¤Á¤ã¤Ë¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿»þ¤Ë¤Ï¡¢
 	BIOS ¤ËÂФ·¤Æ¥É¥é¥¤¥Ö¤òÏÀÍýŪ¤Ë¸ò´¹¤¹¤ë¤è¤¦¤Ë»Ø¼¨¤¹¤ë¤³¤È¤Ç´Êñ¤ËÉüµì¤Ç¤­¤ë¤Î¤Ç¤¹¡£
@@ -1655,9 +1650,7 @@ Mounting root from ufs:/dev/md0c
 	¤³¤ÎÍó¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¥¹¥é¥¤¥¹¤ËÂФ·¤Æ³ä¤êÅö¤Æ¤ë¤³¤È¤Î¤Ç¤­¤ëºÇÂç¤ÎÃͤǤ¹¡£
 	¤³¤ÎÃͤϡ¢³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Ê¤¤Îΰè¤ÎϢ³¤·¤¿¥Ö¥í¥Ã¥¯¡¢¤Þ¤¿¤Ï¡¢¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ÎÁ´¥µ¥¤¥º¤Ç¤¹¡£</para>
 
-      <para>&os; ¤Î¤¿¤á¤Î¶õ¤­Îΰè¤ò´û¤ËºîÀ®¤·¤Æ¤¤¤ë¤Ê¤é
-	(¤ª¤½¤é¤¯ <application>&partitionmagic;</application>
-	¤Ê¤É¤Î¥Ä¡¼¥ë¤òÍøÍѤ·¤¿¤Î¤Ç¤·¤ç¤¦) ¡¢
+      <para>&os; ¤Î¤¿¤á¤Î¶õ¤­Îΰè¤ò´û¤ËºîÀ®¤·¤Æ¤¤¤ë¤Ê¤é¡¢
 	¤½¤Î¤È¤­¤Ï <keycap>C</keycap>
 	¥­¡¼¤ò²¡¤·¤Æ¿·¤·¤¤¥¹¥é¥¤¥¹¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
 	ºÆ¤Ó¡¢ºîÀ®¤·¤¿¤¤¥¹¥é¥¤¥¹¤ÎÂ礭¤µ¤ÎÆþÎϤòÂ¥¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£</para>
@@ -5063,7 +5056,6 @@ Please press any key to reboot.</screen>
 	    ¤¬Ê֤äƤ¯¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
 	    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¥Þ¥¦¥ó¥È¤ò¤Á¤ã¤ó¤ÈÍ­¸ú¤Ë¤Ç¤­¤Æ¤¤¤Ê¤¤¤³¤È¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para>
 	</sect3>
-
       </sect2>
   </sect1>
 </chapter>