xserver: Branch 'master'

[Adam Jackson]

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

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

    doc: Fix punctuation.
    
    [ajax: s/ponct/punct/]
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>

diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 9c8dc5d..36bfa7e 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -420,7 +420,7 @@ FocusClass - the device can be focused.
   </listitem>
   <listitem>
     <para>
-FeedbackClass - the device supports some kind of feedback
+FeedbackClass - the device supports some kind of feedback.
 <!-- .in -5n -->
 <!-- .RE -->
     </para>
@@ -702,7 +702,7 @@ InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols,
 	num_symbols_supported, symbols)
     DeviceIntPtr dev;
     void (*controlProc)();
-    int max_symbols:
+    int max_symbols;
     int num_symbols_supported;
     KeySym *symbols;
 </literallayout>
@@ -1035,7 +1035,7 @@ deviceid - the identifier of the device that generated the event.
   </listitem>
   <listitem>
     <para>
-device_state - the state of any modifiers on the device that generated the event
+device_state - the state of any modifiers on the device that generated the event.
     </para>
   </listitem>
   <listitem>