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

Author: ryusuke
Date: Thu Sep 24 14:15:35 2020
New Revision: 54524
URL: https://svnweb.freebsd.org/changeset/doc/54524

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

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

Modified: head/ja_JP.eucJP/books/handbook/Makefile
==============================================================================
--- head/ja_JP.eucJP/books/handbook/Makefile	Thu Sep 24 13:38:47 2020	(r54523)
+++ head/ja_JP.eucJP/books/handbook/Makefile	Thu Sep 24 14:15:35 2020	(r54524)
@@ -3,7 +3,7 @@
 #
 # Build the FreeBSD Handbook (Japanese).
 #
-# Original revision: r53979
+# Original revision: r53989
 #
 
 # ------------------------------------------------------------------------
@@ -98,6 +98,10 @@ IMAGES_EN+= bsdinstall/bsdinstall-zfs-partmenu.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-vdev_invalid.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-vdev_type.png
 IMAGES_EN+= bsdinstall/bsdinstall-zfs-warning.png
+IMAGES_EN+= bsdinstall/bsdinstall-zfs-rescan-devices.png
+IMAGES_EN+= bsdinstall/bsdinstall-zfs-pool-name.png
+IMAGES_EN+= bsdinstall/bsdinstall-zfs-swap-amount.png
+IMAGES_EN+= bsdinstall/bsdinstall-zfs-init-encription.png
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Thu Sep 24 13:38:47 2020	(r54523)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Thu Sep 24 14:15:35 2020	(r54524)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53979
+     Original revision: r53989
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1588,7 +1588,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	  <para><literal>freebsd-zfs</literal> -
 	    &os; <acronym>ZFS</acronym>	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£
 	    ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	    (<link xlink:href="&url.books.handbook.en;/filesystems-zfs.html">
+	    (<link xlink:href="&url.books.handbook.en;/zfs.html">
 	      The Z File System (ZFS)</link><!-- <xref
 	      linkend="zfs"/>-->) ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 	</listitem>
@@ -1742,35 +1742,15 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	<guibutton>[&nbsp;Finish&nbsp;]</guibutton> ¤òÁªÂò¤·¤Æ
 	<xref linkend="bsdinstall-fetching-distribution"/>
 	¤Ë¿Ê¤ß¡¢¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤á¤Æ¤¯¤À¤µ¤¤¡£</para>
-
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-zfs">
       <title>Root-on-ZFS ¤òÍѤ¤¤¿ Guided ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎºîÀ®</title>
 
-      <para>root-on-ZFS ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¼«Æ°ºîÀ®¤Ï¡¢
-	&os; 10.0-RELEASE ¤«¤éÂбþ¤·¤Þ¤·¤¿¡£
-	¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥â¡¼¥É¤Ï¡¢
+      <para>¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¥â¡¼¥É¤Ï¡¢
 	¥Ç¥£¥¹¥¯¤Î¤¹¤Ù¤Æ¤ÎÎΰè¤ËÂФ·¤Æµ¡Ç½¤¹¤ë¤Î¤Ç¡¢
-	¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤò¾Ãµî¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-	¥¤¥ó¥¹¥È¡¼¥é¤Ï <acronym>ZFS</acronym> ¤¬ 4k ¥»¥¯¥¿¤ò»È¤¦¤è¤¦¤Ë¡¢
-	¼«Æ°Åª¤Ë 4k ¤Î¶­³¦¤Ë¥¢¥é¥¤¥ó¤¹¤ë¤è¤¦¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤Þ¤¹¡£
-	512 ¥Ð¥¤¥È¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£
-	512 ¥Ð¥¤¥È¤Î¥Ç¥£¥¹¥¯¤ÇºîÀ®¤µ¤ì¤¿¥×¡¼¥ë¤Ë¡¢
-	¾­Í襹¥È¥ì¡¼¥¸¶õ´Ö¤òÄɲä·¤¿¤ê¡¢²õ¤ì¤¿¥Ç¥£¥¹¥¯¤ÎÃÖ¤­´¹¤¨¤Ë¤ª¤¤¤Æ¡¢4k
-	¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤òÄɲäǤ­¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤¯¤³¤È¤Ë¤Ï¥á¥ê¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£
-	¥¤¥ó¥¹¥È¡¼¥é¤Ï¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢
-	<acronym>GELI</acronym> ¥Ç¥£¥¹¥¯¤Î°Å¹æ²½¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	<!-- <xref
-	  linkend="disks-encrypting-geli"/> -->
-	°Å¹æ²½¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢<filename>/boot</filename>
-	¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤à 2&nbsp;GB
-	¤Î°Å¹æ²½¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ö¡¼¥È¥×¡¼¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
-	¤³¤³¤Ë¤Ï¡¢¥«¡¼¥Í¥ë¤È¥·¥¹¥Æ¥à¤òµ¯Æ°¤¹¤ë¤Î¤ËɬÍפʥե¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-	¥æ¡¼¥¶¤¬¥µ¥¤¥º¤òÁªÂò²Äǽ¤Ê swap ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤âºîÀ®¤µ¤ì¡¢
-	»Ä¤ê¤Î¥¹¥Ú¡¼¥¹¤¬ <acronym>ZFS</acronym> ¥×¡¼¥ë¤È¤·¤Æ»È¤ï¤ì¤Þ¤¹¡£</para>
-
-      <para>¥¤¥ó¥¹¥È¡¼¥é¤Î <acronym>ZFS</acronym> ÀßÄê¥á¥Ë¥å¡¼¤Ë¤Ï¡¢
+	¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤ÎÆâÍƤ¬¾Ãµî¤µ¤ì¤Þ¤¹¡£
+	¥á¥¤¥ó¤Î <acronym>ZFS</acronym> ÀßÄê¥á¥Ë¥å¡¼¤Ë¤Ï¡¢
 	¥×¡¼¥ë¤ÎºîÀ®¤ò¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¿ô¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <figure xml:id="bsdinstall-zfs-menu">
@@ -1783,21 +1763,103 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
+      <para>¤³¤Î¥á¥Ë¥å¡¼¤ÇÁªÂò¤Ç¤­¤ë¥ª¥×¥·¥ç¥ó¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>Install</literal> -
+	  ÁªÂò¤·¤¿¥ª¥×¥·¥ç¥ó¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤ò¿Ê¤á¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Pool Type/Disks</literal> -
+	  ¥×¡¼¥ë¤ò¹½À®¤¹¤ë <literal>Pool Type</literal>
+	  ¤ª¤è¤Ó¥Ç¥£¥¹¥¯¤Ë¤Ä¤¤¤ÆÀßÄꤷ¤Þ¤¹¡£
+	  <acronym>ZFS</acronym> ¤Î¼«Æ°¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢
+	  ¸½»þÅÀ¤Ç¡¢¥¹¥È¥é¥¤¥×¥â¡¼¥É¤ò½ü¤­¡¢
+	  ñ°ì¤Î¥È¥Ã¥×¥ì¥Ù¥ë¤Î²¾ÁۥǥХ¤¥¹¤ÎºîÀ®¤Î¤ß¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	  ¤è¤êÊ£»¨¤Ê¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢
+	  <xref linkend="bsdinstall-part-shell"/>
+	  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤ÇºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Rescan Devices</literal> -
+	  ÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤òºÆɽ¼¨¤·¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Disk Info</literal> - Disk Info
+	  ¥á¥Ë¥å¡¼¤ò»È¤Ã¤Æ³Æ¥Ç¥£¥¹¥¯¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	  ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤ä¤½¤ì°Ê³°¤Î¥Ç¥Ð¥¤¥¹¥â¥Ç¥ë¥Ê¥ó¥Ð¡¼¤ª¤è¤Ó¥·¥ê¥¢¥ë¥Ê¥ó¥Ð¡¼¤È¤¤¤Ã¤¿¾ðÊó¤â¡¢
+	  ²Äǽ¤Ç¤¢¤ì¤ÐÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Pool Name</literal> - pool ¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
+	  ¥Ç¥Õ¥©¥ë¥È¤Î̾Á°¤Ï <emphasis>zroot</emphasis> ¤Ç¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Force 4K Sectors?</literal> -
+	  4K ¥»¥¯¥¿¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
+	  ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç 4K
+	  ¤Î¶­³¦¤ËÀ°Î󤹤ë¤è¤¦¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¼«Æ°Åª¤ËºîÀ®¤·¡¢
+	  ZFS ¤¬ 4K ¥»¥¯¥¿¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
+	  ¤³¤ì¤Ï 512 ¥Ð¥¤¥È¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤Ç¤â°ÂÁ´¤Ç¡¢
+	  512 ¥Ð¥¤¥È¤Î¥Ç¥£¥¹¥¯¾å¤ËºîÀ®¤µ¤ì¤¿¥×¡¼¥ë¤¬¾­ÍèŪ¤Ë
+	  4K ¥»¥¯¥¿¤Î¥Ç¥£¥¹¥¯¤òÄɲäǤ­¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤¯¤³¤È¤Ë¤Ï¡¢
+	  ¥¹¥È¥ì¡¼¥¸ÍÆÎ̤ÎÄɲää²õ¤ì¤¿¥Ç¥£¥¹¥¯¤Î¸ò´¹»þ¤Ë²¸·Ã¤¬¤¢¤ê¤Þ¤¹¡£
+	  Í­¸ú¤Ë¤¹¤ë¤«Ìµ¸ú¤Ë¤¹¤ë¤«¤òÁªÂò¤·¤Æ
+	  <keycap>Enter</keycap> ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Encrypt Disks?</literal> -
+	  <acronym>GELI</acronym> ¤ò»È¤Ã¤Æ¥Ç¥£¥¹¥¯¤ò°Å¹æ²½¤Ç¤­¤Þ¤¹¡£
+	  ¥Ç¥£¥¹¥¯¤Î°Å¹æ²½¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <link xlink:href="&url.books.handbook.en;/disks-encrypting.html#disks-encrypting-geli">geli ¤Ë¤è¤ë¥Ç¥£¥¹¥¯¤Î°Å¹æ²½</link>
+	  <!-- <xref linkend="disks-encrypting-geli"/> -->
+	  ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+	  <keycap>Enter</keycap> ¥­¡¼¤ò²¡¤·¤Æ¡¢
+	  °Å¹æ²½¤òÍ­¸ú¤Ë¤¹¤ë¤«Ìµ¸ú¤Ë¤¹¤ë¤«¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Partition Scheme</literal> -
+	  ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à¤òÁªÂò¤·¤Þ¤¹¡£
+	  ¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ë¤ª¤¤¤Æ¡¢GPT ¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£
+	  Ê̤Υ¹¥­¡¼¥à¤òÁªÂò¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  <keycap>Enter</keycap> ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Swap Size</literal> - ¥¹¥ï¥Ã¥×ÍÆÎ̤òÀßÄꤷ¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Mirror Swap?</literal> -
+	  ¥¹¥ï¥Ã¥×Îΰè¤ò¥Ç¥£¥¹¥¯´Ö¤Ç¥ß¥é¡¼²½¤·¤Þ¤¹¡£
+	  ¥¹¥ï¥Ã¥×Îΰè¤ò¥ß¥é¡¼²½¤¹¤ë¤È¡¢¥¯¥é¥Ã¥·¥å¥À¥ó¥×¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢
+	  Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  <keycap>Enter</keycap>
+	  ¥­¡¼¤ò²¡¤·¤ÆÍ­¸ú/̵¸ú¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Encrypt Swap?</literal> - ¥¹¥ï¥Ã¥×Îΰè¤ò°Å¹æ²½¤·¤Þ¤¹¡£
+	  ¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤Ë°ì»þ¥­¡¼¤ò¤È¤È¤â¤Ë¥¹¥ï¥Ã¥×Îΰè¤ò°Å¹æ²½¤·¡¢
+	  ºÆµ¯Æ°»þ¤Ë¥­¡¼¤ÏÇË´þ¤µ¤ì¤Þ¤¹¡£
+	  <keycap>Enter</keycap>
+	  ¥­¡¼¤ò²¡¤·¤ÆÍ­¸ú/̵¸ú¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	  ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <link xlink:href="&url.books.handbook.en;/swap-encrypting.html#disks-encrypting-geli">swap Îΰè¤Î°Å¹æ²½</link>
+	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </listitem>
+    </itemizedlist>
+
       <para><keycap>T</keycap> ¤òÁªÂò¤·¤Æ¡¢<literal>Pool Type</literal>
-	¤ª¤è¤Ó¥×¡¼¥ë¤ËÂбþ¤¹¤ë¥Ç¥£¥¹¥¯¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¸½ºß¤Î¤È¤³¤í¡¢¼«Æ°¤Î <acronym>ZFS</acronym> ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢
-	¥¹¥È¥é¥¤¥×¥â¡¼¥É¤ò½ü¤­¡¢
-	ñ°ì¤Î¥È¥Ã¥×¥ì¥Ù¥ë¤Î²¾ÁۥǥХ¤¥¹¤ÎºîÀ®¤Î¤ß¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	¤è¤êÊ£»¨¤Ê¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢<xref
-	  linkend="bsdinstall-part-shell"/>
-	¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤ÇºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢¥¹¥È¥é¥¤¥× (¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£¾éĹÀ­¤Ê¤·)¡¢¥ß¥é¡¼
-	(¥Ù¥¹¥È¤Ê¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡£»ÈÍѤǤ­¤ëÍÆÎ̤ϺǾ®) ¤ª¤è¤Ó RAID-Z 1, 2
-	¤ª¤è¤Ó 3 (¤½¤ì¤¾¤ì 1, 2 ¤ª¤è¤Ó 3 ¥Ç¥£¥¹¥¯¤ÎƱ»þ¾ã³²¤ØÂбþ)¡¢
-	¤È¤¤¤Ã¤¿¤µ¤Þ¤¶¤Þ¤Ê¥¿¥¤¥×¤Î¥×¡¼¥ë¤ÎºîÀ®¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	ÁªÂò¤µ¤ì¤Æ¤¤¤ë¥×¡¼¥ë¥¿¥¤¥×¤ËÂФ·¤Æ¤Ï¡¢¥¹¥¯¥ê¡¼¥ó¤Î²¼¤Ë¡¢
-	ɬÍפʥǥ£¥¹¥¯¿ô¡¢RAID-Z ¤Î¾ì¹ç¤Ë¤Ï¡¢
-	³ÆÀßÄê¤ËÂФ·¤ÆºÇŬ¤Ê¥Ç¥£¥¹¥¯¤Î¿ô¤Ë¤Ä¤¤¤Æ¤Î¥¢¥É¥Ð¥¤¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
+	¤ª¤è¤Ó¥×¡¼¥ë¤ËÂбþ¤¹¤ë¥Ç¥£¥¹¥¯¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <figure xml:id="bsdinstall-zfs-vdev_type">
 	<title><acronym>ZFS</acronym> ¥×¡¼¥ë¥¿¥¤¥×</title>
@@ -1809,16 +1871,60 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
+      <para>¤³¤Î¥á¥Ë¥å¡¼¤ÇÁªÂò²Äǽ¤Ê <literal>Pool Type</literal>
+	¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>stripe</literal> - ¥¹¥È¥é¥¤¥Ô¥ó¥°¤Ç¤Ï¡¢
+	  Àܳ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥Ç¥Ð¥¤¥¹¤ÎºÇÂçÍÆÎ̤ò»ÈÍѤǤ­¤Þ¤¹¡£
+	  ¤¿¤À¤·¡¢¾éĹÀ­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	  °ì¤Ä¤Î¥Ç¥£¥¹¥¯¤¬²õ¤ì¤ë¤À¤±¤Ç¥×¡¼¥ë¤Ë¤¢¤ë¥Ç¡¼¥¿¤Ï¼º¤ï¤ì¤Æ¤·¤Þ¤¤¡¢
+	  ¼è¤êÊÖ¤·¤¬¤Ä¤­¤Þ¤»¤ó¡£</para>
+      </listitem>
+      <listitem>
+	<para><literal>mirror</literal> -
+	  ¥ß¥é¡¼¥ê¥ó¥°¤Ï³Æ¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿¤Î´°Á´¤Ê¥³¥Ô¡¼¤òÊݸ¤·¤Þ¤¹¡£
+	  ¥ß¥é¡¼¥ê¥ó¥°¤Ç¤Ï¡¢ÊÂÎó¤Ë¤¹¤Ù¤Æ¤Î¥Ç¥£¥¹¥¯¤«¤é¥Ç¡¼¥¿¤òÆɤि¤á¡¢
+	  Æɤ߹þ¤ß¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤¬¸þ¾å¤·¤Þ¤¹¡£
+	  ½ñ¤­¹þ¤ß¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Ï¡¢
+	  ¥Ç¡¼¥¿¤¬ÊÂÎó¤Ë¤¹¤Ù¤Æ¤Î¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¤¿¤á¡¢ÃÙ¤¯¤Ê¤ê¤Þ¤¹¡£
+	  1 ¤Ä¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥Ç¥£¥¹¥¯¤¬²õ¤ì¤ë¤³¤È¤òµöÍƤ·¤Þ¤¹¡£
+	  ¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢
+	  ¾¯¤Ê¤¯¤È¤â 2 ¤Ä¤Î¥Ç¥£¥¹¥¯¤òɬÍפȤ·¤Þ¤¹¡£</para>
+      </listitem>
+      <listitem>
+	<para><literal>raid10</literal> - ¥¹¥È¥é¥¤¥Ô¥ó¥°¥ß¥é¡¼¡£
+	  ºÇ¤â¸úΨ¤ÏÎɤ¤¤Ç¤¹¤¬¡¢¥¹¥È¥ì¡¼¥¸ÍÆÎ̤Ͼ¯¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
+	  ¶ö¿ô¤Î¥Ç¥£¥¹¥¯¤¬É¬Íפǡ¢
+	  ¾¯¤Ê¤¯¤È¤â 4 ¤Ä¤Î¥Ç¥£¥¹¥¯¤¬É¬ÍפǤ¹¡£</para>
+      </listitem>
+      <listitem>
+	<para><literal>raidz1</literal> - ¥·¥ó¥°¥ë¥Ñ¥ê¥Æ¥£¤Î RAID¡£
+	  1 Âæ¤Î¥Ç¥£¥¹¥¯¤Î¸Î¾ã¤ËÂѤ¨¤é¤ì¤Þ¤¹¡£
+	  ¾¯¤Ê¤¯¤È¤â 3 ¤Ä¤Î¥Ç¥£¥¹¥¯¤¬É¬ÍפǤ¹¡£</para>
+      </listitem>
+      <listitem>
+	<para><literal>raidz2</literal> - ¥À¥Ö¥ë¥Ñ¥ê¥Æ¥£¤Î RAID¡£
+	  Ʊ»þ¤Ë 2 Âæ¤Î¥Ç¥£¥¹¥¯¤Î¸Î¾ã¤ËÂѤ¨¤é¤ì¤Þ¤¹¡£
+	  ¾¯¤Ê¤¯¤È¤â 4 ¤Ä¤Î¥Ç¥£¥¹¥¯¤¬É¬ÍפǤ¹¡£</para>
+      </listitem>
+      <listitem>
+	<para><literal>raidz3</literal> - ¥È¥ê¥×¥ë¥Ñ¥ê¥Æ¥£¤Î RAID¡£
+	  Ʊ»þ¤Ë 3 Âæ¤Î¥Ç¥£¥¹¥¯¤Î¸Î¾ã¤ËÂѤ¨¤é¤ì¤Þ¤¹¡£
+	  ¾¯¤Ê¤¯¤È¤â 5 ¤Ä¤Î¥Ç¥£¥¹¥¯¤¬É¬ÍפǤ¹¡£</para>
+      </listitem>
+    </itemizedlist>
+
       <para><literal>Pool Type</literal> ¤òÁªÂò¤·¤¿¤é¡¢
 	ÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
 	¤½¤Î¸å¡¢¥×¡¼¥ë¤ò¹½À®¤¹¤ë¥Ç¥£¥¹¥¯¤ò¡¢1 ¤Ä¤Þ¤¿¤ÏÊ£¿ôÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
 	½½Ê¬¤Ê¥Ç¥£¥¹¥¯¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë¤Ä¤¤¤Æ¸¡¾Ú¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
-	¤â¤·¡¢ÌäÂ꤬¤¢¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
-	<guibutton>&lt;Change Selection&gt;</guibutton>
-	¤òÁªÂò¤·¤Æ¡¢¥£¥¹¥¯¤Î°ìÍ÷¤ËÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+	¤â¤·¡¢ÌäÂ꤬¤¢¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢<guibutton>&lt;Change
+	Selection&gt;</guibutton> ¤òÁªÂò¤·¤Æ¡¢¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤ËÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	¤â¤·¤¯¤Ï¡¢
-	<guibutton>&lt;Cancel&gt;</guibutton> ¤òÁªÂò¤·¤Æ¡¢
-	¥×¡¼¥ë¤Î¥¿¥¤¥×¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<guibutton>&lt;Back&gt;</guibutton> ¤òÁªÂò¤·¤Æ¡¢
+	<literal>Pool Type</literal> ¤ËÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <figure xml:id="bsdinstall-zfs-disk_select">
 	<title>¥Ç¥£¥¹¥¯¤ÎÁªÂò</title>
@@ -1845,8 +1951,19 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
       <para>¤³¤Î°ìÍ÷¤ÎÃæ¤ËÈ´¤±¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤¬¤¢¤ë»þ¤ä¡¢
 	¥¤¥ó¥¹¥È¡¼¥é¤¬Î©¤Á¾å¤¬¤Ã¤¿¸å¤Ë¥Ç¥£¥¹¥¯¤òÀܳ¤·¤¿¾ì¹ç¤Ë¡¢
 	ºÇ¿·¤ÎÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤Î°ìÍ÷¤ò¸«¤ë¤Ë¤Ï¡¢
-	<guibutton>- Rescan Devices</guibutton> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥¢¥¯¥·¥Ç¥ó¥È¤Ç´Ö°ã¤Ã¤¿¥Ç¥£¥¹¥¯¤òºï½ü¤·¤Æ¤·¤Þ¤ï¤Ê¤¤¤è¤¦¤Ë¡¢
+	<guibutton>- Rescan Devices</guibutton> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-rescan-devices">
+	<title>Rescan Devices</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-rescan-devices"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¥¢¥¯¥·¥Ç¥ó¥È¤Ç´Ö°ã¤Ã¤¿¥Ç¥£¥¹¥¯¤òºï½ü¤·¤Æ¤·¤Þ¤ï¤Ê¤¤¤è¤¦¤Ë¡¢
 	<guibutton>- Disk Info</guibutton> ¥á¥Ë¥å¡¼ÁªÂò¤·¤Æ¡¢
 	³Æ¥Ç¥£¥¹¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¡¢¤ª¤è¤Ó¡¢
 	¥Ç¥Ð¥¤¥¹¥â¥Ç¥ëÈֹ椪¤è¤Ó¥·¥ê¥¢¥ëÈÖ¹æ¤Ê¤É¤Î¤µ¤Þ¤¶¤Þ¤Ê¾ðÊó¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1861,19 +1978,60 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
-      <para>¥á¥¤¥ó¤Î <acronym>ZFS</acronym> ÀßÄê¥á¥Ë¥å¡¼¤Ç¤Ï¡¢
-	pool ̾¤ÎÆþÎÏ¡¢4k ¥»¥¯¥¿À©¸Â¤ÎÀßÄê¤Î̵¸ú²½¡¢
-	°Å¹æ²½¤ÎÍ­¸ú / ̵¸ú¤ÎÀßÄê¡¢¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¥¿¥¤¥×¤Î
-	<acronym>GPT</acronym> (¿ä¾©)
-	¤È <acronym>MBR</acronym> ¤ÎÀÚ¤êÂؤ¨¡¢
-	¤½¤·¤Æ¥¹¥ï¥Ã¥×Îΰè¤ÎÍÆÎ̤òÀßÄê¤Ç¤­¤Þ¤¹¡£
-	¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤¬Å¬ÀÚ¤ÊÃͤËÀßÄꤵ¤ì¤¿¤é¡¢
-	¥á¥Ë¥å¡¼¤Î¥È¥Ã¥×¤Ë¤¢¤ë
-	<guibutton>&gt;&gt;&gt;&nbsp;Install</guibutton>
-	¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para><keycap>N</keycap> ¤òÁªÂò¤·¤Æ¡¢
+	<literal>Pool Name</literal> ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	´õ˾¤¹¤ë̾Á°¤òÆþÎϸ塢
+	<guibutton>&lt;OK&gt;</guibutton> ¤òÁªÂò¤·¤Æ³ÎÄꤹ¤ë¤«¡¢
+	<guibutton>&lt;Cancel&gt;</guibutton> ¤ò²¡¤·¤Æ¡¢
+	¥Ç¥Õ¥©¥ë¥È̾¤Î¤Þ¤Þ¤Ç¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
+      <figure xml:id="bsdinstall-zfs-pool-name">
+	<title>Pool Name</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-pool-name"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para><keycap>S</keycap> ¤òÁªÂò¤·¤Æ¥¹¥ï¥Ã¥×¤ÎÍÆÎ̤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	ɬÍפʥ¹¥ï¥Ã¥×ÍÆÎ̤òÆþÎϤ·¡¢
+	<guibutton>&lt;OK&gt;</guibutton> ¤ò²¡¤·¤Æ³ÎÄꤹ¤ë¤«¡¢
+	¤â¤·¤¯¤Ï
+	<guibutton>&lt;Cancel&gt;</guibutton> ¤ò²¡¤·¤Æ¡¢
+	¥Ç¥Õ¥©¥ë¥È¤ÎÍÆÎ̤Τޤޡ¢¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-swap-amount">
+	<title>Swap ÍÆÎÌ</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-swap-amount"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para>¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤Ë´õ˾¤¹¤ëÃͤòÀßÄꤷ¤¿¤é¡¢
+	¥á¥Ë¥å¡¼¤Î¾åÉô¤Ë¤¢¤ë <guibutton>&gt;&gt;&gt;&nbsp;Install</guibutton>
+	¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢<acronym>ZFS</acronym>
+	¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤¿¤á¤ÎºÇ½ª³Îǧ¤ò¹Ô¤¤¤Þ¤¹¡£
+	¤³¤ì¤Ï¡¢ÁªÂò¤·¤¿¥É¥é¥¤¥Ö¤ÎÆâÍƤ¬²õ¤ì¤ë¤³¤È¤ò¥­¥ã¥ó¥»¥ë¤¹¤ëºÇ¸å¤Î³Îǧ¤Î¾ì¤Ç¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-zfs-warning">
+	<title>ºÇ½ª³Îǧ</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="bsdinstall/bsdinstall-zfs-warning"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
       <para><acronym>GELI</acronym> ¥Ç¥£¥¹¥¯°Å¹æ²½¤òÍ­¸ú¤Ë¤·¤Æ¤¤¤¿¤é¡¢
-	¥Ç¥£¥¹¥¯¤ò°Å¹æ²½¤¹¤ë¤¿¤á¤ËÍѤ¤¤ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò 2 ÅÙµá¤á¤é¤ì¤Þ¤¹¡£</para>
+	¥Ç¥£¥¹¥¯¤ò°Å¹æ²½¤¹¤ë¤¿¤á¤ËÍѤ¤¤ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò 2
+	ÅÙµá¤á¤é¤ì¤Þ¤¹¡£¤½¤Î¸å¡¢°Å¹æ¤Î½é´ü²½¤¬³«»Ï¤·¤Þ¤¹¡£</para>
 
       <figure xml:id="bsdinstall-zfs-geli_password">
 	<title>¥Ç¥£¥¹¥¯°Å¹æ²½¥Ñ¥¹¥ï¡¼¥É</title>
@@ -1886,20 +2044,21 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
-      <para>¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢ÁªÂò¤µ¤ì¤¿¥É¥é¥¤¥Ö¤ÎÃæ¿È¤¬ <acronym>ZFS</acronym>
-	¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤³¤È¤ÇÇË´þ¤µ¤ì¤ë¤³¤È¤ò¥­¥ã¥ó¥»¥ë¤¹¤ë¤«¤É¤¦¤«¤ÎºÇ½ª³Îǧ¤ò¹Ô¤¤¤Þ¤¹¡£</para>
+      <figure xml:id="bsdinstall-zfs-init-encription">
+	<title>°Å¹æ¤Î½é´ü²½</title>
 
-      <figure xml:id="bsdinstall-zfs-warning">
-	<title>ºÇ½ª³Îǧ</title>
-
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-zfs-warning"/>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-zfs-init-encription"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
-      <para>¤½¤Î¸å¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î²áÄø¤Ï¡¢Ä̾ïÄ̤ê¤Ë¿Ê¤ß¤Þ¤¹¡£</para>
+      <para>¤½¤Î¸å¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î²áÄø¤Ï¡¢Ä̾ïÄ̤ê¤Ë¿Ê¤ß¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥ë¤ò¿Ê¤á¤ë¤Ë¤Ï¡¢
+	<xref linkend="bsdinstall-fetching-distribution"/>
+	¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
 
     </sect2>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"