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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Mon Jan 4 13:43:06 UTC 2016


Author: ryusuke
Date: Mon Jan  4 13:43:05 2016
New Revision: 47950
URL: https://svnweb.freebsd.org/changeset/doc/47950

Log:
  - Merge the following from the English version:
  
  	r44701 -> r44738	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 Jan  4 13:39:02 2016	(r47949)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Mon Jan  4 13:43:05 2016	(r47950)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44701
+     Original revision: r44738
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="x11">
@@ -457,8 +457,7 @@ dbus_enable="YES"</programlisting>
 	¤µ¤é¤Ë¡¢<application>&xorg;</application>
 	¤Ï´Êñ¤Ë &truetype; ¥Õ¥©¥ó¥È¤ò»È¤¦¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
 	¾Ü¤·¤¯¤Ï¡¢&man.X.7; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤«
-	<link linkend="truetype">&truetype; ¥Õ¥©¥ó¥È¤ÎÀá</link>
-	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<xref linkend="truetype"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>¾åµ­¤Î Type1 ¥Õ¥©¥ó¥È¥³¥ì¥¯¥·¥ç¥ó¤ò Ports Collection
 	¤«¤éÆþ¤ì¤ë¾ì¹ç¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -489,8 +488,7 @@ dbus_enable="YES"</programlisting>
 	»°ÈÖÌܤÎÊýË¡¤Ï¿·¤·¤¤
 	<filename>/usr/local/etc/fonts/local.conf</filename>
 	¥Õ¥¡¥¤¥ë¤ò»È¤¦¤³¤È¤Ç¤¹¡£
-	¤³¤ì¤Ë´Ø¤·¤Æ¤Ï <link linkend="antialias">¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹</link>
-	Àá¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	¤³¤ì¤Ë´Ø¤·¤Æ¤Ï <xref linkend="antialias"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2 xml:id="truetype">
@@ -536,8 +534,7 @@ dbus_enable="YES"</programlisting>
 
       <para>¼¡¤Ë &truetype;
 	¥Õ¥©¥ó¥È¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥Õ¥©¥ó¥È¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£
-	¾å¤Î <link linkend="type1">Type1</link>
-	¥Õ¥©¥ó¥È¤Î¾ì¹ç¤ÈƱ¤¸¤è¤¦¤Ë¡¢</para>
+	<xref linkend="type1"/> ¤Î¾ì¹ç¤ÈƱ¤¸¤è¤¦¤Ë¡¢</para>
 
       <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
@@ -1001,147 +998,115 @@ DisplayManager.requestPort:     0</scree
   </sect1>
 
   <sect1 xml:id="x11-wm">
-    <info><title>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</title>
-      <!--<authorgroup>
-	<author><personname><firstname>Valentino</firstname><surname>Vaschetto</surname></personname><contrib>´ó¹Æ (2001 ǯ 6 ·î): </contrib></author>
-      </authorgroup>-->
-    </info>
+    <info>
+    <title>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</title>
 
-    
+      <authorgroup>
+	<author>
+	  <personname>
+	    <firstname>Valentino</firstname>
+	    <surname>Vaschetto</surname>
+	  </personname>
+	  <!--
+	  <contrib>´ó¹Æ (2001 ǯ 6 ·î): </contrib> -->
+	</author>
+      </authorgroup>
+    </info>
 
