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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu Feb 13 13:07:16 2020
New Revision: 53889
URL: https://svnweb.freebsd.org/changeset/doc/53889

Log:
  - Merge the following from the English version:
  
  	r53792 -> r53879	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 Feb 13 01:38:57 2020	(r53888)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Feb 13 13:07:16 2020	(r53889)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r53792
+     Original revision: r53879
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1625,11 +1625,6 @@ hald_enable="YES"</programlisting>
       <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde5</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <indexterm>
-	<primary>KDE</primary>
-	<secondary>¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã</secondary>
-      </indexterm>
-
       <para><application>KDE</application> ¤Ç¤Ï¡¢
 	<filename>/proc</filename>
 	¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
@@ -1650,6 +1645,11 @@ hald_enable="YES"</programlisting>
       <programlisting>dbus_enable="YES"
 hald_enable="YES"</programlisting>
 
+      <indexterm>
+	<primary>KDE</primary>
+	<secondary>¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã</secondary>
+      </indexterm>
+
       <para>KDE Plasma 5 ¤«¤é KDE ¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
 	<application>KDM</application> ¤Î³«È¯¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£
 	¤«¤ï¤ê¤Ë¿ä¾©¤µ¤ì¤Æ¤¤¤ë¤Î¤¬ <application>SDDM</application> ¤Ç¤¹¡£
@@ -1662,21 +1662,21 @@ hald_enable="YES"</programlisting>
 
       <programlisting>sddm_enable="YES"</programlisting>
 
-      <para><application>KDE</application> ¤òµ¯Æ°¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
+      <para><application>KDE Plasma</application> ¤òµ¯Æ°¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
 	¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é <command>startx</command> ¤ò¼Â¹Ô¤¹¤ëÊýË¡¤Ç¤¹¡£
 	¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢<filename>~/.xinitrc</filename>
 	¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>exec ck-launch-session startplasma-x11</programlisting>
 
-      <para><application>KDE</application> ¤òµ¯Æ°¤¹¤ë 3 ¤Ä¤á¤ÎÊýË¡¤Ï¡¢
+      <para><application>KDE Plasma</application> ¤òµ¯Æ°¤¹¤ë 3 ¤Ä¤á¤ÎÊýË¡¤Ï¡¢
 	<application>XDM</application> ¤òÍøÍѤ¹¤ëÊýË¡¤Ç¤¹¡£
 	¤³¤ÎÊýË¡¤ò»È¤¦¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¼Â¹Ô²Äǽ¤Ê
 	<filename>~/.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "exec ck-launch-session startkde" > ~/.xsession</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec ck-launch-session startplasma-x11" > ~/.xsession</userinput></screen>
 
-      <para><application>KDE</application> ¤òµ¯Æ°¤·¤¿¸å¤Ï¡¢
+      <para><application>KDE Plasma</application> ¤òµ¯Æ°¤·¤¿¸å¤Ï¡¢
 	¥Ó¥ë¥È¥¤¥ó¥Ø¥ë¥×¥·¥¹¥Æ¥à¤«¤é¡¢
 	¤µ¤Þ¤¶¤Þ¤Ê¥á¥Ë¥å¡¼¤ª¤è¤Ó¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î»ÈÍÑÊýË¡¤Ê¤É¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤ò»²¾È¤Ç¤­¤Þ¤¹¡£</para>
     </sect2>
@@ -1942,7 +1942,7 @@ emerald --replace &</programlisting>
     </sect2>
   </sect1>
 
-  <sect1 xml:id="x11-understanding">
+  <sect1 xml:id="x11-troubleshooting">
 
     <title>¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</title>