fix formatting and spelling in various files

12 files changed, 17 insertions, 18 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index d5d13ea56..f24d15c55 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -2319,7 +2319,7 @@ void nxagentSetDeferLevel(void)
     nxagentChangeOption(Streaming, False);
   }
 
- switch (nxagentOption(LinkType))
+  switch (nxagentOption(LinkType))
   {
     case LINK_TYPE_MODEM:
     case LINK_TYPE_ISDN:  { deferLevel = 2; tileWidth =   64; tileHeight =   64; break; }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
index a39c53c07..9006b2253 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
@@ -58,7 +58,7 @@ void nxagentWMDetect(void);
 #ifdef XlibAtom
 
 /*
- * only provide these protoypes if the including file knows about Xlib
+ * only provide these prototypes if the including file knows about Xlib
  * types. This allows us including Atoms.h without having to use the
  * Xlib type magic of Agent.h
  */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 9931bdd77..cc9d35ac6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -767,7 +767,7 @@ static void nxagentDisplayFlushHandler(Display *disp, int length)
  * Error flag after the _NXDisplayErrorPredicate returns true. The
  * function can be used to activate additional checks, besides the
  * normal failures detected by Xlib on the display socket. For exam-
- * ple, the application can set the funciton to verify if an inter-
+ * ple, the application can set the function to verify if an inter-
  * rupt was received or if any other event occurred mandating the
  + end of the session."
  */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c
index 2aa404910..b956bb8df 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GC.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c
@@ -1127,7 +1127,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects)
         /*
          * Originally, the clip origin area were 0,0 but it didn't
          * work with kedit and family, because it got the clip mask of
-         * the pixmap all traslated.
+         * the pixmap all translated.
          */
 
         XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
index ae9de652a..5bda3c9ef 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -528,13 +528,12 @@ void nxagentReconnectPictFormat(void *p0, XID x1, void *p2)
 }
 
 /*
- * The set of picture formats may change considerably
- * between different X servers. This poses a problem
- * while migrating NX sessions, because a requisite to
- * successfully reconnect the session is that all pic-
- * ture formats have to be available on the new X server.
- * To reduce such problems, we use a limited set of
- * pictures available on the most X servers.
+ * The set of picture formats may change considerably between
+ * different X servers. This poses a problem while migrating NX
+ * sessions, because a requisite to successfully reconnect the session
+ * is that all picture formats have to be available on the new X
+ * server.  To reduce such problems, we use a limited set of pictures
+ * available on the most X servers.
  */
 
 void nxagentPictureCreateDefaultFormats(ScreenPtr pScreen, FormatInitRec *formats, int *nformats)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index 9bcd90130..72cb13042 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -1245,7 +1245,7 @@ void nxagentFreePropertyList(void)
 
 /*
  * We are trying to distinguish notifications generated by an external
- * client from those genarated by our own requests.
+ * client from those generated by our own requests.
  */
 
 Bool nxagentNotifyMatchChangeProperty(void *p)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 2e2b130fe..99cc3a280 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -112,7 +112,7 @@ SplitResourcePtr nxagentAllocSplitResource(void)
       fprintf(stderr, "nxagentAllocSplitResource: PANIC! No more resources for the next split.\n");
       #endif
 /*
-FIXME: Must deal with the case all resources are exausted.
+FIXME: Must deal with the case all resources are exhausted.
 */
       FatalError("nxagentAllocSplitResource: PANIC! No more resources for the next split.\n");
     }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index d5b0c1b6a..841ee3888 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1530,7 +1530,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
  * position in the window tree, and pPriorParent is its previous
  * parent. This function can be NULL.
  *
- * We simply pass this pver to the real X server.
+ * We simply pass this over to the real X server.
  */
 void nxagentReparentWindow(WindowPtr pWin, WindowPtr pOldParent)
 {
diff --git a/nxcomp/include/NX.h b/nxcomp/include/NX.h
index cc1cfb280..088e265e0 100644
--- a/nxcomp/include/NX.h
+++ b/nxcomp/include/NX.h
@@ -342,7 +342,7 @@ extern int NXTransFlush(int fd);
  *                   connection.
  *
  * NX_CHANNEL_SLAVE: The channel will forward data to a remote slave
- *                   command (see NX_SLAVE_CMD envrionment variable)
+ *                   command (see NX_SLAVE_CMD environment variable)
  *
  * Only a proxy running at the NX server/X client side will be able
  * to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy running
diff --git a/nxcomp/src/Control.h b/nxcomp/src/Control.h
index 764fca2c1..21edae77c 100644
--- a/nxcomp/src/Control.h
+++ b/nxcomp/src/Control.h
@@ -144,7 +144,7 @@ class Control
   T_session_mode SessionMode;
 
   //
-  // Either immediate or defferred flushes.
+  // Either immediate or deferred flushes.
   //
 
   T_flush_policy FlushPolicy;
diff --git a/nxcomp/src/Message.h b/nxcomp/src/Message.h
index 30883f101..f3a588104 100644
--- a/nxcomp/src/Message.h
+++ b/nxcomp/src/Message.h
@@ -566,7 +566,7 @@ class MessageStore
       // it can contain valid data that must be
       // explicitly deallocated if not needed.
       // Note also that you cannot count on the
-      // initialization made in costructor.
+      // initialization made in constructor.
       //
 
       temporary_ = message;
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index 9a145d2c0..c22f15a48 100644
--- a/nxproxy/man/nxproxy.1
+++ b/nxproxy/man/nxproxy.1
@@ -109,7 +109,7 @@ Remote port used for the connection.
 
 .TP 8
 .B retry=<int>
-Number of connection atempts.
+Number of connection attempts.
 
 .TP 8
 .B root=<string>