Merge branch 'uli42-pr/codespell' into 3.6.x

Attributes GH PR #686: https://github.com/ArcticaProject/nx-libs/pull/686

50 files changed, 92 insertions, 93 deletions

diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index 81d6ea147..6e58b7f02 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -51,7 +51,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
 # NX_TESTSET_CFLAG(<variable>, <flag>, [<alternative flag>, ...])
 # ---------------
 # Test if the compiler works when passed the given flag as a command line argument.
-# If it succeeds, the flag is appeneded to the given variable.  If not, it tries the
+# If it succeeds, the flag is appended to the given variable.  If not, it tries the
 # next flag in the list until there are no more options.
 #
 # Note that this does not guarantee that the compiler supports the flag as some
@@ -212,7 +212,7 @@ NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 # NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
 # NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 
-# Turn some warnings into errors, so we don't accidently get successful builds
+# Turn some warnings into errors, so we don't accidentally get successful builds
 # when there are problems that should be fixed.
 
 if test "x$SELECTIVE_WERROR" = "xyes" ; then
@@ -425,7 +425,7 @@ AM_CONDITIONAL([TARGET_ELF], [test x"$nxconf_cv_targetelf" = "xyes"])
 ]) # NX_TARGET_USE_ELF
 
 AC_DEFUN([LIBJPEG_FALLBACK_CHECK],[
-AC_MSG_CHECKING([for libjpeg shared libary file and headers])
+AC_MSG_CHECKING([for libjpeg shared library file and headers])
 AC_CHECK_LIB([jpeg], [jpeg_destroy_compress],
     [have_jpeg_lib=yes], [have_jpeg_lib=no])
 AC_CHECK_HEADERS([jpeglib.h],
@@ -443,7 +443,7 @@ fi
 ]) # LIBJPEG_FALLBACK_CHECK
 
 AC_DEFUN([ZLIB_FALLBACK_CHECK],[
-AC_MSG_CHECKING([for zlib shared libary file and headers])
+AC_MSG_CHECKING([for zlib shared library file and headers])
 AC_CHECK_LIB([z], [inflateEnd],
     [have_zlib_lib=yes], [have_zlib_lib=no])
 AC_CHECK_HEADERS([zlib.h],
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index 8fc344ac5..4d522f9e2 100644
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -1185,7 +1185,7 @@ clean::								@@\
 
 /* This rule is used for libs in Xserver/Imakefile which are loaded, not
  * linked into the core module. Since modules are called libXXXX.a,
- * this rule mustn't be overriden by .cf files.
+ * this rule mustn't be overridden by .cf files.
  */
 #ifndef ModuleLibraryTargetName
 #define ModuleLibraryTargetName(libname)Concat(lib,libname.a)
@@ -3609,7 +3609,7 @@ clean::									@@\
 #endif
 
 /* Phony targets - GNU make has a feature to mark a target as phony,
- * which means that it wont consider that target to be the name of a
+ * which means that it won't consider that target to be the name of a
  * file.  In general this speeds up make, since it doesn't have to
  * look for those files when it sets out to create a phony target.
  * However, on cygwin, this is actually required for correct
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index d6ef779cb..e202dabce 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -1736,7 +1736,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
 #else
               CPP = CppCmd $(STD_CPP_DEFINES)		/* simple filters */
            RAWCPP = RawCppCmd $(STD_CPP_OPTIONS)
-    PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES)	/* prefered; mdep */
+    PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES)	/* preferred; mdep */
 #endif
           INSTALL = InstallCmd
      INSTALLFLAGS = InstallFlags
diff --git a/nx-X11/config/cf/gnu.cf b/nx-X11/config/cf/gnu.cf
index c7dd071fe..d57580125 100644
--- a/nx-X11/config/cf/gnu.cf
+++ b/nx-X11/config/cf/gnu.cf
@@ -142,7 +142,7 @@ XCOMM i386Architecture
 
 #define ConnectionFlags		-DUNIXCONN -DTCPCONN
 
-/* Some of these man page defaults are overriden in the above OS sections */
+/* Some of these man page defaults are overridden in the above OS sections */
 #ifndef ManSuffix
 # define ManSuffix	1x
 #endif
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 0969a8f48..1360331be 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -145,7 +145,7 @@
 /*
  * To use the deprecated, old keyboard driver, uncomment this.  But
  * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
- * work for your architechture.  The old driver will be removed in the
+ * work for your architecture.  The old driver will be removed in the
  * next release.
  *
 #define UseDeprecatedKeyboardDriver YES
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index df7837c9e..fe8d97ec3 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -875,7 +875,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #define ConnectionFlags	-DUNIXCONN -DTCPCONN
 
 
-/* Some of these man page defaults are overriden in the above OS sections */
+/* Some of these man page defaults are overridden in the above OS sections */
 #ifndef ManSuffix
 # define ManSuffix	1x
 #endif
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index dc8a77362..578d82af4 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -645,7 +645,7 @@ DRIVERSDKMODULEDIR = DriverSDKModuleDir
 DRIVERSDKINCLUDEDIR = DriverSDKIncludeDir
 
 /*
- * Some commonly refered to directories are defined here.
+ * Some commonly referred to directories are defined here.
  */
 
        XF86SRC = $(SERVERSRC)/hw/xfree86
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index f735495f8..0ffe86056 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -65,7 +65,7 @@
 /*
  * To use the deprecated, old keyboard driver, uncomment this.  But
  * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
- * work for your architechture.  The old driver will be removed in the
+ * work for your architecture.  The old driver will be removed in the
  * next release.
  *
 #define UseDeprecatedKeyboardDriver YES
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index e2d97d2b4..5e578a5fd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -415,8 +415,8 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d
 
 /*
  * FIXME: We should clean up the atom map
- * at nxagent reset, in order to cancel 
- * all the local atoms but still mantaining 
+ * at nxagent reset, in order to cancel
+ * all the local atoms but still maintaining
  * the Xserver values and the atom names.
  */
 
@@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
   }
 
   /*
-   * Ask X-Server for ours Atoms
-   * ... if successfull cache them too.
+   * Ask X-Server for our Atoms
+   * ... if successful cache them too.
    */
 
   ret_value = XInternAtoms(nxagentDisplay, name_list, list_size, False, atom_list);
@@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
 }
 
 /*
- * If the nxagent has been resetted,
+ * If the nxagent has been reset,
  * the local value of the atoms stored
  * in cache could have the value None, 
  * do not call this function with None.
@@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit)
   {
     /*
      * Found Cached by name.
-     * It means that nxagent has been resetted,
+     * It means that nxagent has been reset,
      * but not the xserver so we still have cached its atoms.
      */
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index a13c84224..a2ea7d6f9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -43,7 +43,7 @@
 #include "X11/include/Xfixes_nxagent.h"
 
 /*
- * Use asyncronous get property replies.
+ * Use asynchronous get property replies.
  */
 
 #include "compext/Compext.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 494a73211..3ca3db2a3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -589,8 +589,8 @@ FIXME: Should print a warning if the user tries to let
        the agent impersonate the same display as the
        display where the agent is supposed to connect.
        We actually handle this by means of RejectWell-
