xserver: Branch 'master'

[Adam Jackson]

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

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

    doc: Fix extraneous >
    
    It looks like it serves no special purpose.
    
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 5521510..9c8dc5d 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -362,7 +362,7 @@ server to begin checking for available input from this device.
 </para>
 <para>
 <!-- .LP -->
->From InitAndStartDevices, EnableDevice is called for all devices that have
+From InitAndStartDevices, EnableDevice is called for all devices that have
 the "inited" and "startup" fields in the DeviceIntRec set to TRUE.  The
 "inited" field is set by InitAndStartDevices to the value returned by
 the deviceproc when called with a mode value of DEVICE_INIT.  The "startup"