svn commit: r47960 - in head/ja_JP.eucJP/books/handbook: introduction x11

[Ryusuke SUZUKI]

Author: ryusuke
Date: Fri Jan  8 10:16:55 2016
New Revision: 47960
URL: https://svnweb.freebsd.org/changeset/doc/47960

Log:
  - Merge the following from the English version:
  
  	r47745 -> r47949	head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  	r44739 -> r44741	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Thu Jan  7 09:09:49 2016	(r47959)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Fri Jan  8 10:16:55 2016	(r47960)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r47745
+     Original revision: r47949
      $FreeBSD$
 -->
 

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Jan  7 09:09:49 2016	(r47959)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Fri Jan  8 10:16:55 2016	(r47960)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44739
+     Original revision: r44741
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="x11">
@@ -1007,8 +1007,8 @@ DisplayManager.requestPort:     0</scree
 	    <firstname>Valentino</firstname>
 	    <surname>Vaschetto</surname>
 	  </personname>
-	  <!--
-	  <contrib>´ó¹Æ (2001 ǯ 6 ·î): </contrib> -->
+	  <contrib>´ó¹Æ: </contrib>
+	   <!-- in June 2001 -->
 	</author>
       </authorgroup>
     </info>
@@ -1189,73 +1189,48 @@ DisplayManager.requestPort:     0</scree
 	<para><application>Xfce</application> ¤Ï
 	  <application>GNOME</application> ¤Ç»È¤ï¤ì¤Æ¤¤¤ë
 	  GTK+ ¥Ä¡¼¥ë¥­¥Ã¥È¤ò¥Ù¡¼¥¹¤Ë¤·¤¿¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¤¹¤¬¡¢
-	  ¤º¤Ã¤È·Ú¤¤¤Î¤Ç¡¢
-	  ¥·¥ó¥×¥ë¤Ç¸úΨŪ¤Ç¤¢¤ê¤Ê¤¬¤é»È¤¤¤ä¤¹¤¯ÀßÄ꤬´Êñ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òµá¤á¤ë¿Í¤Ë¸þ¤¤¤Æ¤¤¤Þ¤¹¡£
-	  ¸«¤¿¤á¤Ï¾¦ÍÑ &unix; ¥·¥¹¥Æ¥à¤¬ºÎÍѤ·¤Æ¤¤¤ë
-	  <application>CDE</application>
-	  ¤Ë¤«¤Ê¤ê»÷¤Æ¤¤¤Þ¤¹¡£<application>Xfce</application>
-	  ¤Îµ¡Ç½¤ò¤¤¤¯¤Ä¤«°Ê²¼¤Ëµó¤²¤Þ¤¹¡£</para>
+	  ¤è¤ê·ÚÎÌ¡¢
+	  ¥·¥ó¥×¥ë¤Ç¤«¤Ä¸úΨŪ¤Ç¤¢¤ê¤Ê¤¬¤é»È¤¤¤ä¤¹¤¤¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¤¹¡£
 
