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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sat Jan 23 16:03:16 2016
New Revision: 48081
URL: https://svnweb.freebsd.org/changeset/doc/48081

Log:
  - Merge the following from the English version:
  
  	r46820 -> r46930	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	Sat Jan 23 13:10:26 2016	(r48080)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Sat Jan 23 16:03:16 2016	(r48081)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46820
+     Original revision: r46930
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -521,12 +521,12 @@ dbus_enable="YES"</programlisting>
 	X ¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë (<filename>/etc/X11/xorg.conf</filename>)
 	¤ÎŬÀڤʾì½ê¤Ë¼¡¤Î¤è¤¦¤Ê¹Ô¤ò²Ã¤¨¤Þ¤¹¡£</para>
 
-      <programlisting>FontPath "/usr/local/lib/X11/fonts/urwfonts/"</programlisting>
+      <programlisting>FontPath "/usr/local/share/fonts/urwfonts/"</programlisting>
 
       <para>Ê̤ÎÊýË¡¤È¤·¤Æ¤Ï¡¢
 	X ¤Î¥»¥Ã¥·¥ç¥óÃæ¤Ë¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/urwfonts</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/urwfonts</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>¤³¤ì¤ÏÆ°¤¯¤Î¤Ç¤¹¤¬¡¢X
@@ -567,7 +567,7 @@ dbus_enable="YES"</programlisting>
       <programlisting>Load  "freetype"</programlisting>
 
       <para>¤µ¤Æ¡¢¤Þ¤º¤Ï &truetype; ¥Õ¥©¥ó¥ÈÍѤΥǥ£¥ì¥¯¥È¥ê
-	(Î㤨¤Ð <filename>/usr/local/lib/X11/fonts/TrueType</filename>)
+	(Î㤨¤Ð <filename>/usr/local/share/fonts/TrueType</filename>)
 	¤òºî¤ê¡¢¤½¤³¤Ë &truetype; ¥Õ¥©¥ó¥È¤ò¤¹¤Ù¤ÆÊü¤ê¹þ¤ß¤Þ¤·¤ç¤¦¡£
 	&apple; &mac; ¤Î &truetype;
 	¥Õ¥©¥ó¥È¤Ï¡¢¤½¤Î¤Þ¤Þ¤Ç¤Ï»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -580,14 +580,14 @@ dbus_enable="YES"</programlisting>
 	<package>x11-fonts/ttmkfdir</package>
 	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/TrueType</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/local/share/fonts/TrueType</userinput>
 &prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
       <para>¼¡¤Ë &truetype;
 	¥Õ¥©¥ó¥È¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥Õ¥©¥ó¥È¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£
 	<xref linkend="type1"/> ¤Î¾ì¹ç¤ÈƱ¤¸¤è¤¦¤Ë¡¢</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>¤È¤¹¤ë¤«¡¢¤â¤·¤¯¤Ï <filename>xorg.conf</filename>
@@ -620,7 +620,7 @@ dbus_enable="YES"</programlisting>
 	<secondary>¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹</secondary>
       </indexterm>
 
-      <para><filename>/usr/local/lib/X11/fonts/</filename> ¤È
+      <para><filename>/usr/local/share/fonts/</filename> ¤È
 	<filename>~/.fonts/</filename> ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î
 	<application>&xorg;</application> ¤Î¥Õ¥©¥ó¥È¤¬¡¢Xft
 	¤ËÂбþ¤·¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¼«Æ°Åª¤Ë¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹É½¼¨¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
@@ -651,7 +651,7 @@ dbus_enable="YES"</programlisting>
       </programlisting>
 
       <para>¤¹¤Ç¤ËÀâÌÀ¤·¤¿¤è¤¦¤Ë¡¢
-	<filename>/usr/local/lib/X11/fonts/</filename> ¤È
+	<filename>/usr/local/share/fonts/</filename> ¤È
 	<filename>~/.fonts/</filename> ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥©¥ó¥È¤Ï
 	Xft Âбþ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÇÍøÍѤǤ­¤Þ¤¹¡£
 	¤³¤ì¤é 2 ¤Ä°Ê³°¤ËÊ̤Υǥ£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¤Î¤Ê¤é¡¢