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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Fri Aug 23 00:29:13 2013
New Revision: 42572
URL: http://svnweb.freebsd.org/changeset/doc/42572

Log:
  - Merge the following from the English version:
  
  	r41343 -> r42571	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 Aug 22 21:33:53 2013	(r42571)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Fri Aug 23 00:29:13 2013	(r42572)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41343
+     Original revision: r42571
      $FreeBSD$
 -->
 
@@ -1587,15 +1587,6 @@ DisplayManager.requestPort:     0</scree
 	  FreeBSD ÆÃÍ­¤Î¾ðÊó¤È¥ê¥½¡¼¥¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	  <ulink url="http://freebsd.kde.org/">KDE/FreeBSD
 	    initiative</ulink> ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-	<para>FreeBSD ¤ÇÍøÍѤǤ­¤ë <application>KDE</application>
-	  ¤Ë¤Ï 2 ¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
-	  ¥Ð¡¼¥¸¥ç¥ó 3 ¤Ï¡¢Ä¹¤¤´Ö¹­¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
-	  ¸½ºß¤Ï¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤Æ¤ª¤é¤º¡¢ÉôʬŪ¤ËÉÔ°ÂÄê¤Ê¤È¤³¤í¤â¤¢¤ê¤Þ¤¹¤¬¡¢
-	  Ports Collection ¤ÇÍøÍѤǤ­¤Þ¤¹¡£
-	  ¥Ð¡¼¥¸¥ç¥ó 4 ¤ÏŬÀڤ˥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢
-	  <application>KDE</application> ¤Î¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
-	  ¤³¤ì¤é¤ò¶¦Â¸¤¹¤ë·Á¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
       </sect3>
 
       <sect3 id="x11-wm-kde-install">
@@ -1605,11 +1596,6 @@ DisplayManager.requestPort:     0</scree
 	  ¤ä¾¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¡¢
 	  package ¤ä Ports Collection ¤«¤é´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
-	<para><application>KDE 3</application> package
-	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen>
-
 	<para><application>KDE 4</application> package
 	  ¤ò¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
@@ -1618,29 +1604,29 @@ DisplayManager.requestPort:     0</scree
 	<para>&man.pkg.add.1;
 	  ¤Ï¼«Æ°Åª¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎºÇ¿·ÈǤò¼èÆÀ¤·¤Þ¤¹¡£</para>
 
-	<para><application>KDE 3</application>
-	  ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
+	<para><application>pkgng</application> ¥æ¡¼¥¶¤Ï¡¢
+	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde3</userinput>
-&prompt.root; <userinput>make install clean</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
 
-        <para><application>KDE 4</application>
+        <para><application>KDE</application>
 	  ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
 
         <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
+	<para>port ¤òºÇ½é¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Ë¤Ï¡¢
+	  ¥ª¥×¥·¥ç¥ó¤òÁªÂò¤¹¤ë¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+	  ¥Ç¥Õ¥©¥ë¥È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
+
+	<para><application>KDE 4</application> ¤ÏÂ礭¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¤¿¤á¡¢
+	  ¹â®¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤â¥³¥ó¥Ñ¥¤¥ë¤ËŤ¤»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£</para>
+
 	<para><application>KDE</application> ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤¿¤é
 	  X ¥µ¡¼¥Ð¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤ÎÂå¤ï¤ê¤Ë¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òΩ¤Á¾å¤²¤ë¤è¤¦¤Ë¶µ¤¨¤Þ¤¹¡£
 	  <filename>.xinitrc</filename>
 	  ¥Õ¥¡¥¤¥ë¤ò¼¡¤Î¤è¤¦¤ËÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£</para>
 
-	<para><application>KDE 3</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.user; <userinput>echo "exec startkde" > ~/.xinitrc</userinput></screen>
-
-	<para><application>KDE 4</application> ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
 	<screen>&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" > ~/.xinitrc</userinput></screen>
 
 	<para>¤µ¤¡¡¢¤³¤ì¤Ç <command>startx</command> ¤Ç¤¤¤Ä
@@ -1691,17 +1677,6 @@ DisplayManager.requestPort:     0</scree
 	  <application>GNOME</application> ¤Ê¤É)
 	  ¤ò´Êñ¤ËÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-	<para><application>KDM</application>
-	  ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢
-	  ÊÔ½¸¤¹¤ë¥Õ¥¡¥¤¥ë¤Ï¡¢<application>KDE</application>
-	  ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë°Í¸¤·¤Þ¤¹¡£</para>
-
-	<para><application>KDE 3</application> ¤Ç¤Ï¡¢
-	  <filename>/etc/ttys</filename> ¤Î¹àÌÜ
-	  <literal>ttyv8</literal> ¤ò°Ê²¼¤Î¤è¤¦¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	 <programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
-
 	<para><application>KDE 4</application> ¤Ç¤Ï¡¢
 	  &man.procfs.5; ¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	  <filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>