-    <para>¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢FreeBSD ¾å¤Î X
-      ¤ÇÍøÍѲÄǽ¤Ê¤¤¤¯¤Ä¤«¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
-      <quote>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</quote> ¤È¤Ï¡¢
-      ñ¤Ê¤ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤«¤é <application>KDE</application>
-      ¤ä <application>GNOME</application>
-      ¤È¤¤¤Ã¤¿¤è¤¦¤Ê´°Á´¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¹¥¤¡¼¥È¤Þ¤Ç¥«¥Ð¡¼¤·¤Þ¤¹¡£</para>
+    <para>¤³¤ÎÀá¤Ç¤Ï¡¢Îɤ¯»È¤ï¤ì¤Æ¤¤¤ë 3 ¤Ä¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ò
+      &os; ¾å¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
+      ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤Ï¡¢
+      ñ¤Ê¤ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤«¤é´°Á´¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¹¥¤¡¼¥È¤Þ¤Ç¥«¥Ð¡¼¤·¤Þ¤¹¡£
+      Ports Collection ¤Î <filename>x11-wm</filename> ¥«¥Æ¥´¥ê¤Ë¤Ï¡¢
+      100 ¤òĶ¤¨¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <sect2 xml:id="x11-wm-gnome">
       <title>GNOME</title>
 
-      <sect3 xml:id="x11-wm-gnome-about">
-	<title>GNOME ¤Ë¤Ä¤¤¤Æ</title>
-
 	<indexterm><primary>GNOME</primary></indexterm>
 	<para><application>GNOME</application>
-	  ¤Ï¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¡¢
-	  ¥æ¡¼¥¶¤Ï¥³¥ó¥Ô¥å¡¼¥¿¤ò´Êñ¤Ë»È¤Ã¤¿¤êÀßÄꤷ¤¿¤ê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-	  <application>GNOME</application> ¤Ë¤Ï¥Ñ¥Í¥ë
-	  (¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òµ¯Æ°¤·¤¿¤ê¾õÂÖ¤òɽ¼¨¤·¤¿¤ê¤¹¤ë¤â¤Î)¡¢
-	  ¥Ç¥¹¥¯¥È¥Ã¥× (¥Ç¡¼¥¿¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÃÖ¤«¤ì¤ë¾ì½ê)¡¢
-	  ɸ½àŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥Ä¡¼¥ë¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥»¥Ã¥È¡¢
+	  ¤Ï¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¤¹¡£
+	  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òµ¯Æ°¤·¤¿¤ê¥¹¥Æ¡¼¥¿¥¹¤òɽ¼¨¤¹¤ë¥Ñ¥Í¥ë¡¢
+	  ¥Ç¥¹¥¯¥È¥Ã¥×¡¢¥Ä¡¼¥ë¤ª¤è¤Ó¥¢¥×¥ê¥±¡¼¥·¥ç¥ó·²¡¢
 	  ¤½¤·¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¸ß¤¤¤Ë¤¦¤Þ¤¯¤ä¤ê¼è¤ê¤Ç¤­¤ë¤è¤¦¤Ê»ÅÁȤߤ¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	  ¾¤Î OS ¤ä´Ä¶­¤Ë´·¤ì¤Æ¤¤¤ë¿Í¤Ç¤â
-	  <application>GNOME</application>
-	  ¤ÎÄ󶡤¹¤ë¥°¥é¥Õ¥£¥Ã¥¯´Ä¶­¤Ç¤¢¤ì¤Ð¿´ÃϤ褯´¶¤¸¤ë¤Ç¤·¤ç¤¦¡£
-	  FreeBSD ¾å¤Î <application>GNOME</application>
-	  ¤Ë´Ø¤¹¤ë¤â¤Ã¤È¾Ü¤·¤¤¾ðÊó¤Ï¡¢
-	  <link xlink:href="http://www.FreeBSD.org/gnome">FreeBSD GNOME
-	    Project</link> ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Ç¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	  ¥¦¥§¥Ö¥µ¥¤¥È¤Ë¤Ï¡¢<application>GNOME</application>
-	  ¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ÀßÄê¡¢´ÉÍý¤Ë´Ø¤¹¤ëÈó¾ï¤Ëʬ¤«¤ê¤ä¤¹¤¤ FAQ
-	  ¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-      </sect3>
-
-      <sect3 xml:id="x11-wm-gnome-install">
-	<title>GNOME ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
+	  &os; ¾å¤Î <application>GNOME</application>
+	  ¤Ë´Ø¤¹¤ë¤â¤Ã¤È¾Ü¤·¤¤¾ðÊó¤Ï¡¢<link
+	    xlink:href="http://www.FreeBSD.org/gnome">http://www.FreeBSD.org/gnome</link>
+	  ¤Ç¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	  ¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Ë¤Ï¡¢&os; ¤Ç¤Î <application>GNOME</application>
+	  ¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ÀßÄê¡¢
+	  ´ÉÍý¤Ë´Ø¤¹¤ë¿¤¯¤Î¾ðÊ󤬤¢¤ê¤Þ¤¹¡£</para>
 
