and ProximityOut are registered.
.PP
.TP 8
-.B --test-xi2
-Register for a number of XI2 events and display them. This option does not
-take a device argument.
+.B --test-xi2 [\fIdevice\fP]
+Register for a number of XI2 events and display them. If a device is given,
+only events on this device are displayed.
.PP
.TP 8
.B --create-master \fIprefix\fP [sendCore] [enable]
\fImaster\fP must specify a master pointer.
.PP
.TP 8
-.B --map-to-crtc \fIdevice\fP \fIcrtc\fP
+.B --map-to-output \fIdevice\fP \fIcrtc\fP
Restricts the movements of the absolute \fIdevice\fP to the RandR
-\fIcrtc\fP. The CRTC name must match a currently connected CRTC (see
+\fIcrtc\fP. The output name must match a currently connected output (see
\fIxrandr(__appmansuffix__)\fP). If the NVIDIA binary driver is
detected or RandR 1.2 or later is not available, a Xinerama output may be
specified as "HEAD-N", with N being the Xinerama screen number. This option