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

Author: ryusuke
Date: Fri Jan 22 09:47:55 2016
New Revision: 48077
URL: https://svnweb.freebsd.org/changeset/doc/48077

Log:
  - Merge the following from the English version:
  
  	r46462 -> r46820	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 21 20:26:54 2016	(r48076)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Fri Jan 22 09:47:55 2016	(r48077)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46462
+     Original revision: r46820
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -31,8 +31,7 @@
     <note>
       <para>¼«Æ°Åª¤Ë <application>&xorg;</application> ¤òÀßÄꤷ¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ò´õ˾¤¹¤ë¥æ¡¼¥¶¤Ï¡¢
-	<link
-	  xlink:href="http://www.pcbsd.org/">pcbsd.org</link>
+	<link xlink:href="http://www.pcbsd.org/">pcbsd.org</link>
 	¥¦¥§¥Ö¥µ¥¤¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </note>
 
@@ -496,10 +495,10 @@ dbus_enable="YES"</programlisting>
 	¤Ç¤Ï¤½¤ì¤é¤ò´Êñ¤ËÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	Î㤨¤Ð¡¢URW ¥Õ¥©¥ó¥È¥³¥ì¥¯¥·¥ç¥ó
 	(<package>x11-fonts/urwfonts</package>)
-	¤Ë¤Ï¹âÉʼÁ¤Î Type1 ¥Õ¥©¥ó¥È
-	(<trademark class="registered">Times Roman</trademark>,
-	<trademark class="registered">Helvetica</trademark>,
-	<trademark class="registered">Palatino</trademark> ¤Ê¤É)
+	¤Ë¤Ï¹âÉʼÁ¤Î Type1 ¥Õ¥©¥ó¥È (<trademark
+	  class="registered">Times Roman</trademark>, <trademark
+	  class="registered">Helvetica</trademark>, <trademark
+	  class="registered">Palatino</trademark> ¤Ê¤É)
 	¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£freefont ¥³¥ì¥¯¥·¥ç¥ó
 	(<package>x11-fonts/freefonts</package>)
 	¤Ë¤Ï¤â¤Ã¤È¤¿¤¯¤µ¤ó¤Î¥Õ¥©¥ó¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
@@ -793,7 +792,7 @@ dbus_enable="YES"</programlisting>
 
   <sect1 xml:id="x-xdm">
     <info>
-    <title>X ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã</title>
+      <title>X ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã</title>
 
       <authorgroup>
 	<author>
@@ -972,7 +971,7 @@ DisplayManager.requestPort:     0</scree
 
   <sect1 xml:id="x11-wm">
     <info>
-    <title>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</title>
+      <title>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­</title>
 
       <authorgroup>
 	<author>
@@ -1004,7 +1003,7 @@ DisplayManager.requestPort:     0</scree
 	¤½¤·¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¸ß¤¤¤Ë¤¦¤Þ¤¯¤ä¤ê¼è¤ê¤Ç¤­¤ë¤è¤¦¤Ê»ÅÁȤߤ¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
 	&os; ¾å¤Î <application>GNOME</application>
 	¤Ë´Ø¤¹¤ë¤â¤Ã¤È¾Ü¤·¤¤¾ðÊó¤Ï¡¢<link
-	    xlink:href="http://www.FreeBSD.org/gnome">http://www.FreeBSD.org/gnome</link>
+	  xlink:href="http://www.FreeBSD.org/gnome">http://www.FreeBSD.org/gnome</link>.
 	¤Ç¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Ë¤Ï¡¢&os; ¤Ç¤Î <application>GNOME</application>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ÀßÄê¡¢´ÉÍý¤Ë´Ø¤¹¤ë¿¤¯¤Î¾ðÊ󤬤¢¤ê¤Þ¤¹¡£</para>
@@ -1235,8 +1234,8 @@ DisplayManager.requestPort:     0</scree
 
       <para>¤³¤Î¥É¥é¥¤¥Ð¤Ï¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤òºîÀ®¤¹¤ë¤Î¤Ç¡¢
 	¤³¤Î¥â¥¸¥å¡¼¥ë¤ò¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤ËÆɤ߹þ¤à¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-	°Ê²¼¤Î¹Ô¤ò
-	<filename>/boot/loader.conf</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	°Ê²¼¤Î¹Ô¤ò <filename>/boot/loader.conf</filename>
+	¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>nvidia_load="YES"</programlisting>
 