-       KnownSockets() but without giving to the user
-       a friendly explaination for the error.
+       KnownSockets() but without giving a friendly
+       explanation for the error to the user.
 */
 
   newAction.sa_handler = nxagentRejectConnection;
@@ -1280,7 +1280,7 @@ N/A
 /*
 FIXME: Use of nxagentParentWindow is strongly deprecated.
        We need also to clarify which events are selected
-       in the diferent operating modes.
+       in the different operating modes.
 */
 
   nxagentInitDefaultEventMask();
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 8e828368d..522870546 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -71,8 +71,8 @@
 /*
  * If defined, send the XClearArea at the end
  * of the loop synchronizing the shadow pixmap.
- * In this way, large images can be splitted but
- * the user will see more updates togheter.
+ * In this way, large images can be split but
+ * the user will see more updates together.
  */
 
 #undef  COLLECTED_UPDATES
@@ -643,7 +643,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for synchronization.\n");
 
     /*
-     * Print detailed informations if the
+     * Print detailed information if the
      * image length is zero.
      */
 
@@ -2645,8 +2645,8 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable)
 
   /*
    * Should create a function to append
-   * a bitmap to another, instead of de-
-   * stroy the old one.
+   * a bitmap to another, instead of
+   * destroying the old one.
    */
 
   if (nxagentDrawableBitmap(pDrawable) != NullPixmap)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index 33d8abe6d..bc58ef849 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -103,7 +103,7 @@ void nxagentGetClientsPath(void);
 static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp);
 
 /* declare an error handler that does not exit when an error
- * event is catched.
+ * event is caught.
  */
 
 int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 91a3c6eb9..5e598f5bc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -3231,7 +3231,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
     if ((pWin = nxagentRootlessTopLevelWindow(X -> xconfigure.window)) != NULL)
     {
       /*
-       * Cheking for new geometry or stacking order changes.
+       * Checking for new geometry or stacking order changes.
        */
 
       nxagentCheckWindowConfiguration((XConfigureEvent*)X);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index 72c5eb9d0..a1690ebb8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames)
    * number of dashes in the pattern acts as
    * a rule to select how to search for the
    * font names, so the pattern '*' is useful
