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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu Jan 14 09:17:02 2016
New Revision: 48010
URL: https://svnweb.freebsd.org/changeset/doc/48010

Log:
  - Merge the following from the English version:
  
  	r46019 -> r46352	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 Jan 14 01:48:25 2016	(r48009)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Thu Jan 14 09:17:02 2016	(r48010)
@@ -3,10 +3,12 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46019
+     Original revision: r46352
      $FreeBSD$
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="x11">
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="x11">
   <info><title>X Window System</title>
     <!--<authorgroup>
       <author><personname><firstname>Ken</firstname><surname>Tom</surname></personname><contrib>X.Org X11 ¥µ¡¼¥ÐÂбþ: </contrib></author>
@@ -520,12 +522,12 @@ dbus_enable="YES"</programlisting>
 	X ¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë (<filename>/etc/X11/xorg.conf</filename>)
 	¤ÎŬÀڤʾì½ê¤Ë¼¡¤Î¤è¤¦¤Ê¹Ô¤ò²Ã¤¨¤Þ¤¹¡£</para>
 
-      <programlisting>FontPath "/usr/local/lib/X11/fonts/URW/"</programlisting>
+      <programlisting>FontPath "/usr/local/lib/X11/fonts/urwfonts/"</programlisting>
 
       <para>Ê̤ÎÊýË¡¤È¤·¤Æ¤Ï¡¢
 	X ¤Î¥»¥Ã¥·¥ç¥óÃæ¤Ë¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/URW</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/urwfonts</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>¤³¤ì¤ÏÆ°¤¯¤Î¤Ç¤¹¤¬¡¢X
@@ -592,9 +594,8 @@ dbus_enable="YES"</programlisting>
       <para>¤È¤¹¤ë¤«¡¢¤â¤·¤¯¤Ï <filename>xorg.conf</filename>
 	¥Õ¥¡¥¤¥ë¤Ë <literal>FontPath</literal> ¹Ô¤òÄɲä·¤Þ¤¹¡£</para>
 
-      <para>¤³¤ì¤Ç½ª¤ï¤ê¤Ç¤¹¡£
-	<application>Gimp</application> ¤ä
-	<application>Apache OpenOffice</application>
+      <para>¤³¤ì¤Ç <application>Gimp</application> ¤ä
+	<application>OpenOffice</application>
 	¤È¤¤¤Ã¤¿¤¹¤Ù¤Æ¤Î X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é
 	&truetype; ¥Õ¥©¥ó¥È¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	(¹â²òÁüÅ٤ʥǥ£¥¹¥×¥ì¥¤¤Ç¸«¤ë¥¦¥§¥Ö¥Ú¡¼¥¸¾å¤Î¥Æ¥­¥¹¥È¤ß¤¿¤¤¤Ê)
@@ -1134,7 +1135,7 @@ DisplayManager.requestPort:     0</scree
 	¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢<filename>~/.xinitrc</filename>
 	¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-      <programlisting>exec /usr/local/kde4/bin/startkde</programlisting>
+      <programlisting>exec /usr/local/bin/startkde</programlisting>
 
       <para><application>KDE</application> ¤òµ¯Æ°¤¹¤ë 3 ¤Ä¤á¤ÎÊýË¡¤Ï¡¢
 	<application>XDM</application> ¤òÍøÍѤ¹¤ëÊýË¡¤Ç¤¹¡£
@@ -1142,7 +1143,7 @@ DisplayManager.requestPort:     0</scree
 	<filename>~/.xsession</filename> ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
-&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" >> ~/.xsession</userinput>
+&prompt.user; <userinput>echo "exec /usr/local/bin/startkde" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
 
       <para><application>KDE</application> ¤òµ¯Æ°¤·¤¿¸å¤Ï¡¢
@@ -1267,7 +1268,7 @@ DisplayManager.requestPort:     0</scree
 
 	<para>
 	  <filename>/usr/local/share/X11/xkb/rules/base.lst</filename>
-	  ¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ÍøÍѲÄǽ¤Ê¥­¡¼¥Ü¡¼¥É¡¢
+	  ¤Ë¤Ï¡¢ÍøÍѲÄǽ¤Ê¥­¡¼¥Ü¡¼¥É¡¢
 	  ¥ì¥¤¥¢¥¦¥È¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤¬¤¢¤ê¤Þ¤¹¡£</para>
       </note>