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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Aug 29 08:33:03 UTC 2020


Author: ryusuke
Date: Sat Aug 29 08:33:02 2020
New Revision: 54444
URL: https://svnweb.freebsd.org/changeset/doc/54444

Log:
  - Merge the following from the English version:
  
  	r53958 -> r53979	head/ja_JP.eucJP/books/handbook/Makefile
  	r53961 -> r53979	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	Sat Aug 29 05:30:46 2020	(r54443)
+++ head/ja_JP.eucJP/books/handbook/Makefile	Sat Aug 29 08:33:02 2020	(r54444)
@@ -3,7 +3,7 @@
 #
 # Build the FreeBSD Handbook (Japanese).
 #
-# Original revision: r53958
+# Original revision: r53979
 #
 
 # ------------------------------------------------------------------------
@@ -75,6 +75,7 @@ IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-entire-part.png
+IMAGES_EN+= bsdinstall/bsdinstall-ufs-warning.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-guided-disk.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-guided-manual.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-manual-addpart.png

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Aug 29 05:30:46 2020	(r54443)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Aug 29 08:33:02 2020	(r54444)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53961
+     Original revision: r53979
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1346,10 +1346,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	  <filename>/var</filename>
 	  ¤ò¼þÊÕÉô¤Ë°ÜÆ°¤µ¤»¤ë¤³¤È¤Ë¤è¤Ã¤ÆÂ礭¤Ê¸ú²Ì¤¬ÆÀ¤é¤ì¤¿¤Î¤È¤ÏÂоÈŪ¤Ë¡¢
 	  °ÕÌ£¤Î¤¢¤ë¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎÁý²Ã¤Ï¸«¹þ¤á¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
-    </sect2>  
-    
+    </sect2>
+
     <sect2 xml:id="bsdinstall-part-guided">
-      <title>Guided ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä</title>
+      <title>UFS ¤òÍѤ¤¤¿ Guided ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Îʬ³ä</title>
 
       <para>¤³¤ÎÊýË¡¤òÁªÂò¤¹¤ë¤È¡¢
 	¥á¥Ë¥å¡¼¤Ë¤ÏÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
@@ -1384,6 +1384,43 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
+      <para><guibutton>[ Entire Disk ]</guibutton>
+	¤òÁªÂò¤¹¤ë¤È¡¢
+	<application>bsdinstall</application> ¤Ï¡¢
+	¥Ç¥£¥¹¥¯¤ÎÆâÍƤ¬¾Ãµî¤µ¤ì¤ë¤³¤È¤ò³Îǧ¤¹¤ë¥À¥¤¥¢¥í¥°¤òɽ¼¨¤·¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-ufs-warning">
+	<title>³Îǧ</title>
+
+        <mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-ufs-warning"/>
+	  </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>¼¡¤Î¥á¥Ë¥å¡¼¤Ç¤Ï¡¢
+	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à¥¿¥¤¥×¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+	amd64 ¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï¡¢Ä̾ï GPT
+	¤¬ºÇ¤âŬÀÚ¤ÊÁªÂò¤È¤Ê¤ê¤Þ¤¹¡£
+	<acronym>GPT</acronym> ¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¤è¤¦¤Ê¸Å¤¤¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï¡¢
+	<acronym>MBR</acronym> ¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
+	¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à¤Ï¡¢»È¤¦¤³¤È¤¬¤Þ¤ì¤Ç¤¢¤Ã¤¿¤ê¡¢
+	¸Å¤¤¥³¥ó¥Ô¥å¡¼¥¿¤ÇÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£
+	<xref linkend="partition-schemes"/> ¤Ë¾ÜºÙ¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
+      <figure xml:id="bsdinstall-ufs-scheme">
+	<title>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à¤ÎÁªÂò</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
       <para>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥ì¥¤¥¢¥¦¥È¤òºîÀ®¤·¤¿¤é¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤Î¾ò·ï¤òËþ¤¿¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¿¼¤¯³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	<guibutton>[ Revert ]</guibutton> ¤òÁªÂò¤¹¤ë¤È¡¢