-   * to retrive the font aliases, while the
+   * to retrieve the font aliases, while the
    * other one will select the 'real' fonts.
    */
 
@@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id)
 
 /*
 FIXME: It happens that this resource had been already
-       destroied. We should verify if the same font is
+       destroyed. We should verify if the same font is
        assigned both to the server client and another
        client. We had a crash when freeing server client
        resources.
@@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
       numSearchFields = nxagentSplitString(nxagentRemoteFontList.list[i]->name, searchFields, FIELDS+1, "-");
 
 
-      /* The following code attemps to find an accurate approximation
+      /* The following code attempts to find an accurate approximation
        * of the missing font. The current candidate and the missing font are
        * compared on the 14 fields of the X Logical Font Description Convention.
        * The selection is performed by the analysis of the matching fields,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index e4c05685b..c9aea9cdd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -96,7 +96,7 @@
 #define TIME_BEFORE_YIELD        500
 
 /*
- * Dinamically reduce the display buffer
+ * Dynamically reduce the display buffer
  * size after a congestion.
  */
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 7043f09b4..a5e19724b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -189,8 +189,8 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order)
 {
   /*
    * This is used whenever we need to swap the image data.
-   * If we got an image from a X server having a different
-   * endianess, we will need to redormat the image to match
+   * If we got an image from an X server having a different
+   * endianness, we will need to reformat the image to match
    * our own image-order so that ProcGetImage can return
    * the expected format to the client.
    */
@@ -1157,9 +1157,9 @@ FIXME: Should use an unpack resource here.
 
   /*
    * We got the image data from the X client or
-   * from the frame-buffer with our own endianess.
+   * from the frame-buffer with our own endianness.
    * Byte swap the image data if the display has
-   * a different endianess than our own.
+   * a different endianness than our own.
    */
 
   if (nxagentImageNormalize(plainImage) != 0)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/nx-X11/programs/Xserver/hw/nxagent/Image.h
index 771c0dbe1..6e22fa9f6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.h
@@ -84,7 +84,7 @@ void nxagentResetAlphaCache(void);
 
 /*
  * Byte swap the image if the display
- * uses a different endianess.
+ * uses a different endianness.
  */
 
 #define nxagentImageNormalize(image) \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 26374f85a..6e68b80fc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -212,7 +212,7 @@ INCLUDES = \
 # NXAGENT_GLYPHCACHE
 # NXAGENT_GLYPHCACHE_SIZE          Slots for glyph cache
 # NXAGENT_SHAPE2 	           New shape code
-# NXAGENT_FIXKEYS     	           Force the release of pressed key when loosing focus
+# NXAGENT_FIXKEYS     	           Force the release of pressed key when losing focus
 # NXAGENT_EXPOSURES                Manage expose events
 # NXAGENT_CLIPBOARD                Enables clipboard cut and paste function between X servers.
 # NXAGENT_FONTEXCLUDE              Exclude some specific font names (only "-ult1mo" at this moment).
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 44b1033a3..5cfa92769 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -540,7 +540,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
 #if defined(DDXBEFORERESET)
     ddxBeforeReset ();
 #endif
-    /* FIXME: maybe move the code upto the KillAllClients() call to ddxBeforeReset? */
+    /* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */
     if ((dispatchException & DE_RESET) && 
             (serverGeneration > nxagentMaxAllowedResets))
     {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
index 727246cc7..370fff6b5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
@@ -568,7 +568,7 @@ ProcSendEvent(ClientPtr client)
 	    return Success;
 
 	/* If the input focus is PointerRootWin, send the event to where
-	the pointer is if possible, then perhaps propogate up to root. */
+	the pointer is if possible, then perhaps propagate up to root. */
    	if (inputFocus == PointerRootWin)
 	    inputFocus = ROOT;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
index a564d84b9..e05b36877 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
@@ -437,7 +437,7 @@ RestartLoop:
 
                 /*
                  * It's not enough to check if the number of elements has
-                 * changed, beacause it could happen that the number of
+                 * changed, because it could happen that the number of
                  * resources that have been added matches the number of
                  * the freed ones.
                  * 'nxagentResChangedFlag' is set if a resource has been
@@ -521,7 +521,7 @@ RestartLoop:
 
             /*
              * It's not enough to check if the number of elements has
-             * changed, beacause it could happen that the number of
+             * changed, because it could happen that the number of
              * resources that have been added matches the number of
              * the freed ones.
              * 'nxagentResChangedFlag' is set if a resource has been
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index d108d3ef3..64bbf67c4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -543,7 +543,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
     if (!pParent)
 	return Success;
 
-	/* Figure out if the window should be moved.  Doesnt
+	/* Figure out if the window should be moved.  Doesn't
 	   make the changes to the window if event sent */
 
     #ifdef TEST
@@ -769,7 +769,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
     if (pWin->prevSib)
 	pWin->prevSib->nextSib = pWin->nextSib;
 
-    /* insert at begining of pParent */
+    /* insert at beginning of pParent */
     pWin->parent = pParent;
     pPrev = RealChildHead(pParent);
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index a4e2c5099..8e898bd77 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -334,7 +334,7 @@ typedef struct _AgentOptions
 
   /*
    * If set, prevent the shadow session to
-   * interact with master diplay.
+   * interact with master display.
    */
 
   int ViewOnly;
@@ -429,7 +429,7 @@ typedef struct _AgentOptions
   * we cannot rely on them because RandR and PanoramiX change their
   * values when trying to initialize. So we use this variable to
   * save the user preference provided by the -/+(rr)xinerama parameter(s)
-  * before initalizing those extensions.
+  * before initializing those extensions.
   */
 
   int Xinerama;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
index fa25a46c7..316d147ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
@@ -111,10 +111,9 @@ while (0)
                  nxagentCongestion > 4)
 
 /*
-FIXME: The condition checking for the render
-       version is a workaround implemented to
-       avoid problems with the render composi-
-       te on XFree86 remote server.
+FIXME: The condition checking for the render version is a workaround
+       implemented to avoid problems with the render composite on
+       XFree86 remote server.
 */
 /*
 FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 25d410d51..421e023c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -1129,7 +1129,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap)
 
       #ifdef TEST
       fprintf(stderr, "nxagentCheckPixmapIntegrity: Pixmap at [%p] has been realized. "
-                  "Now remote and frambuffer data are synchronized.\n", (void *) pPixmap);
+                  "Now remote and framebuffer data are synchronized.\n", (void *) pPixmap);
       #endif
     }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 27398474a..675389705 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -236,7 +236,7 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo)
    * server this stuff is done after having opened the
    * real display as Xnest lets the screen reflect the
    * order of the remote end. Agent will instead set
-   * the order according to local endianess and swap
+   * the order according to local endianness and swap
    * data whenever it is appropriate.
    *
    * From a standard implementation:
@@ -329,7 +329,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
 /*
 FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWindow()
        in order to avoid the session window is iconified.
-       We could avoid the sesssion window is iconified when a LeaveNotify event is received,
+       We could avoid the session window is iconified when a LeaveNotify event is received,
        so this check would be unnecessary.
 */
     struct timeval timeout;
@@ -4012,7 +4012,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
       /*
        * Convert old RANDR 1.0 data (if any) to current structure. This
        * is needed once at the first run of this function. If we don't
-       * do this here it will be done implicitely later and add mode(s) to
+       * do this here it will be done implicitly later and add mode(s) to
        * our crtc(s)!
        */
       rrgetinfo = RRGetInfo(pScreen, FALSE);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
index c123791cd..a29560d43 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
@@ -141,7 +141,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth)
 
 /*
  * Create a fake 32 bits depth visual and
- * initialize it based on the endianess
+ * initialize it based on the endianness
  * of the remote display.
  */
 
