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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu Feb 21 16:34:24 2013
New Revision: 41028
URL: http://svnweb.freebsd.org/changeset/doc/41028

Log:
  - Merge the following from the English version:
  
  	r39176 -> r41025	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 21 14:37:46 2013	(r41027)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Feb 21 16:34:24 2013	(r41028)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39176
+     Original revision: r41025
      $FreeBSD$
 -->
 
@@ -37,8 +37,7 @@
       &os; ¤Ë¤ª¤±¤ë¥Ç¥Õ¥©¥ë¥È¤«¤Ä¸ø¼°¤Î X11 ¥µ¡¼¥Ð¤Ï
       X.Org Foundation ¤¬³«È¯¤·¤Æ¤¤¤ë
       <application>&xorg;</application> ¤Ç¤¹¡£
-      &os; ¤Ë»÷¤¿¥é¥¤¥»¥ó¥¹¤Ë½¾¤Ã¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      &os; ÍѤξ¦ÍÑ X ¥µ¡¼¥Ð¤âÆþ¼ê¤Ç¤­¤Þ¤¹¡£</para>
+      &os; ¤Ë»÷¤¿¥é¥¤¥»¥ó¥¹¤Ë½¾¤Ã¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>X11 ¤¬¥µ¥Ý¡¼¥È¤¹¤ë¥Ó¥Ç¥ª¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤Ï¡¢
       <ulink url="http://www.x.org/">&xorg;</ulink>
@@ -124,7 +123,7 @@
 	½ÐÎÏÁõÃ֤Ȥ·¤Æ¥Ó¥Ç¥ª¥×¥í¥¸¥§¥¯¥¿¤òÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹)
 	¤ò¼è¤ê°·¤¤¤Þ¤¹¡£
 	³Æ X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (<application>XTerm</application> ¤ä
-	<application>&netscape;</application> ¤Ê¤É) ¤Ï
+	<application>Firefox</application> ¤Ê¤É) ¤Ï
 	<quote>¥¯¥é¥¤¥¢¥ó¥È</quote> ¤Ë¤Ê¤ê¤Þ¤¹¡£
 	¥¯¥é¥¤¥¢¥ó¥È¤Ï <quote>¤³¤ÎºÂɸ¤Ë¥¦¥£¥ó¥É¥¦¤òÉÁ¤¤¤Æ¤¯¤À¤µ¤¤</quote>
 	¤È¤¤¤Ã¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ð¤ØÁ÷¤ê¡¢¥µ¡¼¥Ð¤Ï
@@ -180,16 +179,8 @@
       <para>¤½¤ÎÂå¤ï¤ê¤Ë¡¢X
 	¤Ç¤Ï¤½¤¦¤¤¤Ã¤¿¤³¤È¤ò <quote>¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã</quote>
 	¤È¸Æ¤Ð¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËǤ¤»¤ë¤Î¤Ç¤¹¡£
-	X ÍѤΥ¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹¡£
-	<application>AfterStep</application>,
-	<application>Blackbox</application>,
-	<application>ctwm</application>,
-	<application>Enlightenment</application>,
-	<application>fvwm</application>,
-	<application>Sawfish</application>,
-	<application>twm</application>,
-	<application>Window Maker</application>
-	¤Ê¤É¤Ê¤É¡£
+	X ÍѤΠ<ulink
+	  url="http://xwinman.org/">¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï¤¿¤¯¤µ¤ó</ulink> ¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Î¸«¤¿Ìܤä»È¤¤¾¡¼ê¤Ï¤½¤ì¤¾¤ì°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
 	<quote>¥Ð¡¼¥Á¥ã¥ë¥Ç¥¹¥¯¥È¥Ã¥×</quote>
 	¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¤·¡¢
