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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed May 20 14:04:00 2020
New Revision: 54157
URL: https://svnweb.freebsd.org/changeset/doc/54157

Log:
  - Merge the following from the English version:
  
  	r53939 -> r53941	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	Wed May 20 09:54:41 2020	(r54156)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Wed May 20 14:04:00 2020	(r54157)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53939
+     Original revision: r53941
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -91,11 +91,11 @@
 
       <listitem>
 	<para>Amazon <link
-	    xlink:href="https://aws.amazon.com/mp/solutions/freebsd/">AWS
+	    xlink:href="https://aws.amazon.com/marketplace/pp/B07L6QV354">AWS
 	    Marketplace</link>, <link
 	    xlink:href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps?search=freebsd&page=1">Microsoft
 	    Azure Marketplace</link> ¤ª¤è¤Ó <link
-	    xlink:href="https://console.cloud.google.com/launcher/details/freebsd-cloud/freebsd-11">Google
+	    xlink:href="https://console.cloud.google.com/marketplace/details/freebsd-cloud/freebsd-12">Google
 	    Cloud Platform</link>
 	  ¤Ë¤ª¤¤¤Æ¡¢
 	  ¤½¤ì¤¾¤ì¤Î¥Û¥¹¥Æ¥£¥ó¥°¥µ¡¼¥Ó¥¹¤Ç¼Â¹Ô²Äǽ¤Ê²¾ÁÛ¥Þ¥·¥ó¥¤¥á¡¼¥¸¤òÍøÍѤǤ­¤Þ¤¹¡£
@@ -250,8 +250,8 @@
 	    <acronym>PAE</acronym> µ¡Ç½¤òÍ­¸ú¤Ë¤·¤¿¥«¡¼¥Í¥ë¤Ç¤Ï¡¢
 	    4 ¥®¥¬¥Ð¥¤¥È°Ê¾å¤Î¥á¥â¥ê¤òǧ¼±¤·¡¢¥·¥¹¥Æ¥à¤¬ÍøÍѤǤ­¤Þ¤¹¡£
 	    ¤·¤«¤·¤Ê¤¬¤é¡¢<acronym>PAE</acronym> ¤ò»È¤¦¤È¡¢
-	    ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤ä &os; ¤Î¾¤Îµ¡Ç½¤ËÀ©¸Â¤ò²Ý¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-	    ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï &man.pae.4; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤ä &os;
+	    ¤Î¾¤Îµ¡Ç½¤ËÀ©¸Â¤ò²Ý¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -343,14 +343,6 @@
 	  1 ¤Ä¤Î¥Ç¥£¥¹¥¯¤Ë 128 ¸Ä¤Þ¤Ç¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎºîÀ®¤¬²Äǽ¤Ç¤¢¤ê¡¢
 	  ÏÀÍý¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
 
-	<warning>
-	  <para>&windows; XP ¤Î¤è¤¦¤Ê¸Å¤¤¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ï¡¢
-	    <acronym>GPT</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È¸ß´¹À­¤¬¤¢¤ê¤Þ¤»¤ó¡£
-	    &os; ¤ò¤³¤Î¤è¤¦¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤È¥Ç¥£¥¹¥¯¾å¤Ç¶¦Â¸¤µ¤»¤ë¾ì¹ç¤Ë¤Ï¡¢
-	    <acronym>MBR</acronym>
-	    ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
-	</warning>
-
 	<para>&os; ¤Î¥Ö¡¼¥È¥í¡¼¥À¤Ï¡¢¥×¥é¥¤¥Þ¥ê¤Þ¤¿¤Ï
 	  <acronym>GPT</acronym> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¤É¤Á¤é¤«¤òɬÍפȤ·¤Þ¤¹¡£
 	  ¥Ç¥£¥¹¥¯¾å¤Î¥×¥é¥¤¥Þ¥ê¡¢¤â¤·¤¯¤Ï
@@ -437,7 +429,7 @@
 	  ȯÀ¸¤·¤¿¥Ð¥°¤¬¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	  ¤³¤ì¤é¤ÎÌäÂê¤Ïȯ¸«¤µ¤ì²ò·è¤µ¤ì¤ë¤È¡¢
 	  &os; ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î &os; Errata (<link
-	    xlink:href="&url.base;/releases/&rel.current;R/errata.html">https://www.freebsd.org/releases/&rel.current;R/errata.html</link>)
+	    xlink:href="&url.base;/releases/&rel121.current;R/errata.html">https://www.freebsd.org/releases/&rel121.current;R/errata.html</link>)
 	  ¤Ëµ­ºÜ¤µ¤ì¤Þ¤¹¡£
 	  ¥¤¥ó¥¹¥È¡¼¥ë¤Ë±Æ¶Á¤¹¤ë¤è¤¦¤Ê´ûÃΤÎÌäÂ̵꤬¤¤¤³¤È¤ò¡¢
 	  ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë Errata ¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -467,8 +459,8 @@
 	³Æ¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢&os;
 	¤Î¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤ª¤è¤Ó¥¢¡¼¥­¥Æ¥¯¥Á¥ã¡¢¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤«¤é¤Ê¤ê¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢&arch.amd64; ¥·¥¹¥Æ¥à¤Ë <acronym>DVD</acronym> ¤«¤é
-	&os; 10.2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	<filename>FreeBSD-10.2-RELEASE-amd64-dvd1.iso</filename>
+	&os; 12.1 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	<filename>FreeBSD-12.1-RELEASE-amd64-dvd1.iso</filename>
 	¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢¥Õ¥¡¥¤¥ë¤ò <acronym>DVD</acronym>
 	¤Ë¾Æ¤­¡¢<acronym>DVD</acronym>
 	¤òÁÞÆþ¤·¤Æ¤«¤é¥·¥¹¥Æ¥à¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -595,7 +587,7 @@
 	      &os; ¥·¥¹¥Æ¥à¤ÎºÇ½é¤Î
 	      <acronym>USB</acronym> ¥Ç¥Ð¥¤¥¹¤Ë½ñ¤­¹þ¤ß¤Þ¤¹¡£</para>
 
-	    <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.2-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1M conv=sync</userinput></screen>
+	    <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-12.1-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1M conv=sync</userinput></screen>
 
 	    <para>¤â¤·¾åµ­¤Î¥³¥Þ¥ó¥É¤Ë¼ºÇÔ¤¹¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢
 	      <acronym>USB</acronym> ¥¹¥Æ¥£¥Ã¥¯¤¬¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ä¡¢
@@ -2344,7 +2336,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
-      <para>Ìð°õ¥­¡¼¤ò»È¤Ã¤ÆŬÀڤʻþ¹ï¤òÁªÂò¤·¤¿¤é¡¢
+      <para>Ìð°õ¥­¡¼¤ò»È¤Ã¤ÆŬÀڤʻþ¹ï¤ËÀßÄꤷ¤¿¤é¡¢
 	<guibutton>[ Set Time ]</guibutton>
 	¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£
 	<guibutton>[ Skip ]</guibutton>