@@ -152,7 +152,7 @@ void nxagentInitAlphaVisual(void)
   /*
    * Color masks are referred to bits inside
    * the pixel. This is independent from the
-   * endianess.
+   * endianness.
    */
 
   nxagentAlphaVisual.red_mask   = 0x00ff0000;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index e2ce9d372..073021ed8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask)
   }
 
   /*
-   * As we set this bit, whe must change dix in
+   * As we set this bit, we must change dix in
    * order not to perform PositionWindow and let
    * X move children windows for us.
    */
@@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void)
 
 Bool nxagentDisconnectAllWindows(void)
 {
-  Bool succeded = True;
+  Bool succeeded = True;
   int i;
   WindowPtr pWin;
 
@@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void)
   for (i = 0; i < screenInfo.numScreens; i++)
   {
     pWin = screenInfo.screens[i]->root;
-    nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeded);
+    nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeeded);
     nxagentDefaultWindows[i] = None;
   }
 
@@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void)
   fprintf(stderr, "nxagentDisconnectAllWindows: all windows disconnected\n");
   #endif
 
-  return succeded;
+  return succeeded;
 }
 
 /*
@@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff
     }
 /*
 XXX: This would break Motif menus.
-     If pWin is mapped but not realized, a followin UnmapWindow() wouldn't
+     If pWin is mapped but not realized, a following UnmapWindow() wouldn't
      do anything, leaving this mapped window around. XMapWindow()
      is called in nxagentRealizeWindow() and there it is enough.
 
@@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin)
      {
        #ifdef WARNING
        fprintf(stderr, "nxagentCheckWindowIntegrity: Window %p has been realized "
-                   "now remote and frambuffer data are synchronized.\n", (void*) pWin);
+                   "now remote and framebuffer data are synchronized.\n", (void*) pWin);
        #endif
      }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index 7e560b3f0..230c9abae 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -501,7 +501,7 @@ int NXSetDisplayBuffer(Display *dpy, int size)
 
 /*
  * If set, the Popen() function in the X server
- * wil remove the LD_LIBRARY_PATH variable from
+ * will remove the LD_LIBRARY_PATH variable from
  * the environment before calling the execl()
  * function on the child process.
  */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h
