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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Fri Sep  6 22:13:58 2013
New Revision: 42620
URL: http://svnweb.freebsd.org/changeset/doc/42620

Log:
  - Merge the following from the English version:
  
  	r42247 -> r42402	head/ja_JP.eucJP/books/handbook/install/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/install/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/install/chapter.xml	Fri Sep  6 21:58:47 2013	(r42619)
+++ head/ja_JP.eucJP/books/handbook/install/chapter.xml	Fri Sep  6 22:13:58 2013	(r42620)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42247
+     Original revision: r42402
      $FreeBSD$
 -->
 
@@ -2240,14 +2240,9 @@ Mounting root from ufs:/dev/md0c
 	      firewall</guimenuitem></term>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>FTP</primary>
-	      <secondary>Passive ¥â¡¼¥É</secondary>
-	    </indexterm>
-
 	    <para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢
 	      &man.sysinstall.8; ¤Ï¡¢¤¹¤Ù¤Æ¤Î FTP žÁ÷¤ÎºÝ¤Ë
-	      passive ¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
+	      passive ¥â¡¼¥É<indexterm><primary>FTP</primary><secondary>Passive ¥â¡¼¥É</secondary></indexterm>¤ò»ÈÍѤ·¤Þ¤¹¡£
 	      ¤³¤Î¥â¡¼¥É¤ò»ÈÍѤ¹¤ë¤È¡¢
 	      ¥é¥ó¥À¥à TCP ¥Ý¡¼¥È¤Ë¤è¤ë³°Éô¤«¤é¤ÎÀܳ¤òµö²Ä¤·¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ò±Û¤¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 	  </listitem>
@@ -2259,16 +2254,11 @@ Mounting root from ufs:/dev/md0c
 	      through a http proxy</guimenuitem></term>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>FTP</primary>
-	      <secondary>HTTP proxy ·Ðͳ</secondary>
-	    </indexterm>
-
 	    <para>¤³¤ÎÊýË¡¤Ç¤Ï¡¢&man.sysinstall.8; ¤Ï¡¢HTTP
 	      ¥×¥í¥È¥³¥ë¤ò»È¤Ã¤Æ proxy ¥µ¡¼¥Ð¤ËÀܳ¤·¡¢FTP ¤ÎÁàºî¤ò¼Â¸½¤·¤Þ¤¹¡£
 	      proxy ¥µ¡¼¥Ð¤Ï FTP Í×µá¤ò (ÌõÃí: HTTP ¤«¤é FTP ¤Ë) ÊÑ´¹¤·¤Æ
 	      FTP ¥µ¡¼¥Ð¤ËÁ÷¤ë¤¿¤á¡¢¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤¬ FTP
-	      Àܳ¤ò¶Ø»ß¤·¤Æ¤¤¤Æ¤â¡¢HTTP proxy ¥µ¡¼¥Ð¤¬Ä󶡤µ¤ì¤Æ¤¤¤ì¤Ð
+	      Àܳ¤ò¶Ø»ß¤·¤Æ¤¤¤Æ¤â¡¢HTTP proxy ¥µ¡¼¥Ð<indexterm><primary>FTP</primary><secondary>HTTP proxy ·Ðͳ</secondary></indexterm>¤¬Ä󶡤µ¤ì¤Æ¤¤¤ì¤Ð
 	      ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤òĶ¤¨¤¿ FTP Àܳ¤ò¹Ô¤Ê¤¦¤³¤È¤¬²Äǽ¤Ç¤¹¡£
 	      ¤³¤ÎÊýË¡¤òÍѤ¤¤ë¾ì¹ç¤Ë¤Ï¡¢FTP ¥µ¡¼¥Ð¤Î¾¤Ë proxy
 	      ¥µ¡¼¥Ð¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
@@ -4209,7 +4199,10 @@ Please press any key to reboot.</screen>
 	    <para><application>&xorg;</application> üËö¤«¤é
 	      &man.sysinstall.8; ¤ò»È¤¦¤È¡¢
 	      ¥é¥¤¥È¥°¥ì¡¼¤ÎÇطʤ˥ե©¥ó¥È¤¬²«¿§¤Çɽ¼¨¤µ¤ì¡¢Æɤߤº¤é¤¤¤Ç¤¹¡£
-	      ¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥È¥é¥¹¥È<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm> ¤ò¹â¤¯¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤«?</para>
+	      ¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥È¥é¥¹¥È
+	      <indexterm><primary>color</primary>
+	      <secondary>contrast</secondary></indexterm>
+	      ¤ò¹â¤¯¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤«?</para>
 	  </question>
 	  <answer>
 	    <para><filename