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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Sep 13 09:03:29 2016
New Revision: 49386
URL: https://svnweb.freebsd.org/changeset/doc/49386

Log:
  - Merge the following from the English version:
  
  	r48719 -> r49376	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	Tue Sep 13 08:45:30 2016	(r49385)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Tue Sep 13 09:03:29 2016	(r49386)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r48719
+     Original revision: r49376
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1102,15 +1102,15 @@ EndSection</programlisting>
 	<filename>/usr/local/share/fonts/</filename> ¤È
 	<filename>~/.fonts/</filename> ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥©¥ó¥È¤Ï
 	Xft Âбþ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÇÍøÍѤǤ­¤Þ¤¹¡£
-	¤³¤ì¤é 2 ¤Ä°Ê³°¤ËÊ̤Υǥ£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¤Î¤Ê¤é¡¢
+	¤³¤ì¤é 2 ¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê³°¤ËÊ̤Υǥ£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¤Ê¤é¡¢
 	<filename>/usr/local/etc/fonts/local.conf</filename>
-	¤Ë°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤òÄɲä·¤Þ¤¹¡£</para>
+	¤Ë°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting><dir>/path/to/my/fonts</dir></programlisting>
 
       <para>¿·¤·¤¤¥Õ¥©¥ó¥È¡¢
-	¤½¤·¤ÆÆä˿·¤·¤¤¥Õ¥©¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤é¡¢
-	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥©¥ó¥È¥­¥ã¥Ã¥·¥å¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	Æä˿·¤·¤¤¥Õ¥©¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤é¡¢
+	¥Õ¥©¥ó¥È¥­¥ã¥Ã¥·¥å¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>fc-cache -f</userinput></screen>
 
@@ -1150,7 +1150,7 @@ EndSection</programlisting>
 	100 ¤ËÀßÄꤹ¤ëÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
 	¤½¤¦¤¹¤ë¤¿¤á¤Ë¤Ï¼¡¤Î¹Ô¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <programlisting>        <match target="pattern" name="family">
+      <programlisting>	<match target="pattern" name="family">
             <test qual="any" name="family">
                 <string>fixed</string>
             </test>
@@ -1200,11 +1200,11 @@ EndSection</programlisting>
 	¥¿¥°¤Ç½ª¤ï¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤ì¤ò¹Ô¤ï¤Ê¤±¤ì¤Ð¡¢Êѹ¹¤Ï̵»ë¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£</para>
 
-      <para>ºÇ¸å¤Ë¡¢¥æ¡¼¥¶¤Ï¼«Ê¬¤À¤±¤ÎÀßÄê¤ò³Æ¼«¤Î
-	<filename>.fonts.conf</filename> ¥Õ¥¡¥¤¥ë¤ËÄɲäǤ­¤Þ¤¹¡£
-	¤³¤ì¤ò¹Ô¤¦¤¿¤á¤Ë¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤¬Ã±¤Ë
-	<filename>~/.fonts.conf</filename> ¤òºîÀ®¤¹¤ë¤À¤±¤Ç¤¹¡£
-	¤³¤Î¥Õ¥¡¥¤¥ë¤â XML ·Á¼°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
+      <para>¥æ¡¼¥¶¤Ï¼«Ê¬¤À¤±¤ÎÀßÄê¤ò³Æ¼«¤Î
+	<filename>~/.config/fontconfig/fonts.conf</filename>
+	¤ËÄɲäǤ­¤Þ¤¹¡£
+	¤³¤Î¥Õ¥¡¥¤¥ë¤â¤³¤ì¤Þ¤Ç¤ÎÀâÌÀ¤ÈƱ¤¸¤¯ <acronym>XML</acronym>
+	·Á¼°¤ò»È¤¤¤Þ¤¹¡£</para>
 
       <indexterm><primary>LCD ¥¹¥¯¥ê¡¼¥ó</primary></indexterm>
       <indexterm><primary>¥Õ¥©¥ó¥È</primary>
@@ -1218,7 +1218,7 @@ EndSection</programlisting>
 	¤³¤ì¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï <filename>local.conf</filename>
 	¥Õ¥¡¥¤¥ë¤Ë¼¡¤Î¹Ô¤ò²Ã¤¨¤Þ¤¹¡£</para>
 
-      <programlisting><match target="font">
+      <programlisting>	 <match target="font">
             <test qual="all" name="rgba">
                 <const>unknown</const>
             </test>