index a40384398..c0259a939 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h
@@ -103,7 +103,7 @@ extern int NXSetDisplayBuffer(
 
 /*
  * If set, the Popen() function in the X server
- * wil remove the LD_LIBRARY_PATH variable from
+ * will remove the LD_LIBRARY_PATH variable from
  * the environment before calling the execl()
  * function on the child process. The function
  * returns the previous value.
@@ -334,7 +334,7 @@ extern Status NXGetUnpackParameters(
  * shared memory blocks. A MIT-SHM compliant protocol is used
  * between proxy and the real server, while a simplified
  * version is used between the agent and the client proxy to
- * accomodate both packed images and plain X bitmaps.
+ * accommodate both packed images and plain X bitmaps.
  */
 
 extern Status NXGetShmemParameters(
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c
index b235e095e..457080032 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c
@@ -258,7 +258,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
   /*
    * TODO: Be sure the padded bytes are cleaned.
    * It would be better to set to zero the bytes
-   * that are not alligned to the word boundary
+   * that are not aligned to the word boundary
    * at the end of the procedure.
    */
 
@@ -491,7 +491,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
     /*
      * TODO: Be sure the padded bytes are cleaned.
      * It would be better to set to zero the bytes
-     * that are not alligned to the word boundary
+     * that are not aligned to the word boundary
      * at the end of the procedure.
      */
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
index 594269dbe..9bf59eaf2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
@@ -261,7 +261,7 @@ int ZInitEncoder(void)
     zStream -> opaque = (voidpf) 0;
 
     #ifdef TEST
-    fprintf(stderr, "******ZInitEncoder: Initializing compressor with level [%d] and startegy [%d].\n",
+    fprintf(stderr, "******ZInitEncoder: Initializing compressor with level [%d] and strategy [%d].\n",
                 zCompressionLevel, zCompressionStrategy);
     #endif
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 7ba24a4b5..b9c81cdb4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -775,7 +775,7 @@ the text after the /; it is used to distinguish between instances of
 
 <action> ::= a | i | e
 
-<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string>
+<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string>
 
 <dbl quoted string> ::= <space> " <not dqoute>* " <space>
 
diff --git a/nxcomp/src/Agent.h b/nxcomp/src/Agent.h
index 3e1a50ae5..a7c8b63bb 100644
--- a/nxcomp/src/Agent.h
+++ b/nxcomp/src/Agent.h
@@ -50,7 +50,7 @@ class Agent
   //
   // Must be created by passing the fake descriptor that
   // will be used for simulating socket communication
-  // betwen the agent and the proxy. I/O will take place
+  // between the agent and the proxy. I/O will take place
   // by copying data to the agent's read and write buf-
   // fers.
   //
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index e586292da..2431e5329 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -893,7 +893,7 @@ int NXTransKeeper(int caches, int images, const char *root)
   }
 
   //
-  // Take care of the persisten image cache.
+  // Take care of the persistent image cache.
   // Run a number of iterations and then exit,
   // so we can keep the memory consumption
   // low. The parent will check our exit code
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index 1c6354897..f67ee0a34 100644
--- a/nxcomp/src/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -3850,7 +3850,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
               //
               // Use differential compression at startup and plain
               // data compression later. Check X_ListFonts message
-              // for an explaination.
+              // for an explanation.
               //
 
               MessageStore *messageStore = serverStore_ ->
@@ -5974,7 +5974,7 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
   // integer number (0-255) referred to as the 'resource' field.
   //
   // Before the proxy will be able to report the status of the
-  // split, the agent will have to close the sequence by issueing
+  // split, the agent will have to close the sequence by issuing
   // an end-split. The proxy will then report the result of the
   // operation, so that the agent will have the option of suspend-
   // ing the client or marking the drawable as dirty and take
diff --git a/nxcomp/src/Control.cpp b/nxcomp/src/Control.cpp
index 75fd56e3f..d894e652a 100644
--- a/nxcomp/src/Control.cpp
+++ b/nxcomp/src/Control.cpp
@@ -131,7 +131,7 @@
 #define SHMEM_TIMEOUT                            200
 //
 // Before closing down the proxy, wait for the
-// given amount of miliseconds to let all the
+// given amount of milliseconds to let all the
 // running applications to close down their
 // connections.
 //
diff --git a/nxcomp/src/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp
index 4c1530d9b..09ed67347 100644
--- a/nxcomp/src/DecodeBuffer.cpp
+++ b/nxcomp/src/DecodeBuffer.cpp
@@ -476,7 +476,7 @@ const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes)
   //
   // Force ourselves to a byte boundary.
   // Is up to application to ensure data
-  // is word alligned when needed.
+  // is word aligned when needed.
   //
 
   if (srcMask_ != 0x80)
diff --git a/nxcomp/src/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp
index 78217157e..dd8bfd83c 100644
--- a/nxcomp/src/GenericReadBuffer.cpp
+++ b/nxcomp/src/GenericReadBuffer.cpp
@@ -52,7 +52,7 @@ int GenericReadBuffer::locateMessage(const unsigned char *start,
                                                      unsigned int &trailerLength)
 {
   //
-  // We don't care about the endianess
+  // We don't care about the endianness
   // in generic channels.
   //
 
diff --git a/nxcomp/src/Keeper.cpp b/nxcomp/src/Keeper.cpp
index 4babbe8a6..d945e6ab5 100644
--- a/nxcomp/src/Keeper.cpp
+++ b/nxcomp/src/Keeper.cpp
@@ -100,7 +100,7 @@ File::File()
 
 //
 // TODO: This class can leak industrial amounts of memory.
-// I'm 100% sure that the desctructor is called and that
+// I'm 100% sure that the destructor is called and that
 // also the string pointed in the File structure is dele-
 // ted. Everything is logged, but still the memory is not
 // freed. This is less a problem on Windows, where the me-
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f22053cc6..ddffcd1ca 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -751,7 +751,7 @@ static char sessionDir[DEFAULT_STRING_LENGTH] = { 0 };
 
 //
 // Log files for errors and statistics. Error log is
-// the place where we print also debug informations.
+// the place where we print also debug information.
 // Both files are closed, deleted and reopened as
 // their size exceed the limit set in control class.
 // The session log is not reopened, as it is used by
@@ -3100,7 +3100,7 @@ int InitBeforeNegotiation()
   SetDescriptors();
 
   //
-  // Set local endianess.
+  // Set local endianness.
   //
 
   unsigned int test = 1;
@@ -5664,7 +5664,7 @@ void HandleSignal(int signal)
       // if (agentFD[1] != -1)
       // {
       //   cerr << "Info" << ": Received signal 'SIGPIPE'. "
-      //        << "Closing agent conection.\n";
+      //        << "Closing agent connection.\n";
       //
       //   shutdown(agentFD[1], SHUT_RDWR);
       // }
@@ -6636,7 +6636,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
   // Show an alert after 20 seconds and use the
   // same timeout to interrupt the connect. The
   // retry timeout is incremental, starting from
-  // 100 miliseconds up to 1 second.
+  // 100 milliseconds up to 1 second.
   //
 
   int alertTimeout   = 20000;
diff --git a/nxcomp/src/MD5.c b/nxcomp/src/MD5.c
index 7255ca5c0..43a2793e3 100644
--- a/nxcomp/src/MD5.c
+++ b/nxcomp/src/MD5.c
@@ -60,7 +60,7 @@
 #include <string.h>
 
 /*
- * Try to determine the CPU endianess
+ * Try to determine the CPU endianness
  * at compile time.
  */
 
diff --git a/nxcomp/src/Proxy.h b/nxcomp/src/Proxy.h
index ea60c827a..2c4353f0e 100644
--- a/nxcomp/src/Proxy.h
+++ b/nxcomp/src/Proxy.h
@@ -184,7 +184,7 @@ class Proxy
   static const int TOKEN_TYPES = 3;
 
   //
-  // Lenght of buffer we use to add our
+  // Length of buffer we use to add our
   // control messages plus the length of
   // the data frame.
   //
diff --git a/nxcomp/src/PutPackedImage.h b/nxcomp/src/PutPackedImage.h
index d28ad39eb..9e3559625 100644
--- a/nxcomp/src/PutPackedImage.h
+++ b/nxcomp/src/PutPackedImage.h
@@ -47,7 +47,7 @@
 #define PUTPACKEDIMAGE_ENABLE_COMPRESS                         0
 
 //
-// We can't exceed lenght of 262144 bytes.
+// We can't exceed a length of 262144 bytes.
 //
 
 #define PUTPACKEDIMAGE_DATA_LIMIT                              262144 - 40
diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp
index 68673ffc1..c6f665849 100644
--- a/nxcomp/src/Statistics.cpp
+++ b/nxcomp/src/Statistics.cpp
@@ -348,9 +348,9 @@ void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
 // receives the data from the upper layers. The reason
 // is that data can be compressed by the stream com-
 // pressor, so we can become aware of the new bitrate
-// only afer having flushed the ZLIB stream. This also
-// means that, to have a reliable estimate, we need to
-// flush the link often.
+// only after having flushed the ZLIB stream. This also
+// means that, to have a reliable estimatation, we need
+// to flush the link often.
 //
 
 void Statistics::updateBitrate(int bytes)
diff --git a/nxcompshad/src/Core.cpp b/nxcompshad/src/Core.cpp
index 39ac4a3b2..c5084e884 100644
--- a/nxcompshad/src/Core.cpp
+++ b/nxcompshad/src/Core.cpp
@@ -251,7 +251,7 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s
 
   for (; curLine < (int) height_; curLine++)
   {
-    logDebug("CorePoller::isChanged", "Analizing line [%d] move backward [%d] status [%d] priority [%d].",
+    logDebug("CorePoller::isChanged", "Analyzing line [%d] move backward [%d] status [%d] priority [%d].",
                 curLine, moveBackward, lineStatus_[curIlace], linePriority_[curLine]);
 
     //
diff --git a/nxcompshad/src/Manager.cpp b/nxcompshad/src/Manager.cpp
index 6e3f6b1b0..ef337db67 100644
--- a/nxcompshad/src/Manager.cpp
+++ b/nxcompshad/src/Manager.cpp
@@ -239,7 +239,7 @@ void UpdateManager::handleInput()
     }
     catch (UpdaterClosing u)
     {
-      logTest("UpdateManager::handleInput", "Catched exception UpdaterClosing().");
+      logTest("UpdateManager::handleInput", "Caught exception UpdaterClosing().");
 
       removeUpdater((UpdaterHandle)updaterVector[i]);
 
diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp
index 8c5dbd5f6..7a84b7340 100644
--- a/nxcompshad/src/X11.cpp
+++ b/nxcompshad/src/X11.cpp
@@ -212,7 +212,7 @@ char *Poller::getRect(XRectangle r)
 {
   logTrace("Poller::getRect");
 
-  logDebug("Poller::getRect", "Going to retrive rectangle [%d, %d, %d, %d].",
+  logDebug("Poller::getRect", "Going to retrieve rectangle [%d, %d, %d, %d].",
               r.x, r.y, r.width, r.height);
 
   if (shmExtension_ == 1)
@@ -1144,7 +1144,7 @@ SendKeycode:
 
   //
   // Use keysyms to translate keycodes across different
-  // keyboard models. Unuseful when both keyboards have
+  // keyboard models. Useless when both keyboards have
   // same keycodes (e.g. both are pc keyboards).
   //
 
diff --git a/nxproxy/src/Main.c b/nxproxy/src/Main.c
index dc4e0fd68..fd3a4978c 100644
--- a/nxproxy/src/Main.c
+++ b/nxproxy/src/Main.c
@@ -11,7 +11,7 @@
 /*                                                                        */
 /* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* All rights reserved.                                                   */
 /*                                                                        */
 /**************************************************************************/