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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Mon May 18 13:47:01 2020
New Revision: 54153
URL: https://svnweb.freebsd.org/changeset/doc/54153

Log:
  - Merge the following from the English version:
  
  	r53932 -> r53935	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	Mon May 18 11:23:00 2020	(r54152)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Mon May 18 13:47:01 2020	(r54153)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53932
+     Original revision: r53935
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1206,7 +1206,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
     <para>¼¡¤Î¥á¥Ë¥å¡¼¤Ç¤Ï¡¢¥Ç¥£¥¹¥¯Îΰè¤ò³ä¤êÅö¤Æ¤ëÊýË¡¤òÁªÂò¤·¤Þ¤¹¡£</para>
 
     <figure xml:id="bsdinstall-zfs-partmenu">
-      <title>&os; 10.x °Ê¹ß¤Ç¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ÎÁªÂò</title>
+      <title>¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ÎÁªÂò</title>
 
       <mediaobject>
 	<imageobject>
@@ -1215,21 +1215,42 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
       </mediaobject>
     </figure>
 
-    <para><emphasis>Guided</emphasis> ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³äÊýË¡¤Ç¤Ï¡¢
-      ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¼«Æ°Åª¤ËÀßÄꤷ¤Þ¤¹¡£
-      <emphasis>Manual</emphasis> ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³äÊýË¡¤Ï¡¢
-      ¹âÅÙ¤ÊÃ챤ò»ý¤Ä¥æ¡¼¥¶¸þ¤±¤Ç¡¢
-      ¥á¥Ë¥å¡¼¥ª¥×¥·¥ç¥ó¤«¤é¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
-      <literal>Shell</literal> ¤Ï¡¢¥·¥§¥ë¥×¥í¥ó¥×¥È¤òµ¯Æ°¤·¡¢
-      ¹âÅÙ¤ÊÃ챤ò»ý¤Ä¥æ¡¼¥¶¤¬¡¢
-      &man.gpart.8;, &man.fdisk.8;, &man.bsdlabel.8;
-      ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Æ¡¢
-      ¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
-      &os; 10 °Ê¹ß¤ÇÍøÍѲÄǽ¤Ê <acronym>ZFS</acronym> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
-      <firstterm>¥Ö¡¼¥È´Ä¶­¤ËÂбþ¤·¤¿</firstterm>
-      root-on-ZFS ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤·¤Þ¤¹¡£
-      °Å¹æ²½¤µ¤ì¤¿ root-on-ZFS ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+    <para><application>bsdinstall</application>
+      ¤Ç¤Ï¡¢¥Ç¥£¥¹¥¯Îΰè¤Î³ä¤êÅö¤Æ¤Î¤¿¤á¤Ë
+      4 ¤Ä¤ÎÊýË¡¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
+    <itemizedlist>
+      <listitem>
+	<para><literal>Auto (UFS)</literal>
+	  ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤Ç¤Ï¡¢
+	  <literal>UFS</literal>
+	  ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò»È¤Ã¤Æ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¼«Æ°Åª¤Ëʬ³ä¤·¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Manual</literal>
+	  ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤Ï¡¢
+	  ¹âÅÙ¤ÊÃ챤ò»ý¤Ä¥æ¡¼¥¶¸þ¤±¤Ç¡¢
+	  ¥á¥Ë¥å¡¼¥ª¥×¥·¥ç¥ó¤«¤é¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Shell</literal> ¤Ç¤Ï¡¢¥·¥§¥ë¥×¥í¥ó¥×¥È¤òµ¯Æ°¤·¡¢
+	  ¹âÅÙ¤ÊÃ챤ò»ý¤Ä¥æ¡¼¥¶¤¬¡¢
+	  &man.gpart.8;, &man.fdisk.8;, &man.bsdlabel.8;
+	  ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Æ¡¢
+	  ¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Auto (ZFS)</literal>
+	  ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä¤Ç¤Ï¡¢
+	  root-on-ZFS ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤·¤Þ¤¹¡£
+	  GELI °Å¹æ¤ËÂбþ¤·¤¿ <firstterm>¥Ö¡¼¥È´Ä¶­</firstterm>
+	  ¤ò¹½ÃÛ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+      </listitem>
+    </itemizedlist>
+
     <para>¤³¤Î¾Ï¤Ç¤Ï¡¢
       ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¥ì¥¤¥¢¥¦¥È¤¹¤ëºÝ¤Î¸¡Æ¤»ö¹à¤òÀâÌÀ¤·¤Þ¤¹¡£
       ¤½¤Î¸å¡¢³Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎºîÀ®ÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
@@ -1275,8 +1296,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	  <filename>/var/tmp</filename> °Ê²¼¤ËŸ³«¤·¤Þ¤¹¡£
 	  <filename>/var/tmp</filename>
 	  °Ê²¼¤Ë½½Ê¬¤Ê¥Ç¥£¥¹¥¯ÍÆÎ̤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢
-	  <application>Firefox</application>,
-	  <application>Apache OpenOffice</application> ¤ä
+	  <application>Firefox</application> ¤ä
 	  <application>LibreOffice</application> ¤Î¤è¤¦¤Ê¡¢
 	  Â礭¤Ê¥½¥Õ¥È¥¦¥§¥¢ package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¡¢
 	  º¤Æñ¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>