svn commit: r39814 - head/ja_JP.eucJP/books/handbook/bsdinstall

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sat Oct 27 04:13:27 2012
New Revision: 39814
URL: http://svn.freebsd.org/changeset/doc/39814

Log:
  - Merge the following from the English version:
  
  	r39550 -> r39813	head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Fri Oct 26 18:38:55 2012	(r39813)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Oct 27 04:13:27 2012	(r39814)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39550
+     Original revision: r39813
      $FreeBSD$
 -->
 
@@ -1184,7 +1184,6 @@ Trying to mount root from cd9660:/dev/is
       ¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
       3 ¤ÄÌܤÎÊýË¡¤È¤·¤Æ¡¢¥·¥§¥ë¤òÍøÍѤ·¡¢&man.gpart.8;, &man.fdisk.8;, &man.bsdlabel.8;
       ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ëÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£</para>
-      <!-- WB: mention ZFS here? -->
 
       <figure id="bsdinstall-part-guided-manual">
 	<title>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤Ë Guided ¤È Manual ¤Î¤É¤Á¤é¤òÍѤ¤¤ë¤«¤ÎÁªÂò</title>
@@ -1368,19 +1367,20 @@ Trying to mount root from cd9660:/dev/is
 	</listitem>
 
 	<listitem>
-	  <para><literal>freebsd-zfs</literal> - &os;
-	    ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£<!-- <xref linkend="filesystems-zfs"> -->
-	    <ulink url="&url.books.handbook.en;/filesystems-zfs.html">
-	      The Z File System (ZFS)</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-	  </para>
-	</listitem>
-
-	<listitem>
 	  <para><literal>freebsd-swap</literal> - &os;
 	    ¥¹¥ï¥Ã¥×¶õ´Ö¡£</para>
 	</listitem>
       </itemizedlist>
 
+      <para>¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó·Á¼°¤Ë <literal>freebsd-zfs</literal> ¤¬¤¢¤ê¤Þ¤¹¡£
+	¤³¤ì¤Ï &os; ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò´Þ¤á¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
+
+	<ulink url="&url.books.handbook.en;/filesystems-zfs.html">
+	  The Z File System (ZFS)</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+	ÍøÍѲÄǽ¤Ê <acronym>GPT</acronym>
+	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¿¥¤¥×¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.gpart.8;
+	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
       <para>Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	<filename>/</filename>, <filename>/var</filename>,
 	<filename>/tmp</filename> ¤½¤·¤Æ <filename>/usr</filename>
@@ -1388,10 +1388,6 @@ Trying to mount root from cd9660:/dev/is
 	¥ì¥¤¥¢¥¦¥È¤ÎÎ㤬 <xref
 	  linkend="bsdinstall-part-manual-splitfs"/> ¤Ë¤¢¤ê¤Þ¤¹¡£</para>
 
-      <para>ÍøÍѲÄǽ¤Ê <acronym>GPT</acronym>
-	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¿¥¤¥×¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.gpart.8;
-	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
       <para>¥µ¥¤¥º¤òÆþÎϤ¹¤ëºÝ¤Ë¡¢
 	<emphasis>K</emphasis> (¥­¥í¥Ð¥¤¥È)¡¢<emphasis>M</emphasis> (¥á¥¬¥Ð¥¤¥È)¡¢
 	<emphasis>G</emphasis> (¥®¥¬¥Ð¥¤¥È)