Index: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -805,20 +805,18 @@
 		<literal>InputClass</literal>.  This will be applied
 		to all input devices that match the class.</para>
 
-	      <para>This example selects a French keyboard layout with
-		the <literal>oss</literal> variant.</para>
+	      <para>This example selects a French keyboard
+		layout.</para>
 
 	      <example>
 		<title>Setting a Keyboard Layout</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>
 
@@ -866,7 +864,6 @@
 
 		<programlisting>Section	"InputClass"
 	Identifier	"KeyboardDefaults"
-	Driver		"keyboard"
 	MatchIsKeyboard	"on"
 	Option		"XkbOptions" "terminate:ctrl_alt_bksp"
 EndSection</programlisting>
@@ -878,6 +875,14 @@
 
       <sect3 xml:id="x11-input-mice">
 	<title>Mice and Pointing Devices</title>
+
+	<important>
+	  <para>If using <package>xorg-server</package>&nbsp;1.20.8 or
+	    later under &os;&nbsp;&rel121.current; and not
+	    using &man.moused.8;, add
+	    <userinput>kern.evdev.rcpt_mask=12</userinput> to
+	    <filename>/etc/sysctl.conf</filename>.</para>
+	</important>
 
 	<para>Many mouse parameters can be adjusted with configuration
 	  options.  See &man.mousedrv.4x; for a full list.</para>