· 5 years ago · Nov 18, 2020, 09:22 AM
1From dddd19aafdcd06d9324eec121251b6691c9e72ab Mon Sep 17 00:00:00 2001
2From: Andi <you@example.com>
3Date: Wed, 18 Nov 2020 10:07:56 +0100
4Subject: [PATCH] Revert "Fix spelling/wording issues"
5
6This reverts commit 23e83724df4809fd7857cc609c33ce7e8d3021a4.
7---
8 README.md | 2 +-
9 Xext/hashtable.h | 2 +-
10 Xext/saver.c | 4 +-
11 Xext/shm.c | 4 +-
12 Xext/vidmode.c | 4 +-
13 Xext/xres.c | 10 ++---
14 Xext/xtest.c | 5 +--
15 Xext/xvmain.c | 4 +-
16 Xi/closedev.c | 2 +-
17 Xi/exevents.c | 4 +-
18 Xi/grabdev.c | 2 +-
19 Xi/xiproperty.c | 6 +--
20 composite/compwindow.c | 2 +-
21 configure.ac | 2 +-
22 dbe/dbe.c | 4 +-
23 dbe/dbestruct.h | 2 +-
24 dix/.gitignore | 2 +-
25 dix/colormap.c | 4 +-
26 dix/dispatch.c | 2 +-
27 dix/dixfonts.c | 2 +-
28 dix/enterleave.c | 4 +-
29 dix/events.c | 8 ++--
30 dix/getevents.c | 12 +++---
31 dix/ptrveloc.c | 6 +--
32 dix/region.c | 4 +-
33 dix/swaprep.c | 4 +-
34 dix/touch.c | 6 +--
35 dix/window.c | 6 +--
36 doc/Xserver-spec.xml | 4 +-
37 doc/dtrace/Xserver-DTrace.xml | 2 +-
38 exa/exa.c | 2 +-
39 exa/exa.h | 2 +-
40 exa/exa_offscreen.c | 2 +-
41 exa/exa_priv.h | 4 +-
42 fb/fbbltone.c | 2 +-
43 fb/fbcmap_mi.c | 2 +-
44 glamor/glamor.c | 2 +-
45 glamor/glamor.h | 2 +-
46 glamor/glamor_gradient.c | 6 +--
47 glamor/glamor_largepixmap.c | 2 +-
48 glamor/glamor_vbo.c | 2 +-
49 glx/glxcmds.c | 2 +-
50 glx/indirect_util.c | 2 +-
51 hw/dmx/.gitignore | 2 +-
52 hw/dmx/config/.gitignore | 2 +-
53 hw/dmx/config/dmxconfig.c | 2 +-
54 hw/dmx/config/dmxparse.h | 4 +-
55 hw/dmx/dmx-config.h | 2 +-
56 hw/dmx/dmx.c | 2 +-
57 hw/dmx/dmxcb.c | 2 +-
58 hw/dmx/dmxcursor.c | 2 +-
59 hw/dmx/dmxextension.c | 6 +--
60 hw/dmx/dmxlog.c | 2 +-
61 hw/dmx/dmxscrinit.c | 2 +-
62 hw/dmx/dmxsync.c | 2 +-
63 hw/dmx/dmxwindow.c | 2 +-
64 hw/dmx/doc/DMXSpec.txt | 4 +-
65 hw/dmx/doc/dmx.xml | 4 +-
66 hw/dmx/examples/.gitignore | 2 +-
67 hw/dmx/glxProxy/glxcmds.c | 2 +-
68 hw/dmx/glxProxy/glxcmdsswap.c | 2 +-
69 hw/dmx/glxProxy/glxsingle.c | 2 +-
70 hw/dmx/glxProxy/glxvendor.c | 2 +-
71 hw/dmx/input/atKeynames.h | 4 +-
72 hw/dmx/input/dmxbackend.c | 2 +-
73 hw/dmx/input/dmxconsole.c | 4 +-
74 hw/dmx/input/dmxevents.c | 2 +-
75 hw/dmx/input/dmxinputinit.h | 2 +-
76 hw/dmx/man/Xdmx.man | 2 +-
77 hw/kdrive/ephyr/README | 32 +++++++-------
78 hw/kdrive/ephyr/ephyr.c | 12 +++---
79 hw/kdrive/ephyr/ephyr.h | 2 +-
80 hw/kdrive/ephyr/ephyr_glamor_glx.c | 2 +-
81 hw/kdrive/ephyr/ephyrinit.c | 2 +-
82 hw/kdrive/ephyr/ephyrlog.h | 2 +-
83 hw/kdrive/ephyr/ephyrvideo.c | 2 +-
84 hw/kdrive/ephyr/hostx.c | 2 +-
85 hw/kdrive/ephyr/hostx.h | 2 +-
86 hw/kdrive/src/kxv.c | 2 +-
87 hw/xfree86/common/.gitignore | 2 +-
88 hw/xfree86/common/xf86Bus.c | 4 +-
89 hw/xfree86/common/xf86Cursor.c | 4 +-
90 hw/xfree86/common/xf86Events.c | 8 ++--
91 hw/xfree86/common/xf86Helper.c | 4 +-
92 hw/xfree86/common/xf86Mode.c | 4 +-
93 hw/xfree86/common/xf86Module.h | 2 +-
94 hw/xfree86/common/xf86Xinput.c | 2 +-
95 hw/xfree86/common/xf86fbman.c | 4 +-
96 hw/xfree86/common/xf86pciBus.c | 2 +-
97 hw/xfree86/common/xf86platformBus.c | 2 +-
98 hw/xfree86/common/xf86xv.c | 2 +-
99 hw/xfree86/common/xisb.c | 2 +-
100 hw/xfree86/ddc/edid.h | 2 +-
101 hw/xfree86/ddc/print_edid.c | 2 +-
102 hw/xfree86/doc/README.modes | 2 +-
103 hw/xfree86/doc/ddxDesign.xml | 12 +++---
104 hw/xfree86/dri/dri.c | 2 +-
105 hw/xfree86/dri2/dri2.h | 8 ++--
106 hw/xfree86/dri2/dri2ext.c | 2 +-
107 hw/xfree86/drivers/modesetting/driver.c | 4 +-
108 .../drivers/modesetting/drmmode_display.c | 2 +-
109 hw/xfree86/drivers/modesetting/pageflip.c | 6 +--
110 hw/xfree86/fbdevhw/fbdevhw.c | 4 +-
111 hw/xfree86/fbdevhw/fbpriv.h | 2 +-
112 hw/xfree86/i2c/xf86i2c.c | 10 ++---
113 hw/xfree86/int10/INT10.HOWTO | 4 +-
114 hw/xfree86/int10/generic.c | 2 +-
115 hw/xfree86/int10/helper_exec.c | 6 +--
116 hw/xfree86/int10/vbe.c | 4 +-
117 hw/xfree86/int10/vbe.h | 3 +-
118 hw/xfree86/int10/vbeModes.c | 2 +-
119 hw/xfree86/int10/xf86int10.c | 2 +-
120 hw/xfree86/modes/xf86Crtc.c | 4 +-
121 hw/xfree86/modes/xf86Crtc.h | 2 +-
122 hw/xfree86/modes/xf86EdidModes.c | 4 +-
123 hw/xfree86/modes/xf86RandR12.c | 2 +-
124 hw/xfree86/os-support/bsd/bsd_init.c | 6 +--
125 hw/xfree86/os-support/bsd/memrange.h | 2 +-
126 hw/xfree86/os-support/shared/sigio.c | 2 +-
127 hw/xfree86/os-support/solaris/sun_apm.c | 2 +-
128 hw/xfree86/os-support/xf86_OSproc.h | 4 +-
129 hw/xfree86/parser/Configint.h | 6 +--
130 hw/xfree86/parser/write.c | 2 +-
131 hw/xfree86/ramdac/CURSOR.NOTES | 42 +++++++++----------
132 hw/xfree86/utils/cvt/cvt.c | 4 +-
133 hw/xfree86/vgahw/vgaHW.c | 6 +--
134 hw/xfree86/vgahw/vgaHW.h | 2 +-
135 hw/xfree86/x86emu/decode.c | 2 +-
136 hw/xfree86/x86emu/ops.c | 18 ++++----
137 hw/xfree86/x86emu/prim_ops.c | 14 +++----
138 hw/xfree86/x86emu/sys.c | 2 +-
139 hw/xfree86/x86emu/x86emu/debug.h | 4 +-
140 hw/xfree86/x86emu/x86emu/regs.h | 2 +-
141 hw/xfree86/x86emu/x86emu/x86emui.h | 4 +-
142 hw/xfree86/xorgconf.cpp | 2 +-
143 hw/xnest/Args.c | 2 +-
144 hw/xnest/Handlers.c | 2 +-
145 hw/xnest/Keyboard.c | 6 ++-
146 hw/xnest/Window.c | 2 +-
147 hw/xnest/man/Xnest.man | 2 +-
148 hw/xquartz/GL/capabilities.c | 6 +--
149 hw/xquartz/GL/glcontextmodes.c | 8 ++--
150 hw/xquartz/X11Controller.h | 4 +-
151 hw/xquartz/darwin.c | 4 +-
152 hw/xquartz/mach-startup/.gitignore | 2 +-
153 hw/xquartz/pbproxy/x-selection.m | 10 ++---
154 hw/xquartz/xpr/xprScreen.c | 2 +-
155 hw/xwayland/xwayland-glamor-eglstream.c | 8 ++--
156 hw/xwayland/xwayland-input.c | 2 +-
157 hw/xwayland/xwayland-shm.c | 2 +-
158 hw/xwin/InitOutput.c | 2 +-
159 hw/xwin/ddraw.h | 24 +++++------
160 hw/xwin/glx/indirect.c | 6 +--
161 hw/xwin/man/XWin.man | 4 +-
162 hw/xwin/man/XWinrc.man | 2 +-
163 hw/xwin/win.h | 2 +-
164 hw/xwin/winallpriv.c | 2 +-
165 hw/xwin/winclipboard/wndproc.c | 2 +-
166 hw/xwin/winclipboard/xwinclip.man | 4 +-
167 hw/xwin/winclipboardinit.c | 2 +-
168 hw/xwin/winconfig.c | 2 +-
169 hw/xwin/wincreatewnd.c | 2 +-
170 hw/xwin/wincursor.c | 2 +-
171 hw/xwin/winkeynames.h | 4 +-
172 hw/xwin/winmouse.c | 2 +-
173 hw/xwin/winmultiwindowicons.c | 2 +-
174 hw/xwin/winmultiwindowwindow.c | 8 ++--
175 hw/xwin/winmultiwindowwm.c | 6 +--
176 hw/xwin/winprefs.c | 2 +-
177 hw/xwin/winprocarg.c | 2 +-
178 hw/xwin/winscrinit.c | 6 +--
179 hw/xwin/winshadgdi.c | 2 +-
180 hw/xwin/winwndproc.c | 4 +-
181 include/.gitignore | 2 +-
182 include/glxvndabi.h | 2 +-
183 include/pixmap.h | 2 +-
184 include/scrnintstr.h | 6 +--
185 include/xkbstr.h | 2 +-
186 mi/miarc.c | 4 +-
187 mi/mibitblt.c | 2 +-
188 mi/micmap.c | 2 +-
189 mi/miglblt.c | 2 +-
190 mi/mipointer.c | 6 +--
191 mi/mipointer.h | 2 +-
192 mi/miscrinit.c | 2 +-
193 mi/mizerline.c | 2 +-
194 miext/rootless/rootless.h | 4 +-
195 miext/rootless/rootlessCommon.h | 2 +-
196 miext/rootless/rootlessWindow.c | 6 +--
197 miext/shadow/shadow.c | 2 +-
198 miext/sync/misyncstr.h | 2 +-
199 os/access.c | 2 +-
200 os/backtrace.c | 2 +-
201 os/client.c | 2 +-
202 os/connection.c | 2 +-
203 os/io.c | 6 +--
204 present/present.h | 2 +-
205 present/present_wnmd.c | 2 +-
206 record/record.c | 4 +-
207 xfixes/cursor.c | 2 +-
208 xkb/XKM_file_format.txt | 6 +--
209 xkb/ddxLoad.c | 2 +-
210 202 files changed, 395 insertions(+), 389 deletions(-)
211
212diff --git a/README.md b/README.md
213index a40f2ca2b..bc39f41cd 100644
214--- a/README.md
215+++ b/README.md
216@@ -19,7 +19,7 @@ Xorg mailing list:
217
218 https://lists.freedesktop.org/mailman/listinfo/xorg
219
220-The primary development code repository can be found at:
221+The master development code repository can be found at:
222
223 https://gitlab.freedesktop.org/xorg/xserver
224
225diff --git a/Xext/hashtable.h b/Xext/hashtable.h
226index 04e0be9e2..a988af32c 100644
227--- a/Xext/hashtable.h
228+++ b/Xext/hashtable.h
229@@ -40,7 +40,7 @@ typedef struct {
230 int keySize;
231 } HtGenericHashSetupRec, *HtGenericHashSetupPtr;
232
233-/** @brief ht_create initializes a hash table for a certain hash table
234+/** @brief ht_create initalizes a hash table for a certain hash table
235 configuration
236
237 @param[out] ht The hash table structure to initialize
238diff --git a/Xext/saver.c b/Xext/saver.c
239index 1d7e3cadf..c27a66c80 100644
240--- a/Xext/saver.c
241+++ b/Xext/saver.c
242@@ -366,7 +366,7 @@ ScreenSaverFreeSuspend(void *value, XID id)
243 }
244 }
245
246- /* Re-enable the screensaver if this was the last client suspending it. */
247+ /* Reenable the screensaver if this was the last client suspending it. */
248 if (screenSaverSuspended && suspendingClients == NULL) {
249 screenSaverSuspended = FALSE;
250
251@@ -1243,7 +1243,7 @@ ProcScreenSaverSuspend(ClientPtr client)
252 /*
253 * Allocate a suspension record for the client, and stop the screensaver
254 * if it isn't already suspended by another client. We attach a resource ID
255- * to the record, so the screensaver will be re-enabled and the record freed
256+ * to the record, so the screensaver will be reenabled and the record freed
257 * if the client disconnects without reenabling it first.
258 */
259 this = malloc(sizeof(ScreenSaverSuspensionRec));
260diff --git a/Xext/shm.c b/Xext/shm.c
261index 0deb9a945..24c6b1087 100644
262--- a/Xext/shm.c
263+++ b/Xext/shm.c
264@@ -303,8 +303,8 @@ ProcShmQueryVersion(ClientPtr client)
265 }
266
267 /*
268- * Simulate the access() system call for a shared memory segment,
269- * using the credentials from the client if available.
270+ * Simulate the access() system call for a shared memory segement,
271+ * using the credentials from the client if available
272 */
273 static int
274 shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
275diff --git a/Xext/vidmode.c b/Xext/vidmode.c
276index c7c61647e..6e4a7c709 100644
277--- a/Xext/vidmode.c
278+++ b/Xext/vidmode.c
279@@ -277,8 +277,8 @@ ProcVidModeGetModeLine(ClientPtr client)
280
281 /*
282 * Older servers sometimes had server privates that the VidMode
283- * extension made available. So to be compatible pretend that
284- * there are no server privates to pass to the client.
285+ * extention made available. So to be compatiable pretend that
286+ * there are no server privates to pass to the client
287 */
288 rep.privsize = 0;
289
290diff --git a/Xext/xres.c b/Xext/xres.c
291index 354329802..7a7aabc9b 100644
292--- a/Xext/xres.c
293+++ b/Xext/xres.c
294@@ -72,7 +72,7 @@ typedef struct {
295 HashTable visitedResources;
296
297 /* Used by AddSubResourceSizeSpec when AddResourceSizeValue is
298- handling cross-references */
299+ handling crossreferences */
300 HashTable visitedSubResources;
301
302 /* used when ConstructResourceBytesCtx is passed to
303@@ -442,7 +442,7 @@ WillConstructMask(ClientPtr client, CARD32 mask,
304 client id spec
305
306 @param sendClient Which client wishes to receive this answer. Used for
307- byte endianness.
308+ byte endianess.
309 @param client Which client are we considering.
310 @param mask The client id spec mask indicating which information
311 we want about this client.
312@@ -609,7 +609,7 @@ ProcXResQueryClientIds (ClientPtr client)
313 return rc;
314 }
315
316-/** @brief Swaps xXResResourceIdSpec endianness */
317+/** @brief Swaps xXResResourceIdSpec endianess */
318 static void
319 SwapXResResourceIdSpec(xXResResourceIdSpec *spec)
320 {
321@@ -617,7 +617,7 @@ SwapXResResourceIdSpec(xXResResourceIdSpec *spec)
322 swapl(&spec->type);
323 }
324
325-/** @brief Swaps xXResResourceSizeSpec endianness */
326+/** @brief Swaps xXResResourceSizeSpec endianess */
327 static void
328 SwapXResResourceSizeSpec(xXResResourceSizeSpec *size)
329 {
330@@ -627,7 +627,7 @@ SwapXResResourceSizeSpec(xXResResourceSizeSpec *size)
331 swapl(&size->useCount);
332 }
333
334-/** @brief Swaps xXResResourceSizeValue endianness */
335+/** @brief Swaps xXResResourceSizeValue endianess */
336 static void
337 SwapXResResourceSizeValue(xXResResourceSizeValue *rep)
338 {
339diff --git a/Xext/xtest.c b/Xext/xtest.c
340index 540d270a1..38b80122b 100644
341--- a/Xext/xtest.c
342+++ b/Xext/xtest.c
343@@ -57,10 +57,9 @@
344
345 #include "extinit.h"
346
347-/* XTest events are sent during request processing and may be interrupted by
348+/* XTest events are sent during request processing and may be interruped by
349 * a SIGIO. We need a separate event list to avoid events overwriting each
350- * other's memory.
351- */
352+ * other's memory */
353 static InternalEvent *xtest_evlist;
354
355 /**
356diff --git a/Xext/xvmain.c b/Xext/xvmain.c
357index f62747193..c520c7d29 100644
358--- a/Xext/xvmain.c
359+++ b/Xext/xvmain.c
360@@ -425,7 +425,7 @@ XvdiDestroyVideoNotifyList(void *pn, XID id)
361 {
362 XvVideoNotifyPtr npn, cpn;
363
364- /* ACTUALLY DESTROY THE NOTIFY LIST */
365+ /* ACTUALLY DESTROY THE NOTITY LIST */
366
367 cpn = (XvVideoNotifyPtr) pn;
368
369@@ -820,7 +820,7 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
370 tpn = tpn->next;
371 }
372
373- /* IF TURNING OFF, THEN JUST RETURN */
374+ /* IF TUNNING OFF, THEN JUST RETURN */
375
376 if (!onoff)
377 return Success;
378diff --git a/Xi/closedev.c b/Xi/closedev.c
379index f68b5231a..199d38a5a 100644
380--- a/Xi/closedev.c
381+++ b/Xi/closedev.c
382@@ -108,7 +108,7 @@ DeleteDeviceEvents(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
383
384 /***********************************************************************
385 *
386- * Walk through the window tree, deleting event selections for this client
387+ * Walk througth the window tree, deleting event selections for this client
388 * from this device from all windows.
389 *
390 */
391diff --git a/Xi/exevents.c b/Xi/exevents.c
392index 41a4097cc..98319ad4d 100644
393--- a/Xi/exevents.c
394+++ b/Xi/exevents.c
395@@ -653,7 +653,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
396 * Copies the CONTENT of the classes of device from into the classes in device
397 * to. From and to are identical after finishing.
398 *
399- * If to does not have classes from currently has, the classes are stored in
400+ * If to does not have classes from currenly has, the classes are stored in
401 * to's devPrivates system. Later, we recover it again from there if needed.
402 * Saves a few memory allocations.
403 */
404@@ -2667,7 +2667,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
405 return Success;
406
407 /* If the input focus is PointerRootWin, send the event to where
408- * the pointer is if possible, then perhaps propagate up to root. */
409+ * the pointer is if possible, then perhaps propogate up to root. */
410 if (inputFocus == PointerRootWin)
411 inputFocus = GetCurrentRootWindow(d);
412
413diff --git a/Xi/grabdev.c b/Xi/grabdev.c
414index cb68cfa8d..eb4f9bfde 100644
415--- a/Xi/grabdev.c
416+++ b/Xi/grabdev.c
417@@ -153,7 +153,7 @@ ProcXGrabDevice(ClientPtr client)
418 * set when XI starts up) and binary OR's the device's mask to whatever the
419 * event mask for the given event type was.
420 * If an error occurs, it is sent to the client. Errors are generated if
421- * - if the device given in the event class is invalid
422+ * - if the device given in the event classs is invalid
423 * - if the device in the class list is not the device given as parameter (no
424 * error if parameter is NULL)
425 *
426diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
427index a36f7d61d..6ec419e87 100644
428--- a/Xi/xiproperty.c
429+++ b/Xi/xiproperty.c
430@@ -414,7 +414,7 @@ XIResetProperties(void)
431 * @param val The property value
432 * @param nelem_return The maximum number of elements to return.
433 * @param buf_return Pointer to an array of at least @nelem_return values.
434- * @return Success or the error code if an error occurred.
435+ * @return Success or the error code if an error occured.
436 */
437 _X_EXPORT int
438 XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
439@@ -484,7 +484,7 @@ XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
440 * @param val The property value
441 * @param nelem_return The maximum number of elements to return.
442 * @param buf_return Pointer to an array of at least @nelem_return values.
443- * @return Success or the error code if an error occurred.
444+ * @return Success or the error code if an error occured.
445 */
446 _X_EXPORT int
447 XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
448@@ -521,7 +521,7 @@ XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
449 /* Registers a new property handler on the given device and returns a unique
450 * identifier for this handler. This identifier is required to unregister the
451 * property handler again.
452- * @return The handler's identifier or 0 if an error occurred.
453+ * @return The handler's identifier or 0 if an error occured.
454 */
455 long
456 XIRegisterPropertyHandler(DeviceIntPtr dev,
457diff --git a/composite/compwindow.c b/composite/compwindow.c
458index 73a1871a0..ea59b5a1a 100644
459--- a/composite/compwindow.c
460+++ b/composite/compwindow.c
461@@ -453,7 +453,7 @@ compReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
462 compUnredirectOneSubwindow(pPriorParent, pWin);
463 compRedirectOneSubwindow(pWin->parent, pWin);
464 /*
465- * Add any implicit redirect due to synthesized visual
466+ * Add any implict redirect due to synthesized visual
467 */
468 if (compImplicitRedirect(pWin, pWin->parent))
469 compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
470diff --git a/configure.ac b/configure.ac
471index 2f2c1cd53..1e844971f 100644
472--- a/configure.ac
473+++ b/configure.ac
474@@ -189,7 +189,7 @@ if test "x$ac_cv_func_getpeereid" = xno && test "x$ac_cv_func_getpeerucred" = xn
475 AC_DEFINE([NO_LOCAL_CLIENT_CRED], 1, [Define to 1 if no local socket credentials interface exists])
476 fi
477
478-dnl Find the math library, then check for cbrt function in it.
479+dnl Find the math libary, then check for cbrt function in it.
480 AC_CHECK_LIB(m, sqrt)
481 AC_CHECK_FUNCS([cbrt])
482
483diff --git a/dbe/dbe.c b/dbe/dbe.c
484index cdab3e9e5..292a22366 100644
485--- a/dbe/dbe.c
486+++ b/dbe/dbe.c
487@@ -1127,7 +1127,7 @@ DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC)
488 * DbeExtensionInit().
489 *
490 * To make resource deletion simple, we do not do anything in this function
491- * and leave all resource deletion to DbeWindowPrivDelete(), which will
492+ * and leave all resource deleteion to DbeWindowPrivDelete(), which will
493 * eventually be called or already has been called. Deletion functions are
494 * not guaranteed to be called in any particular order.
495 *
496@@ -1183,7 +1183,7 @@ DbeWindowPrivDelete(void *pDbeWinPriv, XID id)
497 }
498 else {
499 /* We are removing the last ID in the array, in which case, the
500- * assignment below is all that we need to do.
501+ * assignement below is all that we need to do.
502 */
503 }
504 pDbeWindowPriv->IDs[pDbeWindowPriv->nBufferIDs - 1] = DBE_FREE_ID_ELEMENT;
505diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
506index ce99fbea8..fe2ef0af6 100644
507--- a/dbe/dbestruct.h
508+++ b/dbe/dbestruct.h
509@@ -171,7 +171,7 @@ typedef struct _DbeWindowPrivRec {
510
511 typedef struct _DbeScreenPrivRec {
512 /* Wrapped functions
513- * It is the responsibility of the DDX layer to wrap PositionWindow().
514+ * It is the responsibilty of the DDX layer to wrap PositionWindow().
515 * DbeExtensionInit wraps DestroyWindow().
516 */
517 PositionWindowProcPtr PositionWindow;
518diff --git a/dix/.gitignore b/dix/.gitignore
519index 47cb0826e..f149fffc6 100644
520--- a/dix/.gitignore
521+++ b/dix/.gitignore
522@@ -1,2 +1,2 @@
523-# Add & Override for this directory and its subdirectories
524+# Add & Override for this directory and it's subdirectories
525 dix.O
526diff --git a/dix/colormap.c b/dix/colormap.c
527index 7a00d14d6..12a85b256 100644
528--- a/dix/colormap.c
529+++ b/dix/colormap.c
530@@ -1095,7 +1095,7 @@ AllocColor(ColormapPtr pmap,
531
532 /*
533 * FakeAllocColor -- fake an AllocColor request by
534- * returning a free pixel if available, otherwise returning
535+ * returning a free pixel if availible, otherwise returning
536 * the closest matching pixel. This is used by the mi
537 * software sprite code to recolor cursors. A nice side-effect
538 * is that this routine will never return failure.
539@@ -2510,7 +2510,7 @@ _colormap_find_resource(void *value, XID id, void *cdata)
540 }
541
542 /* something has realloced the visuals, instead of breaking
543- ABI fix it up here - glx and composite did this wrong */
544+ ABI fix it up here - glx and compsite did this wrong */
545 Bool
546 ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth)
547 {
548diff --git a/dix/dispatch.c b/dix/dispatch.c
549index 8865219d0..f20e1963e 100644
550--- a/dix/dispatch.c
551+++ b/dix/dispatch.c
552@@ -3864,7 +3864,7 @@ static int init_screen(ScreenPtr pScreen, int i, Bool gpu)
553
554 /*
555 * This loop gets run once for every Screen that gets added,
556- * but that's ok. If the ddx layer initializes the formats
557+ * but thats ok. If the ddx layer initializes the formats
558 * one at a time calling AddScreen() after each, then each
559 * iteration will make it a little more accurate. Worst case
560 * we do this loop N * numPixmapFormats where N is # of screens.
561diff --git a/dix/dixfonts.c b/dix/dixfonts.c
562index 58a385f71..0ea8678bb 100644
563--- a/dix/dixfonts.c
564+++ b/dix/dixfonts.c
565@@ -1108,7 +1108,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
566 if (ClientIsAsleep(client)) {
567 /* Client has died, but we cannot bail out right now. We
568 need to clean up after the work we did when going to
569- sleep. Setting the drawable pointer to 0 makes this
570+ sleep. Setting the drawable poiner to 0 makes this
571 happen without any attempts to render or perform other
572 unnecessary activities. */
573 c->pDraw = (DrawablePtr) 0;
574diff --git a/dix/enterleave.c b/dix/enterleave.c
575index a41bacfb9..a2f625bc9 100644
576--- a/dix/enterleave.c
577+++ b/dix/enterleave.c
578@@ -130,7 +130,7 @@ PointerWin(DeviceIntPtr dev)
579
580 /**
581 * Search for the first window below 'win' that has a pointer directly within
582- * its boundaries (excluding boundaries of its own descendants).
583+ * it's boundaries (excluding boundaries of its own descendants).
584 *
585 * @return The child window that has the pointer within its boundaries or
586 * NULL.
587@@ -150,7 +150,7 @@ FirstPointerChild(WindowPtr win)
588
589 /**
590 * Search for the first window below 'win' that has a focus directly within
591- * its boundaries (excluding boundaries of its own descendants).
592+ * it's boundaries (excluding boundaries of its own descendants).
593 *
594 * @return The child window that has the pointer within its boundaries or
595 * NULL.
596diff --git a/dix/events.c b/dix/events.c
597index 9431e4f12..f546700fa 100644
598--- a/dix/events.c
599+++ b/dix/events.c
600@@ -1508,7 +1508,7 @@ UpdateTouchesForGrab(DeviceIntPtr mouse)
601 * @param mouse The device to grab.
602 * @param grab The grab structure, needs to be setup.
603 * @param autoGrab True if the grab was caused by a button down event and not
604- * explicitly by a client.
605+ * explicitely by a client.
606 */
607 void
608 ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
609@@ -2764,7 +2764,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
610 }
611
612 /**
613- * Deliver event to a window and its immediate parent. Used for most window
614+ * Deliver event to a window and it's immediate parent. Used for most window
615 * events (CreateNotify, ConfigureNotify, etc.). Not useful for events that
616 * propagate up the tree or extension events
617 *
618@@ -3977,7 +3977,7 @@ CheckPassiveGrabsOnWindow(WindowPtr pWin,
619 *
620 * If the event is a keyboard event, the ancestors of the focus window are
621 * traced down and tried to see if they have any passive grabs to be
622- * activated. If the focus window itself is reached and its descendants
623+ * activated. If the focus window itself is reached and it's descendants
624 * contain the pointer, the ancestors of the window that the pointer is in
625 * are then traced down starting at the focus window, otherwise no grabs are
626 * activated.
627@@ -5398,7 +5398,7 @@ ProcSendEvent(ClientPtr client)
628 return Success;
629
630 /* If the input focus is PointerRootWin, send the event to where
631- the pointer is if possible, then perhaps propagate up to root. */
632+ the pointer is if possible, then perhaps propogate up to root. */
633 if (inputFocus == PointerRootWin)
634 inputFocus = GetCurrentRootWindow(dev);
635
636diff --git a/dix/getevents.c b/dix/getevents.c
637index b2b8f124f..f784c68d5 100644
638--- a/dix/getevents.c
639+++ b/dix/getevents.c
640@@ -1328,7 +1328,7 @@ QueuePointerEvents(DeviceIntPtr device, int type,
641 * rescaled to match Sx/Sy for [n..m]. In the simplest example, x of (m/2-1)
642 * is the last coordinate on the first screen and must be rescaled for the
643 * event to be m. XI2 clients that do their own coordinate mapping would
644- * otherwise interpret the position of the device elsewhere to the cursor.
645+ * otherwise interpret the position of the device elsewere to the cursor.
646 * However, this scaling leads to losses:
647 * if we have two ScreenRecs we scale from e.g. [0..44704] (Wacom I4) to
648 * [0..2048[. that gives us 2047.954 as desktop coord, or the per-screen
649@@ -1446,7 +1446,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
650
651 storeLastValuators(pDev, &mask, 0, 1, devx, devy);
652
653- /* Update the MD's coordinates, which are always in desktop space. */
654+ /* Update the MD's co-ordinates, which are always in desktop space. */
655 if (!IsMaster(pDev) && !IsFloating(pDev)) {
656 DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER);
657
658@@ -1473,7 +1473,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
659 event->detail.button = buttons;
660 }
661
662- /* root_x and root_y must be in per-screen coordinates */
663+ /* root_x and root_y must be in per-screen co-ordinates */
664 event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y);
665
666 if (flags & POINTER_EMULATED) {
667@@ -1931,7 +1931,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
668 switch (type) {
669 case XI_TouchBegin:
670 event->type = ET_TouchBegin;
671- /* If we're starting a touch, we must have x & y coordinates. */
672+ /* If we're starting a touch, we must have x & y co-ordinates. */
673 if (!mask_in ||
674 !valuator_mask_isset(mask_in, 0) ||
675 !valuator_mask_isset(mask_in, 1)) {
676@@ -1957,7 +1957,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
677 return 0;
678 }
679
680- /* Get our screen event coordinates (root_x/root_y/event_x/event_y):
681+ /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y):
682 * these come from the touchpoint in Absolute mode, or the sprite in
683 * Relative. */
684 if (t->mode == XIDirectTouch) {
685@@ -2003,7 +2003,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
686 if (emulate_pointer)
687 storeLastValuators(dev, &mask, 0, 1, devx, devy);
688
689- /* Update the MD's coordinates, which are always in desktop space. */
690+ /* Update the MD's co-ordinates, which are always in desktop space. */
691 if (emulate_pointer && !IsMaster(dev) && !IsFloating(dev)) {
692 DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);
693
694diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
695index 632971ed9..ff39d7bba 100644
696--- a/dix/ptrveloc.c
697+++ b/dix/ptrveloc.c
698@@ -97,7 +97,7 @@ InitVelocityData(DeviceVelocityPtr vel)
699 {
700 memset(vel, 0, sizeof(DeviceVelocityRec));
701
702- vel->corr_mul = 10.0; /* dots per 10 millisecond should be usable */
703+ vel->corr_mul = 10.0; /* dots per 10 milisecond should be usable */
704 vel->const_acceleration = 1.0; /* no acceleration/deceleration */
705 vel->reset_time = 300;
706 vel->use_softening = 1;
707@@ -519,7 +519,7 @@ DoGetDirection(int dx, int dy)
708
709 /* cache DoGetDirection().
710 * To avoid excessive use of direction calculation, cache the values for
711- * [-5..5] for both x/y. Anything outside of that is calculated on the fly.
712+ * [-5..5] for both x/y. Anything outside of that is calcualted on the fly.
713 *
714 * @return A bitmask for N, NE, S, SE, etc. indicating the directions for
715 * this movement.
716@@ -597,7 +597,7 @@ CalcTracker(const MotionTracker * tracker, int cur_t)
717 /* find the most plausible velocity. That is, the most distant
718 * (in time) tracker which isn't too old, the movement vector was
719 * in the same octant, and where the velocity is within an
720- * acceptable range to the initial velocity.
721+ * acceptable range to the inital velocity.
722 *
723 * @return The tracker's velocity or 0 if the above conditions are unmet
724 */
725diff --git a/dix/region.c b/dix/region.c
726index 49d823cda..e269e695c 100644
727--- a/dix/region.c
728+++ b/dix/region.c
729@@ -1114,7 +1114,7 @@ QuickSortRects(BoxRec rects[], int numRects)
730 *
731 * Side Effects:
732 * The passed-in ``region'' may be modified.
733- * pOverlap set to TRUE if any rectangles overlapped, else FALSE;
734+ * pOverlap set to TRUE if any retangles overlapped, else FALSE;
735 *
736 * Strategy:
737 * Step 1. Sort the rectangles into ascending order with primary key y1
738@@ -1123,7 +1123,7 @@ QuickSortRects(BoxRec rects[], int numRects)
739 * Step 2. Split the rectangles into the minimum number of proper y-x
740 * banded regions. This may require horizontally merging
741 * rectangles, and vertically coalescing bands. With any luck,
742- * this step in an identity transformation (ala the Box widget),
743+ * this step in an identity tranformation (ala the Box widget),
744 * or a coalescing into 1 box (ala Menus).
745 *
746 * Step 3. Merge the separate regions down to a single region by calling
747diff --git a/dix/swaprep.c b/dix/swaprep.c
748index d785b2e5e..08344d7f7 100644
749--- a/dix/swaprep.c
750+++ b/dix/swaprep.c
751@@ -118,7 +118,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
752 nbytes = (toLast - to) << 2;
753 while (to < toLast) {
754 /* can't write "cpswapl(*from++, *to++)" because cpswapl is a macro
755- that evaluates its args more than once */
756+ that evaulates its args more than once */
757 cpswapl(*from, *to);
758 from++;
759 to++;
760@@ -165,7 +165,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
761 nbytes = (toLast - to) << 1;
762 while (to < toLast) {
763 /* can't write "cpswaps(*from++, *to++)" because cpswaps is a macro
764- that evaluates its args more than once */
765+ that evaulates its args more than once */
766 cpswaps(*from, *to);
767 from++;
768 to++;
769diff --git a/dix/touch.c b/dix/touch.c
770index 337674ddb..37902bd05 100644
771--- a/dix/touch.c
772+++ b/dix/touch.c
773@@ -44,7 +44,7 @@
774
775 /**
776 * Some documentation about touch points:
777- * The driver submits touch events with its own (unique) touch point ID.
778+ * The driver submits touch events with it's own (unique) touch point ID.
779 * The driver may re-use those IDs, the DDX doesn't care. It just passes on
780 * the data to the DIX. In the server, the driver's ID is referred to as the
781 * DDX id anyway.
782@@ -63,7 +63,7 @@
783
784 /**
785 * Check which devices need a bigger touch event queue and grow their
786- * last.touches by half its current size.
787+ * last.touches by half it's current size.
788 *
789 * @param client Always the serverClient
790 * @param closure Always NULL
791@@ -578,7 +578,7 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
792 * @param[in] button_event The respective button event (if any)
793 *
794 * @returns The number of converted events.
795- * @retval 0 An error occurred
796+ * @retval 0 An error occured
797 * @retval 1 only the motion event is valid
798 * @retval 2 motion and button event are valid
799 */
800diff --git a/dix/window.c b/dix/window.c
801index cd917f006..b9c79ce95 100644
802--- a/dix/window.c
803+++ b/dix/window.c
804@@ -2274,8 +2274,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
805 if (!pParent)
806 return Success;
807
808- /* Figure out if the window should be moved. Doesn't
809- make the changes to the window if event sent. */
810+ /* Figure out if the window should be moved. Doesnt
811+ make the changes to the window if event sent */
812
813 if (mask & CWStackMode)
814 pSib = WhereDoIGoInTheStack(pWin, pSib, pParent->drawable.x + x,
815@@ -2547,7 +2547,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
816 if (pWin->prevSib)
817 pWin->prevSib->nextSib = pWin->nextSib;
818
819- /* insert at beginning of pParent */
820+ /* insert at begining of pParent */
821 pWin->parent = pParent;
822 pPrev = RealChildHead(pParent);
823 if (pPrev) {
824diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
825index 15ecb0fd5..2c7e17a86 100644
826--- a/doc/Xserver-spec.xml
827+++ b/doc/Xserver-spec.xml
828@@ -1238,7 +1238,7 @@ clients are drawing into their windows simultaneously.
829 If it allows one client to run until its request
830 queue is empty by ignoring isItTimeToYield, the client's queue may
831 in fact never empty and other clients will be blocked out.
832-On the other hand, if it switches between different clients too quickly,
833+On the other hand, if it switchs between different clients too quickly,
834 performance may suffer due to too much switching between contexts.
835 For example, if a graphics processor needs to be set up with drawing modes
836 before drawing, and two different clients are drawing with
837@@ -4624,7 +4624,7 @@ GC mode-dependent components: fgPixel (for fillStyle Solid); tile, patOrg
838 (for fillStyle Tile); stipple, patOrg, fgPixel (for fillStyle Stipple);
839 and stipple, patOrg, fgPixel and bgPixel (for fillStyle OpaqueStipple).</para>
840 <para>
841-PushPixels applies the foreground color, tile, or stipple from the pGC
842+PushPixels applys the foreground color, tile, or stipple from the pGC
843 through a stencil onto pDrawable. pBitMap points to a stencil (of
844 which we use an area dx wide by dy high), which is oriented over the
845 drawable at xOrg, yOrg. Where there is a 1 bit in the bitmap, the
846diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml
847index 6ff8caee5..ee594ac7c 100644
848--- a/doc/dtrace/Xserver-DTrace.xml
849+++ b/doc/dtrace/Xserver-DTrace.xml
850@@ -58,7 +58,7 @@ DEALINGS IN THE SOFTWARE.
851 </para>
852
853 <para>
854- The provider was integrated into the X.Org code base
855+ The provider was integrated into the X.Org git master repository
856 with Solaris 10 & OpenSolaris support for the Xserver 1.4 release,
857 released in 2007 with X11R7.3. Support for DTrace on MacOS X
858 was added in Xserver 1.7.
859diff --git a/exa/exa.c b/exa/exa.c
860index b16875845..d6ff19796 100644
861--- a/exa/exa.c
862+++ b/exa/exa.c
863@@ -497,7 +497,7 @@ static void
864 exaValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
865 {
866 /* fbValidateGC will do direct access to pixmaps if the tiling has changed.
867- * Do a few smart things so fbValidateGC can do its work.
868+ * Do a few smart things so fbValidateGC can do it's work.
869 */
870
871 ScreenPtr pScreen = pDrawable->pScreen;
872diff --git a/exa/exa.h b/exa/exa.h
873index 288d9ac66..949ea3ac0 100644
874--- a/exa/exa.h
875+++ b/exa/exa.h
876@@ -140,7 +140,7 @@ typedef struct _ExaDriver {
877 /**
878 * The flags field is bitfield of boolean values controlling EXA's behavior.
879 *
880- * The flags include EXA_OFFSCREEN_PIXMAPS, EXA_OFFSCREEN_ALIGN_POT, and
881+ * The flags in clude EXA_OFFSCREEN_PIXMAPS, EXA_OFFSCREEN_ALIGN_POT, and
882 * EXA_TWO_BITBLT_DIRECTIONS.
883 */
884 int flags;
885diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
886index c77e36261..174d4456a 100644
887--- a/exa/exa_offscreen.c
888+++ b/exa/exa_offscreen.c
889@@ -150,7 +150,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
890 * @param privdata private data for the save callback.
891 *
892 * Allocates offscreen memory from the device associated with pScreen. size
893- * and align determine where and how large the allocated area is, and locked
894+ * and align deteremine where and how large the allocated area is, and locked
895 * will mark whether it should be held in card memory. privdata may be any
896 * pointer for the save callback when the area is removed.
897 *
898diff --git a/exa/exa_priv.h b/exa/exa_priv.h
899index 8414bd857..912e21478 100644
900--- a/exa/exa_priv.h
901+++ b/exa/exa_priv.h
902@@ -119,7 +119,7 @@ typedef struct {
903 /* Hash table mapping from glyph sha1 to position in the glyph; we use
904 * open addressing with a hash table size determined based on size and large
905 * enough so that we always have a good amount of free space, so we can
906- * use linear probing. (Linear probing is preferable to double hashing
907+ * use linear probing. (Linear probing is preferrable to double hashing
908 * here because it allows us to easily remove entries.)
909 */
910 int *hashEntries;
911@@ -130,7 +130,7 @@ typedef struct {
912
913 PicturePtr picture; /* Where the glyphs of the cache are stored */
914 int yOffset; /* y location within the picture where the cache starts */
915- int columns; /* Number of columns the glyphs are laid out in */
916+ int columns; /* Number of columns the glyphs are layed out in */
917 int evictionPosition; /* Next random position to evict a glyph */
918 } ExaGlyphCacheRec, *ExaGlyphCachePtr;
919
920diff --git a/fb/fbbltone.c b/fb/fbbltone.c
921index 7eac85b08..811bbc533 100644
922--- a/fb/fbbltone.c
923+++ b/fb/fbbltone.c
924@@ -227,7 +227,7 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */
925 */
926 dstS = dstX / dstBpp;
927 /*
928- * Compute shift constants for effective alignment
929+ * Compute shift constants for effective alignement
930 */
931 if (srcX >= dstS) {
932 leftShift = srcX - dstS;
933diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
934index d9976ce9f..7b6a2c679 100644
935--- a/fb/fbcmap_mi.c
936+++ b/fb/fbcmap_mi.c
937@@ -101,7 +101,7 @@ fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
938
939 /*
940 * Given a list of formats for a screen, create a list
941- * of visuals and depths for the screen which correspond to
942+ * of visuals and depths for the screen which coorespond to
943 * the set which can be used with this version of fb.
944 */
945 Bool
946diff --git a/glamor/glamor.c b/glamor/glamor.c
947index a11e2212d..59178b930 100644
948--- a/glamor/glamor.c
949+++ b/glamor/glamor.c
950@@ -1071,7 +1071,7 @@ glamor_shareable_fd_from_pixmap(ScreenPtr screen,
951 int ret;
952
953 /*
954- * The actual difference between a shareable and non-shareable buffer
955+ * The actual difference between a sharable and non sharable buffer
956 * is decided 4 call levels deep in glamor_make_pixmap_exportable()
957 * based on pixmap->usage_hint == CREATE_PIXMAP_USAGE_SHARED
958 * 2 of those calls are also exported API, so we cannot just add a flag.
959diff --git a/glamor/glamor.h b/glamor/glamor.h
960index 31157471d..76ad84ed9 100644
961--- a/glamor/glamor.h
962+++ b/glamor/glamor.h
963@@ -344,7 +344,7 @@ extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen,
964 * @scrn: Current screen info pointer.
965 * @fd: Current drm fd.
966 *
967- * This function creates and initializes EGL contexts.
968+ * This function creates and intialize EGL contexts.
969 * Should be called from DDX's preInit function.
970 * Return TRUE if success, otherwise return FALSE.
971 * */
972diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c
973index 7e5d5cca9..eef078860 100644
974--- a/glamor/glamor_gradient.c
975+++ b/glamor/glamor_gradient.c
976@@ -204,7 +204,7 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
977 * Refer to pixman radial gradient.
978 *
979 * The problem is given the two circles of c1 and c2 with the radius of r1 and
980- * r1, we need to calculate the t, which is used to do interpolate with stops,
981+ * r1, we need to caculate the t, which is used to do interpolate with stops,
982 * using the fomula:
983 * length((1-t)*c1 + t*c2 - p) = (1-t)*r1 + t*r2
984 * expand the fomula with xy coond, get the following:
985@@ -428,11 +428,11 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
986 * |
987 *
988 * step 1: compute the distance of p, pt1 and pt2 in the slope direction.
989- * Calculate the distance on Y axis first and multiply cos_val to
990+ * Caculate the distance on Y axis first and multiply cos_val to
991 * get the value on slope direction(pd, p1d and p2d represent the
992 * distance of p, pt1, and pt2 respectively).
993 *
994- * step 2: calculate the percentage of (pd - p1d)/(p2d - p1d).
995+ * step 2: caculate the percentage of (pd - p1d)/(p2d - p1d).
996 * If (pd - p1d) > (p2d - p1d) or < 0, then sub or add (p2d - p1d)
997 * to make it in the range of [0, (p2d - p1d)].
998 *
999diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c
1000index 57760f8d3..f9adb93bc 100644
1001--- a/glamor/glamor_largepixmap.c
1002+++ b/glamor/glamor_largepixmap.c
1003@@ -744,7 +744,7 @@ glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
1004
1005 /*
1006 * As transform and repeatpad mode.
1007- * We may get a clipped result which in multiple regions.
1008+ * We may get a clipped result which in multipe regions.
1009 * It's not easy to do a 2nd round clipping just as we do
1010 * without transform/repeatPad. As it's not easy to reverse
1011 * the 2nd round clipping result with a transform/repeatPad mode,
1012diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c
1013index 000c3e827..734189fa2 100644
1014--- a/glamor/glamor_vbo.c
1015+++ b/glamor/glamor_vbo.c
1016@@ -24,7 +24,7 @@
1017 /**
1018 * @file glamor_vbo.c
1019 *
1020- * Helpers for managing streamed vertex buffers used in glamor.
1021+ * Helpers for managing streamed vertex bufffers used in glamor.
1022 */
1023
1024 #include "glamor_priv.h"
1025diff --git a/glx/glxcmds.c b/glx/glxcmds.c
1026index c29b62676..1e2061d89 100644
1027--- a/glx/glxcmds.c
1028+++ b/glx/glxcmds.c
1029@@ -251,7 +251,7 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId,
1030 ** Find the display list space that we want to share.
1031 **
1032 ** NOTE: In a multithreaded X server, we would need to keep a reference
1033- ** count for each display list so that if one client destroyed a list that
1034+ ** count for each display list so that if one client detroyed a list that
1035 ** another client was using, the list would not really be freed until it
1036 ** was no longer in use. Since this sample implementation has no support
1037 ** for multithreaded servers, we don't do this.
1038diff --git a/glx/indirect_util.c b/glx/indirect_util.c
1039index ba180b0cc..dccffa393 100644
1040--- a/glx/indirect_util.c
1041+++ b/glx/indirect_util.c
1042@@ -227,7 +227,7 @@ get_decode_index(const struct __glXDispatchInfo *dispatch_info, unsigned opcode)
1043 child_index = (opcode & mask) >> next_remain;
1044 index = tree[index + 1 + child_index];
1045
1046- /* If the next node is an empty leaf, the opcode is for a non-existent
1047+ /* If the next node is an empty leaf, the opcode is for a non-existant
1048 * function. We're done.
1049 *
1050 * If the next node is a non-empty leaf, look up the function pointer
1051diff --git a/hw/dmx/.gitignore b/hw/dmx/.gitignore
1052index 513ee3770..4dd9b0358 100644
1053--- a/hw/dmx/.gitignore
1054+++ b/hw/dmx/.gitignore
1055@@ -1,2 +1,2 @@
1056-# Add & Override for this directory and its subdirectories
1057+# Add & Override for this directory and it's subdirectories
1058 Xdmx
1059diff --git a/hw/dmx/config/.gitignore b/hw/dmx/config/.gitignore
1060index b74975302..086062204 100644
1061--- a/hw/dmx/config/.gitignore
1062+++ b/hw/dmx/config/.gitignore
1063@@ -1,4 +1,4 @@
1064-# Add & Override for this directory and its subdirectories
1065+# Add & Override for this directory and it's subdirectories
1066 dmxtodmx
1067 parser.c
1068 parser.h
1069diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
1070index 5daf9ec9c..85bc0dbe4 100644
1071--- a/hw/dmx/config/dmxconfig.c
1072+++ b/hw/dmx/config/dmxconfig.c
1073@@ -63,7 +63,7 @@ typedef struct DMXConfigListStruct {
1074 struct DMXConfigListStruct *next;
1075 } DMXConfigList, *DMXConfigListPtr;
1076
1077-/** This structure stores the parsed configuration information. */
1078+/** This stucture stores the parsed configuration information. */
1079 typedef struct DMXConfigCmdStruct {
1080 const char *filename;
1081 const char *config;
1082diff --git a/hw/dmx/config/dmxparse.h b/hw/dmx/config/dmxparse.h
1083index 0a82e4ef0..a64b36f70 100644
1084--- a/hw/dmx/config/dmxparse.h
1085+++ b/hw/dmx/config/dmxparse.h
1086@@ -132,7 +132,7 @@ typedef struct _DMXConfigWall {
1087 int width, height; /* dimensions of displays */
1088 int xwall, ywall; /* dimensions of wall, in tiles */
1089
1090- /* Raw configuration information */
1091+ /* Raw configuration informaiton */
1092 DMXConfigTokenPtr start;
1093 DMXConfigPairPtr wallDim;
1094 DMXConfigPairPtr displayDim;
1095@@ -145,7 +145,7 @@ typedef struct _DMXConfigOption {
1096 /* Summary information */
1097 char *string;
1098
1099- /* Raw configuration information */
1100+ /* Raw configuration informaiton */
1101 DMXConfigTokenPtr start;
1102 DMXConfigStringPtr option;
1103 DMXConfigTokenPtr end;
1104diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
1105index 76a37566b..83a2cfbd7 100644
1106--- a/hw/dmx/dmx-config.h
1107+++ b/hw/dmx/dmx-config.h
1108@@ -55,7 +55,7 @@
1109 *
1110 * Note 2: The default epoch for the year is 2000.
1111 * To change the default epoch, change the DMX_VENDOR_RELEASE
1112- * macro below, bump the minor version number, and change
1113+ * macro below, bumb the minor version number, and change
1114 * xdpyinfo to key off the major/minor version to determine the
1115 * new epoch. Remember to do this on January 1, 2100 and every
1116 * 100 years thereafter.
1117diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
1118index 9020f9e91..4c7808de1 100644
1119--- a/hw/dmx/dmx.c
1120+++ b/hw/dmx/dmx.c
1121@@ -33,7 +33,7 @@
1122
1123 /** \file
1124 * This file implements the server-side part of the DMX protocol. A
1125- * vector of functions is provided at extension initialization time, so
1126+ * vector of fucntions is provided at extension initialization time, so
1127 * most all of the useful functions in this file are declared static and
1128 * do not appear in the doxygen documentation.
1129 *
1130diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
1131index 6d652c32b..cca5702ee 100644
1132--- a/hw/dmx/dmxcb.c
1133+++ b/hw/dmx/dmxcb.c
1134@@ -193,7 +193,7 @@ dmxConnectionBlockCallback(void)
1135 found[k] = TRUE;
1136 }
1137 else {
1138- /* Screen #k is detached, so it always succeeds */
1139+ /* Screen #k is detatched, so it always succeeds */
1140 found[k] = TRUE;
1141 }
1142 }
1143diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
1144index c5ae2a620..0ef800e39 100644
1145--- a/hw/dmx/dmxcursor.c
1146+++ b/hw/dmx/dmxcursor.c
1147@@ -186,7 +186,7 @@ dmxWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
1148 {
1149 DMXDBG3("dmxWarpCursor(%d,%d,%d)\n", pScreen->myNum, x, y);
1150 #if 11 /*BP*/
1151- /* This call is deprecated. Replace with???? */
1152+ /* This call is depracated. Replace with???? */
1153 miPointerWarpCursor(pDev, pScreen, x, y);
1154 #else
1155 pScreen->SetCursorPosition(pDev, pScreen, x, y, FALSE);
1156diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
1157index 504e5a00b..4f5ca7252 100644
1158--- a/hw/dmx/dmxextension.c
1159+++ b/hw/dmx/dmxextension.c
1160@@ -959,7 +959,7 @@ dmxBECreateResources(void *value, XID id, RESTYPE type, void *n)
1161 }
1162 }
1163
1164-/** Create window hierarchy on back-end server. The window tree is
1165+/** Create window hierachy on back-end server. The window tree is
1166 * created in a special order (bottom most subwindow first) so that the
1167 * #dmxCreateNonRootWindow() function does not need to recursively call
1168 * itself to create each window's parents. This is required so that we
1169@@ -1590,11 +1590,11 @@ dmxBEDestroyScratchGCs(int scrnNum)
1170 dmxBEFreeGC(ppGC[i]);
1171 }
1172
1173-/** Destroy window hierarchy on back-end server. To ensure that all
1174+/** Destroy window hierachy on back-end server. To ensure that all
1175 * XDestroyWindow() calls succeed, they must be performed in a bottom
1176 * up order so that windows are not destroyed before their children.
1177 * XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will
1178- * destroy a window as well as all of its children. */
1179+ * destroy a window as well as all of it's children. */
1180 static void
1181 dmxBEDestroyWindowTree(int idx)
1182 {
1183diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
1184index a1915a189..3249c4867 100644
1185--- a/hw/dmx/dmxlog.c
1186+++ b/hw/dmx/dmxlog.c
1187@@ -204,7 +204,7 @@ dmxLogCont(dmxLogLevel logLevel, const char *format, ...)
1188 }
1189
1190 #ifndef DMX_LOG_STANDALONE
1191-/** Log an informational message (at level #dmxInfo) related to output.
1192+/** Log an informational message (at level #dmxInfo) related to ouput.
1193 * The message prefix will contain backend information from \a
1194 * dmxScreen. */
1195 void
1196diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
1197index 433e31863..ae095e300 100644
1198--- a/hw/dmx/dmxscrinit.c
1199+++ b/hw/dmx/dmxscrinit.c
1200@@ -216,7 +216,7 @@ dmxScreenInit(ScreenPtr pScreen, int argc, char *argv[])
1201 return FALSE;
1202
1203 /*
1204- * Initialise the visual types. miSetVisualTypesAndMasks() requires
1205+ * Initalise the visual types. miSetVisualTypesAndMasks() requires
1206 * that all of the types for each depth be collected together. It's
1207 * intended for slightly different usage to what we would like here.
1208 * Maybe a miAddVisualTypeAndMask() function will be added to make
1209diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c
1210index ce20c84a5..b55c9ddf3 100644
1211--- a/hw/dmx/dmxsync.c
1212+++ b/hw/dmx/dmxsync.c
1213@@ -146,7 +146,7 @@ dmxSyncInit(void)
1214 * is TRUE, call XSync() immediately instead of waiting for the next
1215 * XSync() batching point. Note that if XSync() batching was deselected
1216 * with #dmxSyncActivate() before #dmxSyncInit() was called, then no
1217- * XSync() batching is performed and this function always calls XSync()
1218+ * XSync() batching is performed and this function always calles XSync()
1219 * immediately.
1220 *
1221 * (Note that this function uses TimerSet but works correctly in the
1222diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
1223index 56c6c9825..dcdb9ac60 100644
1224--- a/hw/dmx/dmxwindow.c
1225+++ b/hw/dmx/dmxwindow.c
1226@@ -270,7 +270,7 @@ dmxCreateNonRootWindow(WindowPtr pWindow)
1227
1228 /** This function handles lazy window creation and realization. Window
1229 * creation is handled by #dmxCreateNonRootWindow(). It also handles
1230- * any stacking changes that have occurred since the window was
1231+ * any stacking changes that have occured since the window was
1232 * originally created by calling #dmxDoRestackWindow(). If the window
1233 * is shaped, the shape is set on the back-end server by calling
1234 * #dmxDoSetShape(), and if the window has pictures (from RENDER)
1235diff --git a/hw/dmx/doc/DMXSpec.txt b/hw/dmx/doc/DMXSpec.txt
1236index 4053dcc8f..4009f1210 100644
1237--- a/hw/dmx/doc/DMXSpec.txt
1238+++ b/hw/dmx/doc/DMXSpec.txt
1239@@ -287,7 +287,7 @@
1240
1241 On success, status will be 0 and physicalScreen will contain the new
1242 screen number. On failure, status will be non-zero. The status
1243- will be 1 if any of the following occurred:
1244+ will be 1 if any of the following occured:
1245 * the -addremovescreens command-line option was not specified on
1246 the Xdmx command line
1247 * the value of physicalScreen is out of range
1248@@ -419,7 +419,7 @@
1249 layout. The valueMask and valueList specify which attributes are to
1250 be changed. The possible values are:
1251
1252- Attribute Type
1253+ Attriubute Type
1254
1255 Width INT16
1256 Height INT16
1257diff --git a/hw/dmx/doc/dmx.xml b/hw/dmx/doc/dmx.xml
1258index 2f86e5d33..1ee748440 100644
1259--- a/hw/dmx/doc/dmx.xml
1260+++ b/hw/dmx/doc/dmx.xml
1261@@ -3307,10 +3307,10 @@ described above).
1262 <title>Doxygen documentation</title>
1263
1264 <para>Doxygen is an open-source (GPL) documentation system for generating
1265-browsable documentation from stylized comments in the source code. We
1266+browseable documentation from stylized comments in the source code. We
1267 have placed all of the Xdmx server and DMX protocol source code files
1268 under Doxygen so that comprehensive documentation for the Xdmx source
1269-code is available in an easily browsable format.
1270+code is available in an easily browseable format.
1271 </para>
1272 </sect3>
1273
1274diff --git a/hw/dmx/examples/.gitignore b/hw/dmx/examples/.gitignore
1275index 9f32fa7df..d86e7eb2c 100644
1276--- a/hw/dmx/examples/.gitignore
1277+++ b/hw/dmx/examples/.gitignore
1278@@ -1,4 +1,4 @@
1279-# Add & Override for this directory and its subdirectories
1280+# Add & Override for this directory and it's subdirectories
1281 dmxaddinput
1282 dmxaddscreen
1283 dmxinfo
1284diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
1285index b71588678..6e64811ce 100644
1286--- a/hw/dmx/glxProxy/glxcmds.c
1287+++ b/hw/dmx/glxProxy/glxcmds.c
1288@@ -722,7 +722,7 @@ ChangeCurrentContext(__GLXclientState * cl, __GLXcontext * glxc,
1289 }
1290
1291 /*
1292-** Given a tag, and back-end screen number, retrieves the current back-end
1293+** Given a tag, and back-end screen number, retrives the current back-end
1294 ** tag.
1295 */
1296 int
1297diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
1298index b7fc1c56f..92ca512a7 100644
1299--- a/hw/dmx/glxProxy/glxcmdsswap.c
1300+++ b/hw/dmx/glxProxy/glxcmdsswap.c
1301@@ -752,7 +752,7 @@ __glXSwapRenderLarge(__GLXclientState * cl, GLbyte * pc)
1302 /*
1303 * call the command procedure to swap any arguments
1304 * Note that we are assuming that all arguments that needs to be
1305- * swapped are on the first req only !
1306+ * swaped are on the first req only !
1307 */
1308 opcode = hdr->opcode;
1309 if ((opcode >= __GLX_MIN_RENDER_OPCODE) &&
1310diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c
1311index 319da50b0..e254936a9 100644
1312--- a/hw/dmx/glxProxy/glxsingle.c
1313+++ b/hw/dmx/glxProxy/glxsingle.c
1314@@ -57,7 +57,7 @@
1315 /*
1316 * GetReqSingle - this is the equivalent of GetReq macro
1317 * from Xlibint.h but it does not set the reqType field (the opcode).
1318- * this is because the GL single opcodes has different naming convention
1319+ * this is because the GL single opcodes has different naming convension
1320 * the other X opcodes (ie. X_GLsop_GetFloatv).
1321 */
1322 #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
1323diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c
1324index f1d464305..52d70eb70 100644
1325--- a/hw/dmx/glxProxy/glxvendor.c
1326+++ b/hw/dmx/glxProxy/glxvendor.c
1327@@ -56,7 +56,7 @@
1328 /*
1329 * GetReqVendorPrivate - this is the equivalent of GetReq macro
1330 * from Xlibint.h but it does not set the reqType field (the opcode).
1331- * this is because the GL single opcodes has different naming convention
1332+ * this is because the GL single opcodes has different naming convension
1333 * the other X opcodes (ie. X_GLsop_GetFloatv).
1334 */
1335 #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
1336diff --git a/hw/dmx/input/atKeynames.h b/hw/dmx/input/atKeynames.h
1337index 4aabb4165..68e2eb31d 100644
1338--- a/hw/dmx/input/atKeynames.h
1339+++ b/hw/dmx/input/atKeynames.h
1340@@ -72,7 +72,7 @@
1341 * Set2 sends a makecode for keypress, and the same code prefixed by a
1342 * F0 for keyrelease. This is a little bit ugly to handle. Thus we use
1343 * here for X386 the PC/XT compatible Set1. This set uses 8bit scancodes.
1344- * Bit 7 is set if the key is released. The code E0 switches to a
1345+ * Bit 7 ist set if the key is released. The code E0 switches to a
1346 * different meaning to add the new MF cursorkeys, while not breaking old
1347 * applications. E1 is another special prefix. Since I assume that there
1348 * will be further versions of PC/XT scancode compatible keyboards, we
1349@@ -180,7 +180,7 @@
1350 #define KEY_F12 /* F12 0x58 */ 88
1351
1352 #define KEY_Prefix0 /* special 0x60 */ 96
1353-#define KEY_Prefix1 /* special 0x61 */ 97
1354+#define KEY_Prefix1 /* specail 0x61 */ 97
1355
1356 /*
1357 * The 'scancodes' below are generated by the server, because the MF101/102
1358diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
1359index 1c51776e7..56abe8013 100644
1360--- a/hw/dmx/input/dmxbackend.c
1361+++ b/hw/dmx/input/dmxbackend.c
1362@@ -429,7 +429,7 @@ dmxBackendCollectEvents(DevicePtr pDev,
1363 continue;
1364 if (!(dmxScreen = dmxBackendFindWindow(priv, X.xmotion.window)))
1365 dmxLog(dmxFatal,
1366- " Event on non-existent window %lu\n",
1367+ " Event on non-existant window %lu\n",
1368 X.xmotion.window);
1369 if (!priv->relative || dmxInput->console) {
1370 int newX = X.xmotion.x - dmxScreen->rootX;
1371diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
1372index 86f01b703..f33a0ebd3 100644
1373--- a/hw/dmx/input/dmxconsole.c
1374+++ b/hw/dmx/input/dmxconsole.c
1375@@ -433,7 +433,7 @@ dmxConsoleMoveRelative(myPrivate * priv, int x, int y,
1376 }
1377
1378 /** This routine gets called from #dmxCoreMotion for each motion. This
1379- * allows the console's notion of the cursor position to change when
1380+ * allows the console's notion of the cursor postion to change when
1381 * another input device actually caused the change. */
1382 void
1383 dmxConsoleUpdatePosition(void *private, int x, int y)
1384@@ -475,7 +475,7 @@ dmxConsoleUpdatePosition(void *private, int x, int y)
1385 }
1386 }
1387
1388-/** Collect all pending events from the console's display. Place these
1389+/** Collect all pending events from the console's display. Plase these
1390 * events on the server event queue using the \a motion and \a enqueue
1391 * routines. The \a checkspecial routine is used to check for special
1392 * keys that need handling. \a block tells if signals should be blocked
1393diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
1394index a4b99cd5a..fb0c00fe1 100644
1395--- a/hw/dmx/input/dmxevents.c
1396+++ b/hw/dmx/input/dmxevents.c
1397@@ -32,7 +32,7 @@
1398 */
1399
1400 /** \file
1401- * Provide support and helper functions for enqueuing events received by
1402+ * Provide support and helper functions for enqueing events received by
1403 * the low-level input drivers. */
1404
1405 #ifdef HAVE_DMX_CONFIG_H
1406diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h
1407index 27e93561e..11af2ca82 100644
1408--- a/hw/dmx/input/dmxinputinit.h
1409+++ b/hw/dmx/input/dmxinputinit.h
1410@@ -256,7 +256,7 @@ typedef struct _DMXLocalInputInfo {
1411
1412 long deviceId; /**< device id on remote side,
1413 * if any */
1414- const char *deviceName; /**< device name on remote
1415+ const char *deviceName; /**< devive name on remote
1416 * side, if any */
1417 } DMXLocalInputInfoRec;
1418
1419diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
1420index 209c49ca6..a5bdccd58 100644
1421--- a/hw/dmx/man/Xdmx.man
1422+++ b/hw/dmx/man/Xdmx.man
1423@@ -278,7 +278,7 @@ This option disables the RENDER extension.
1424 .sp
1425 .TP 8
1426 .BI "-noglxproxy"
1427-This option disables GLX proxy -- the built-in GLX extension
1428+This option disables GLX proxy -- the build-in GLX extension
1429 implementation that is DMX aware.
1430 .sp
1431 .TP 8
1432diff --git a/hw/kdrive/ephyr/README b/hw/kdrive/ephyr/README
1433index 5019fbb5f..6d6a222ef 100644
1434--- a/hw/kdrive/ephyr/README
1435+++ b/hw/kdrive/ephyr/README
1436@@ -7,7 +7,7 @@ What Is It ?
1437
1438 Xephyr is a a kdrive server that outputs to a window on a pre-existing
1439 'host' X display. Think Xnest but with support for modern extensions
1440-like composite, damage and randr.
1441+like composite, damage and randr.
1442
1443 Unlike Xnest which is an X proxy, i.e. limited to the
1444 capabilities of the host X server, Xephyr is a real X server which
1445@@ -17,7 +17,7 @@ It also has support for 'visually' debugging what the server is
1446 painting.
1447
1448
1449-How To Use
1450+How To Use
1451 ==========
1452
1453 You probably want to run like;
1454@@ -26,46 +26,48 @@ Xephyr :1 -ac -screen 800x600 &
1455
1456 Then set DISPLAY=:1 and run whatever X apps you like.
1457
1458-Use 'xrandr' to change to orientation/size.
1459+Use 'xrandr' to change to orientation/size.
1460
1461-There is a '-parent' switch which works just like Xnest's ( for use
1462+There is a '-parent' switch which works just like Xnests ( for use
1463 with things like matchbox-nest - http://matchbox.handhelds.org ).
1464
1465 There is also a '-host-cursor' switch to set 'cursor acceleration' -
1466 The host's cursor is reused. This is only really there to aid
1467 debugging by avoiding server paints for the cursor. Performance
1468-improvement is negligible.
1469+improvement is negiable.
1470
1471 Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to
1472 toggle the debugging mode. In this mode red rectangles are painted to
1473 screen areas getting painted before painting the actual content. The
1474 delay between this can be altered by setting a XEPHYR_PAUSE env var to
1475-a value in microseconds.
1476+a value in micro seconds.
1477
1478
1479 Caveats
1480 =======
1481
1482- - Depth is limited to being the same as the host.
1483- *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp
1484+ - Depth is limited to being the same as the host.
1485+ *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp
1486 on 24bpp host.
1487
1488 - Rotated displays are currently updated via full blits. This
1489 is slower than a normal oprientated display. Debug mode will
1490- therefore not be of much use rotated.
1491+ therefor not be of much use rotated.
1492
1493- - The '-host-cursor' cursor is static in its appearance.
1494+ - The '-host-cursor' cursor is static in its appearence.
1495
1496 - The build gets a warning about 'nanosleep'. I think the various '-D'
1497- build flags are causing this. I haven't figured as yet how to work
1498- around it. It doesn't appear to break anything however.
1499+ build flags are causing this. I havn't figured as yet how to work
1500+ round it. It doesn't appear to break anything however.
1501
1502- - Keyboard handling is basic but works.
1503+ - Keyboard handling is basic but works.
1504
1505- - Mouse button 5 probably won't work.
1506+ - Mouse button 5 probably wont work.
1507
1508
1509
1510
1511
1512-Matthew Allum <mallum@o-hand.com> 2004
1513+Matthew Allum <mallum@o-hand.com> 2004
1514+
1515+
1516diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
1517index c503ad6a6..4f1f19860 100644
1518--- a/hw/kdrive/ephyr/ephyr.c
1519+++ b/hw/kdrive/ephyr/ephyr.c
1520@@ -1,5 +1,5 @@
1521 /*
1522- * Xephyr - A kdrive X server that runs in a host X window.
1523+ * Xephyr - A kdrive X server thats runs in a host X window.
1524 * Authored by Matthew Allum <mallum@openedhand.com>
1525 *
1526 * Copyright © 2004 Nokia
1527@@ -219,7 +219,7 @@ ephyrMapFramebuffer(KdScreenInfo * screen)
1528
1529 /*
1530 * Use the rotation last applied to ourselves (in the Xephyr case the fb
1531- * coordinate system moves independently of the pointer coordinate system).
1532+ * coordinate system moves independently of the pointer coordiante system).
1533 */
1534 KdComputePointerMatrix(&m, ephyrRandr, screen->width, screen->height);
1535 KdSetPointerMatrix(&m);
1536@@ -294,7 +294,7 @@ ephyrShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf)
1537 EPHYR_LOG("slow paint");
1538
1539 /* FIXME: Slow Rotated/Reflected updates could be much
1540- * much faster efficiently updating via transforming
1541+ * much faster efficiently updating via tranforming
1542 * pBuf->pDamage regions
1543 */
1544 shadowUpdateRotatePacked(pScreen, pBuf);
1545@@ -777,7 +777,8 @@ ephyrUpdateModifierState(unsigned int state)
1546 for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
1547 int key;
1548
1549- /* Modifier is down, but shouldn't be */
1550+ /* Modifier is down, but shouldn't be
1551+ */
1552 if ((xkb_state & mask) && !(state & mask)) {
1553 int count = keyc->modifierKeyCount[i];
1554
1555@@ -795,7 +796,8 @@ ephyrUpdateModifierState(unsigned int state)
1556 }
1557 }
1558
1559- /* Modifier should be down, but isn't */
1560+ /* Modifier shoud be down, but isn't
1561+ */
1562 if (!(xkb_state & mask) && (state & mask))
1563 for (key = 0; key < MAP_LENGTH; key++)
1564 if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
1565diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h
1566index 587a48dc7..fe01661dc 100644
1567--- a/hw/kdrive/ephyr/ephyr.h
1568+++ b/hw/kdrive/ephyr/ephyr.h
1569@@ -1,5 +1,5 @@
1570 /*
1571- * Xephyr - A kdrive X server that runs in a host X window.
1572+ * Xephyr - A kdrive X server thats runs in a host X window.
1573 * Authored by Matthew Allum <mallum@o-hand.com>
1574 *
1575 * Copyright © 2004 Nokia
1576diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c b/hw/kdrive/ephyr/ephyr_glamor_glx.c
1577index 40b80cbe7..b41a90eff 100644
1578--- a/hw/kdrive/ephyr/ephyr_glamor_glx.c
1579+++ b/hw/kdrive/ephyr/ephyr_glamor_glx.c
1580@@ -42,7 +42,7 @@
1581 #include <X11/Xproto.h>
1582
1583 /* until we need geometry shaders GL3.1 should suffice. */
1584-/* Xephyr has its own copy of this for build reasons */
1585+/* Xephyr has it's own copy of this for build reasons */
1586 #define GLAMOR_GL_CORE_VER_MAJOR 3
1587 #define GLAMOR_GL_CORE_VER_MINOR 1
1588 /** @{
1589diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
1590index 020461db2..47bd97ade 100644
1591--- a/hw/kdrive/ephyr/ephyrinit.c
1592+++ b/hw/kdrive/ephyr/ephyrinit.c
1593@@ -1,5 +1,5 @@
1594 /*
1595- * Xephyr - A kdrive X server that runs in a host X window.
1596+ * Xephyr - A kdrive X server thats runs in a host X window.
1597 * Authored by Matthew Allum <mallum@o-hand.com>
1598 *
1599 * Copyright © 2004 Nokia
1600diff --git a/hw/kdrive/ephyr/ephyrlog.h b/hw/kdrive/ephyr/ephyrlog.h
1601index 744da74c5..43679e181 100644
1602--- a/hw/kdrive/ephyr/ephyrlog.h
1603+++ b/hw/kdrive/ephyr/ephyrlog.h
1604@@ -1,5 +1,5 @@
1605 /*
1606- * Xephyr - A kdrive X server that runs in a host X window.
1607+ * Xephyr - A kdrive X server thats runs in a host X window.
1608 * Authored by Matthew Allum <mallum@openedhand.com>
1609 *
1610 * Copyright © 2007 OpenedHand Ltd
1611diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
1612index 2dbddfb8d..671a0ddce 100644
1613--- a/hw/kdrive/ephyr/ephyrvideo.c
1614+++ b/hw/kdrive/ephyr/ephyrvideo.c
1615@@ -1,5 +1,5 @@
1616 /*
1617- * Xephyr - A kdrive X server that runs in a host X window.
1618+ * Xephyr - A kdrive X server thats runs in a host X window.
1619 * Authored by Matthew Allum <mallum@openedhand.com>
1620 *
1621 * Copyright © 2007 OpenedHand Ltd
1622diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
1623index a5b2e344e..6b1d3eb40 100644
1624--- a/hw/kdrive/ephyr/hostx.c
1625+++ b/hw/kdrive/ephyr/hostx.c
1626@@ -1,5 +1,5 @@
1627 /*
1628- * Xephyr - A kdrive X server that runs in a host X window.
1629+ * Xephyr - A kdrive X server thats runs in a host X window.
1630 * Authored by Matthew Allum <mallum@o-hand.com>
1631 *
1632 * Copyright © 2004 Nokia
1633diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h
1634index 4b2678e58..d0f30119c 100644
1635--- a/hw/kdrive/ephyr/hostx.h
1636+++ b/hw/kdrive/ephyr/hostx.h
1637@@ -1,5 +1,5 @@
1638 /*
1639- * Xephyr - A kdrive X server that runs in a host X window.
1640+ * Xephyr - A kdrive X server thats runs in a host X window.
1641 * Authored by Matthew Allum <mallum@o-hand.com>
1642 *
1643 * Copyright © 2004 Nokia
1644diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
1645index cb04f48cc..711f4d80d 100644
1646--- a/hw/kdrive/src/kxv.c
1647+++ b/hw/kdrive/src/kxv.c
1648@@ -423,7 +423,7 @@ KdXVInitAdaptors(ScreenPtr pScreen, KdVideoAdaptorPtr infoPtr, int number)
1649 client clip from the GC when the video is initialized. We then
1650 use KdXVUpdateCompositeClip to calculate the new composite clip
1651 when we need it. This is different from what DEC did. They saved
1652- the GC and used its clip list when they needed to reclip the window,
1653+ the GC and used it's clip list when they needed to reclip the window,
1654 even if the client clip was different from the one the video was
1655 initialized with. If the original GC was destroyed, they had to stop
1656 the video. I like the new method better (MArk).
1657diff --git a/hw/xfree86/common/.gitignore b/hw/xfree86/common/.gitignore
1658index 817dfda8b..81e8416d2 100644
1659--- a/hw/xfree86/common/.gitignore
1660+++ b/hw/xfree86/common/.gitignore
1661@@ -1,3 +1,3 @@
1662-# Add & Override for this directory and its subdirectories
1663+# Add & Override for this directory and it's subdirectories
1664 xf86Build.h
1665 xf86DefModeSet.c
1666diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
1667index 0263e6907..367feae46 100644
1668--- a/hw/xfree86/common/xf86Bus.c
1669+++ b/hw/xfree86/common/xf86Bus.c
1670@@ -131,7 +131,7 @@ xf86BusConfig(void)
1671 /*
1672 * 2. If no Screens were found, call each drivers probe function with
1673 * ignorePrimary = TRUE, to ensure that we do actually get a
1674- * Screen if there is at least one supported video card.
1675+ * Screen if there is atleast one supported video card.
1676 */
1677 if (xf86NumScreens == 0) {
1678 xf86ProbeIgnorePrimary = TRUE;
1679@@ -403,7 +403,7 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
1680
1681 /*
1682 * xf86ClearEntityListForScreen() - called when a screen is deleted
1683- * to mark its entities unused. Called by xf86DeleteScreen().
1684+ * to mark it's entities unused. Called by xf86DeleteScreen().
1685 */
1686 void
1687 xf86ClearEntityListForScreen(ScrnInfoPtr pScrn)
1688diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
1689index 8bb68a56f..de054fbc9 100644
1690--- a/hw/xfree86/common/xf86Cursor.c
1691+++ b/hw/xfree86/common/xf86Cursor.c
1692@@ -137,8 +137,8 @@ xf86PointerMoved(ScrnInfoPtr pScr, int x, int y)
1693 Bool frameChanged = FALSE;
1694
1695 /*
1696- * check whether (x,y) belongs to the visual part of the screen
1697- * if not, change the base of the displayed frame occurring
1698+ * check wether (x,y) belongs to the visual part of the screen
1699+ * if not, change the base of the displayed frame accoring
1700 */
1701 if (pScr->frameX0 > x) {
1702 pScr->frameX0 = x;
1703diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
1704index 05fa2bb90..4b939000c 100644
1705--- a/hw/xfree86/common/xf86Events.c
1706+++ b/hw/xfree86/common/xf86Events.c
1707@@ -280,12 +280,12 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
1708 /*
1709 * Hmm... here is the biggest hack of every time !
1710 * It may be possible that a switch-vt procedure has finished BEFORE
1711- * you released all keys necessary to do this. That peculiar behavior
1712+ * you released all keys neccessary to do this. That peculiar behavior
1713 * can fool the X-server pretty much, cause it assumes that some keys
1714- * were not released. TWM may stuck almost completely....
1715+ * were not released. TWM may stuck alsmost completly....
1716 * OK, what we are doing here is after returning from the vt-switch
1717- * explicitly unrelease all keyboard keys before the input-devices
1718- * are re-enabled.
1719+ * exeplicitely unrelease all keyboard keys before the input-devices
1720+ * are reenabled.
1721 */
1722
1723 for (i = keyc->xkbInfo->desc->min_key_code;
1724diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
1725index 6bdbf7c15..3b4811053 100644
1726--- a/hw/xfree86/common/xf86Helper.c
1727+++ b/hw/xfree86/common/xf86Helper.c
1728@@ -811,8 +811,8 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
1729 scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
1730 scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
1731 scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
1732- /* EDID structure version 2 gives optional separate red, green & blue
1733- * gamma values in bytes 0x57-0x59 */
1734+ /* EDID structure version 2 gives optional seperate red, green & blue gamma values
1735+ * in bytes 0x57-0x59 */
1736 #endif
1737 }
1738 else if (TEST_GAMMA(gamma)) {
1739diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
1740index eb0885571..484cde7ab 100644
1741--- a/hw/xfree86/common/xf86Mode.c
1742+++ b/hw/xfree86/common/xf86Mode.c
1743@@ -1186,7 +1186,7 @@ LCM(unsigned int x, unsigned int y)
1744
1745 /*
1746 * Given various screen attributes, determine the minimum scanline width such
1747- * that each scanline is server and DDX padded and any pixels with embedded
1748+ * that each scanline is server and DDX padded and any pixels with imbedded
1749 * bank boundaries are off-screen. This function returns -1 if such a width
1750 * cannot exist.
1751 */
1752@@ -1223,7 +1223,7 @@ scanLineWidth(unsigned int xsize, /* pixels */
1753
1754 /*
1755 * Scanlines will be server-pad aligned at this point. They will also be
1756- * a multiple of nWidthUnit bits long. Ensure that pixels with embedded
1757+ * a multiple of nWidthUnit bits long. Ensure that pixels with imbedded
1758 * bank boundaries are off-screen.
1759 *
1760 * It seems reasonable to limit total frame buffer size to 1/16 of the
1761diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
1762index a40ecff0f..c590ffec4 100644
1763--- a/hw/xfree86/common/xf86Module.h
1764+++ b/hw/xfree86/common/xf86Module.h
1765@@ -92,7 +92,7 @@ typedef enum {
1766 LDR_NOENT, /* Module file does not exist */
1767 LDR_NOLOAD, /* type specific loader failed */
1768 LDR_ONCEONLY, /* Module should only be loaded once (not an error) */
1769- LDR_MISMATCH, /* the module didn't match the spec'd requirements */
1770+ LDR_MISMATCH, /* the module didn't match the spec'd requirments */
1771 LDR_BADUSAGE, /* LoadModule is called with bad arguments */
1772 LDR_INVALID, /* The module doesn't have a valid ModuleData object */
1773 LDR_BADOS, /* The module doesn't support the OS */
1774diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
1775index a2b2de392..3cc90c4e9 100644
1776--- a/hw/xfree86/common/xf86Xinput.c
1777+++ b/hw/xfree86/common/xf86Xinput.c
1778@@ -1476,7 +1476,7 @@ xf86FirstLocalDevice(void)
1779 *
1780 * This function is the same for X or Y coordinates.
1781 * You may have to reverse the high and low values to compensate for
1782- * different origins on the touch screen vs X.
1783+ * different orgins on the touch screen vs X.
1784 *
1785 * e.g. to scale from device coordinates into screen coordinates, call
1786 * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);
1787diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
1788index 25779e510..91ddedc29 100644
1789--- a/hw/xfree86/common/xf86fbman.c
1790+++ b/hw/xfree86/common/xf86fbman.c
1791@@ -382,7 +382,7 @@ AllocateArea(FBManagerPtr offman,
1792 break;
1793 }
1794
1795- /* try to boot a removable one out if we are not expendable ourselves */
1796+ /* try to boot a removeable one out if we are not expendable ourselves */
1797 if (!area && !removeCB) {
1798 link = offman->UsedAreas;
1799
1800@@ -1056,7 +1056,7 @@ localResizeOffscreenLinear(FBLinearPtr resize, int length)
1801 return FALSE;
1802 }
1803
1804- /* This could actually be a lot smarter and try to move allocations
1805+ /* This could actually be alot smarter and try to move allocations
1806 from XY to linear when available. For now if it was XY, we keep
1807 it XY */
1808
1809diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
1810index aeeed8be6..6575c4ec8 100644
1811--- a/hw/xfree86/common/xf86pciBus.c
1812+++ b/hw/xfree86/common/xf86pciBus.c
1813@@ -633,7 +633,7 @@ struct Inst {
1814 * \param devList List of Device sections parsed from the config file.
1815 * \param numDevs Number of entries in \c devList.
1816 * \param drvp Pointer the driver's control structure.
1817- * \param foundEntities Returned list of entity indices associated with the
1818+ * \param foundEntities Returned list of entity indicies associated with the
1819 * driver.
1820 *
1821 * \returns
1822diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
1823index ee2f3f86a..f87760b63 100644
1824--- a/hw/xfree86/common/xf86platformBus.c
1825+++ b/hw/xfree86/common/xf86platformBus.c
1826@@ -534,7 +534,7 @@ xf86platformProbeDev(DriverPtr drvp)
1827 const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList);
1828 int i, j;
1829
1830- /* find the main device or any device specified in xorg.conf */
1831+ /* find the main device or any device specificed in xorg.conf */
1832 for (i = 0; i < numDevs; i++) {
1833 const char *devpath;
1834
1835diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
1836index 8a8c5939d..d613d712c 100644
1837--- a/hw/xfree86/common/xf86xv.c
1838+++ b/hw/xfree86/common/xf86xv.c
1839@@ -544,7 +544,7 @@ xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number)
1840 client clip from the GC when the video is initialized. We then
1841 use xf86XVUpdateCompositeClip to calculate the new composite clip
1842 when we need it. This is different from what DEC did. They saved
1843- the GC and used its clip list when they needed to reclip the window,
1844+ the GC and used it's clip list when they needed to reclip the window,
1845 even if the client clip was different from the one the video was
1846 initialized with. If the original GC was destroyed, they had to stop
1847 the video. I like the new method better (MArk).
1848diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
1849index f35a6825a..3568a578c 100644
1850--- a/hw/xfree86/common/xisb.c
1851+++ b/hw/xfree86/common/xisb.c
1852@@ -155,7 +155,7 @@ XisbTrace(XISBuffer * b, int trace)
1853 * will use check to select for data and prevent a block.
1854 * It is the caller's responsibility to set the block_duration to -1 if it
1855 * knows that there is data to read (because the main select loop triggered
1856- * the read) and wants to avoid the unnecessary overhead of the select call
1857+ * the read) and want's to avoid the unnecessary overhead of the select call
1858 *
1859 * a zero or positive block duration will cause the select to block for the
1860 * give duration in usecs.
1861diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
1862index adc9bf71c..b884d8212 100644
1863--- a/hw/xfree86/ddc/edid.h
1864+++ b/hw/xfree86/ddc/edid.h
1865@@ -164,7 +164,7 @@
1866 #define T2 GET(E_T2)
1867 #define T_MANU GET(E_TMANU)
1868
1869-/* extract information from established timing section */
1870+/* extract information from estabished timing section */
1871 #define _VALID_TIMING(x) !(((x[0] == 0x01) && (x[1] == 0x01)) \
1872 || ((x[0] == 0x00) && (x[1] == 0x00)) \
1873 || ((x[0] == 0x20) && (x[1] == 0x20)) )
1874diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
1875index 699cbe11d..e16b12476 100644
1876--- a/hw/xfree86/ddc/print_edid.c
1877+++ b/hw/xfree86/ddc/print_edid.c
1878@@ -143,7 +143,7 @@ print_dpms_features(int scrnIndex, struct disp_features *c,
1879 if (!c->input_type) { /* analog */
1880 switch (c->display_type) {
1881 case DISP_MONO:
1882- xf86ErrorF("; Monochrome/GrayScale Display\n");
1883+ xf86ErrorF("; Monochorome/GrayScale Display\n");
1884 break;
1885 case DISP_RGB:
1886 xf86ErrorF("; RGB/Color Display\n");
1887diff --git a/hw/xfree86/doc/README.modes b/hw/xfree86/doc/README.modes
1888index 54543bf0a..ea228e592 100644
1889--- a/hw/xfree86/doc/README.modes
1890+++ b/hw/xfree86/doc/README.modes
1891@@ -54,7 +54,7 @@ refresh rate.
1892
1893 As hardware often limits possible configuration combinations, each output
1894 knows the set of CRTCs that it can be connected to as well as the set of
1895-other outputs which can be simultaneously connected to a CRTC.
1896+other outputs which can be simutaneously connected to a CRTC.
1897
1898 2.1.2 CRTC overview
1899
1900diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
1901index 1eed293fe..796a02648 100644
1902--- a/hw/xfree86/doc/ddxDesign.xml
1903+++ b/hw/xfree86/doc/ddxDesign.xml
1904@@ -511,7 +511,7 @@ mechanism for this.
1905
1906 <para>
1907 If a device is capable of disabling this decoding the resource is
1908- called shareable. For PCI devices a generic method is provided to
1909+ called sharable. For PCI devices a generic method is provided to
1910 control resource decoding. Other devices will have to provide a
1911 device specific function to control decoding.
1912 </para>
1913@@ -1065,7 +1065,7 @@ Here is what <function>InitOutput()</function> does:
1914 against the expected number (most drivers expect only one). The
1915 entity information for each of them should be retrieved (with
1916 <function>xf86GetEntityInfo()</function>) and checked for the correct
1917- bus type and that none of the shareable resources registered during
1918+ bus type and that none of the sharable resources registered during
1919 the Probe phase was rejected.
1920 </para>
1921
1922@@ -1373,7 +1373,7 @@ Here is what <function>InitOutput()</function> does:
1923
1924 <orderedlist>
1925 <listitem><para>
1926- The shareable resources registered by each entity are compared.
1927+ The sharable resources registered by each entity are compared.
1928 If a resource is registered by more than one entity the entity
1929 will be marked to indicate that it needs to share this resources
1930 type (IO or MEM).
1931@@ -2193,7 +2193,7 @@ giving up the VT.
1932
1933 <para>
1934 In <function>PreInit()</function> phase each driver should check if any
1935-shareable resources it has registered during <function>Probe()</function> has
1936+sharable resources it has registered during <function>Probe()</function> has
1937 been denied and take appropriate action which could simply be to fail.
1938 If it needs to access resources it has disabled during
1939 <function>EntitySetup()</function> it can do so provided it has registered
1940@@ -2226,7 +2226,7 @@ rules:
1941
1942 <orderedlist>
1943 <listitem><para>
1944- The shareable resources registered by each entity are compared. If
1945+ The sharable resources registered by each entity are compared. If
1946 a resource is registered by more than one entity the entity will be
1947 marked to need to share this resources type (<constant>IO</constant> or
1948 <constant>MEM</constant>).
1949@@ -4704,7 +4704,7 @@ typedef struct {
1950 <varlistentry>
1951 <term><structfield>depth</structfield></term>
1952 <listitem><para>
1953- The significant bits per pixel in RGB formats (analogous to the
1954+ The significant bits per pixel in RGB formats (analgous to the
1955 depth of a pixmap format).
1956 </para></listitem></varlistentry>
1957
1958diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
1959index d1b092bdb..9f7075996 100644
1960--- a/hw/xfree86/dri/dri.c
1961+++ b/hw/xfree86/dri/dri.c
1962@@ -1736,7 +1736,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
1963 return;
1964 }
1965
1966- /* useful for debugging, just print out after n context switches */
1967+ /* usefull for debugging, just print out after n context switches */
1968 if (!count || !(count % 1)) {
1969 DRIDrvMsg(pScreen->myNum, X_INFO,
1970 "[DRI] Context switch %5d from %p/0x%08x (%d)\n",
1971diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
1972index 4c14b705d..1e7afddbd 100644
1973--- a/hw/xfree86/dri2/dri2.h
1974+++ b/hw/xfree86/dri2/dri2.h
1975@@ -169,7 +169,7 @@ typedef void (*DRI2InvalidateProcPtr) (DrawablePtr pDraw, void *data, XID id);
1976 * support other swap_limits it has to implement supported limits with this
1977 * callback.
1978 *
1979- * \param pDraw drawable whose swap_limit is going to be changed
1980+ * \param pDraw drawable whos swap_limit is going to be changed
1981 * \param swap_limit new swap_limit that going to be set
1982 * \return TRUE if limit is support, FALSE if not.
1983 */
1984@@ -299,13 +299,13 @@ extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
1985 * the \c XF86ModuleData from a layered module, such a module will fail to
1986 * load (due to an unresolved symbol) if the DRI2 extension is not loaded.
1987 *
1988- * \param major Location to store the major version of the DRI2 extension
1989- * \param minor Location to store the minor version of the DRI2 extension
1990+ * \param major Location to store the major verion of the DRI2 extension
1991+ * \param minor Location to store the minor verion of the DRI2 extension
1992 *
1993 * \note
1994 * This interface was added some time after the initial release of the DRI2
1995 * module. Layered modules that wish to use this interface must first test
1996- * its existence by calling \c xf86LoaderCheckSymbol.
1997+ * its existance by calling \c xf86LoaderCheckSymbol.
1998 */
1999 extern _X_EXPORT void DRI2Version(int *major, int *minor);
2000
2001diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
2002index 4f98639aa..529de7515 100644
2003--- a/hw/xfree86/dri2/dri2ext.c
2004+++ b/hw/xfree86/dri2/dri2ext.c
2005@@ -344,7 +344,7 @@ ProcDRI2CopyRegion(ClientPtr client)
2006 /* CopyRegion needs to be a round trip to make sure the X server
2007 * queues the swap buffer rendering commands before the DRI client
2008 * continues rendering. The reply has a bitmask to signal the
2009- * presence of optional return values as well, but we're not using
2010+ * presense of optional return values as well, but we're not using
2011 * that yet.
2012 */
2013
2014diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
2015index 5098adb94..0c1867f02 100644
2016--- a/hw/xfree86/drivers/modesetting/driver.c
2017+++ b/hw/xfree86/drivers/modesetting/driver.c
2018@@ -1267,7 +1267,7 @@ msEnableSharedPixmapFlipping(RRCrtcPtr crtc, PixmapPtr front, PixmapPtr back)
2019 return FALSE;
2020
2021 /* EVDI uses USB transport but is platform device, not usb.
2022- * Exclude it explicitly. */
2023+ * Blacklist it explicitly */
2024 if (syspath && strstr(syspath, "evdi"))
2025 return FALSE;
2026 }
2027@@ -1691,7 +1691,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
2028 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
2029
2030 /* If pageflip is enabled hook the screen's cursor-sprite (swcursor) funcs.
2031- * So that we can disable page-flipping on fallback to a swcursor. */
2032+ * So that we can disabe page-flipping on fallback to a swcursor. */
2033 if (ms->drmmode.pageflip) {
2034 miPointerScreenPtr PointPriv =
2035 dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
2036diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
2037index 49b9ae944..a9a83aa8b 100644
2038--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
2039+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
2040@@ -3970,7 +3970,7 @@ drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth,
2041
2042 /*
2043 * We hook the screen's cursor-sprite (swcursor) functions to see if a swcursor
2044- * is active. When a swcursor is active we disable page-flipping.
2045+ * is active. When a swcursor is active we disabe page-flipping.
2046 */
2047
2048 static void drmmode_sprite_do_set_cursor(msSpritePrivPtr sprite_priv,
2049diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
2050index 9c199668f..2113f2228 100644
2051--- a/hw/xfree86/drivers/modesetting/pageflip.c
2052+++ b/hw/xfree86/drivers/modesetting/pageflip.c
2053@@ -85,7 +85,7 @@ struct ms_flipdata {
2054 };
2055
2056 /*
2057- * Per crtc pageflipping information,
2058+ * Per crtc pageflipping infomation,
2059 * These are submitted to the queuing code
2060 * one of them per crtc per flip.
2061 */
2062@@ -219,7 +219,7 @@ queue_flip_on_crtc(ScreenPtr screen, xf86CrtcPtr crtc,
2063 xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue retry\n");
2064 }
2065
2066- /* The page flip succeeded. */
2067+ /* The page flip succeded. */
2068 return TRUE;
2069 }
2070
2071@@ -273,7 +273,7 @@ ms_do_pageflip(ScreenPtr screen,
2072 * Take a local reference on flipdata.
2073 * if the first flip fails, the sequence abort
2074 * code will free the crtc flip data, and drop
2075- * its reference which would cause this to be
2076+ * it's reference which would cause this to be
2077 * freed when we still required it.
2078 */
2079 flipdata->flip_count++;
2080diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
2081index 3d8b92e66..f146ff4a4 100644
2082--- a/hw/xfree86/fbdevhw/fbdevhw.c
2083+++ b/hw/xfree86/fbdevhw/fbdevhw.c
2084@@ -1,4 +1,4 @@
2085-/* all drivers need this */
2086+/* all driver need this */
2087 #ifdef HAVE_XORG_CONFIG_H
2088 #include <xorg-config.h>
2089 #endif
2090@@ -118,7 +118,7 @@ fbdevHWGetFD(ScrnInfoPtr pScrn)
2091 }
2092
2093 /* -------------------------------------------------------------------- */
2094-/* some helpers for printing debug information */
2095+/* some helpers for printing debug informations */
2096
2097 #ifdef DEBUG
2098 static void
2099diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h
2100index 8d224ae02..340a4428c 100644
2101--- a/hw/xfree86/fbdevhw/fbpriv.h
2102+++ b/hw/xfree86/fbdevhw/fbpriv.h
2103@@ -1,5 +1,5 @@
2104 /*
2105- * copied from from linux kernel 2.2.4
2106+ * copyed from from linux kernel 2.2.4
2107 * removed internal stuff (#ifdef __KERNEL__)
2108 */
2109
2110diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
2111index 59733b032..22109cfbc 100644
2112--- a/hw/xfree86/i2c/xf86i2c.c
2113+++ b/hw/xfree86/i2c/xf86i2c.c
2114@@ -401,8 +401,8 @@ xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr)
2115 * 3rd, if a Start condition has been successfully sent,
2116 * Send a Stop condition.
2117 *
2118- * The function exits immediately when an error occurs,
2119- * not processing any data left. However, step 3 will
2120+ * The functions exits immediately when an error occures,
2121+ * not proceeding any data left. However, step 3 will
2122 * be executed anyway to leave the bus in clean idle state.
2123 */
2124
2125@@ -440,7 +440,7 @@ I2CWriteRead(I2CDevPtr d,
2126 return r;
2127 }
2128
2129-/* wrapper - for compatibility and convenience */
2130+/* wrapper - for compatibility and convinience */
2131
2132 Bool
2133 xf86I2CWriteRead(I2CDevPtr d,
2134@@ -592,7 +592,7 @@ xf86I2CWriteVec(I2CDevPtr d, I2CByte * vec, int nValues)
2135 * =========================
2136 */
2137
2138-/* Allocates an I2CDevRec for you and initializes with proper defaults
2139+/* Allocates an I2CDevRec for you and initializes with propper defaults
2140 * you may modify before calling xf86I2CDevInit. Your I2CDevRec must
2141 * contain at least a SlaveAddr, and a pI2CBus pointer to the bus this
2142 * device shall be linked to.
2143@@ -692,7 +692,7 @@ xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr)
2144
2145 static I2CBusPtr I2CBusList;
2146
2147-/* Allocates an I2CBusRec for you and initializes with proper defaults
2148+/* Allocates an I2CBusRec for you and initializes with propper defaults
2149 * you may modify before calling xf86I2CBusInit. Your I2CBusRec must
2150 * contain at least a BusName, a scrnIndex (or -1), and a complete set
2151 * of either high or low level I2C function pointers. You may pass
2152diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO
2153index 13477ce87..e2154c1c3 100644
2154--- a/hw/xfree86/int10/INT10.HOWTO
2155+++ b/hw/xfree86/int10/INT10.HOWTO
2156@@ -96,7 +96,7 @@ for the INT10 executor:
2157 starting at address 0 in the process virtual memory space. Thus if
2158 this mode is to be used, the OS environment has to be able to provide
2159 that, ie. it must be able to remap the processes virtual memory space
2160- onto itself. If the emulator is able to handle memory access through
2161+ onto itself. If the emulator is able to handle memory access thru
2162 externally provided functions the real mode process memory can be
2163 located anywhere in the processes virtual memory. It does not even
2164 have to be consecutive.
2165@@ -304,7 +304,7 @@ FALSE. Otherwise TRUE is returned.
2166
2167 Note: This function is currently based on the Linux vm86 call. It
2168 might have to be modified or even rewritten for other OS. So your
2169-mileage may vary.
2170+milage may vary.
2171
2172 Functions to dump memory, code, xf86 CPU register values and stack are
2173 also provided. Take a look at helper.c To view a memory range the
2174diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
2175index 1811efb14..8d5c4daf3 100644
2176--- a/hw/xfree86/int10/generic.c
2177+++ b/hw/xfree86/int10/generic.c
2178@@ -223,7 +223,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
2179 setup_int_vect(pInt);
2180 set_return_trap(pInt);
2181
2182- /* Retrieve the entire legacy video BIOS segment. This can be up to
2183+ /* Retrieve the entire legacy video BIOS segment. This can be upto
2184 * 128KiB.
2185 */
2186 vbiosMem = (char *) base + V_BIOS;
2187diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
2188index 12000bf96..6a83f422e 100644
2189--- a/hw/xfree86/int10/helper_exec.c
2190+++ b/hw/xfree86/int10/helper_exec.c
2191@@ -660,10 +660,10 @@ bios_checksum(const uint8_t *start, int size)
2192 * an attempt to detect a legacy ISA card. If they find one they might
2193 * act very strange: for example they might configure the card as a
2194 * monochrome card. This might cause some drivers to choke.
2195- * To avoid this we attempt legacy VGA by writing to all known VGA
2196+ * To avoid this we attempt legacy VGA by writing to all know VGA
2197 * disable registers before we call the BIOS initialization and
2198- * restore the original values afterwards. In between we hold our
2199- * breath. To get to a (possibly existing) ISA card need to disable
2200+ * restore the original values afterwards. In beween we hold our
2201+ * breath. To get to a (possibly exising) ISA card need to disable
2202 * our current PCI card.
2203 */
2204 /*
2205diff --git a/hw/xfree86/int10/vbe.c b/hw/xfree86/int10/vbe.c
2206index 26efdd76e..a37975ddf 100644
2207--- a/hw/xfree86/int10/vbe.c
2208+++ b/hw/xfree86/int10/vbe.c
2209@@ -169,7 +169,7 @@ vbeFree(vbeInfoPtr pVbe)
2210 return;
2211
2212 xf86Int10FreePages(pVbe->pInt10, pVbe->memory, pVbe->num_pages);
2213- /* If we have initialized int10 we ought to free it, too */
2214+ /* If we have initalized int10 we ought to free it, too */
2215 if (pVbe->init_int10)
2216 xf86FreeInt10(pVbe->pInt10);
2217 free(pVbe);
2218@@ -846,7 +846,7 @@ VBEGetVBEpmi(vbeInfoPtr pVbe)
2219 AX := Status
2220 ES := Real Mode Segment of Table
2221 DI := Offset of Table
2222- CX := Length of Table including protected mode code in bytes (for copying purposes)
2223+ CX := Lenght of Table including protected mode code in bytes (for copying purposes)
2224 (All other registers are preserved)
2225 */
2226
2227diff --git a/hw/xfree86/int10/vbe.h b/hw/xfree86/int10/vbe.h
2228index 8024f5102..c8fb4e48f 100644
2229--- a/hw/xfree86/int10/vbe.h
2230+++ b/hw/xfree86/int10/vbe.h
2231@@ -225,7 +225,8 @@ typedef enum {
2232 } vbeSaveRestoreFunction;
2233
2234 extern _X_EXPORT Bool
2235-VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
2236+
2237+VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction,
2238 void **memory, int *size, int *real_mode_pages);
2239
2240 /*
2241diff --git a/hw/xfree86/int10/vbeModes.c b/hw/xfree86/int10/vbeModes.c
2242index 980e40b9c..50ac50d2c 100644
2243--- a/hw/xfree86/int10/vbeModes.c
2244+++ b/hw/xfree86/int10/vbeModes.c
2245@@ -431,7 +431,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
2246 }
2247
2248 /*
2249- * These wrappers are to allow (temporary) functionality divergences.
2250+ * These wrappers are to allow (temporary) funtionality divergences.
2251 */
2252 int
2253 VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
2254diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
2255index 578f461b7..5ead44f23 100644
2256--- a/hw/xfree86/int10/xf86int10.c
2257+++ b/hw/xfree86/int10/xf86int10.c
2258@@ -598,7 +598,7 @@ int42_handler(xf86Int10InfoPtr pInt)
2259 /**
2260 * These functions are meant to be used by the PCI BIOS emulation. Some
2261 * BIOSes need to see if there are \b other chips of the same type around so
2262- * by setting \c exclude one PCI device can be explicitly excluded, if
2263+ * by setting \c exclude one PCI device can be explicitely excluded, if
2264 * required.
2265 */
2266 static struct pci_device *
2267diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
2268index ead393062..9c4c66969 100644
2269--- a/hw/xfree86/modes/xf86Crtc.c
2270+++ b/hw/xfree86/modes/xf86Crtc.c
2271@@ -2737,7 +2737,7 @@ xf86DisableCrtc(xf86CrtcPtr crtc)
2272 }
2273
2274 /*
2275- * Check the CRTC we're going to map each output to vs. its current
2276+ * Check the CRTC we're going to map each output to vs. it's current
2277 * CRTC. If they don't match, we have to disable the output and the CRTC
2278 * since the driver will have to re-route things.
2279 */
2280@@ -3164,7 +3164,7 @@ xf86OutputSetTileProperty(xf86OutputPtr output)
2281
2282 #endif
2283
2284-/* Pull out a physical size from a detailed timing if available. */
2285+/* Pull out a phyiscal size from a detailed timing if available. */
2286 struct det_phySize_parameter {
2287 xf86OutputPtr output;
2288 ddc_quirk_t quirks;
2289diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
2290index fcba5c902..bf3e808bc 100644
2291--- a/hw/xfree86/modes/xf86Crtc.h
2292+++ b/hw/xfree86/modes/xf86Crtc.h
2293@@ -1066,7 +1066,7 @@ extern _X_EXPORT Bool
2294 xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags);
2295
2296 /**
2297- * Superseded by xf86CursorResetCursor, which is getting called
2298+ * Superseeded by xf86CursorResetCursor, which is getting called
2299 * automatically when necessary.
2300 */
2301 static _X_INLINE _X_DEPRECATED void xf86_reload_cursors(ScreenPtr screen) {}
2302diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
2303index 1ac573867..96249ac3a 100644
2304--- a/hw/xfree86/modes/xf86EdidModes.c
2305+++ b/hw/xfree86/modes/xf86EdidModes.c
2306@@ -573,7 +573,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
2307 * Refuse to create modes that are insufficiently large. 64 is a random
2308 * number, maybe the spec says something about what the minimum is. In
2309 * particular I see this frequently with _old_ EDID, 1.0 or so, so maybe
2310- * our parser is just being too aggressive there.
2311+ * our parser is just being too aggresive there.
2312 */
2313 if (timing->h_active < 64 || timing->v_active < 64) {
2314 xf86DrvMsg(scrnIndex, X_INFO,
2315@@ -589,7 +589,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
2316 return NULL;
2317 }
2318
2319- /* We only do separate sync currently */
2320+ /* We only do seperate sync currently */
2321 if (timing->sync != 0x03) {
2322 xf86DrvMsg(scrnIndex, X_INFO,
2323 "%s: %dx%d Warning: We only handle separate"
2324diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
2325index 0bef53714..adec7bd3c 100644
2326--- a/hw/xfree86/modes/xf86RandR12.c
2327+++ b/hw/xfree86/modes/xf86RandR12.c
2328@@ -550,7 +550,7 @@ xf86RandR12SetMode(ScreenPtr pScreen,
2329 }
2330 /*
2331 * We know that if the driver failed to SwitchMode to the rotated
2332- * version, then it should revert back to its prior mode.
2333+ * version, then it should revert back to it's prior mode.
2334 */
2335 if (!xf86SwitchMode(pScreen, mode)) {
2336 ret = FALSE;
2337diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
2338index 46536f81d..6fdf6d4e6 100644
2339--- a/hw/xfree86/os-support/bsd/bsd_init.c
2340+++ b/hw/xfree86/os-support/bsd/bsd_init.c
2341@@ -102,9 +102,9 @@ static char *supported_drivers[] = {
2342 };
2343
2344 /*
2345- * Functions to probe for the existence of a supported console driver.
2346+ * Functions to probe for the existance of a supported console driver.
2347 * Any function returns either a valid file descriptor (driver probed
2348- * successfully), -1 (driver not found), or uses FatalError() if the
2349+ * succesfully), -1 (driver not found), or uses FatalError() if the
2350 * driver was found but proved to not support the required mode to run
2351 * an X server.
2352 */
2353@@ -131,7 +131,7 @@ static int xf86OpenWScons(void);
2354 * The sequence of the driver probes is important; start with the
2355 * driver that is best distinguishable, and end with the most generic
2356 * driver. (Otherwise, pcvt would also probe as syscons, and either
2357- * pcvt or syscons might successfully probe as pccons.)
2358+ * pcvt or syscons might succesfully probe as pccons.)
2359 */
2360 static xf86ConsOpen_t xf86ConsTab[] = {
2361 #ifdef PCVT_SUPPORT
2362diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
2363index 49d5627f1..bacd4aa0d 100644
2364--- a/hw/xfree86/os-support/bsd/memrange.h
2365+++ b/hw/xfree86/os-support/bsd/memrange.h
2366@@ -1,5 +1,5 @@
2367 /*
2368- * Memory range attribute operations, performed on /dev/mem
2369+ * Memory range attribute operations, peformed on /dev/mem
2370 */
2371
2372 #ifdef HAVE_XORG_CONFIG_H
2373diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
2374index ccf9d89d7..247bec708 100644
2375--- a/hw/xfree86/os-support/shared/sigio.c
2376+++ b/hw/xfree86/os-support/shared/sigio.c
2377@@ -68,7 +68,7 @@
2378 #endif
2379
2380 #ifdef MAXDEVICES
2381-/* MAXDEVICES represents the maximum number of input devices usable
2382+/* MAXDEVICES represents the maximimum number of input devices usable
2383 * at the same time plus one entry for DRM support.
2384 */
2385 #define MAX_FUNCS (MAXDEVICES + 1)
2386diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
2387index 368f21eef..dbdc4b677 100644
2388--- a/hw/xfree86/os-support/solaris/sun_apm.c
2389+++ b/hw/xfree86/os-support/solaris/sun_apm.c
2390@@ -127,7 +127,7 @@ sunToXF86(int type)
2391 }
2392
2393 /*
2394- * APM events can be requested directly from /dev/apm
2395+ * APM events can be requested direclty from /dev/apm
2396 */
2397 static int
2398 sunPMGetEventFromOS(int fd, pmEvent * events, int num)
2399diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
2400index 05a7cd820..c6a201aea 100644
2401--- a/hw/xfree86/os-support/xf86_OSproc.h
2402+++ b/hw/xfree86/os-support/xf86_OSproc.h
2403@@ -68,9 +68,9 @@
2404 #define _XF86_OSPROC_H
2405
2406 /*
2407- * The actual prototypes have been pulled into this separate file so
2408+ * The actual prototypes have been pulled into this seperate file so
2409 * that they can can be used without pulling in all of the OS specific
2410- * stuff like sys/stat.h, etc. that causes problems for loadable modules.
2411+ * stuff like sys/stat.h, etc. This casues problem for loadable modules.
2412 */
2413
2414 /*
2415diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h
2416index 0a8e4feee..e5fa6cec2 100644
2417--- a/hw/xfree86/parser/Configint.h
2418+++ b/hw/xfree86/parser/Configint.h
2419@@ -124,10 +124,10 @@ else\
2420
2421 /*
2422 * These are defines for error messages to promote consistency.
2423- * Error messages are preceded by the line number, section and file name,
2424+ * error messages are preceded by the line number, section and file name,
2425 * so these messages should be about the specific keyword and syntax in error.
2426- * To help limit namespace pollution, end each with _MSG.
2427- * Limit messages to 70 characters if possible.
2428+ * To help limit namespace polution, end each with _MSG.
2429+ * limit messages to 70 characters if possible.
2430 */
2431
2432 #define BAD_OPTION_MSG \
2433diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
2434index 6e96ba053..122e96730 100644
2435--- a/hw/xfree86/parser/write.c
2436+++ b/hw/xfree86/parser/write.c
2437@@ -139,7 +139,7 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
2438 int status;
2439 void (*csig) (int);
2440
2441- /* Need to fork to change ruid without losing euid */
2442+ /* Need to fork to change ruid without loosing euid */
2443 csig = OsSignal(SIGCHLD, SIG_DFL);
2444 switch ((pid = fork())) {
2445 case -1:
2446diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES
2447index 3be79a1e2..726e2edc1 100644
2448--- a/hw/xfree86/ramdac/CURSOR.NOTES
2449+++ b/hw/xfree86/ramdac/CURSOR.NOTES
2450@@ -9,9 +9,9 @@ cursor management is separate from the rest of the module.
2451
2452 All relevant prototypes and defines are in xf86Cursor.h.
2453
2454- To initialize the cursor, the driver should allocate an
2455-xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described
2456-later in this document and pass it to xf86InitCursor(). xf86InitCursor()
2457+ To initialize the cursor, the driver should allocate an
2458+xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described
2459+later in this document and pass it to xf86InitCursor(). xf86InitCursor()
2460 must be called _after_ the software cursor initialization (usually
2461 miDCInitialize).
2462
2463@@ -21,7 +21,7 @@ structure in its CloseScreen function via xf86DestroyCursorInfoRec().
2464
2465 2) FILLING OUT THE xf86CursorInfoRec
2466
2467- The driver informs the ramdac module of its hardware cursor capabilities by
2468+ The driver informs the ramdac module of it's hardware cursor capablities by
2469 filling out an xf86CursorInfoRec structure and passing it to xf86InitCursor().
2470 The xf86CursorInfoRec contains the following function pointers:
2471
2472@@ -46,10 +46,10 @@ void SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
2473 void SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
2474
2475 Set the cursor foreground and background colors. In 8bpp, fg and
2476- bg are indices into the current colormap unless the
2477+ bg are indicies into the current colormap unless the
2478 HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set. In that case
2479 and in all other bpps the fg and bg are in 8-8-8 RGB format.
2480-
2481+
2482 void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
2483
2484 LoadCursorImage is how the hardware cursor bits computed by the
2485@@ -59,14 +59,14 @@ void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
2486
2487 /**** These functions are optional ****/
2488
2489-
2490-unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
2491+
2492+unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
2493
2494 If RealizeCursor is not provided by the driver, one will be provided
2495 for you based on the Flags field described below. The driver must
2496 provide this function if the hardware cursor format is not one of
2497 the common ones supported by this module.
2498-
2499+
2500
2501 Bool UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
2502
2503@@ -122,7 +122,7 @@ Flags
2504 /* Cursor data packing flags */
2505
2506 Hardware cursor data consists of two pieces, a source and a mask.
2507- The mask is a bitmap indicating which parts of the cursor are
2508+ The mask is a bitmap indicating which parts of the cursor are
2509 transparent and which parts are drawn. The source is a bitmap
2510 indicating which parts of the non-transparent portion of the the
2511 cursor should be painted in the foreground color and which should
2512@@ -142,8 +142,8 @@ Flags
2513
2514 HARDWARE_CURSOR_AND_SOURCE_WITH_MASK
2515
2516- This flag will have the module logical AND the source with the mask to make
2517- sure there are no source bits set if the corresponding mask bits
2518+ This flag will have the module logical AND the source with the mask to make
2519+ sure there are no source bits set if the corresponding mask bits
2520 aren't set. Some hardware will not care if source bits are set where
2521 there are supposed to be transparent areas, but some hardware will
2522 interpret this as a third cursor color or similar. That type of
2523@@ -170,21 +170,21 @@ Flags
2524 until the entire pattern is stored. The following flags describe the
2525 bit interleave.
2526
2527- HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED
2528+ HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED
2529
2530 This one is the default.
2531-
2532+
2533 The following are for interleaved cursors.
2534-
2535- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1
2536- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8
2537- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16
2538- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32
2539- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64
2540+
2541+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1
2542+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8
2543+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16
2544+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32
2545+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64
2546
2547 And once again, if your hardware requires something different than
2548 these packing styles, your driver can supply its own RealizeCursor
2549- function.
2550+ function.
2551
2552
2553
2554diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c
2555index 8e5bc1aeb..9413c20fa 100644
2556--- a/hw/xfree86/utils/cvt/cvt.c
2557+++ b/hw/xfree86/utils/cvt/cvt.c
2558@@ -67,7 +67,7 @@ XNFcallocarray(size_t nmemb, size_t size)
2559 }
2560
2561 /*
2562- * Quickly check whether this is a CVT standard mode.
2563+ * Quickly check wether this is a CVT standard mode.
2564 */
2565 static Bool
2566 CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
2567@@ -108,7 +108,7 @@ PrintUsage(char *Name)
2568 fprintf(stderr, "usage: %s [-v|--verbose] [-r|--reduced] X Y [refresh]\n",
2569 Name);
2570 fprintf(stderr, "\n");
2571- fprintf(stderr, " -v|--verbose : Warn about CVT standard adherence.\n");
2572+ fprintf(stderr, " -v|--verbose : Warn about CVT standard adherance.\n");
2573 fprintf(stderr, " -r|--reduced : Create a mode with reduced blanking "
2574 "(default: normal blanking).\n");
2575 fprintf(stderr, " X : Desired horizontal resolution "
2576diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
2577index f6888009c..ebecfa8a9 100644
2578--- a/hw/xfree86/vgahw/vgaHW.c
2579+++ b/hw/xfree86/vgahw/vgaHW.c
2580@@ -591,12 +591,12 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
2581 }
2582 else {
2583 /*
2584- * Re-enable sequencer, then turn on screen.
2585+ * Reenable sequencer, then turn on screen.
2586 */
2587
2588 tmp = hwp->readSeq(hwp, 0x01);
2589
2590- hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* re-enable display */
2591+ hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* reenable display */
2592 vgaHWSeqReset(hwp, FALSE); /* clear synchronousreset */
2593
2594 hwp->disablePalette(hwp);
2595@@ -1946,7 +1946,7 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
2596 hwp->writeCrtc(hwp, 0x09, (save->cr09 & 0xDF));
2597 save->cr07 = hwp->readCrtc(hwp, 0x07);
2598 hwp->writeCrtc(hwp, 0x07, (save->cr07 & 0x10));
2599- /* vsync polarity negative & ensure a 25MHz clock */
2600+ /* vsync polarity negativ & ensure a 25MHz clock */
2601 save->msr = hwp->readMiscOut(hwp);
2602 hwp->writeMiscOut(hwp, ((save->msr & 0xF3) | 0x80));
2603 break;
2604diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
2605index 0fa80da45..b979b85a6 100644
2606--- a/hw/xfree86/vgahw/vgaHW.h
2607+++ b/hw/xfree86/vgahw/vgaHW.h
2608@@ -83,7 +83,7 @@ typedef struct {
2609 unsigned char *CRTC; /* Crtc Controller */
2610 unsigned char *Sequencer; /* Video Sequencer */
2611 unsigned char *Graphics; /* Video Graphics */
2612- unsigned char *Attribute; /* Video Attribute */
2613+ unsigned char *Attribute; /* Video Atribute */
2614 unsigned char DAC[768]; /* Internal Colorlookuptable */
2615 unsigned char numCRTC; /* number of CRTC registers, def=VGA_NUM_CRTC */
2616 unsigned char numSequencer; /* number of seq registers, def=VGA_NUM_SEQ */
2617diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
2618index 261d67b21..08a07b1bb 100644
2619--- a/hw/xfree86/x86emu/decode.c
2620+++ b/hw/xfree86/x86emu/decode.c
2621@@ -269,7 +269,7 @@ cpu-state-varible M.x86.mode. There are several potential states:
2622 gs segment override
2623 ss segment override
2624
2625- ds/ss select (in absence of override)
2626+ ds/ss select (in absense of override)
2627
2628 Each of the above 7 items are handled with a bit in the mode field.
2629 ****************************************************************************/
2630diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
2631index 8846db0ca..210f8ce64 100644
2632--- a/hw/xfree86/x86emu/ops.c
2633+++ b/hw/xfree86/x86emu/ops.c
2634@@ -39,7 +39,7 @@
2635 * to the 256 byte-"opcodes" found on the 8086. The table which
2636 * dispatches this is found in the files optab.[ch].
2637 *
2638-* Each opcode proc has a comment preceding it which gives its table
2639+* Each opcode proc has a comment preceeding it which gives it's table
2640 * address. Several opcodes are missing (undefined) in the table.
2641 *
2642 * Each proc includes information for decoding (DECODE_PRINTF and
2643@@ -7590,8 +7590,8 @@ x86emuOp_lahf(u8 X86EMU_UNUSED(op1))
2644 DECODE_PRINTF("LAHF\n");
2645 TRACE_AND_STEP();
2646 M.x86.R_AH = (u8) (M.x86.R_FLG & 0xff);
2647- /* Undocumented TC++ behavior??? Nope. It's documented, but
2648- you have to look real hard to notice it. */
2649+ /*undocumented TC++ behavior??? Nope. It's documented, but
2650+ you have too look real hard to notice it. */
2651 M.x86.R_AH |= 0x2;
2652 DECODE_CLEAR_SEGOVR();
2653 END_OF_INSTR();
2654@@ -7711,7 +7711,7 @@ x86emuOp_movs_byte(u8 X86EMU_UNUSED(op1))
2655 TRACE_AND_STEP();
2656 count = 1;
2657 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2658- /* don't care whether REPE or REPNE */
2659+ /* dont care whether REPE or REPNE */
2660 /* move them until CX is ZERO. */
2661 count = M.x86.R_CX;
2662 M.x86.R_CX = 0;
2663@@ -7756,7 +7756,7 @@ x86emuOp_movs_word(u8 X86EMU_UNUSED(op1))
2664 TRACE_AND_STEP();
2665 count = 1;
2666 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2667- /* don't care whether REPE or REPNE */
2668+ /* dont care whether REPE or REPNE */
2669 /* move them until CX is ZERO. */
2670 count = M.x86.R_CX;
2671 M.x86.R_CX = 0;
2672@@ -7991,7 +7991,7 @@ x86emuOp_stos_byte(u8 X86EMU_UNUSED(op1))
2673 inc = 1;
2674 TRACE_AND_STEP();
2675 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2676- /* don't care whether REPE or REPNE */
2677+ /* dont care whether REPE or REPNE */
2678 /* move them until CX is ZERO. */
2679 while (M.x86.R_CX != 0) {
2680 store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
2681@@ -8036,7 +8036,7 @@ x86emuOp_stos_word(u8 X86EMU_UNUSED(op1))
2682 TRACE_AND_STEP();
2683 count = 1;
2684 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2685- /* don't care whether REPE or REPNE */
2686+ /* dont care whether REPE or REPNE */
2687 /* move them until CX is ZERO. */
2688 count = M.x86.R_CX;
2689 M.x86.R_CX = 0;
2690@@ -8072,7 +8072,7 @@ x86emuOp_lods_byte(u8 X86EMU_UNUSED(op1))
2691 else
2692 inc = 1;
2693 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2694- /* don't care whether REPE or REPNE */
2695+ /* dont care whether REPE or REPNE */
2696 /* move them until CX is ZERO. */
2697 while (M.x86.R_CX != 0) {
2698 M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
2699@@ -8117,7 +8117,7 @@ x86emuOp_lods_word(u8 X86EMU_UNUSED(op1))
2700 TRACE_AND_STEP();
2701 count = 1;
2702 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2703- /* don't care whether REPE or REPNE */
2704+ /* dont care whether REPE or REPNE */
2705 /* move them until CX is ZERO. */
2706 count = M.x86.R_CX;
2707 M.x86.R_CX = 0;
2708diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
2709index 35ef94710..5604c7e81 100644
2710--- a/hw/xfree86/x86emu/prim_ops.c
2711+++ b/hw/xfree86/x86emu/prim_ops.c
2712@@ -68,7 +68,7 @@
2713 *
2714 * By inspection, one gets: cc = ab + r'(a + b)
2715 *
2716-* That represents a lot of operations, but NO CHOICE....
2717+* That represents alot of operations, but NO CHOICE....
2718 *
2719 * Borrow Chain Calculation.
2720 *
2721@@ -2050,7 +2050,7 @@ test_byte(u8 d, u8 s)
2722 CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
2723 CONDITIONAL_SET_FLAG(res == 0, F_ZF);
2724 CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
2725- /* AF == don't care */
2726+ /* AF == dont care */
2727 CLEAR_FLAG(F_CF);
2728 }
2729
2730@@ -2069,7 +2069,7 @@ test_word(u16 d, u16 s)
2731 CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
2732 CONDITIONAL_SET_FLAG(res == 0, F_ZF);
2733 CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
2734- /* AF == don't care */
2735+ /* AF == dont care */
2736 CLEAR_FLAG(F_CF);
2737 }
2738
2739@@ -2088,7 +2088,7 @@ test_long(u32 d, u32 s)
2740 CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
2741 CONDITIONAL_SET_FLAG(res == 0, F_ZF);
2742 CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
2743- /* AF == don't care */
2744+ /* AF == dont care */
2745 CLEAR_FLAG(F_CF);
2746 }
2747
2748@@ -2597,7 +2597,7 @@ ins(int size)
2749 inc = -size;
2750 }
2751 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2752- /* don't care whether REPE or REPNE */
2753+ /* dont care whether REPE or REPNE */
2754 /* in until CX is ZERO. */
2755 u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
2756 M.x86.R_ECX : M.x86.R_CX);
2757@@ -2663,7 +2663,7 @@ outs(int size)
2758 inc = -size;
2759 }
2760 if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
2761- /* don't care whether REPE or REPNE */
2762+ /* dont care whether REPE or REPNE */
2763 /* out until CX is ZERO. */
2764 u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
2765 M.x86.R_ECX : M.x86.R_CX);
2766@@ -2818,7 +2818,7 @@ cpuid(void)
2767 switch (feature) {
2768 case 0:
2769 /* Regardless if we have real data from the hardware, the emulator
2770- * will only support up to feature 1, which we set in register EAX.
2771+ * will only support upto feature 1, which we set in register EAX.
2772 * Registers EBX:EDX:ECX contain a string identifying the CPU.
2773 */
2774 M.x86.R_EAX = 1;
2775diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
2776index 6a648bf39..c9d463f3b 100644
2777--- a/hw/xfree86/x86emu/sys.c
2778+++ b/hw/xfree86/x86emu/sys.c
2779@@ -529,7 +529,7 @@ PARAMETERS:
2780 int - New software interrupt to prepare for
2781
2782 REMARKS:
2783-This function is used to set up the emulator state to execute a software
2784+This function is used to set up the emulator state to exceute a software
2785 interrupt. This can be used by the user application code to allow an
2786 interrupt to be hooked, examined and then reflected back to the emulator
2787 so that the code in the emulator will continue processing the software
2788diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h
2789index 8660ebcb6..1f04b7b65 100644
2790--- a/hw/xfree86/x86emu/x86emu/debug.h
2791+++ b/hw/xfree86/x86emu/x86emu/debug.h
2792@@ -107,8 +107,8 @@
2793 x86emu_decode_printf(x,y)
2794
2795 /*
2796- * The following allows us to look at the bytes of an instruction. The
2797- * first INCR_INSTRN_LEN, is called every time bytes are consumed in
2798+ * The following allow us to look at the bytes of an instruction. The
2799+ * first INCR_INSTRN_LEN, is called everytime bytes are consumed in
2800 * the decoding process. The SAVE_IP_CS is called initially when the
2801 * major opcode of the instruction is accessed.
2802 */
2803diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h
2804index edf9be324..3c9469f52 100644
2805--- a/hw/xfree86/x86emu/x86emu/regs.h
2806+++ b/hw/xfree86/x86emu/x86emu/regs.h
2807@@ -58,7 +58,7 @@
2808 * EAX & 0xff === AL
2809 * EAX & 0xffff == AX
2810 *
2811- * etc. The result is that a lot of the calculations can then be
2812+ * etc. The result is that alot of the calculations can then be
2813 * done using the native instruction set fully.
2814 */
2815
2816diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h
2817index aa2074a87..01bd92a6f 100644
2818--- a/hw/xfree86/x86emu/x86emu/x86emui.h
2819+++ b/hw/xfree86/x86emu/x86emu/x86emui.h
2820@@ -33,8 +33,8 @@
2821 * Developer: Kendall Bennett
2822 *
2823 * Description: Header file for system specific functions. These functions
2824-* are always compiled and linked in the OS dependent libraries,
2825-* and never in a binary portable driver.
2826+* are always compiled and linked in the OS depedent libraries,
2827+* and never in a binary portable driver.
2828 *
2829 ****************************************************************************/
2830
2831diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
2832index 4cf677f36..8352dcad2 100644
2833--- a/hw/xfree86/xorgconf.cpp
2834+++ b/hw/xfree86/xorgconf.cpp
2835@@ -142,7 +142,7 @@ Section "InputDevice"
2836
2837 Option "AutoRepeat" "500 5"
2838
2839-# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)).
2840+# Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)).
2841
2842 # Option "Xleds" "1 2 3"
2843
2844diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
2845index f54dbd608..21faf2e3a 100644
2846--- a/hw/xnest/Args.c
2847+++ b/hw/xnest/Args.c
2848@@ -188,5 +188,5 @@ ddxUseMsg(void)
2849 ErrorF("-bw int window border width\n");
2850 ErrorF("-name string window name\n");
2851 ErrorF("-scrns int number of screens to generate\n");
2852- ErrorF("-install install colormaps directly\n");
2853+ ErrorF("-install instal colormaps directly\n");
2854 }
2855diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
2856index 27ea30a83..e90a6168f 100644
2857--- a/hw/xnest/Handlers.c
2858+++ b/hw/xnest/Handlers.c
2859@@ -32,7 +32,7 @@ is" without express or implied warranty.
2860 #include "Handlers.h"
2861
2862 void
2863-xnestBlockHandler(void *blockData, void *timeout)
2864+xnestBlockHandler(void *blockData, void *timout)
2865 {
2866 xnestCollectExposures();
2867 XFlush(xnestDisplay);
2868diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
2869index 46f257c83..c7af77e9b 100644
2870--- a/hw/xnest/Keyboard.c
2871+++ b/hw/xnest/Keyboard.c
2872@@ -238,7 +238,8 @@ xnestUpdateModifierState(unsigned int state)
2873 for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
2874 int key;
2875
2876- /* Modifier is down, but shouldn't be */
2877+ /* Modifier is down, but shouldn't be
2878+ */
2879 if ((xkb_state & mask) && !(state & mask)) {
2880 int count = keyc->modifierKeyCount[i];
2881
2882@@ -256,7 +257,8 @@ xnestUpdateModifierState(unsigned int state)
2883 }
2884 }
2885
2886- /* Modifier should be down, but isn't */
2887+ /* Modifier shoud be down, but isn't
2888+ */
2889 if (!(xkb_state & mask) && (state & mask))
2890 for (key = 0; key < MAP_LENGTH; key++)
2891 if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
2892diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
2893index d6f44a25a..8d9c67205 100644
2894--- a/hw/xnest/Window.c
2895+++ b/hw/xnest/Window.c
2896@@ -339,7 +339,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
2897 xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
2898 }
2899
2900- if (mask & CWCursor) /* this is handled in cursor code */
2901+ if (mask & CWCursor) /* this is handeled in cursor code */
2902 mask &= ~CWCursor;
2903
2904 if (mask)
2905diff --git a/hw/xnest/man/Xnest.man b/hw/xnest/man/Xnest.man
2906index 1057e2d72..e287b8e9c 100644
2907--- a/hw/xnest/man/Xnest.man
2908+++ b/hw/xnest/man/Xnest.man
2909@@ -150,7 +150,7 @@ This option specifies the geometry parameters for the top-level
2910 window.
2911 See \(lqGEOMETRY SPECIFICATIONS\(rq in
2912 .BR X (@miscmansuffix@)
2913-for a discussion of this option's syntax.
2914+for a discusson of this option's syntax.
2915 This window corresponds to the root window of the nested server.
2916 The width
2917 .I W
2918diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
2919index 1744f1203..5573629fd 100644
2920--- a/hw/xquartz/GL/capabilities.c
2921+++ b/hw/xquartz/GL/capabilities.c
2922@@ -369,7 +369,7 @@ handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes)
2923 assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);
2924 }
2925
2926-/* Return non-zero if an error occurred. */
2927+/* Return non-zero if an error occured. */
2928 static CGLError
2929 handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
2930 struct glCapabilitiesConfig *c)
2931@@ -521,7 +521,7 @@ freeGlCapabilities(struct glCapabilities *cap)
2932 cap->configurations = NULL;
2933 }
2934
2935-/* Return true if an error occurred. */
2936+/*Return true if an error occured. */
2937 bool
2938 getGlCapabilities(struct glCapabilities *cap)
2939 {
2940@@ -566,6 +566,6 @@ getGlCapabilities(struct glCapabilities *cap)
2941
2942 CGLDestroyRendererInfo(info);
2943
2944- /* No error occurred. We are done. */
2945+ /* No error occured. We are done. */
2946 return kCGLNoError;
2947 }
2948diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c
2949index 64a1ac7c4..17e7a5874 100644
2950--- a/hw/xquartz/GL/glcontextmodes.c
2951+++ b/hw/xquartz/GL/glcontextmodes.c
2952@@ -114,7 +114,7 @@ _gl_convert_to_x_visual_type(int visualType)
2953 /**
2954 * Copy a GLX visual config structure to a GL context mode structure. All
2955 * of the fields in \c config are copied to \c mode. Additional fields in
2956- * \c mode that can be derived from the fields of \c config (i.e.,
2957+ * \c mode that can be derrived from the fields of \c config (i.e.,
2958 * \c haveDepthBuffer) are also filled in. The remaining fields in \c mode
2959 * that cannot be derived are set to default values.
2960 *
2961@@ -408,10 +408,10 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
2962 * \param count Number of structures to allocate.
2963 * \param minimum_size Minimum size of a structure to allocate. This allows
2964 * for differences in the version of the
2965- * \c __GLcontextModes structure used in libGL and in a
2966+ * \c __GLcontextModes stucture used in libGL and in a
2967 * DRI-based driver.
2968 * \returns A pointer to the first element in a linked list of \c count
2969- * structures on success, or \c NULL on failure.
2970+ * stuctures on success, or \c NULL on failure.
2971 *
2972 * \warning Use of \c minimum_size does \b not guarantee binary compatibility.
2973 * The fundamental assumption is that if the \c minimum_size
2974@@ -469,7 +469,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size)
2975 * Destroy a linked list of \c __GLcontextModes structures created by
2976 * \c _gl_context_modes_create.
2977 *
2978- * \param modes Linked list of structures to be destroyed. All structures
2979+ * \param modes Linked list of structures to be destroyed. All structres
2980 * in the list will be freed.
2981 */
2982 void
2983diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
2984index c8b501831..1e6027006 100644
2985--- a/hw/xquartz/X11Controller.h
2986+++ b/hw/xquartz/X11Controller.h
2987@@ -88,7 +88,7 @@ typedef unsigned int NSUInteger;
2988 IBOutlet NSMenuItem *window_separator;
2989 // window_separator is DEPRECATED due to this radar:
2990 // <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
2991- // It is kept around for localization compatibility and is subject to removal "eventually"
2992+ // It is kept around for localization compatability and is subject to removal "eventually"
2993 // If it is !NULL (meaning it is in the nib), it is removed from the menu and released
2994
2995 IBOutlet NSMenuItem *x11_about_item;
2996@@ -96,7 +96,7 @@ typedef unsigned int NSUInteger;
2997 IBOutlet NSMenuItem *apps_separator;
2998 IBOutlet NSMenuItem *toggle_fullscreen_item;
2999 #ifdef XQUARTZ_SPARKLE
3000- NSMenuItem *check_for_updates_item; // Programmatically enabled
3001+ NSMenuItem *check_for_updates_item; // Programatically enabled
3002 #endif
3003 IBOutlet NSMenuItem *copy_menu_item;
3004 IBOutlet NSMenu *dock_apps_menu;
3005diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
3006index e34994673..7bfbb767e 100644
3007--- a/hw/xquartz/darwin.c
3008+++ b/hw/xquartz/darwin.c
3009@@ -731,7 +731,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
3010
3011 if (!strcmp(argv[i], "-fakemouse2")) {
3012 if (i == argc - 1) {
3013- FatalError("-fakemouse2 must be followed by a modifier list\n");
3014+ FatalError("-fakemouse2 must be followed by a modifer list\n");
3015 }
3016 if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
3017 darwinFakeMouse2Mask = 0;
3018@@ -744,7 +744,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
3019
3020 if (!strcmp(argv[i], "-fakemouse3")) {
3021 if (i == argc - 1) {
3022- FatalError("-fakemouse3 must be followed by a modifier list\n");
3023+ FatalError("-fakemouse3 must be followed by a modifer list\n");
3024 }
3025 if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
3026 darwinFakeMouse3Mask = 0;
3027diff --git a/hw/xquartz/mach-startup/.gitignore b/hw/xquartz/mach-startup/.gitignore
3028index f6a06c550..374abbfbe 100644
3029--- a/hw/xquartz/mach-startup/.gitignore
3030+++ b/hw/xquartz/mach-startup/.gitignore
3031@@ -1,4 +1,4 @@
3032-# Add & Override for this directory and its subdirectories
3033+# Add & Override for this directory and it's subdirectories
3034 mach_startup.h
3035 mach_startupServer.c
3036 mach_startupServer.h
3037diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
3038index b89a5760e..f4f4de88e 100644
3039--- a/hw/xquartz/pbproxy/x-selection.m
3040+++ b/hw/xquartz/pbproxy/x-selection.m
3041@@ -787,7 +787,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
3042 [self send_reply:&reply];
3043 }
3044
3045-/* Return nil if an error occurred. */
3046+/* Return nil if an error occured. */
3047 /* DO NOT retain the encdata for longer than the length of an event response.
3048 * The autorelease pool will reuse/free it.
3049 */
3050@@ -818,8 +818,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
3051 return encdata;
3052 }
3053
3054-/* Return YES when an error has occurred when trying to send the PICT. */
3055-/* The caller should send a default response with a property of None when an error occurs. */
3056+/* Return YES when an error has occured when trying to send the PICT. */
3057+/* The caller should send a default reponse with a property of None when an error occurs. */
3058 - (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e
3059 pasteboard:(NSPasteboard *)pb
3060 type:(NSBitmapImageFileType)imagetype
3061@@ -866,7 +866,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
3062 return NO; /*no error*/
3063 }
3064
3065-/* Return YES if an error occurred. */
3066+/* Return YES if an error occured. */
3067 /* The caller should send a reply with a property of None when an error occurs. */
3068 - (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
3069 pasteboard:(NSPasteboard *)pb
3070@@ -1049,7 +1049,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
3071 if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
3072 &type)) {
3073 /*
3074- * An error occurred, so we should invoke the copy_completed:, but
3075+ * An error occured, so we should invoke the copy_completed:, but
3076 * not handle_selection:type:propdata:
3077 */
3078 [self copy_completed:e->selection];
3079diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
3080index 74ea86b5c..30f2218b6 100644
3081--- a/hw/xquartz/xpr/xprScreen.c
3082+++ b/hw/xquartz/xpr/xprScreen.c
3083@@ -470,7 +470,7 @@ xprSetupScreen(int index, ScreenPtr pScreen)
3084
3085 /*
3086 * xprUpdateScreen
3087- * Update screen after configuration change.
3088+ * Update screen after configuation change.
3089 */
3090 static void
3091 xprUpdateScreen(ScreenPtr pScreen)
3092diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
3093index a344c2993..aa5267a4d 100644
3094--- a/hw/xwayland/xwayland-glamor-eglstream.c
3095+++ b/hw/xwayland/xwayland-glamor-eglstream.c
3096@@ -84,7 +84,7 @@ struct xwl_pixmap {
3097 struct wl_buffer *buffer;
3098 struct xwl_screen *xwl_screen;
3099
3100- /* The stream and associated resources have their own lifetime separate
3101+ /* The stream and associated resources have their own lifetime seperate
3102 * from the pixmap's */
3103 int refcount;
3104
3105@@ -365,7 +365,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap)
3106 * - X window receives resize event, causing us to create a new pixmap and
3107 * begin creating the corresponding eglstream. This pixmap is known as
3108 * pixmap A.
3109- * - X window receives another resize event, and again changes its current
3110+ * - X window receives another resize event, and again changes it's current
3111 * pixmap causing us to create another corresponding eglstream for the same
3112 * window. This pixmap is known as pixmap B.
3113 * - Start handling events from the wayland compositor.
3114@@ -375,7 +375,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap)
3115 * callback in the original order the pixmaps were created. This means the
3116 * following would happen:
3117 *
3118- * - Receive pixmap A's stream callback, attach its stream to the surface of
3119+ * - Receive pixmap A's stream callback, attach it's stream to the surface of
3120 * the window that just orphaned it.
3121 * - Receive pixmap B's stream callback, fall over and fail because the
3122 * window's surface now incorrectly has pixmap A's stream attached to it.
3123@@ -386,7 +386,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap)
3124 *
3125 * - Begin processing X events...
3126 * - A window is resized, causing us to add an eglstream (known as eglstream
3127- * A) waiting for its consumer to finish attachment to be added to the
3128+ * A) waiting for it's consumer to finish attachment to be added to the
3129 * queue.
3130 * - Resize on same window happens. We invalidate the previously pending
3131 * stream and add another one to the pending queue (known as eglstream B).
3132diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
3133index d31e0ea4e..f7ba91051 100644
3134--- a/hw/xwayland/xwayland-input.c
3135+++ b/hw/xwayland/xwayland-input.c
3136@@ -435,7 +435,7 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
3137 if (BitIsOn(dev->button->down, i))
3138 QueuePointerEvents(dev, ButtonRelease, i, 0, &mask);
3139
3140- /* The last cursor frame we committed before the pointer left one
3141+ /* The last cursor frame we commited before the pointer left one
3142 * of our surfaces might not have been shown. In that case we'll
3143 * have a cursor surface frame callback pending which we need to
3144 * clear so that we can continue submitting new cursor frames. */
3145diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
3146index 00f2600a7..84d58874a 100644
3147--- a/hw/xwayland/xwayland-shm.c
3148+++ b/hw/xwayland/xwayland-shm.c
3149@@ -111,7 +111,7 @@ create_tmpfile_cloexec(char *tmpname)
3150 *
3151 * If the C library implements posix_fallocate(), it is used to
3152 * guarantee that disk space is available for the file at the
3153- * given size. If disk space is insufficient, errno is set to ENOSPC.
3154+ * given size. If disk space is insufficent, errno is set to ENOSPC.
3155 * If posix_fallocate() is not supported, program may receive
3156 * SIGBUS on accessing mmap()'ed file contents instead.
3157 */
3158diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
3159index c9390fd18..9f4a2f807 100644
3160--- a/hw/xwin/InitOutput.c
3161+++ b/hw/xwin/InitOutput.c
3162@@ -139,7 +139,7 @@ void XwinExtensionInit(void)
3163 #if defined(DDXBEFORERESET)
3164 /*
3165 * Called right before KillAllClients when the server is going to reset,
3166- * allows us to shutdown our separate threads cleanly.
3167+ * allows us to shutdown our seperate threads cleanly.
3168 */
3169
3170 void
3171diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
3172index 720fa5a9c..4c9af772e 100644
3173--- a/hw/xwin/ddraw.h
3174+++ b/hw/xwin/ddraw.h
3175@@ -344,7 +344,7 @@ extern "C" {
3176 #define DDSCAPS2_RESERVED2 0x00000040
3177 /* indicates surface will never be locked again */
3178 #define DDSCAPS2_OPAQUE 0x00000080
3179-/* set at CreateSurface() time to indicate antialiasing will be used */
3180+/* set at CreateSurface() time to indicate antialising will be used */
3181 #define DDSCAPS2_HINTANTIALIASING 0x00000100
3182 /* set at CreateSurface() time to indicate cubic environment map */
3183 #define DDSCAPS2_CUBEMAP 0x00000200
3184@@ -383,9 +383,9 @@ extern "C" {
3185 typedef struct _DDCAPS_DX7 { /* DirectX 7 version of caps struct */
3186 DWORD dwSize; /* size of the DDDRIVERCAPS structure */
3187 DWORD dwCaps; /* driver specific capabilities */
3188- DWORD dwCaps2; /* more driver specific capabilities */
3189+ DWORD dwCaps2; /* more driver specific capabilites */
3190 DWORD dwCKeyCaps; /* color key capabilities of the surface */
3191- DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
3192+ DWORD dwFXCaps; /* driver specific stretching and effects capabilites */
3193 DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
3194 DWORD dwPalCaps; /* palette capabilities */
3195 DWORD dwSVCaps; /* stereo vision capabilities */
3196@@ -407,7 +407,7 @@ extern "C" {
3197 DWORD dwAlignSizeDest; /* dest rectangle byte size */
3198 DWORD dwAlignStrideAlign; /* stride alignment */
3199 DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
3200- DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
3201+ DDSCAPS ddsOldCaps; /* old DDSCAPS - superceded for DirectX6+ */
3202 DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3203 DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3204 DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3205@@ -443,9 +443,9 @@ extern "C" {
3206 typedef struct _DDCAPS_DX6 { /* DirectX 6 version of caps struct */
3207 DWORD dwSize; /* size of the DDDRIVERCAPS structure */
3208 DWORD dwCaps; /* driver specific capabilities */
3209- DWORD dwCaps2; /* more driver specific capabilities */
3210+ DWORD dwCaps2; /* more driver specific capabilites */
3211 DWORD dwCKeyCaps; /* color key capabilities of the surface */
3212- DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
3213+ DWORD dwFXCaps; /* driver specific stretching and effects capabilites */
3214 DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
3215 DWORD dwPalCaps; /* palette capabilities */
3216 DWORD dwSVCaps; /* stereo vision capabilities */
3217@@ -467,7 +467,7 @@ extern "C" {
3218 DWORD dwAlignSizeDest; /* dest rectangle byte size */
3219 DWORD dwAlignStrideAlign; /* stride alignment */
3220 DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */
3221- DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
3222+ DDSCAPS ddsOldCaps; /* old DDSCAPS - superceded for DirectX6+ */
3223 DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3224 DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3225 DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
3226@@ -504,9 +504,9 @@ extern "C" {
3227 typedef struct _DDCAPS_DX5 { /* DirectX5 version of caps struct */
3228 DWORD dwSize; /* size of the DDDRIVERCAPS structure */
3229 DWORD dwCaps; /* driver specific capabilities */
3230- DWORD dwCaps2; /* more driver specific capabilities */
3231+ DWORD dwCaps2; /* more driver specific capabilites */
3232 DWORD dwCKeyCaps; /* color key capabilities of the surface */
3233- DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
3234+ DWORD dwFXCaps; /* driver specific stretching and effects capabilites */
3235 DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
3236 DWORD dwPalCaps; /* palette capabilities */
3237 DWORD dwSVCaps; /* stereo vision capabilities */
3238@@ -564,9 +564,9 @@ extern "C" {
3239 typedef struct _DDCAPS_DX3 { /* DirectX3 version of caps struct */
3240 DWORD dwSize; /* size of the DDDRIVERCAPS structure */
3241 DWORD dwCaps; /* driver specific capabilities */
3242- DWORD dwCaps2; /* more driver specific capabilities */
3243+ DWORD dwCaps2; /* more driver specific capabilites */
3244 DWORD dwCKeyCaps; /* color key capabilities of the surface */
3245- DWORD dwFXCaps; /* driver specific stretching and effects capabilities */
3246+ DWORD dwFXCaps; /* driver specific stretching and effects capabilites */
3247 DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */
3248 DWORD dwPalCaps; /* palette capabilities */
3249 DWORD dwSVCaps; /* stereo vision capabilities */
3250@@ -827,7 +827,7 @@ extern "C" {
3251
3252 /* DDCAPS.dwSVCaps */
3253 /* the first 4 of these are now obsolete */
3254-#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occurred */
3255+#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occured */
3256 #define DDSVCAPS_RESERVED1 0x00000001
3257 #define DDSVCAPS_RESERVED2 0x00000002
3258 #define DDSVCAPS_RESERVED3 0x00000004
3259diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
3260index ff015f763..59ee17fb1 100644
3261--- a/hw/xwin/glx/indirect.c
3262+++ b/hw/xwin/glx/indirect.c
3263@@ -763,7 +763,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
3264 Discard any CopyWindow requests if a GL drawing context is pointing at the window
3265
3266 For regions which are being drawn by GL, the shadow framebuffer doesn't have the
3267- correct bits, so we wish to avoid shadow framebuffer damage occurring, which will
3268+ correct bits, so we wish to avoid shadow framebuffer damage occuring, which will
3269 cause those incorrect bits to be transferred to the display....
3270 */
3271 if (pGlxDraw && pGlxDraw->drawContext) {
3272@@ -1110,7 +1110,7 @@ glxWinReleaseTexImage(__GLXcontext * baseContext,
3273 *
3274 * WGL contexts are created for a specific HDC, so we cannot create the WGL
3275 * context in glxWinCreateContext(), we must defer creation until the context
3276- * is actually used on a specific drawable which is connected to a native window,
3277+ * is actually used on a specifc drawable which is connected to a native window,
3278 * pbuffer or DIB
3279 *
3280 * The WGL context may be used on other, compatible HDCs, so we don't need to
3281@@ -1915,7 +1915,7 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
3282 continue;
3283 }
3284 else {
3285- // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD accelerated...
3286+ // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated...
3287 c->base.visualRating = GLX_NONE_EXT;
3288 }
3289
3290diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
3291index 8d4af41db..296ce4c9f 100644
3292--- a/hw/xwin/man/XWin.man
3293+++ b/hw/xwin/man/XWin.man
3294@@ -66,7 +66,7 @@ Screen specific parameters can be applied as a
3295 default to all screens by placing those screen specific parameters
3296 before any \fB\-screen\fP parameter. Screen specific parameters placed after
3297 the first \fB\-screen\fP parameter will apply only to the immediately
3298-preceding \fB\-screen\fP parameter.
3299+preceeding \fB\-screen\fP parameter.
3300 .TP 8
3301 .B \-[no]multimonitors or \-[no]multiplemonitors
3302 Create a screen 0 that covers all monitors [the primary monitor] on a system with
3303@@ -79,7 +79,7 @@ This option is currently enabled by default in \fB\-multiwindow\fP mode.
3304 .B "\-screen \fIscreen_number\fP [\fIW\fP \fIH\fP [\fIX\fP \fIY\fP] | [[\fIW\fPx\fIH\fP[+\fIX\fP+\fIY\fP]][@\fIM\fP]] ] "
3305 Create screen number
3306 .I screen_number
3307-and optionally specify its
3308+and optionally specify it's
3309 .I height,
3310 .I width
3311 and
3312diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man
3313index 3c1ed067d..bc51a7a64 100644
3314--- a/hw/xwin/man/XWinrc.man
3315+++ b/hw/xwin/man/XWinrc.man
3316@@ -141,7 +141,7 @@ filename of an .ico format file
3317 .br
3318 (e.g. "cygwin.ico", "apple.ico", "C:\\icons\\cheese.ico", "/usr/share/icons/moon.ico")
3319 .IP \fI"NAME.DLL,nnn"\fP 16
3320-filename of a DLL with an index into its ICON resources
3321+filename of a DLL with an index into it's ICON resources
3322 .br
3323 (e.g. "c:\\windows\\system32\\shell32.dll,4", the default folder icon,
3324 "/usr/bin/cygicons-0.dll,10", the hippo icon)
3325diff --git a/hw/xwin/win.h b/hw/xwin/win.h
3326index 48795a8b5..50554e7dd 100644
3327--- a/hw/xwin/win.h
3328+++ b/hw/xwin/win.h
3329@@ -470,7 +470,7 @@ typedef struct _winPrivScreenRec {
3330 void *pWMInfo;
3331 Bool fRootWindowShown;
3332
3333- /* Privates used for any module running in a separate thread */
3334+ /* Privates used for any module running in a seperate thread */
3335 pthread_mutex_t pmServerStarted;
3336 Bool fServerStarted;
3337
3338diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
3339index 818805cb1..e25e6bd11 100644
3340--- a/hw/xwin/winallpriv.c
3341+++ b/hw/xwin/winallpriv.c
3342@@ -67,7 +67,7 @@ winAllocatePrivates(ScreenPtr pScreen)
3343 /* Initialize the memory of the private structure */
3344 ZeroMemory(pScreenPriv, sizeof(winPrivScreenRec));
3345
3346- /* Initialize private structure members */
3347+ /* Intialize private structure members */
3348 pScreenPriv->fActive = TRUE;
3349
3350 /* Register our screen private */
3351diff --git a/hw/xwin/winclipboard/wndproc.c b/hw/xwin/winclipboard/wndproc.c
3352index 63de4b9e5..10824a3ae 100644
3353--- a/hw/xwin/winclipboard/wndproc.c
3354+++ b/hw/xwin/winclipboard/wndproc.c
3355@@ -298,7 +298,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
3356
3357 /*
3358 WM_RENDERALLFORMATS is sent as we are shutting down, to render the
3359- clipboard so its contents remains available to other applications.
3360+ clipboard so it's contents remains available to other applications.
3361
3362 Unfortunately, this can't work without major changes. The server is
3363 already waiting for us to stop, so we can't ask for the rendering of
3364diff --git a/hw/xwin/winclipboard/xwinclip.man b/hw/xwin/winclipboard/xwinclip.man
3365index f0c2fc32b..e3db50177 100644
3366--- a/hw/xwin/winclipboard/xwinclip.man
3367+++ b/hw/xwin/winclipboard/xwinclip.man
3368@@ -40,7 +40,7 @@ The INCR (Incremental transfer) clipboard protocol for clipboard contents larger
3369 request (approximately 256K) is only supported for X -> Windows clipboard transfers.
3370
3371 Some X clients, notably ones written in Tcl/Tk, do not re-assert ownership of the PRIMARY selection or update
3372-its timestamp when its contents change, which currently prevents \fIxwinclip\fP from correctly noticing that
3373+it's timestamp when it's contents change, which currently prevents \fIxwinclip\fP from correctly noticing that
3374 the PRIMARY selection's contents have changed.
3375
3376 Windows clipboard rendering is synchronous in the WM_RENDER*FORMAT message (that is, we must have placed the
3377@@ -49,7 +49,7 @@ client which owns the selection to convert the selection to our requested format
3378 using a fixed timeout. After requesting conversion of the selection, if no events are received from the X
3379 client which owns the selection for one second, the conversion is assumed to have failed.
3380
3381-The XWin(1) server should indicate somehow (by placing an atom on the root window?) that it is running with its
3382+The XWin(1) server should indicate somehow (by placing an atom on the root window?) that it is running with it's
3383 internal clipboard integration enabled, and xwinclip should notice this and exit with an appropriate error.
3384
3385 Probably many other bugs.
3386diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
3387index dbce0bc17..814899f8e 100644
3388--- a/hw/xwin/winclipboardinit.c
3389+++ b/hw/xwin/winclipboardinit.c
3390@@ -108,7 +108,7 @@ winClipboardThreadProc(void *arg)
3391 }
3392
3393 /*
3394- * Initialize the Clipboard module
3395+ * Intialize the Clipboard module
3396 */
3397
3398 Bool
3399diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
3400index 4f16b21e0..646d69006 100644
3401--- a/hw/xwin/winconfig.c
3402+++ b/hw/xwin/winconfig.c
3403@@ -317,7 +317,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
3404
3405 deviceIdentifier = layoutNum >> 16;
3406 for (pass = 0; pass < 2; pass++) {
3407- /* If we didn't find an exact match for the input locale identifier,
3408+ /* If we didn't find an exact match for the input locale identifer,
3409 try to find an match on the language identifier part only */
3410 if (pass == 1)
3411 layoutNum = (layoutNum & 0xffff);
3412diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
3413index 444e843ec..a69c9c643 100644
3414--- a/hw/xwin/wincreatewnd.c
3415+++ b/hw/xwin/wincreatewnd.c
3416@@ -209,7 +209,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
3417
3418 /* Did the user specify a height and width? */
3419 if (pScreenInfo->fUserGaveHeightAndWidth) {
3420- /* User gave a desired height and width, try to accommodate */
3421+ /* User gave a desired height and width, try to accomodate */
3422 #if CYGDEBUG
3423 winDebug("winCreateBoundingWindowWindowed - User gave height "
3424 "and width\n");
3425diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
3426index 3fc050bfa..2afcf9fb5 100644
3427--- a/hw/xwin/wincursor.c
3428+++ b/hw/xwin/wincursor.c
3429@@ -173,7 +173,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
3430 dBackY = BRIGHTNESS(pCursor->back);
3431 fReverse = dForeY < dBackY;
3432
3433- /* Check whether the X11 cursor is bigger than the win32 cursor */
3434+ /* Check wether the X11 cursor is bigger than the win32 cursor */
3435 if (pScreenPriv->cursor.sm_cx < pCursor->bits->width ||
3436 pScreenPriv->cursor.sm_cy < pCursor->bits->height) {
3437 winErrorFVerb(3,
3438diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
3439index 2ac1c8c97..6159f623e 100644
3440--- a/hw/xwin/winkeynames.h
3441+++ b/hw/xwin/winkeynames.h
3442@@ -42,7 +42,7 @@
3443 * Set2 sends a makecode for keypress, and the same code prefixed by a
3444 * F0 for keyrelease. This is a little bit ugly to handle. Thus we use
3445 * here for X386 the PC/XT compatible Set1. This set uses 8bit scancodes.
3446- * Bit 7 is set if the key is released. The code E0 switches to a
3447+ * Bit 7 ist set if the key is released. The code E0 switches to a
3448 * different meaning to add the new MF cursorkeys, while not breaking old
3449 * applications. E1 is another special prefix. Since I assume that there
3450 * will be further versions of PC/XT scancode compatible keyboards, we
3451@@ -150,7 +150,7 @@
3452 #define KEY_F12 /* F12 0x58 */ 88
3453
3454 #define KEY_Prefix0 /* special 0x60 */ 96
3455-#define KEY_Prefix1 /* special 0x61 */ 97
3456+#define KEY_Prefix1 /* specail 0x61 */ 97
3457
3458 /*
3459 * The 'scancodes' below are generated by the server, because the MF101/102
3460diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
3461index aad99d9ad..bbe21cba6 100644
3462--- a/hw/xwin/winmouse.c
3463+++ b/hw/xwin/winmouse.c
3464@@ -100,7 +100,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState)
3465 */
3466 map = malloc(sizeof(CARD8) * (lngMouseButtons + lngWheelEvents + 1));
3467
3468- /* initialize button map */
3469+ /* initalize button map */
3470 map[0] = 0;
3471 for (i = 1; i <= lngMouseButtons + lngWheelEvents; i++)
3472 map[i] = i;
3473diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
3474index 0ef666d89..f39f842db 100644
3475--- a/hw/xwin/winmultiwindowicons.c
3476+++ b/hw/xwin/winmultiwindowicons.c
3477@@ -346,7 +346,7 @@ NetWMToWinIcon(int bpp, uint32_t * icon)
3478 osvi.dwMajorVersion = 5;
3479 osvi.dwMinorVersion = 1;
3480
3481- /* Windows versions later than XP have icon alpha channel support, 2000 does not */
3482+ /* Windows versions later than XP have icon alpha channel suport, 2000 does not */
3483 VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION,
3484 VER_GREATER_EQUAL);
3485 VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION,
3486diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
3487index b3bdb6b23..4eec72be2 100644
3488--- a/hw/xwin/winmultiwindowwindow.c
3489+++ b/hw/xwin/winmultiwindowwindow.c
3490@@ -507,7 +507,7 @@ winCreateWindowsWindow(WindowPtr pWin)
3491 make sure the window actually ends up somewhere where it will be visible
3492
3493 To handle arrangements of monitors which form a non-rectangular virtual
3494- desktop, check if the window will end up with its top-left corner on any
3495+ desktop, check if the window will end up with it's top-left corner on any
3496 monitor
3497 */
3498 if (pWin->drawable.class != InputOnly) {
3499@@ -551,7 +551,7 @@ winCreateWindowsWindow(WindowPtr pWin)
3500
3501 /*
3502 Calculate the window coordinates containing the requested client area,
3503- being careful to preserve CW_USEDEFAULT
3504+ being careful to preseve CW_USEDEFAULT
3505 */
3506 rc.top = (iY != CW_USEDEFAULT) ? iY : 0;
3507 rc.left = (iX != CW_USEDEFAULT) ? iX : 0;
3508@@ -751,7 +751,7 @@ winReorderWindowsMultiWindow(void)
3509 WindowPtr pWin = NULL;
3510 WindowPtr pWinSib = NULL;
3511 XID vlist[2];
3512- static Bool fRestacking = FALSE; /* Avoid recursive calls to this function */
3513+ static Bool fRestacking = FALSE; /* Avoid recusive calls to this function */
3514 DWORD dwCurrentProcessID = GetCurrentProcessId();
3515 DWORD dwWindowProcessID = 0;
3516
3517@@ -760,7 +760,7 @@ winReorderWindowsMultiWindow(void)
3518 #endif
3519
3520 if (fRestacking) {
3521- /* It is a recursive call so immediately exit */
3522+ /* It is a recusive call so immediately exit */
3523 #if CYGWINDOWING_DEBUG
3524 ErrorF("winReorderWindowsMultiWindow - "
3525 "exit because fRestacking == TRUE\n");
3526diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
3527index 37f1a7a02..9801b14c9 100644
3528--- a/hw/xwin/winmultiwindowwm.c
3529+++ b/hw/xwin/winmultiwindowwm.c
3530@@ -698,7 +698,7 @@ UpdateStyle(WMInfoPtr pWMInfo, xcb_window_t iWindow)
3531 winApplyHints(pWMInfo, iWindow, hWnd, &zstyle);
3532 winUpdateWindowPosition(hWnd, &zstyle);
3533
3534- /* Apply the updated window style, without changing its show or activation state */
3535+ /* Apply the updated window style, without changing it's show or activation state */
3536 flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE;
3537 if (zstyle == HWND_NOTOPMOST)
3538 flags |= SWP_NOZORDER | SWP_NOOWNERZORDER;
3539@@ -1422,7 +1422,7 @@ winInitWM(void **ppWMInfo,
3540 pArg->pWMInfo = pWMInfo;
3541 pArg->ppmServerStarted = ppmServerStarted;
3542
3543- /* Initialize the message queue */
3544+ /* Intialize the message queue */
3545 if (!InitQueue(&pWMInfo->wmMsgQueue)) {
3546 ErrorF("winInitWM - InitQueue () failed.\n");
3547 return FALSE;
3548@@ -1600,7 +1600,7 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
3549
3550 /*
3551 Set the root window cursor to left_ptr (this controls the cursor an
3552- application gets over its windows when it doesn't set one)
3553+ application gets over it's windows when it doesn't set one)
3554 */
3555 {
3556 #define XC_left_ptr 68
3557diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
3558index d0b2ef2e7..a948e4a7d 100644
3559--- a/hw/xwin/winprefs.c
3560+++ b/hw/xwin/winprefs.c
3561@@ -295,7 +295,7 @@ HandleCustomWM_INITMENU(HWND hwnd, HMENU hmenu)
3562
3563 /*
3564 * Searches for the custom WM_COMMAND command ID and performs action.
3565- * Return TRUE if command is processed, FALSE otherwise.
3566+ * Return TRUE if command is proccessed, FALSE otherwise.
3567 */
3568 Bool
3569 HandleCustomWM_COMMAND(HWND hwnd, WORD command, winPrivScreenPtr pScreenPriv)
3570diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
3571index 66023f335..50b1f6c38 100644
3572--- a/hw/xwin/winprocarg.c
3573+++ b/hw/xwin/winprocarg.c
3574@@ -442,7 +442,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
3575 g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
3576 }
3577
3578- /* Flag that this screen was explicitly specified by the user */
3579+ /* Flag that this screen was explicity specified by the user */
3580 g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;
3581
3582 /*
3583diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
3584index ae6bc12a6..9c0473019 100644
3585--- a/hw/xwin/winscrinit.c
3586+++ b/hw/xwin/winscrinit.c
3587@@ -40,7 +40,7 @@
3588
3589 /*
3590 * Determine what type of screen we are initializing
3591- * and call the appropriate procedure to initialize
3592+ * and call the appropriate procedure to intiailize
3593 * that type of screen.
3594 */
3595
3596@@ -101,7 +101,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
3597 else if (dwInitialBPP != pScreenInfo->dwBPP) {
3598 /* Warn user if engine forced a depth different to -depth parameter */
3599 ErrorF
3600- ("winScreenInit - Command line depth of %d bpp overridden by engine, using %d bpp\n",
3601+ ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n",
3602 (int) dwInitialBPP, (int) pScreenInfo->dwBPP);
3603 }
3604 else {
3605@@ -288,7 +288,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
3606 * own colormap, as it cannot allocate 7 planes in the default
3607 * colormap. Setting whitePixel to 1 allows Magic to get 7
3608 * planes in the default colormap, so it doesn't create its
3609- * own colormap. This latter situation is highly desirable,
3610+ * own colormap. This latter situation is highly desireable,
3611 * as it keeps the Magic window viewable when switching to
3612 * other X clients that use the default colormap.
3613 */
3614diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
3615index 25e16bf76..65678962b 100644
3616--- a/hw/xwin/winshadgdi.c
3617+++ b/hw/xwin/winshadgdi.c
3618@@ -1245,7 +1245,7 @@ winDestroyColormapShadowGDI(ColormapPtr pColormap)
3619 }
3620
3621 /*
3622- * Set engine specific functions
3623+ * Set engine specific funtions
3624 */
3625
3626 Bool
3627diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
3628index c7950880f..456213bc3 100644
3629--- a/hw/xwin/winwndproc.c
3630+++ b/hw/xwin/winwndproc.c
3631@@ -143,7 +143,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
3632 case WM_DISPLAYCHANGE:
3633 /*
3634 WM_DISPLAYCHANGE seems to be sent when the monitor layout or
3635- any monitor's resolution or depth changes, but its lParam and
3636+ any monitor's resolution or depth changes, but it's lParam and
3637 wParam always indicate the resolution and bpp for the primary
3638 monitor (so ignore that as we could be on any monitor...)
3639 */
3640@@ -151,7 +151,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
3641 /* We cannot handle a display mode change during initialization */
3642 if (s_pScreenInfo == NULL)
3643 FatalError("winWindowProc - WM_DISPLAYCHANGE - The display "
3644- "mode changed while we were initializing. This is "
3645+ "mode changed while we were intializing. This is "
3646 "very bad and unexpected. Exiting.\n");
3647
3648 /*
3649diff --git a/include/.gitignore b/include/.gitignore
3650index 3516078d1..8cb149114 100644
3651--- a/include/.gitignore
3652+++ b/include/.gitignore
3653@@ -1,4 +1,4 @@
3654-# Add & Override for this directory and its subdirectories
3655+# Add & Override for this directory and it's subdirectories
3656 *-config.h
3657 do-not-use-config.h.in
3658 xorg-server.h
3659diff --git a/include/glxvndabi.h b/include/glxvndabi.h
3660index e210755ae..71f36e722 100644
3661--- a/include/glxvndabi.h
3662+++ b/include/glxvndabi.h
3663@@ -223,7 +223,7 @@ typedef struct GlxServerExportsRec {
3664 * up the old context private pointer.
3665 *
3666 * However, this function is not safe to use from a ClientStateCallback,
3667- * because GLVND may have already deleted the tag by that point.
3668+ * because GLVND may have alraedy deleted the tag by that point.
3669 */
3670 void * (* getContextTagPrivate)(ClientPtr client, GLXContextTag tag);
3671
3672diff --git a/include/pixmap.h b/include/pixmap.h
3673index f79c41549..b7fb25723 100644
3674--- a/include/pixmap.h
3675+++ b/include/pixmap.h
3676@@ -130,7 +130,7 @@ extern _X_EXPORT Bool
3677 PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst);
3678
3679 /* helper function, drivers can do this themselves if they can do it more
3680- efficiently */
3681+ efficently */
3682 extern _X_EXPORT Bool
3683 PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty);
3684
3685diff --git a/include/scrnintstr.h b/include/scrnintstr.h
3686index d2c65dc47..9b663fa44 100644
3687--- a/include/scrnintstr.h
3688+++ b/include/scrnintstr.h
3689@@ -486,9 +486,9 @@ typedef void (*DPMSProcPtr)(ScreenPtr pScreen, int level);
3690 Wrap(as, pScreen, UnrealizeCursor, AnimCurUnrealizeCursor);
3691
3692 The wrapping block handler is a bit different; it does the Unwrap,
3693- the local operations, and then only re-Wraps if the hook is still
3694- required. Unwrap occurs at the top of each function, just after
3695- entry, and Wrap occurs at the bottom of each function, just
3696+ the local operations and then only re-Wraps if the hook is still
3697+ required. Unwrap occurrs at the top of each function, just after
3698+ entry, and Wrap occurrs at the bottom of each function, just
3699 before returning.
3700 */
3701
3702diff --git a/include/xkbstr.h b/include/xkbstr.h
3703index 8a9f01c68..8d715577a 100644
3704--- a/include/xkbstr.h
3705+++ b/include/xkbstr.h
3706@@ -386,7 +386,7 @@ typedef struct _XkbCompatMapRec {
3707
3708 typedef struct _XkbIndicatorMapRec {
3709 unsigned char flags;
3710- /* FIXME: For some reason, interpretation of groups is wildly
3711+ /* FIXME: For some reason, interepretation of groups is wildly
3712 * different between which being base/latched/locked. */
3713 unsigned char which_groups;
3714 unsigned char groups;
3715diff --git a/mi/miarc.c b/mi/miarc.c
3716index 3936f6c27..71df4ab64 100644
3717--- a/mi/miarc.c
3718+++ b/mi/miarc.c
3719@@ -96,7 +96,7 @@ cbrt(double x)
3720 #endif
3721
3722 /*
3723- * some interesting semantic interpretation of the protocol:
3724+ * some interesting sematic interpretation of the protocol:
3725 *
3726 * Self intersecting arcs (i.e. those spanning 360 degrees)
3727 * never join with other arcs, and are drawn without caps
3728@@ -2370,7 +2370,7 @@ lengthToAngle(double len, dashMap * map)
3729 }
3730
3731 /*
3732- * compute the angle of an ellipse which corresponds to
3733+ * compute the angle of an ellipse which cooresponds to
3734 * the given path length. Note that the correct solution
3735 * to this problem is an eliptic integral, we'll punt and
3736 * approximate (it's only for dashes anyway). This
3737diff --git a/mi/mibitblt.c b/mi/mibitblt.c
3738index 0954b2545..dbfc73a4f 100644
3739--- a/mi/mibitblt.c
3740+++ b/mi/mibitblt.c
3741@@ -451,7 +451,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
3742 ValidateGC(pDraw, pGC);
3743
3744 /* Fill the drawable with the stipple. This will draw the
3745- * foreground color wherever 1 bits are set, leaving everything
3746+ * foreground color whereever 1 bits are set, leaving everything
3747 * with 0 bits untouched. Note that the part outside the clip
3748 * region is all 0s. */
3749 rect.x = dstx;
3750diff --git a/mi/micmap.c b/mi/micmap.c
3751index 7003a5326..8b7ecd27f 100644
3752--- a/mi/micmap.c
3753+++ b/mi/micmap.c
3754@@ -416,7 +416,7 @@ maskShift(Pixel p)
3755
3756 /*
3757 * Given a list of formats for a screen, create a list
3758- * of visuals and depths for the screen which correspond to
3759+ * of visuals and depths for the screen which corespond to
3760 * the set which can be used with this version of cfb.
3761 */
3762
3763diff --git a/mi/miglblt.c b/mi/miglblt.c
3764index 169d44ffc..68be5b914 100644
3765--- a/mi/miglblt.c
3766+++ b/mi/miglblt.c
3767@@ -94,7 +94,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp
3768 int j;
3769 unsigned char *pbits; /* buffer for PutImage */
3770 unsigned char *pb; /* temp pointer into buffer */
3771- CharInfoPtr pci; /* current char info */
3772+ CharInfoPtr pci; /* currect char info */
3773 unsigned char *pglyph; /* pointer bits in glyph */
3774 int gWidth, gHeight; /* width and height of glyph */
3775 int nbyGlyphWidth; /* bytes per scanline of glyph */
3776diff --git a/mi/mipointer.c b/mi/mipointer.c
3777index a638f25d4..75be1aeeb 100644
3778--- a/mi/mipointer.c
3779+++ b/mi/mipointer.c
3780@@ -402,7 +402,7 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
3781 }
3782
3783 /**
3784- * Synchronize the sprite with the cursor.
3785+ * Syncronize the sprite with the cursor.
3786 *
3787 * @param pDev The device to sync
3788 */
3789@@ -699,8 +699,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
3790 /**
3791 * Get the current position of the device in desktop coordinates.
3792 *
3793- * @param x Return value for the current x coordinate in desktop coordinates.
3794- * @param y Return value for the current y coordinate in desktop coordinates.
3795+ * @param x Return value for the current x coordinate in desktop coordiates.
3796+ * @param y Return value for the current y coordinate in desktop coordiates.
3797 */
3798 void
3799 miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
3800diff --git a/mi/mipointer.h b/mi/mipointer.h
3801index 00f523740..7ce6409b3 100644
3802--- a/mi/mipointer.h
3803+++ b/mi/mipointer.h
3804@@ -100,7 +100,7 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);
3805 extern _X_EXPORT void
3806 miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y);
3807
3808-/* Moves the cursor to the specified position. May clip the coordinates:
3809+/* Moves the cursor to the specified position. May clip the co-ordinates:
3810 * x and y are modified in-place. */
3811 extern _X_EXPORT ScreenPtr
3812 miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y,
3813diff --git a/mi/miscrinit.c b/mi/miscrinit.c
3814index 3bb52b1bc..64a160b0c 100644
3815--- a/mi/miscrinit.c
3816+++ b/mi/miscrinit.c
3817@@ -43,7 +43,7 @@ from The Open Group.
3818 #include "shmint.h"
3819 #endif
3820
3821-/* We use this structure to propagate some information from miScreenInit to
3822+/* We use this structure to propogate some information from miScreenInit to
3823 * miCreateScreenResources. miScreenInit allocates the structure, fills it
3824 * in, and puts it into pScreen->devPrivate. miCreateScreenResources
3825 * extracts the info and frees the structure. We could've accomplished the
3826diff --git a/mi/mizerline.c b/mi/mizerline.c
3827index 1a0ca3427..2f22d2309 100644
3828--- a/mi/mizerline.c
3829+++ b/mi/mizerline.c
3830@@ -60,7 +60,7 @@ SOFTWARE.
3831 /* Draw lineSolid, fillStyle-independent zero width lines.
3832 *
3833 * Must keep X and Y coordinates in "ints" at least until after they're
3834- * translated and clipped to accommodate CoordModePrevious lines with very
3835+ * translated and clipped to accomodate CoordModePrevious lines with very
3836 * large coordinates.
3837 *
3838 * Draws the same pixels regardless of sign(dx) or sign(dy).
3839diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
3840index ed3b6c489..1be61cdf3 100644
3841--- a/miext/rootless/rootless.h
3842+++ b/miext/rootless/rootless.h
3843@@ -41,7 +41,7 @@
3844
3845 /*
3846 Each top-level rootless window has a one-to-one correspondence to a physical
3847- on-screen window. The physical window is referred to as a "frame".
3848+ on-screen window. The physical window is refered to as a "frame".
3849 */
3850
3851 typedef void *RootlessFrameID;
3852@@ -345,7 +345,7 @@ void RootlessStartDrawing(WindowPtr pWindow);
3853 void RootlessStopDrawing(WindowPtr pWindow, Bool flush);
3854
3855 /*
3856- * Allocate a new screen pixmap.
3857+ * Alocate a new screen pixmap.
3858 * miCreateScreenResources does not do this properly with a null
3859 * framebuffer pointer.
3860 */
3861diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
3862index 83dec3bb7..c3fa2a297 100644
3863--- a/miext/rootless/rootlessCommon.h
3864+++ b/miext/rootless/rootlessCommon.h
3865@@ -269,7 +269,7 @@ void RootlessFlushScreenColormaps(ScreenPtr pScreen);
3866 // Move a window to its proper location on the screen.
3867 void RootlessRepositionWindow(WindowPtr pWin);
3868
3869-// Move the window to its correct place in the physical stacking order.
3870+// Move the window to it's correct place in the physical stacking order.
3871 void RootlessReorderWindow(WindowPtr pWin);
3872
3873 void RootlessScreenExpose(ScreenPtr pScreen);
3874diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
3875index 106d4320e..e3042990c 100644
3876--- a/miext/rootless/rootlessWindow.c
3877+++ b/miext/rootless/rootlessWindow.c
3878@@ -561,9 +561,9 @@ RootlessReorderWindow(WindowPtr pWin)
3879
3880 /* Find the next window above this one that has a mapped frame.
3881 * Only include cases where the windows are in the same category of
3882- * hittability to ensure offscreen windows don't get restacked
3883+ * hittability to ensure offscreen windows dont get restacked
3884 * relative to onscreen ones (but that the offscreen ones maintain
3885- * their stacking order if they are explicitly asked to Reorder).
3886+ * their stacking order if they are explicitly asked to Reorder
3887 */
3888
3889 newPrevW = pWin->prevSib;
3890@@ -932,7 +932,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
3891
3892 if (code == (WIDTH_SMALLER | HEIGHT_SMALLER)) {
3893 /* Since the window is getting smaller, we can do gravity
3894- repair on it with its current size, then resize it
3895+ repair on it with it's current size, then resize it
3896 afterwards. */
3897
3898 resize_after = TRUE;
3899diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
3900index e8d0d51b0..529402d6e 100644
3901--- a/miext/shadow/shadow.c
3902+++ b/miext/shadow/shadow.c
3903@@ -87,7 +87,7 @@ shadowGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
3904
3905 shadowBuf(pScreen);
3906
3907- /* Many apps use GetImage to sync with the visible frame buffer */
3908+ /* Many apps use GetImage to sync with the visable frame buffer */
3909 if (pDrawable->type == DRAWABLE_WINDOW)
3910 shadowRedisplay(pScreen);
3911 unwrap(pBuf, pScreen, GetImage);
3912diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h
3913index 490cf6194..6f89714d6 100644
3914--- a/miext/sync/misyncstr.h
3915+++ b/miext/sync/misyncstr.h
3916@@ -65,7 +65,7 @@ struct _SyncTrigger {
3917 SyncObject *pSync;
3918 int64_t wait_value; /* wait value */
3919 unsigned int value_type; /* Absolute or Relative */
3920- unsigned int test_type; /* transition or Comparison type */
3921+ unsigned int test_type; /* transition or Comparision type */
3922 int64_t test_value; /* trigger event threshold value */
3923 Bool (*CheckTrigger)(struct _SyncTrigger *pTrigger,
3924 int64_t newval);
3925diff --git a/os/access.c b/os/access.c
3926index 34ebecad9..bffb3eb6b 100644
3927--- a/os/access.c
3928+++ b/os/access.c
3929@@ -920,7 +920,7 @@ AddLocalHosts(void)
3930 /* Fix for XFree86 bug #156: pass addingLocal = TRUE to
3931 * NewHost to tell that we are adding the default local
3932 * host entries and not to flag the entries as being
3933- * explicitly requested */
3934+ * explicitely requested */
3935 (void) NewHost(self->family, self->addr, self->len, TRUE);
3936 }
3937
3938diff --git a/os/backtrace.c b/os/backtrace.c
3939index 9f28b8809..619bf145e 100644
3940--- a/os/backtrace.c
3941+++ b/os/backtrace.c
3942@@ -173,7 +173,7 @@ xorg_backtrace(void)
3943 #define ElfSym Elf32_Sym
3944 #endif
3945
3946-/* Called for each frame on the stack to print its contents */
3947+/* Called for each frame on the stack to print it's contents */
3948 static int
3949 xorg_backtrace_frame(uintptr_t pc, int signo, void *arg)
3950 {
3951diff --git a/os/client.c b/os/client.c
3952index 89a92d5b5..213492d6c 100644
3953--- a/os/client.c
3954+++ b/os/client.c
3955@@ -197,7 +197,7 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
3956 return;
3957 path[totsize - 1] = '\0';
3958
3959- /* Construct the process name without arguments. */
3960+ /* Contruct the process name without arguments. */
3961 if (cmdname) {
3962 *cmdname = strdup(path);
3963 }
3964diff --git a/os/connection.c b/os/connection.c
3965index 9e8d47f6b..85e0050d8 100644
3966--- a/os/connection.c
3967+++ b/os/connection.c
3968@@ -895,7 +895,7 @@ ListenToAllClients(void)
3969 /****************
3970 * IgnoreClient
3971 * Removes one client from input masks.
3972- * Must have corresponding call to AttendClient.
3973+ * Must have cooresponding call to AttendClient.
3974 ****************/
3975
3976 void
3977diff --git a/os/io.c b/os/io.c
3978index 5b7fac349..939f51743 100644
3979--- a/os/io.c
3980+++ b/os/io.c
3981@@ -323,7 +323,7 @@ ReadRequestFromClient(ClientPtr client)
3982 /* save the data we've already read */
3983 memmove(oci->buffer, oci->bufptr, gotnow);
3984 if (needed > oci->size) {
3985- /* make buffer bigger to accommodate request */
3986+ /* make buffer bigger to accomodate request */
3987 char *ibuf;
3988
3989 ibuf = (char *) realloc(oci->buffer, needed);
3990@@ -343,7 +343,7 @@ ReadRequestFromClient(ClientPtr client)
3991 * never get here in those circumstances.
3992 */
3993 if (!oc->trans_conn) {
3994- /* treat as if an error occurred on the read, which is what
3995+ /* treat as if an error occured on the read, which is what
3996 * used to happen
3997 */
3998 YieldControlDeath();
3999@@ -814,7 +814,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
4000 /********************
4001 * FlushClient()
4002 * If the client isn't keeping up with us, then we try to continue
4003- * buffering the data and set the appropriate bit in ClientsWritable
4004+ * buffering the data and set the apropriate bit in ClientsWritable
4005 * (which is used by WaitFor in the select). If the connection yields
4006 * a permanent error, or we can't allocate any more space, we then
4007 * close the connection.
4008diff --git a/present/present.h b/present/present.h
4009index 9d0ecb48d..eaef02a68 100644
4010--- a/present/present.h
4011+++ b/present/present.h
4012@@ -95,7 +95,7 @@ typedef Bool (*present_flip_ptr) (RRCrtcPtr crtc,
4013 Bool sync_flip);
4014 /* Flip pixmap for window, return false if it didn't happen.
4015 *
4016- * Like present_flip_ptr, additionally with:
4017+ * Like present_flip_ptr, additionaly with:
4018 *
4019 * 'window' used for synchronization.
4020 *
4021diff --git a/present/present_wnmd.c b/present/present_wnmd.c
4022index b5a9a995e..c9108e0e2 100644
4023--- a/present/present_wnmd.c
4024+++ b/present/present_wnmd.c
4025@@ -34,7 +34,7 @@
4026 *
4027 * A flip still requires a copy currently, since the original pixmap needs
4028 * to be updated with the new pixmap content. Just a flip of all windows
4029- * to the new pixmap is difficult, because the original pixmap might not be
4030+ * to the new pixmap is diffcult, because the original pixmap might not be
4031 * controlled by the Xserver.
4032 *
4033 */
4034diff --git a/record/record.c b/record/record.c
4035index f2d38c877..42aee324a 100644
4036--- a/record/record.c
4037+++ b/record/record.c
4038@@ -1386,7 +1386,7 @@ RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client,
4039 typedef struct {
4040 int nintervals; /* number of intervals in following array */
4041 RecordSetInterval *intervals; /* array of intervals for this set */
4042- int size; /* size of intervals array; >= nintervals */
4043+ int size; /* size of intevals array; >= nintervals */
4044 int align; /* alignment restriction for set */
4045 int offset; /* where to store set pointer rel. to start of RCAP */
4046 short first, last; /* if for extension, major opcode interval */
4047@@ -1579,7 +1579,7 @@ RecordRegisterClients(RecordContextPtr pContext, ClientPtr client,
4048 return BadAlloc;
4049
4050 /* We may have to create as many as one set for each "predefined"
4051- * protocol types, plus one per range for extension requests, plus one per
4052+ * protocol types, plus one per range for extension reuests, plus one per
4053 * range for extension replies.
4054 */
4055 maxSets = PREDEFSETS + 2 * stuff->nRanges;
4056diff --git a/xfixes/cursor.c b/xfixes/cursor.c
4057index 60580b88f..d4b68f3af 100644
4058--- a/xfixes/cursor.c
4059+++ b/xfixes/cursor.c
4060@@ -670,7 +670,7 @@ ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, void *closure)
4061 ReplaceCursorLookup, (void *) &rcl);
4062 }
4063 }
4064- /* this "knows" that WindowHasNewCursor doesn't depend on its argument */
4065+ /* this "knows" that WindowHasNewCursor doesn't depend on it's argument */
4066 WindowHasNewCursor(screenInfo.screens[0]->root);
4067 }
4068
4069diff --git a/xkb/XKM_file_format.txt b/xkb/XKM_file_format.txt
4070index 2a90e4047..0ba28ee8c 100644
4071--- a/xkb/XKM_file_format.txt
4072+++ b/xkb/XKM_file_format.txt
4073@@ -77,8 +77,8 @@ specific fields listed underneath value 1.
4074 3. XKM Format
4075
4076 The XKM format is a binary format with structs usually being padded to a
4077-multiple of 4 bytes. No provisions for endianness are provided, the parser is
4078-left to guess the endianness of the XKM file.
4079+multiple of 4 bytes. No provisions for endianess are provided, the parser is
4080+left to guess the endianess of the XKM file.
4081
4082 ❧❧❧❧❧❧❧❧❧❧❧
4083 3.1 Common data types
4084@@ -399,7 +399,7 @@ The number of keysyms present is max_keycode - min_keycode + 1.
4085
4086 Presence of names is conditional on the XkmKeyHasTypes flag. The number of
4087 strings is equal to the number of group bits in group_names_mask in the
4088-preceding XKMSymbols section.
4089+preceeding XKMSymbols section.
4090 The number of elements in syms is equal to width * num_groups.
4091 Presence of behavior is conditional on the XkmKeyHasBehavior flag.
4092
4093diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
4094index ea7e34700..a8b8368a6 100644
4095--- a/xkb/ddxLoad.c
4096+++ b/xkb/ddxLoad.c
4097@@ -451,7 +451,7 @@ XkbRMLVOtoKcCGST(DeviceIntPtr dev, XkbRMLVOSet * rmlvo,
4098 /**
4099 * Compile the given RMLVO keymap and return it. Returns the XkbDescPtr on
4100 * success or NULL on failure. If the components compiled are not a superset
4101- * or equal to need, the compilation is treated as failure.
4102+ * or equal to need, the compiliation is treated as failure.
4103 */
4104 static XkbDescPtr
4105 XkbCompileKeymapForDevice(DeviceIntPtr dev, XkbRMLVOSet * rmlvo, int need)
4106--
41072.26.2
4108