-	<para>package ¤ä Ports Collection
-	  ¤òÍøÍѤ·¤Æ¥½¥Õ¥È¥¦¥§¥¢¤ò´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
-	<para><application>GNOME</application> package
-	  ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>¤³¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ï¡¢package
+	  ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
-	<para><application>GNOME</application> ¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¾ì¹ç¡¢
-	  ¼¡¤Î¤è¤¦¤Ë ports ¥Ä¥ê¡¼¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
+	<para>ports ¤«¤é <application>GNOME</application>
+	  ¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
         <para><application>GNOME</application> ¤òŬÀÚ¤ËÆ°ºî¤µ¤»¤ë¤Ë¤Ï¡¢
-          <filename>/proc</filename> ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-          °Ê²¼¤ò <filename>/etc/fstab</filename> ¤ËÄɲ䷤ơ¢µ¯Æ°Ãæ¤Ë
-          &man.procfs.5; ¤ò¥Þ¥¦¥ó¥È¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+          <filename>/proc</filename>
+	  ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	  °Ê²¼¤ò <filename>/etc/fstab</filename> ¤ËÄɲ䷤ơ¢
+	  ¥·¥¹¥Æ¥à¤Îµ¯Æ°Ãæ¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 
         <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
-	<para><application>GNOME</application> ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤¿¤é¡¢
-	  ¥Ç¥Õ¥©¥ë¥È¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤ÎÂå¤ï¤ê¤Ë
+	<para><application>GNOME</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤¿¤é¡¢
 	  <application>GNOME</application> ¤òµ¯Æ°¤¹¤ë¤è¤¦¤Ë
-	  X ¥µ¡¼¥Ð¤Ë»Ø¼¨¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
-
-	<para><application>GNOME</application>
-	  ¤òµ¯Æ°¤¹¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
+	  <application>&xorg;</application> ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	  ºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
 	  <application>GDM</application> ¤ò»È¤¦¤³¤È¤Ç¤¹¡£
 	  <application>GDM</application> ¤Ï¡¢
-	  <application>GNOME</application>
-	  ¥Ç¥¹¥¯¥È¥Ã¥×¤Î°ìÉô¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¤¬¡¢
-	  ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+	  <application>GNOME</application> package ¤Þ¤¿¤Ï port
+	  ¤Î°ìÉô¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
 	  Í­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤ò <filename>/etc/rc.conf</filename>
 	  ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
         <programlisting>gdm_enable="YES"</programlisting>
 
-	<para>ºÆµ¯Æ°¤¹¤ë¤È¡¢<application>GDM</application>
-	  ¤¬¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹¡£</para>
-
 	<para><application>GNOME</application> ¤Î¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ó¥¹¤ò¡¢
-	  <application>GDM</application> ¤È¤È¤â¤Ëµ¯Æ°¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
+	  µ¯Æ°¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
 	  ¤³¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤ò <filename>/etc/rc.conf</filename>
-	  ¥Õ¥¡¥¤¥ë¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	  ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	<programlisting>gnome_enable="YES"</programlisting>
 
-	<para><application>GNOME</application> ¤Ï
+	<para>¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ë¤È¡¢<application>GDM</application>
+	  ¤¬¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹¡£</para>
+
+	<para><application>GNOME</application> ¤òµ¯Æ°¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
+	  <filename>.xinitrc</filename>
+	  ¤òŬÀÚ¤ËÀßÄꤷ¤¿¸å¤Ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é
+	  <command>startx</command> ¤ÈÆþÎϤ¹¤ëÊýË¡¤Ç¤¹¡£
 	  <filename>.xinitrc</filename>
