From owner-svn-doc-all@freebsd.org  Mon Mar 21 09:02:15 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAE84AD6006;
 Mon, 21 Mar 2016 09:02:15 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F61F119;
 Mon, 21 Mar 2016 09:02:15 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2L92EJO098224;
 Mon, 21 Mar 2016 09:02:14 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L92Edi098223;
 Mon, 21 Mar 2016 09:02:14 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201603210902.u2L92Edi098223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 21 Mar 2016 09:02:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48448 - head/ja_JP.eucJP/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2016 09:02:16 -0000

Author: ryusuke
Date: Mon Mar 21 09:02:14 2016
New Revision: 48448
URL: https://svnweb.freebsd.org/changeset/doc/48448

Log:
  - Merge the following from the English version:
  
  	r36653 -> r38506	head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml	Mon Mar 21 08:45:30 2016	(r48447)
+++ head/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml	Mon Mar 21 09:02:14 2016	(r48448)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r36653
+     Original revision: r38506
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="linuxemu">
@@ -48,7 +48,6 @@
       <application>&netscape;</application>,
       <application>&adobe;&nbsp;&acrobat;</application>,
       <application>&realplayer;</application>,
-      <application><trademark>VMware</trademark></application>,
       <application>&oracle;</application>,
       <application>&wordperfect;</application>, <application>Doom</application>,
       <application>Quake</application> などがあります。
@@ -146,9 +145,7 @@ Id Refs Address    Size     Name
 	<indexterm><primary>Ports Collection</primary></indexterm>
 
 	<para>ランタイムライブラリをインストールするには最も簡単な方法です。
-	  <link
-	    xlink:href="file://localhost/usr/ports/">Ports Collection</link>
-	  から他の port
+	  <xref linkend="ports"/> から他の port
 	  をインストールするのと全く同じようにできます。</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base-f10</userinput>
@@ -934,7 +931,7 @@ exit 0</programlisting>
 	    <filename>$MATLAB/bin/finish.sh</filename>
 	    ファイルを作成してください。</para>
 
-	  <programlisting>#!/usr/compat/linux/bin/sh
+	  <programlisting>#!/compat/linux/bin/sh
 (sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>