@@ -1248,9 +1247,8 @@ DisplayManager.requestPort:     0</scree
 	  ¤·¤«¤·¤Ê¤¬¤é¡¢<application>&xorg;</application>
 	  ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤Æ¤Ï¡¢
 	  µ¯Æ°»þ¤Ë¥É¥é¥¤¥Ð¤¬Æɤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤ÈÀµ¤·¤¯Æ°¤«¤Ê¤¤¤â¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢
-	  Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  <filename>/boot/loader.conf</filename> ¤òÊÔ½¸¸å¤Ï¡¢
-	  ºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£<filename>/boot/loader.conf</filename>
+	  ¤òÊÔ½¸¸å¤Ï¡¢ºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </note>
 
       <para>Æɤ߹þ¤Þ¤ì¤¿¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò»È¤¦¤Ë¤Ï¡¢
@@ -1294,7 +1292,8 @@ DisplayManager.requestPort:     0</scree
     Monitor        "Monitor0"
     ...</programlisting>
 
-      <para>(<quote>Monitor</quote> ¤Î¸å¤Ë) ¼¡¤ÎÆó¤Ä¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+      <para>(<quote>Monitor</quote> ¤Î¸å¤Ë)
+	¼¡¤ÎÆó¤Ä¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>DefaultDepth    24
     Option         "AddARGBGLXVisuals" "True"</programlisting>
@@ -1334,7 +1333,7 @@ DisplayManager.requestPort:     0</scree
 	<package>x11/nvidia-xconfig</package> ¤ò
 	(root ¸¢¸Â¤Ç) ¼Â¹Ô¤¹¤ë¤³¤È¤Ç¼«Æ°Åª¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput>
+      <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput>
     &prompt.root; <userinput>nvidia-xconfig --composite</userinput>
     &prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen>
     </sect2>
@@ -1403,7 +1402,6 @@ DisplayManager.requestPort:     0</scree
 	<literal>apps/compiz</literal> °Ê²¼¤ò¸«¤ë¤³¤È¤Ç¡¢
 	¤³¤ì¤é¤ÎÀßÄê¤ò³Îǧ¤¹¤ë¤³¤È¤â½ÐÍè¤Þ¤¹¡£</para>
     </sect2>
-
   </sect1>
 
   <sect1 xml:id="x11-understanding">
@@ -1473,8 +1471,7 @@ DisplayManager.requestPort:     0</scree
 
 	<screen>&prompt.user; <userinput>setxkbmap -model pc102 -layout fr</userinput></screen>
 
-	<para>
-	  <filename>/usr/local/share/X11/xkb/rules/base.lst</filename>
+	<para><filename>/usr/local/share/X11/xkb/rules/base.lst</filename>
 	  ¤Ë¤Ï¡¢ÍøÍѲÄǽ¤Ê¥­¡¼¥Ü¡¼¥É¡¢
 	  ¥ì¥¤¥¢¥¦¥È¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤¬¤¢¤ê¤Þ¤¹¡£</para>
       </note>
@@ -1498,8 +1495,7 @@ DisplayManager.requestPort:     0</scree
         ModelName    "Monitor Model"
         HorizSync    30-107
         VertRefresh  48-120
-	EndSection
-      </programlisting>
+EndSection</programlisting>
 
       <para>¤Û¤È¤ó¤É¤Î¥â¥Ë¥¿¤ÏƱ´ü¼þÇÈ¿ô¤Î¼«Æ°Ç§¼±¤ËÂбþ¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
 	¤³¤ì¤é¤ÎÃͤò¼êÆ°¤ÇÆþÎϤ¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
@@ -1703,44 +1699,44 @@ EndSection</programlisting>
 
 	<para>°Ê¾å¤Î´Êñ¤ÊÊÔ½¸ºî¶È¤¬½ª¤ï¤Ã¤¿¤é¡¢
 	  ¿·¤·¤¤¥ï¥¤¥É¥¹¥¯¥ê¡¼¥ó¥â¥Ë¥¿¾å¤Ç X ¤¬Æ°ºî¤¹¤ë¤Ç¤·¤ç¤¦¡£</para>
-    </sect2>
-
-    <sect2 xml:id="compiz-troubleshooting">
-      <title>Compiz&nbsp;Fusion »ÈÍÑ»þ¤Î¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</title>
+      </sect2>
 