-	  ¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òŬÀÚ¤ËÀßÄꤹ¤ë¤³¤È¤Ç¡¢
-	  ¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éµ¯Æ°¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-	  ¼«Ê¬¤Î <filename>.xinitrc</filename>
 	  ¤¬´û¤Ë¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òµ¯Æ°¤¹¤ë¹Ô¤ò
-	  <application>/usr/local/bin/gnome-session</application>
-	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤ËÊѹ¹¤¹¤ë¤À¤±¤Ç¤¹¡£
-	  Æäˤ³¤Î¥Õ¥¡¥¤¥ë¤òÍÑ°Õ¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	  ¼¡¤Î¤è¤¦¤Ë¤¹¤ì¤Ð½½Ê¬¤Ç¤·¤ç¤¦¡£</para>
+	  <filename>/usr/local/bin/gnome-session</filename>
+	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¤³¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤±¤ì¤Ð¡¢
+	  ¼¡¤Î¥³¥Þ¥ó¥É¤ÇºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.user; <userinput>echo "/usr/local/bin/gnome-session" > ~/.xinitrc</userinput></screen>
 
-	<para>¼¡¤Ë¡¢<command>startx</command> ¤ÈÆþÎϤ¹¤ì¤Ð
-	  <application>GNOME</application>
-	  ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤¬µ¯Æ°¤·¤Þ¤¹¡£</para>
-
-	<note>
-	  <para>¤â¤· <application>XDM</application>
-	    ¤Î¤è¤¦¤Ê¸Å¤¤¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¤¤¤ë¤Ê¤é¡¢
-	    ¤³¤ÎÊýË¡¤Ç¤Ï¤¦¤Þ¤¯¤¤¤­¤Þ¤»¤ó¡£¤½¤ÎÂå¤ï¤ê¡¢¼Â¹Ô²Äǽ¤Ê
-	    <filename>.xsession</filename> ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¡¢
-	    Ʊ¤¸¥³¥Þ¥ó¥É¤òµ¯Æ°¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-	    ¤½¤Î¤¿¤á¤Ë¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤ò
-	    <application>/usr/local/bin/gnome-session</application>
-	    ¤ÇÃÖ¤­´¹¤¨¤Þ¤¹¡£</para>
-	</note>
+	  <para>3 ¤Ä¤á¤ÎÊýË¡¤Ï¡¢<application>XDM</application>
+	    ¤ò¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤È¤·¤Æ»È¤¦ÊýË¡¤Ç¤¹¡£
+	    ¤³¤Î¾ì¹ç¤Ï¡¢¼Â¹Ô²Äǽ¤Ê
+	    <filename>.xsession</filename>
+	    ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/bin/gnome-session" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
-
-	<para>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
-	  ¥í¥°¥¤¥ó»þ¤Ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ë¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÀßÄꤹ¤ë¤³¤È¤Ç¤¹¡£
-	  <link linkend="x11-wm-kde-details">KDE
-	  ¤Î¾ÜºÙ</link>¤Ë¤Ä¤¤¤Æ¤Î¥»¥¯¥·¥ç¥ó¤Ç
-	  <application>KDE</application> ¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ç¤¢¤ë
-	  <application>KDM</application>
-	  ¤ò»È¤Ã¤Æ¤É¤Î¤è¤¦¤Ë¤¹¤ì¤Ð¤¤¤¤¤Î¤«¤ò²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="x11-wm-kde">
       <title>KDE</title>
 
       <indexterm><primary>KDE</primary></indexterm>
-      <sect3 xml:id="x11-wm-kde-about">
-	<title>KDE ¤Ë¤Ä¤¤¤Æ</title>
 
 	<para><application>KDE</application>
 	  ¤ÏºÇ¶á¤Î´Êñ¤Ë»È¤¨¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¤¹¡£
