svn commit: r47942 - head/ja_JP.eucJP/books/handbook/x11

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu Dec 31 12:32:14 2015
New Revision: 47942
URL: https://svnweb.freebsd.org/changeset/doc/47942

Log:
  - Merge the following from the English version:
  
  	r42925 -> r44701	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Dec 31 12:06:24 2015	(r47941)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Dec 31 12:32:14 2015	(r47942)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42925
+     Original revision: r44701
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="x11">
@@ -257,15 +257,7 @@
     </note>
 
     <para>package ¤«¤éľÀÜ <application>&xorg;</application>
-      ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-      <application>pkg_add</application> ¤òÍѤ¤¤Æ package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢
-      °Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <screen>&prompt.root; <userinput>pkg_add -r xorg</userinput></screen>
-
-    <para>¤«¤ï¤ê¤Ë <application>pkg</application>
-      ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-      °Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      ¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
     <screen>&prompt.root; <userinput>pkg install xorg</userinput></screen>
   </sect1>
@@ -1058,13 +1050,7 @@ DisplayManager.requestPort:     0</scree
 	  ¤òÍøÍѤ·¤Æ¥½¥Õ¥È¥¦¥§¥¢¤ò´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
 	<para><application>GNOME</application> package
-	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	  °Ê²¼¤Î¤è¤¦¤Ë¤¹¤ë¤À¤±¤Ç¤¹¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r gnome2</userinput></screen>
-
-	<para><application>pkgng</application> ¥æ¡¼¥¶¤Ï¡¢
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
@@ -1222,18 +1208,10 @@ DisplayManager.requestPort:     0</scree
 	  ¤ä¾¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¡¢
 	  package ¤ä Ports Collection ¤«¤é´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
-	<para><application>KDE 4</application> package
-	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
-
-        <screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
-
-	<para>&man.pkg.add.1;
-	  ¤Ï¼«Æ°Åª¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎºÇ¿·ÈǤò¼èÆÀ¤·¤Þ¤¹¡£</para>
+	<para><application>KDE4</application> package
+	  ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<para><application>pkgng</application> ¥æ¡¼¥¶¤Ï¡¢
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install x11/kde4</userinput></screen>
 
         <para><application>KDE</application>
 	  ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
@@ -1369,13 +1347,7 @@ DisplayManager.requestPort:     0</scree
 	<title>Xfce ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
 
 	<para><application>Xfce</application>
-	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	  ¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r xfce4</userinput></screen>
-
-	<para><application>pkgng</application> ¥æ¡¼¥¶¤Ï¡¢
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg install xfce4</userinput></screen>