svn commit: r46082 - head/ja_JP.eucJP/books/handbook/desktop

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Dec 10 11:31:33 2014
New Revision: 46082
URL: https://svnweb.freebsd.org/changeset/doc/46082

Log:
  - Merge the following from the English version:
  
  	r45818 -> r46081	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Dec 10 11:28:08 2014	(r46081)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Dec 10 11:31:33 2014	(r46082)
@@ -3,10 +3,12 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r45818
+     Original revision: r46081
      $FreeBSD$
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="desktop">
   <!--
   <chapterinfo>
     <authorgroup>
@@ -233,29 +235,21 @@
 
       <procedure>
 	<step>
-	  <para><package>www/nspluginwrapper</package>
-	    port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  <para>port ¤«¤é <package role="port">www/nspluginwrapper</package>
+	    ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Î¤¿¤á package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£
-	    ¤³¤Î port ¤Ï¡¢<package>emulators/linux_base-f10</package>
-	    ¤È¤¤¤¦Â礭¤Ê port ¤òɬÍפȤ·¤Þ¤¹¡£</para>
+	    ¤³¤Î port ¤Ï¡¢<package>emulators/linux_base-c6</package>
+	    ¤òɬÍפȤ·¤Þ¤¹¡£</para>
 	</step>
 
 	<step>
-	  <para><package>www/linux-f10-flashplugin11</package>
-	    port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  <para>port ¤«¤é <package
+	      role="port">www/linux-c6-flashplugin11</package>
+	    ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê¡¢package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£</para>
 	</step>
 
 	<step>
-	  <screen>&prompt.root; <userinput>ln -s /usr/local/lib/browser_plugins/linux-f10-flashplugin/libflashplayer.so \
-  /usr/local/lib/browser_plugins/</userinput></screen>
-
-	  <para>
-	    <filename>/usr/local/lib/browser_plugins</filename>
-	    ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	</step>
-
-	<step>
 	  <para>¥×¥é¥°¥¤¥ó¤òºÇ½é¤Ë»È¤¦Á°¤Ë¡¢
 	    ¥æ¡¼¥¶¤´¤È¤Ë°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
@@ -335,15 +329,15 @@
 	<literal>linux-opera</literal> ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	¤Þ¤º <package>www/linux-f10-flashplugin11</package> port
+	¤Þ¤º <package role="port">www/linux-c6-flashplugin11</package> port
 	¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	package ¤Ï¡¢¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤êÍøÍѤǤ­¤Þ¤»¤ó¡£
-	¤½¤Î¸å¡¢<package>www/opera-linuxplugins</package> port
-	¤â¤·¤¯¤Ï package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£
+	¤½¤Î¸å¡¢<package role="port">www/opera-linuxplugins</package>
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	°Ê²¼¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
 	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-c6-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
 &prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>