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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Mon Aug 24 12:32:33 2020
New Revision: 54436
URL: https://svnweb.freebsd.org/changeset/doc/54436

Log:
  - Merge the following from the English version:
  
  	r54061 -> r54421	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 Aug 22 05:17:55 2020	(r54435)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Mon Aug 24 12:32:33 2020	(r54436)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r54061
+     Original revision: r54421
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -830,20 +830,18 @@ EndSection</programlisting>
 		<literal>XkbVariant</literal> ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
 		¥¯¥é¥¹¤ËÂбþ¤¹¤ë¤¹¤Ù¤Æ¤ÎÆþÎϥǥХ¤¥¹¤ËŬÍѤǤ­¤Þ¤¹¡£</para>
 
-	      <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢ <literal>oss</literal>
-		¥­¡¼ÇÛÃ֤Υեé¥ó¥¹¸ì¤Î¥­¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È¤òÁªÂò¤·¤Þ¤¹¡£</para>
+	      <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢
+		¥Õ¥é¥ó¥¹¸ì¤Î¥­¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È¤òÁªÂò¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
 	      <example>
 		<title>¥­¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È¤òÁªÂò¤¹¤ë¡£</title>
 
-		<para><filename>/usr/local/etc/X11/xorg.conf.d/keyboard-fr-oss.conf</filename></para>
+		<para><filename>/usr/local/etc/X11/xorg.conf.d/keyboard-fr.conf</filename></para>
 
 		<programlisting>Section	"InputClass"
 	Identifier	"KeyboardDefaults"
-	Driver		"keyboard"
 	MatchIsKeyboard	"on"
 	Option		"XkbLayout" "fr"
-	Option		"XkbVariant" "oss"
 EndSection</programlisting>
 	      </example>
 
@@ -892,7 +890,6 @@ EndSection</programlisting>
 
 		<programlisting>Section	"InputClass"
 	Identifier	"KeyboardDefaults"
-	Driver		"keyboard"
 	MatchIsKeyboard	"on"
 	Option		"XkbOptions" "terminate:ctrl_alt_bksp"
 EndSection</programlisting>
@@ -904,6 +901,16 @@ EndSection</programlisting>
 
       <sect3 xml:id="x11-input-mice">
 	<title>¥Þ¥¦¥¹¤ª¤è¤Ó¥Ý¥¤¥ó¥Æ¥£¥ó¥°¥Ç¥Ð¥¤¥¹</title>
+
+	<important>
+	  <para>¤â¤· &os; &rel121.current; ¤Ë¤ª¤¤¤Æ¡¢
+	    &man.moused.8; ¤ò»È¤ï¤º¡¢
+	    <package>xorg-server</package> 1.20.8
+	    °Ê¹ß¤ò»ÈÍѤ·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	    <filename>/etc/sysctl.conf</filename> ¤Ë¡¢
+	    <userinput>kern.evdev.rcpt_mask=12</userinput>
+	    ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	</important>
 
 	<para>¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢
 	  ¿¤¯¤Î¥Þ¥¦¥¹¥Ñ¥é¥á¡¼¥¿¤òÄ´À°¤Ç¤­¤Þ¤¹¡£