-	<itemizedlist>
-	  <listitem>
-	    <para>¥·¥ó¥×¥ë¤Ç»È¤¤¤ä¤¹¤¤¥Ç¥¹¥¯¥È¥Ã¥×</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>¥Þ¥¦¥¹¤Î¥É¥é¥Ã¥°¥¢¥ó¥É¥É¥í¥Ã¥×¤Ê¤É¤Ç¤¹¤Ù¤Æ¤ÎÀßÄ꤬²Äǽ</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><application>CDE</application>
-	      ¤Ë»÷¤¿¥á¥¤¥ó¥Ñ¥Í¥ë¤È¥á¥Ë¥å¡¼¤ä¥¢¥×¥ì¥Ã¥È¡¢
-	      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥é¥ó¥Á¥ã</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Åý¹ç¤µ¤ì¤¿¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¢¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¡¢
-	      ¥µ¥¦¥ó¥É¥Þ¥Í¡¼¥¸¥ã¤È <application>GNOME</application>
-	      ½àµò¤Î¥â¥¸¥å¡¼¥ë¤Ê¤É</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>(GTK+ ¤Ê¤Î¤Ç) ¥Æ¡¼¥Þ¤ò¥µ¥Ý¡¼¥È</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>®¤¯¤Æ·Ú¤¯¤Æ¸úΨŪ: ¸Å¤¤¥Þ¥·¥ó¤äÃÙ¤¤¥Þ¥·¥ó¡¢
-	      ¥á¥â¥ê¤Î¸Â¤é¤ì¤¿¥Þ¥·¥ó¤Ë¸þ¤¤¤Æ¤¤¤Þ¤¹</para>
-	  </listitem>
-	</itemizedlist>
-
-	<para><application>Xfce</application> ¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï
-	  <link xlink:href="http://www.xfce.org/">Xfce ¤Î¥¦¥§¥Ö¥µ¥¤¥È</link>
+	  ¤¹¤Ù¤Æ¤ÎÀßÄ꤬²Äǽ¤Ç¡¢
+	  ¥á¥Ë¥å¡¼¡¢¥¢¥×¥ì¥Ã¥È¤ª¤è¤Ó¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥é¥ó¥Á¥ã¤ò´Þ¤à¥á¥¤¥ó¥Ñ¥Í¥ë¡¢
+	  ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¡¢¥µ¥¦¥ó¥É¥Þ¥Í¡¼¥¸¥ã¤òÄ󶡤·¡¢
+	  ¥Æ¡¼¥Þ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	  ®¤¯¤Æ·Ú¤¯¡¢¸úΨŪ¤Ê¤¿¤á¡¢¸Å¤¤¥Þ¥·¥ó¤äÃÙ¤¤¥Þ¥·¥ó¡¢
+	  ¥á¥â¥ê¤Î¸Â¤é¤ì¤¿¥Þ¥·¥ó¤Ë¸þ¤¤¤Æ¤¤¤Þ¤¹¡£
+	  <application>Xfce</application> ¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï <link
+	    xlink:href="http://www.xfce.org/">http://www.xfce.org</link>
 	  ¤ÇÆÀ¤é¤ì¤Þ¤¹¡£</para>
 
-	<para><application>Xfce</application>
+	<para><application>Xfce</application> package
 	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg install xfce4</userinput></screen>
 
-	<para>¤Þ¤¿¡¢Ports Collection
-	  ¤òÍøÍѤ·¤Æ¥½¡¼¥¹¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£</para>
+	<para>¤Þ¤¿¡¢port ¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/xfce4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>¥¤¥ó¥¹¥È¡¼¥ë¸å¡¢¼¡²ó X ¤òµ¯Æ°¤·¤¿»þ¤Ë
-	  <application>Xfce</application> ¤¬Î©¤Á¾å¤¬¤ë¤è¤¦¤ËÀßÄꤷ¤Þ¤¹¡£
-	  ¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para><application>GNOME</application> ¤ä
+	  <application>KDE</application> ¤È¤Ï°Û¤Ê¤ê¡¢
+	  <application>Xfce</application> ¤Ï¡¢
+	  ¥í¥°¥¤¥ó¥Þ¥Í¡¼¥¸¥ã¤òÄ󶡤·¤Æ¤¤¤Þ¤»¤ó¡£
+	  ¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é <command>startx</command> ¤ò¼Â¹Ô¤·¤Æ
+	  <application>Xfce</application> ¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë <application>Xfce</application> ¤Î¥¨¥ó¥È¥ê¤ò
+	  <filename>~/.xinitrc</filename>
+	  ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" > ~/.xinitrc</userinput></screen>
 
-	<para>X ¤ò¼¡¤Ëµ¯Æ°¤¹¤ë¤È <application>Xfce</application>
-	  ¤¬Î©¤Á¾å¤¬¤ê¤Þ¤¹¡£
-	  <application>XDM</application>
-	  ¤Î¤è¤¦¤Ê¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
-	  <xref linkend="x11-wm-gnome"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤è¤¦¤Ë
-	  <filename>.xsession</filename> ¤òºîÀ®¤·¡¢
-	  <filename>/usr/local/bin/startxfce4</filename>
-	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤ËÄɲä·¤Þ¤¹¡£</para>
+	<para>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï <application>XDM</application>
+	  ¤òÍѤ¤¤ëÊýË¡¤Ç¤¹¡£¤³¤ÎÊýË¡¤ò»È¤¦¤Ë¤Ï¡¢
+	  ¼Â¹Ô²Äǽ¤Ê <filename>.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" >> ~/.xsession</userinput>
+&prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>
   </sect1>