-      <qandaset>
-	<qandaentry>
-	  <question xml:id="no-decorations">
-	    <para><application>Compiz&nbsp;Fusion</application>
-	      ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢ÀâÌÀ¤µ¤ì¤¿¤è¤¦¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
-	      ¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¥Ð¡¼¤ä¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Þ¤»¤ó¡£
-	      ²¿¤¬ÌäÂê¤Ç¤·¤ç¤¦¤«¡©</para>
-	  </question>
-
-	  <answer>
-	    <para>¤ª¤½¤é¤¯ <filename>/etc/X11/xorg.conf</filename>
-	      ¤ÎÀßÄ꤬¹Ô¤ï¤ì¤Æ¤¤¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£
-	      ¤³¤Î¥Õ¥¡¥¤¥ë¤ò¾ÜºÙ¤Ë³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ÆäË
-	      <literal>DefaultDepth</literal> ¤ª¤è¤Ó
-	      <literal>AddARGBGLXVisuals</literal>
-	      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	  </answer>
-	</qandaentry>
+      <sect2 xml:id="compiz-troubleshooting">
+	<title>Compiz&nbsp;Fusion »ÈÍÑ»þ¤Î¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</title>
 
-	<qandaentry>
-	  <question xml:id="xorg-crash">
-	    <para><application>Compiz&nbsp;Fusion</application>
-	      ¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢X ¥µ¡¼¥Ð¤¬¥¯¥é¥Ã¥·¥å¤·¡¢
-	      ¥³¥ó¥½¡¼¥ë¤ËÌá¤ê¤Þ¤¹¡£²¿¤¬ÌäÂê¤Ç¤·¤ç¤¦¤«¡©</para>
-	  </question>
-
-	  <answer>
-	    <para><filename>/var/log/Xorg.0.log</filename>
-	      ¥Õ¥¡¥¤¥ë¤ò³Îǧ¤¹¤ë¤È¡¢
-	      X ¤Îµ¯Æ°»þ¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òõ¤·½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	      ¿¤¯¤Î¾ì¹ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£</para>
+	<qandaset>
+	  <qandaentry>
+	    <question xml:id="no-decorations">
+	      <para><application>Compiz&nbsp;Fusion</application>
+		¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢ÀâÌÀ¤µ¤ì¤¿¤è¤¦¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+		¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¥Ð¡¼¤ä¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Þ¤»¤ó¡£
+		²¿¤¬ÌäÂê¤Ç¤·¤ç¤¦¤«¡©</para>
+	    </question>
+
+	    <answer>
+	      <para>¤ª¤½¤é¤¯ <filename>/etc/X11/xorg.conf</filename>
+		¤ÎÀßÄ꤬¹Ô¤ï¤ì¤Æ¤¤¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£
+		¤³¤Î¥Õ¥¡¥¤¥ë¤ò¾ÜºÙ¤Ë³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ÆäË
+		<literal>DefaultDepth</literal> ¤ª¤è¤Ó
+		<literal>AddARGBGLXVisuals</literal>
+		¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </answer>
+	  </qandaentry>
+
+	  <qandaentry>
+	    <question xml:id="xorg-crash">
+	      <para><application>Compiz&nbsp;Fusion</application>
+		¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢X ¥µ¡¼¥Ð¤¬¥¯¥é¥Ã¥·¥å¤·¡¢
+		¥³¥ó¥½¡¼¥ë¤ËÌá¤ê¤Þ¤¹¡£²¿¤¬ÌäÂê¤Ç¤·¤ç¤¦¤«¡©</para>
+	    </question>
+
+	    <answer>
+	      <para><filename>/var/log/Xorg.0.log</filename>
+		¥Õ¥¡¥¤¥ë¤ò³Îǧ¤¹¤ë¤È¡¢
+		X ¤Îµ¯Æ°»þ¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òõ¤·½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+		¿¤¯¤Î¾ì¹ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£</para>
 
-	    <screen>(EE) NVIDIA(0):     Failed to initialize the GLX module; please check in your X
+	      <screen>(EE) NVIDIA(0):     Failed to initialize the GLX module; please check in your X
     (EE) NVIDIA(0):     log file that the GLX module has been loaded in your X
     (EE) NVIDIA(0):     server, and that the module is the NVIDIA GLX module.  If
     (EE) NVIDIA(0):     you continue to encounter problems, Please try
@@ -1748,8 +1744,8 @@ EndSection</programlisting>
 
 	    <para>¤³¤ì¤ÏÄ̾ï <application>&xorg;</application>
 	      ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿»þ¤Ëµ¯¤­¤ë¸½¾Ý¤Ç¤¹¡£
-	      <package>x11/nvidia-driver</package> package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ
-	      glx ¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	      <package>x11/nvidia-driver</package> package
+	      ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ glx ¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	  </answer>
 	</qandaentry>
       </qandaset>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"