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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sun Mar 22 08:33:02 2020
New Revision: 54007
URL: https://svnweb.freebsd.org/changeset/doc/54007

Log:
  - Merge the following from the English version:
  
  	r53893 -> r53920	head/ja_JP.eucJP/books/handbook/Makefile
  	r53893 -> r53920	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 Mar 21 20:55:05 2020	(r54006)
+++ head/ja_JP.eucJP/books/handbook/Makefile	Sun Mar 22 08:33:02 2020	(r54007)
@@ -3,7 +3,7 @@
 #
 # Build the FreeBSD Handbook (Japanese).
 #
-# Original revision: r53893
+# Original revision: r53920
 #
 
 # ------------------------------------------------------------------------
@@ -69,6 +69,7 @@ IMAGES_EN+= bsdinstall/bsdinstall-final-modification-s
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-10.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-loading.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-select-default.png
+IMAGES_EN+= bsdinstall/bsdinstall-keymap-testing.png
 IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sat Mar 21 20:55:05 2020	(r54006)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Sun Mar 22 08:33:02 2020	(r54007)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53893
+     Original revision: r53920
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -987,11 +987,11 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 
       <para>¤³¤Î¥×¥í¥»¥¹¤¬»Ï¤Þ¤ë¤È¡¢
 	<application>bsdinstall</application> ¤Ï <xref
-	  linkend="bsdinstall-keymap-loading"/> ¤Î¤è¤¦¤Ë
-	keymap ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£</para>
+	  linkend="bsdinstall-keymap-loading"/>
+	¤Î¤è¤¦¤Ë¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£</para>
 
       <figure xml:id="bsdinstall-keymap-loading">
-	<title>Keymap Loading</title>
+	<title>¥­¡¼¥Þ¥Ã¥×¤ÎÆɤ߹þ¤ß</title>
 
 	<mediaobject>
 	  <imageobject>
@@ -1001,64 +1001,40 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
-      <para>»ÈÍѤ·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Î¥³¥ó¥½¡¼¥ë¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢<xref
-	  linkend="bsdinstall-keymap-select-default"/>
-	¤Çɽ¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤¬ºÇ½é¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
+      <para>¥­¡¼¥Þ¥Ã¥×¤¬Æɤ߹þ¤Þ¤ì¤ë¤È¡¢bsdinstall ¤Ï
+	<xref linkend="bsdinstall-keymap-10"/> ¤òɽ¼¨¤·¤Þ¤¹¡£
+	¾å²¼¤ÎÌð°õ¥­¡¼¤ò»È¤Ã¤Æ¡¢
+	¥·¥¹¥Æ¥à¤Î¥­¡¼¥Ü¡¼¥É¤ËºÇ¤â¶á¤¤¥­¡¼¥Þ¥Ã¥×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+	ÁªÂò¤òÊݸ¤¹¤ë¤Ë¤Ï¡¢<keycap>Enter</keycap> ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <figure xml:id="bsdinstall-keymap-select-default">
-	<title>¥­¡¼¥Þ¥Ã¥×¤ÎÁªÂò</title>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata
-	      fileref="bsdinstall/bsdinstall-keymap-select-default"/>
-	  </imageobject>
-	</mediaobject>
-      </figure>
+      <figure xml:id="bsdinstall-keymap-10">
+	<title>¥­¡¼¥Þ¥Ã¥×ÁªÂò¥á¥Ë¥å¡¼</title>
 
