svn commit: r53495 - in head/ja_JP.eucJP/books/handbook: . linuxemu x11

Ryusuke SUZUKI ryusuke at FreeBSD.org
Thu Oct 17 10:18:46 UTC 2019


Author: ryusuke
Date: Thu Oct 17 10:18:45 2019
New Revision: 53495
URL: https://svnweb.freebsd.org/changeset/doc/53495

Log:
  - Merge the following from the English version:
  
  	r53056 -> r53128	head/ja_JP.eucJP/books/handbook/book.xml
  	r53044 -> r53384	head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
  	r53007 -> r53418	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml
  head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
  head/ja_JP.eucJP/books/handbook/x11/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Thu Oct 17 10:10:01 2019	(r53494)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Thu Oct 17 10:18:45 2019	(r53495)
@@ -5,7 +5,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53056
+     Original revision: r53128
      $FreeBSD$
 -->
 

Modified: head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml	Thu Oct 17 10:10:01 2019	(r53494)
+++ head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml	Thu Oct 17 10:18:45 2019	(r53495)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53044
+     Original revision: r53384
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -706,8 +706,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXX
 	</step>
 
 	<step>
-	  <para>
-	   <application>&matlab;</application>
+	  <para><application>&matlab;</application>
 	    ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¤é¡¢
 	    <userinput>/compat/linux/usr/local/matlab</userinput>
 	    ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1258,7 +1257,7 @@ export PATH</programlisting>
     <para>&linux;
       ¥â¡¼¥É¤Ï¾õ¶·¤Ë±þ¤¸¤Æ<emphasis>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥àËÜÍè¤Î¥ë¡¼¥È¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤òÃÖ¤­´¹¤¨¤Æ</emphasis>¥Õ¥¡¥¤¥ë¤Î»²¾È¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
       ¤³¤ì¤Ï¡¢<option>union</option>
-      ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£
+      ¤ò»ØÄꤷ¤Æ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£
       ¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ëºÝ¤Ë¤Ï¤Þ¤º
       <filename>/compat/linux/original-path</filename>
       ¤òÄ´¤Ù¤Þ¤¹¡£¸«¤Ä¤±¤é¤ì¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¡¢

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Oct 17 10:10:01 2019	(r53494)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Oct 17 10:18:45 2019	(r53495)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53007
+     Original revision: r53418
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"


More information about the svn-doc-all mailing list