@@ -1403,6 +1440,33 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	  </imageobject>
 	</mediaobject>
       </figure>
+
+      <para>¥Ç¥£¥¹¥¯¤ò°ìÅÙÀßÄꤹ¤ë¤È¡¢¼¡¤Î¥á¥Ë¥å¡¼¤Ï¡¢
+	ÁªÂò¤·¤¿¥Ï¡¼¥É¥É¥é¥¤¥Ö¤ò¥Õ¥©¡¼¥Þ¥Ã¥È¤¹¤ëÁ°¤Ë¡¢
+	ÀßÄê¤òÊѹ¹¤¹¤ëºÇ¸å¤Î¥Á¥ã¥ó¥¹¤Ç¤¹¡£
+	¤â¤·Êѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
+	<guibutton>[ Back ]</guibutton>
+	¤òÁªÂò¤·¤Æ¥á¥¤¥ó¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¨¥Ç¥£¥¿¤Þ¤ÇÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+	<guibutton>[ Revert & Exit ]</guibutton>
+	¤òÁªÂò¤¹¤ë¤È¡¢
+	¥Ï¡¼¥É¥É¥é¥¤¥Ö¤Ø¤ÎÊѹ¹¤Ê¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Î¤Ë¤Ï¡¢
+	<guibutton>[ Commit ]</guibutton>
+	¤òÁªÂò¤·¤Æ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <figure xml:id="bsdinstall-ufs-final-confirmation">
+	<title>ºÇ¸å¤Î³Îǧ</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-final-confirmation"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+      <para><xref linkend="bsdinstall-fetching-distribution"/>
+	¤Ë¿Ê¤ó¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤ò³¤±¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-manual">
@@ -1443,7 +1507,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à¤Ï¡¢»È¤¦¤³¤È¤¬¤Þ¤ì¤Ç¤¢¤Ã¤¿¤ê¡¢
 	¸Å¤¤¥³¥ó¥Ô¥å¡¼¥¿¤ÇÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£</para>
 
-      <table frame="none" rowsep="1" pgwide="1">
+      <table xml:id="partition-schemes" frame="none" rowsep="1" pgwide="1">
 	<title>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¹¥­¡¼¥à</title>
 
 	<tgroup cols="2" align="left">
@@ -1521,19 +1585,21 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</listitem>
 
 	<listitem>
+	  <para><literal>freebsd-zfs</literal> -
+	    &os; <acronym>ZFS</acronym>	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£
+	    ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	    (<link xlink:href="&url.books.handbook.en;/filesystems-zfs.html">
+	      The Z File System (ZFS)</link><!-- <xref
+	      linkend="zfs"/>-->) ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	</listitem>
+
+	<listitem>
 	  <para><literal>freebsd-swap</literal> - &os;
 	    ¥¹¥ï¥Ã¥×¶õ´Ö¡£</para>
 	</listitem>
       </itemizedlist>
 
-      <para>¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó·Á¼°¤Ë <literal>freebsd-zfs</literal>
-	¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤Ï &os; <acronym>ZFS</acronym>
-	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à (<link xlink:href="&url.books.handbook.en;/filesystems-zfs.html">
-	  The Z File System (ZFS)</link><!-- <xref
-	  linkend="zfs"/>-->)
-	¤ò´Þ¤à¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë»È¤ï¤ì¤Þ¤¹¡£
-	ÍøÍѲÄǽ¤Ê <acronym>GPT</acronym>
+      <para>ÍøÍѲÄǽ¤Ê <acronym>GPT</acronym>
 	¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¿¥¤¥×¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.gpart.8;
 	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
@@ -1672,13 +1738,15 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</informaltable>
       </example>
 