-      <para>¥­¡¼¥Ü¡¼¥É¤Î¥ì¥¤¥¢¥¦¥È¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢
-	<guibutton>[ YES ]</guibutton> ¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¾õÂ֤ǡ¢
-	<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£<xref
-	  linkend="bsdinstall-config-keymap"/>
-	¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-	¥Ç¥Õ¥©¥ë¥È¤Î¥ì¥¤¥¢¥¦¥È¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¥«¡¼¥½¥ë¥­¡¼¤ò»È¤Ã¤Æ¡¢
-	<guibutton>[ NO ]</guibutton> ¤òÁªÂò¤·¡¢
-	<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¡¢
-	¤³¤Î¥á¥Ë¥å¡¼²èÌ̤ò¥¹¥­¥Ã¥×¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <figure xml:id="bsdinstall-config-keymap">
-	<title>¥­¡¼¥Ü¡¼¥É¥á¥Ë¥å¡¼¤ÎÁªÂò</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
-      <para>¥­¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢
-	¥·¥¹¥Æ¥à¤Î¥­¡¼¥Ü¡¼¥É¤ËºÇ¤â¶á¤¤¥­¡¼¥Þ¥Ã¥×¤ò¥«¡¼¥½¥ë¥­¡¼¤Î¾å²¼¥­¡¼¤Î¤ÇÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-	ÁªÂò¤òÊݸ¤¹¤ë¤Ë¤Ï¡¢<keycap>Enter</keycap> ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <note><para><keycap>Esc</keycap> ¤ò²¡¤¹¤È¡¢¥á¥Ë¥å¡¼¤Ï½ªÎ»¤·¡¢
+	¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥Ü¡¼¥É¥Þ¥Ã¥×¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+	¤É¤Î¥­¡¼¥Ü¡¼¥É¥Þ¥Ã¥×¤òÁª¤Ù¤Ð¤è¤¤¤«¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢
+	<guimenuitem>United States of America ISO-8859-1</guimenuitem>
+	¤òÁª¤Ö¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</para></note>
 
-      <note>
-	<para><keycap>Esc</keycap> ¤ò²¡¤¹¤È¡¢¥á¥Ë¥å¡¼¤ò½ªÎ»¤·¡¢
-	  ¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥Ü¡¼¥É¥Þ¥Ã¥×¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-	  ¤É¤Î¥­¡¼¥Ü¡¼¥É¥Þ¥Ã¥×¤òÁª¤Ù¤Ð¤è¤¤¤«¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	  <guimenuitem>United States of America ISO-8859-1</guimenuitem>
-	  ¤òÁª¤Ö¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
-      </note>
+      <para>¥Ç¥Õ¥©¥ë¥È¤È¤Ï°Û¤Ê¤ë¥­¡¼¥Þ¥Ã¥×¤òÁªÂò¤·¤¿¾ì¹ç¤Ë¤Ï¡¢
+	<xref linkend="bsdinstall-keymap-testing"/> ¤Ç
+	¥­¡¼¥Þ¥Ã¥×¤Î¥Æ¥¹¥È¤ò¹Ô¤¤¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤àÁ°¤ËÀµ¤·¤¯Æ°¤¯¤«¤É¤¦¤«¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>&os; 10.0-RELEASE °Ê¹ß¤Ç¤Ï¡¢¤³¤Î¥á¥Ë¥å¡¼¤¬³ÈÄ¥¤µ¤ì¤Þ¤·¤¿¡£
-	¥Ç¥Õ¥©¥ë¥È¤ÎÁªÂò¤È¶¦¤Ë¡¢¥­¡¼¥Þ¥Ã¥×¤Î¤¹¤Ù¤Æ¤ÎÁªÂò¹àÌܤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-	¥Ç¥Õ¥©¥ë¥È¤È¤Ï°Û¤Ê¤ë¥­¡¼¥Þ¥Ã¥×¤òÁªÂò¤·¤¿»þ¤Ë¤Ï¡¢
-	¥À¥¤¥¢¥í¥°¤¬É½¼¨¤µ¤ì¡¢¥¤¥ó¥¹¥È¡¼¥ë¤òÀè¤Ë¿Ê¤àÁ°¤Ë¡¢
-	¥æ¡¼¥¶¤¬¥­¡¼¥Þ¥Ã¥×¤Î¥Æ¥¹¥È¤ò¹Ô¤¤¡¢
-	Àµ¤·¤¯Æ°¤¯¤«¤É¤¦¤«¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
+      <figure xml:id="bsdinstall-keymap-testing">
+	<title>¥­¡¼¥Þ¥Ã¥×¥Æ¥¹¥È¥á¥Ë¥å¡¼</title>
 
-      <figure xml:id="bsdinstall-keymap-10">
-	<title>³ÈÄ¥¥­¡¼¥Þ¥Ã¥×¥á¥Ë¥å¡¼</title>
-
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-keymap-testing"/>
 	  </imageobject>
 	</mediaobject>
       </figure>