xserver: Branch 'master'

[Adam Jackson]

 doc/Xinput.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

    doc: Fix alignment.
    
    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 7f576a1..6f86752 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -1078,7 +1078,7 @@ The following code fragment shows how the two wire events could be initialized:
     deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE;
     deviceValuator *xv;
 
-    xev->type = DeviceKeyPress;                /* defined by input extension */
+    xev->type = DeviceKeyPress;         /* defined by input extension */
     xev->detail = keycode;              /* key pressed on this device */
     xev->time = timestamp;              /* same as for core events    */
     xev->rootX = pointerx;              /* x location of core pointer */
@@ -1093,7 +1093,7 @@ The following code fragment shows how the two wire events could be initialized:
     /*                                                                */
     /******************************************************************/
 
-    xev->deviceid = dev->id | MORE_EVENTS;        /* sending more than 1*/
+    xev->deviceid = dev->id | MORE_EVENTS;     /* sending more than 1 */
 
     /******************************************************************/
     /* Fields in the second 32-byte wire event:                       */
@@ -1152,7 +1152,7 @@ The following code fragment shows how the two wire events could be initialized:
     /*                                                                */
     /******************************************************************/
 
-    xev->deviceid = dev->id | MORE_EVENTS;        /* sending more than 1*/
+    xev->deviceid = dev->id | MORE_EVENTS;     /* sending more than 1 */
 
     /******************************************************************/
     /* Fields in the second 32-byte wire event:                       */