-      <para>¥«¥¹¥¿¥à¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ¤òºîÀ®¤·¤¿¤é
-	<guibutton>[ Finish ]</guibutton> ¤òÁªÂò¤·¤Æ¡¢
-	¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para>
+      <para>¥«¥¹¥¿¥à¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤¿¤é¡¢
+	<guibutton>[ Finish ]</guibutton> ¤òÁªÂò¤·¤Æ
+	<xref linkend="bsdinstall-fetching-distribution"/>
+	¤Ë¿Ê¤ß¡¢¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤á¤Æ¤¯¤À¤µ¤¤¡£</para>
+
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-zfs">
-      <title>root-on-ZFS ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¼«Æ°ºîÀ®</title>
+      <title>Root-on-ZFS ¤òÍѤ¤¤¿ Guided ¤Ë¤è¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎºîÀ®</title>
 
       <para>root-on-ZFS ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¼«Æ°ºîÀ®¤Ï¡¢
 	&os; 10.0-RELEASE ¤«¤éÂбþ¤·¤Þ¤·¤¿¡£
@@ -1853,33 +1921,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
     </sect2>
   </sect1>
 
-  <sect1 xml:id="bsdinstall-final-warning">
-    <title>¥¤¥ó¥¹¥È¡¼¥ëÁàºî¤Î³ÎÄê</title>
+  <sect1 xml:id="bsdinstall-fetching-distribution">
+    <title>ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É</title>
 
-    <para>¥Ç¥£¥¹¥¯¤ò°ìÅÙÀßÄꤹ¤ë¤È¡¢¼¡¤Î¥á¥Ë¥å¡¼¤Ï¡¢
-      ÁªÂò¤·¤¿¥Ï¡¼¥É¥É¥é¥¤¥Ö¤ò¥Õ¥©¡¼¥Þ¥Ã¥È¤¹¤ëÁ°¤Ë¡¢
-      ÀßÄê¤òÊѹ¹¤¹¤ëºÇ¸å¤Î¥Á¥ã¥ó¥¹¤Ç¤¹¡£
-      ¤â¤·Êѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
-      <guibutton>[ Back ]</guibutton>
-      ¤òÁªÂò¤·¤Æ¥á¥¤¥ó¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¨¥Ç¥£¥¿¤Þ¤ÇÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-      <guibutton>[ Revert & Exit ]</guibutton>
-      ¤òÁªÂò¤¹¤ë¤È¡¢
-      ¥Ï¡¼¥É¥É¥é¥¤¥Ö¤Ø¤ÎÊѹ¹¤Ê¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£</para>
-
-    <figure xml:id="bsdinstall-final-confirmation">
-      <title>ºÇ¸å¤Î³Îǧ</title>
-      <mediaobject>
-	<imageobject>
-	  <imagedata
-	    fileref="bsdinstall/bsdinstall-final-confirmation"/>
-	</imageobject>
-      </mediaobject>
-    </figure>
-
-    <para>ËÜÅö¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò³«»Ï¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-      <guibutton>[ Commit ]</guibutton> ¤òÁªÂò¤·¤Æ¡¢
-      <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    
     <para>¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤«¤«¤ë»þ´Ö¤Ï¡¢¤É¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÁª¤ó¤À¤«¡¢
       ¤É¤Î¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤ò»È¤Ã¤¿¤«¡¢
       ¤½¤·¤Æ¥³¥ó¥Ô¥å¡¼¥¿¤Î®Å٤ˤâ°Í¸¤·¤Þ¤¹¡£
@@ -1887,7 +1931,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 
     <para>¤Þ¤ººÇ½é¤Ë¡¢¥¤¥ó¥¹¥È¡¼¥é¤ÏÁªÂò¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤ò¥Õ¥©¡¼¥Þ¥Ã¥È¤·¡¢
       ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½é´ü²½¤·¤Þ¤¹¡£
-      bootonly ¥á¥Ç¥£¥¢¤òÍѤ¤¤¿¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
+      <literal>bootonly media</literal> ¤Þ¤¿¤Ï
+      <literal>mini memstick</literal> ¥á¥Ç¥£¥¢¤òÍѤ¤¤¿¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
       ÁªÂò¤µ¤ì¤¿¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤¹¡£</para>
 
     <figure xml:id="bsdinstall-distfile-fetching">


More information about the svn-doc-head mailing list