xserver: Branch 'master'

[Alan Coopersmith]

 hw/kdrive/ephyr/Xephyr.man.pre |   42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit dacad9ae0bdaedff9403fbe84a5c5a4b4eef3542
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Nov 21 17:16:22 2008 -0800

    Xephyr man page typo fixes.
    
    Also trailing white space removal to clear git warnings.

diff --git a/hw/kdrive/ephyr/Xephyr.man.pre b/hw/kdrive/ephyr/Xephyr.man.pre
index 19c9b86..7f0e811 100644
--- a/hw/kdrive/ephyr/Xephyr.man.pre
+++ b/hw/kdrive/ephyr/Xephyr.man.pre
@@ -22,17 +22,17 @@ Xephyr - X server outputting to a window on a pre-existing X display
 .RI [ option
 .IR ... ]
 .SH DESCRIPTION
-.B Xephyr 
+.B Xephyr
 is a a kdrive server that outputs to a window on a pre-existing
-'host' X display. 
-Think 
-.I Xnest 
-but with support for modern extensions like composite, damage and randr. 
+'host' X display.
+Think
+.I Xnest
+but with support for modern extensions like composite, damage and randr.
 .PP
-Unlike 
-.I Xnest 
-which is an X proxy, i.e.  limited to the capabilities of the host X server, 
-.B Xephyr 
+Unlike
+.I Xnest
+which is an X proxy, i.e.  limited to the capabilities of the host X server,
+.B Xephyr
 is a real X server which
 uses the host X server window as "framebuffer" via fast SHM XImages.
 .PP
@@ -51,12 +51,12 @@ uses exiting window
 set 'cursor acceleration':
 The host's cursor is reused. This is only really there to aid
 debugging by avoiding server paints for the cursor. Performance
-improvement is negiable.
+improvement is negligible.
 .SH "SIGNALS"
 Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
-toggle the debugging mode. 
+toggle the debugging mode.
 In this mode red rectangles are painted to
-screen areas getting painted before painting the actual content. 
+screen areas getting painted before painting the actual content.
 The
 delay between this can be altered by setting a XEPHYR_PAUSE env var to
 a value in micro seconds.
@@ -64,21 +64,21 @@ a value in micro seconds.
 .PP
 .IP \(bu 2
 Rotated displays are currently updated via full blits. This
-is slower than a normal oprientated display. Debug mode will
-therefore not be of much use rotated.  
+is slower than a normal orientated display. Debug mode will
+therefore not be of much use rotated.
 .IP \(bu 2
-The '-host-cursor' cursor is static in its appearence. 
+The '-host-cursor' cursor is static in its appearance.
 .IP \(bu 2
 The build gets a warning about 'nanosleep'. I think the various '-D'
-build flags are causing this. I havn't figured as yet how to work
-round it. It doesn't appear to break anything however. 
+build flags are causing this. I haven't figured as yet how to work
+round it. It doesn't appear to break anything however.
 .IP \(bu 2
-Keyboard handling is basic but works. 
+Keyboard handling is basic but works.
 .TP \(bu 2
-Mouse button 5 probably wont work. 
+Mouse button 5 probably wont work.
 .SH "SEE ALSO"
-X(__miscmansuffix), Xserver(__appmansuffix__)
+X(__miscmansuffix__), Xserver(__appmansuffix__)
 .SH AUTHOR
-Matthew Allum <mallum at o-hand.com> 2004 
+Matthew Allum <mallum at o-hand.com> 2004