@@ -198,8 +189,7 @@
 	¥Ü¥¿¥ó¤ä¤½¤ì¤ËÎह¤ë¤â¤Î¤ò»ý¤Ã¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£
 	<quote>¥Æ¡¼¥Þ</quote> ¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
 	¿·¤·¤¤¥Æ¡¼¥Þ¤òŬÍѤ·¤Æ¸«¤¿Ìܤä»È¤¤¾¡¼ê¤ò´°Á´¤ËÊѤ¨¤é¤ì¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤é¤Î¡¢¤ª¤è¤Ó¤½¤Î¾¿¤¯¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï
-	Ports Collection ¤Î <filename>x11-wm</filename>
+	¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï Ports Collection ¤Î <filename>x11-wm</filename>
 	¤È¤¤¤¦¥«¥Æ¥´¥ê¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>¤µ¤é¤Ë¡¢<application>KDE</application> ¤ä
@@ -302,17 +292,9 @@
 
       <para>¤·¤¿¤¬¤Ã¤Æ¡¢X
 	¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¶¦Ä̤諤¿Ìܤä»È¤¤¾¡¼ê¤ò´üÂÔ¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-	MIT ¤Î¥ª¥ê¥¸¥Ê¥ë¤Î Athena ¥¦¥£¥¸¥§¥Ã¥È¤ä
-	<application>&motif;</application> (&microsoft.windows;
-	¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ï¤³¤ì¤ò´ð¤Ë¤·¤Æ¤ª¤ê¡¢
-	¼ÐÅ٤ΤĤ¤¤¿±ï¤È»°Êý¤Ë³¥¿§¤Î±¢±Æ¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹)¡¢
-	<application>OpenLook</application> ¤ò¤Ï¤¸¤á¤È¤·¤Æ
-	ͭ̾¤Ê¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ä¤½¤Î°¡¼ï¤¬²¿¼ïÎà¤â¤¢¤ê¤Þ¤¹¡£</para>
-
-      <para>Èæ³ÓŪ¿·¤·¤¤ X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¤Û¤È¤ó¤É¤¬¡¢
 	<application>KDE</application> ¤Ç»È¤ï¤ì¤Æ¤¤¤ë Qt ¤ä
 	<application>GNOME</application> ¥×¥í¥¸¥§¥¯¥È¤Ç»È¤ï¤ì¤Æ¤¤¤ë GTK+
-	¤Î¤É¤Á¤é¤«¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£
+	¤È¤¤¤Ã¤¿Í­Ì¾¤Ê¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ä¤½¤Î°¡¼ï¤¬²¿¼ïÎà¤â¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ï¥â¥À¥ó¤Ê¸«¤¿Ìܤò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ÎÅÀ¤Ç¸À¤¨¤Ð¡¢&unix; ¤Î¥ë¥Ã¥¯¥¢¥ó¥É¥Õ¥£¡¼¥ë¤Ï¼ýṲ́µ¤ì¤Æ¤­¤Æ¤ª¤ê¡¢
 	½é¿´¼Ô¤¬¤è¤ê´Êñ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤­¤Æ¤¤¤Þ¤¹¡£</para>
@@ -322,9 +304,8 @@
   <sect1 id="x-install">
     <title>X11 ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
 
-    <para>&os ¤Î¥Ç¥Õ¥©¥ë¥È¤Î X11 ¤Ï¡¢<application>&xorg;</application>
-      ¤Ç¤¹¡£
-      <application>&xorg;</application> ¤Ï  X.Org Foundation
+    <para>&os ¤Ë¤ª¤±¤ë X11 ¤Î¼ÂÁõ¤Ï¡¢<application>&xorg;</application> ¤Ç¤¹¡£
+      <application>&xorg;</application> ¤Ï X.Org Foundation
       ¤¬¥ê¥ê¡¼¥¹¤·¤Æ¤¤¤ë X Window System ¤Î¥ª¡¼¥×¥ó¥½¡¼¥¹¤Ê¼ÂÁõ¤Ç¤¹¡£
       <application>&xorg;</application> ¤Ï
       <application>&xfree86 4.4RC2</application>