xserver: Branch 'master'

[Adam Jackson]

 doc/Xinput.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d9f578e6f0d13ecada7dc677fe61a4dd3d05e18
Author: Cyril Brulebois <kibi at debian.org>
Date:   Mon Jun 6 02:25:11 2011 +0200

    doc: Convert an \fP pair into appropriate tags.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 21eabfa..083b109 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -1060,7 +1060,7 @@ valuator0 through valuator5 - the values of the valuators.
 <!-- .LP -->
 In order to pass this information to the input extension library, two 32-byte
 wire events must be generated by DDX.  The first has an event type of 
-<function>DeviceKeyPress</function>, and the second has an event type of \fPDeviceValuator\fP.
+<function>DeviceKeyPress</function>, and the second has an event type of <function>DeviceValuator</function>.
 </para>
 <para>
 <!-- .LP -->