@@ -1199,10 +1164,6 @@ DisplayManager.requestPort:     0</scree
 	  FreeBSD ÆÃÍ­¤Î¾ðÊó¤È¥ê¥½¡¼¥¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	  <link xlink:href="http://freebsd.kde.org/">KDE/FreeBSD
 	    initiative</link> ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-      </sect3>
-
-      <sect3 xml:id="x11-wm-kde-install">
-	<title>KDE ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
 
 	<para><application>GNOME</application>
 	  ¤ä¾¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¡¢
@@ -1244,11 +1205,6 @@ DisplayManager.requestPort:     0</scree
 	  <filename>.xsession</filename> ¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£
 	  <application>KDM</application>
 	  ÍѤÎÀâÌÀ¤Ï¤³¤Î¾Ï¤Î¸å¤Î¤Û¤¦¤Ë¤¢¤ê¤Þ¤¹¡£</para>
-      </sect3>
-    </sect2>
-
-    <sect2 xml:id="x11-wm-kde-details">
-      <title>KDE ¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ</title>
 
       <para>¤µ¤¡¡¢<application>KDE</application>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¤Ç¤­¤Þ¤·¤¿¡£
@@ -1294,9 +1250,6 @@ DisplayManager.requestPort:     0</scree
     <sect2 xml:id="x11-wm-xfce">
       <title>Xfce</title>
 
-      <sect3 xml:id="x11-wm-xfce-about">
-	<title>Xfce ¤Ë¤Ä¤¤¤Æ</title>
-
 	<para><application>Xfce</application> ¤Ï
 	  <application>GNOME</application> ¤Ç»È¤ï¤ì¤Æ¤¤¤ë
 	  GTK+ ¥Ä¡¼¥ë¥­¥Ã¥È¤ò¥Ù¡¼¥¹¤Ë¤·¤¿¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ç¤¹¤¬¡¢
@@ -1341,10 +1294,6 @@ DisplayManager.requestPort:     0</scree
 	<para><application>Xfce</application> ¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï
 	  <link xlink:href="http://www.xfce.org/">Xfce ¤Î¥¦¥§¥Ö¥µ¥¤¥È</link>
 	  ¤ÇÆÀ¤é¤ì¤Þ¤¹¡£</para>
-      </sect3>
-
-      <sect3 xml:id="x11-wm-xfce-install">
-	<title>Xfce ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
 
 	<para><application>Xfce</application>
 	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1367,15 +1316,12 @@ DisplayManager.requestPort:     0</scree
 	  ¤¬Î©¤Á¾å¤¬¤ê¤Þ¤¹¡£
 	  <application>XDM</application>
 	  ¤Î¤è¤¦¤Ê¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
-	  <link linkend="x11-wm-gnome">GNOME</link>
-	  ¤Î¥»¥¯¥·¥ç¥ó¤Ë½ñ¤¤¤Æ¤¢¤ë¤è¤¦¤Ë
-	  <filename>.xsession</filename> ¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¡¢
+	  <xref linkend="x11-wm-gnome"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤è¤¦¤Ë
+	  <filename>.xsession</filename> ¤òºîÀ®¤·¡¢
 	  <filename>/usr/local/bin/startxfce4</filename>
 	  ¤òµ¯Æ°¤¹¤ë¤è¤¦¤ËÄɲä·¤Þ¤¹¡£
-	  ¤Þ¤¿¤Ï <link linkend="x11-wm-kde-kdm">KDM</link>
-	  ¤Î¥»¥¯¥·¥ç¥ó¤Ë¤¢¤ë¤è¤¦¤Ë¡¢
+	  ¤Þ¤¿¤Ï <xref linkend="x11-wm-kde-kdm"/> ¤Ë¤¢¤ë¤è¤¦¤Ë¡¢
 	  ¥í¥°¥¤¥ó»þ¤Ë¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤«¤é¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </sect3>
     </sect2>
   </sect1>
 


More information about the svn-doc-all mailing list