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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Mon Jan 30 11:51:35 2017
New Revision: 49907
URL: https://svnweb.freebsd.org/changeset/doc/49907

Log:
  - Merge the following from the English version:
  
  	r49853 -> r49905	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	Sun Jan 29 21:33:20 2017	(r49906)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Mon Jan 30 11:51:35 2017	(r49907)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r49853
+     Original revision: r49905
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -31,7 +31,7 @@
     <note>
       <para>¼«Æ°Åª¤Ë <application>&xorg;</application> ¤òÀßÄꤷ¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ò´õ˾¤¹¤ë¥æ¡¼¥¶¤Ï¡¢
-	<link xlink:href="http://www.pcbsd.org/">pcbsd.org</link>
+	<link xlink:href="http://www.trueof.org/" />
 	¥¦¥§¥Ö¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </note>
 
@@ -279,9 +279,15 @@
 
       <para><application>&xorg;</application> ¤Ï¡¢
 	ɸ½àŪ¤Ê¤Û¤È¤ó¤É¤Î¥Ó¥Ç¥ª¥«¡¼¥É¡¢
-	¥­¡¼¥Ü¡¼¥É¡¢¥Ý¥¤¥ó¥Æ¥£¥ó¥°¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£      
-	¤³¤ì¤é¤Î¥Ç¥Ð¥¤¥¹¤Ï¡¢¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¤ë¤¿¤á¡¢
-	¼êÆ°¤ÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
+	¥­¡¼¥Ü¡¼¥É¡¢¥Ý¥¤¥ó¥Æ¥£¥ó¥°¥Ç¥Ð¥¤¥¹¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+      <tip>
+	<para>¥Ó¥Ç¥ª¥«¡¼¥É¡¢¥­¡¼¥Ü¡¼¥É¡¢ÆþÎϥǥХ¤¥¹¤Ï¡¢
+	  ¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¤ë¤Î¤Ç¡¢¼êÆ°¤ÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
+	  ¼«Æ°Ç§¼±¤Ë¼ºÇÔ¤·¤¿¤È¤­°Ê³°¤Ï¡¢<filename>xorg.conf</filename>
+	  ¤òºîÀ®¤·¤¿¤ê¡¢<option>-configure</option>
+	  ¥×¥í¥»¥¹¤Î¼Â¹Ô¤Ï¹Ô¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
+      </tip>
 
       <procedure>
 	<step>
@@ -365,6 +371,10 @@
     <sect2 xml:id="x-config-files">
       <title>¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë</title>
 
+      <para>Ä̾¤³¤ÎÀá¤ÇÀâÌÀ¤¹¤ë¼êÆ°¤ÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
+	¼«Æ°Ç§¼±¤Ë¼ºÇÔ¤·¤¿¤È¤­°Ê³°¤Ï¡¢
+	¼êÆ°¤ÇÀßÄê¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
+
       <sect3 xml:id="x-config-files-directory">
 	<title>¥Ç¥£¥ì¥¯¥È¥ê</title>
 
@@ -895,6 +905,13 @@ EndSection</programlisting>
 	¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Î¤¿¤á¡¢
 	¥«¥¹¥¿¥à¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£</para>
 
+      <warning>
+	<para>¼«Æ°Ç§¼±¤Ë¼ºÇÔ¤·¤¿¤È¤­°Ê³°¤Ï¡¢
+	  ¼êÆ°¤ÇÀßÄê¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
+	  ÉÔɬÍפʼêÆ°¤ÎÀßÄê¤ò¹Ô¤Ã¤¿·ë²Ì¡¢
+	  ŬÀÚ¤ËÆ°ºî¤·¤Ê¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+      </warning>
+
       <para>¸¡½Ð¤µ¤ì¤¿¥Ï¡¼¥É¥¦¥§¥¢¤ò¥Ù¡¼¥¹¤È¤·¤¿¡¢
 	<application>&xorg;</application>
 	¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£