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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Sep 25 08:57:25 2018
New Revision: 52299
URL: https://svnweb.freebsd.org/changeset/doc/52299

Log:
  - Merge the following from the English version:
  
  	r51980 -> r52111	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	Mon Sep 24 16:15:17 2018	(r52298)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Tue Sep 25 08:57:25 2018	(r52299)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r51980
+     Original revision: r52111
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1550,9 +1550,7 @@ hald_enable="YES"</programlisting>
 	¤³¤Î¾ì¹ç¤Ï¡¢¼Â¹Ô²Äǽ¤Ê <filename>.xsession</filename>
 	¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/bin/gnome-session" >> ~/.xsession</userinput>
-&prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/gnome-session" > ~/.xsession</userinput></screen>
     </sect2>
 
     <sect2 xml:id="x11-wm-kde">
@@ -1635,9 +1633,7 @@ hald_enable="YES"</programlisting>
 	¤³¤ÎÊýË¡¤ò»È¤¦¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¼Â¹Ô²Äǽ¤Ê
 	<filename>~/.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/bin/startkde" >> ~/.xsession</userinput>
-&prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
+      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startkde" > ~/.xsession</userinput></screen>
 
       <para><application>KDE</application> ¤òµ¯Æ°¤·¤¿¸å¤Ï¡¢
 	¥Ó¥ë¥È¥¤¥ó¥Ø¥ë¥×¥·¥¹¥Æ¥à¤«¤é¡¢
@@ -1671,24 +1667,31 @@ hald_enable="YES"</programlisting>
       <screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/xfce4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
+      <para><application>Xfce</application> ¤Ï¡¢
+	¥á¥Ã¥»¡¼¥¸¥Ð¥¹¤Ë <application>D-Bus</application> ¤ò»È¤¤¤Þ¤¹¡£
+	¤³¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï <application>Xfce</application>
+	¤Î°Í¸¤È¤·¤Æ¼«Æ°Åª¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+	<filename>/etc/rc.conf</filename> ¤Ë¤ª¤¤¤Æ¡¢
+	¥·¥¹¥Æ¥àµ¯Æ°»þ¤Ëµ¯Æ°¤¹¤ë¤è¤¦¤ËÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <programlisting>dbus_enable="YES"</programlisting>
+
       <para><application>GNOME</application> ¤ä
 	<application>KDE</application> ¤È¤Ï°Û¤Ê¤ê¡¢
 	<application>Xfce</application> ¤Ï¡¢
 	¥í¥°¥¤¥ó¥Þ¥Í¡¼¥¸¥ã¤òÄ󶡤·¤Æ¤¤¤Þ¤»¤ó¡£
 	¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é <command>startx</command> ¤ò¼Â¹Ô¤·¤Æ
 	<application>Xfce</application> ¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¤è¤¦¤Ë <application>Xfce</application> ¤Î¥¨¥ó¥È¥ê¤ò
-	<filename>~/.xinitrc</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¡¢
+	<filename>~/.xinitrc</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" > ~/.xinitrc</userinput></screen>
+      <screen>&prompt.user; <userinput>echo ". /usr/local/etc/xdg/xfce4/xinitrc" > ~/.xinitrc</userinput></screen>
 
       <para>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï <application>XDM</application>
 	¤òÍѤ¤¤ëÊýË¡¤Ç¤¹¡£¤³¤ÎÊýË¡¤ò»È¤¦¤Ë¤Ï¡¢
 	¼Â¹Ô²Äǽ¤Ê <filename>.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" >> ~/.xsession</userinput>
-&prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
+      <screen>&prompt.user; <userinput>echo ". /usr/local/etc/xdg/xfce4/xinitrc" > ~/.xsession</userinput></screen>
     </sect2>
   </sect1>