Index: generic/nsf.c
===================================================================
diff -u -r1001159512509e6643f66aa1b72340b6f7608cdc -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- generic/nsf.c	(.../nsf.c)	(revision 1001159512509e6643f66aa1b72340b6f7608cdc)
+++ generic/nsf.c	(.../nsf.c)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -2818,12 +2818,12 @@
   assert(bClass->order != NULL);
 
   /*
-   * Check whether a is in the precedence order of b. E.g.
+   * Check whether "x" is in the precedence order of "y". E.g.
    *
-   *   a c1 object
-   *   b c2 a object
+   *   x c1 object
+   *   y c2 x object
    *
-   * If so then b must be before a to preserve the precedence order based on
+   * If so then "y" must be before "x" to preserve the precedence order based on
    * single inheritance (monotonicity).
    */
   success = (NsfClassListFind(bClass->order, aClass) != NULL);
@@ -6913,7 +6913,7 @@
   /*fprintf(stderr, "NSCheckNamespace %s parentNsPtr %p\n", nameString, parentNsPtr);*/
 
   /*
-   * Check whether there is a already a namespace for the full name. The
+   * Check whether there is an already a namespace for the full name. The
    * namespace will be only in rare cases, but we have to make this check in
    * every case. If there is a full namespace, we can use it to determine the
    * parent name.
@@ -10809,7 +10809,7 @@
  *----------------------------------------------------------------------
  * GuardAddInheritedGuards --
  *
- *    Add a inherited guards to the provided destination list.
+ *    Add an inherited guards to the provided destination list.
  *
  * Results:
  *    None.
@@ -18238,7 +18238,7 @@
  * ParameterMethodDispatch --
  *
  *    Dispatch a method provided via parameter definition. The function checks
- *    the parameter definition, builds a argument list for the function call
+ *    the parameter definition, builds an argument list for the function call
  *    and invokes finally the configured cmd.  This function is typically
  *    called from configure.
  *
@@ -30578,7 +30578,7 @@
           CmdListAddSorted(&nclopt->isObjectMixinOf, object->id, NULL);
         } else {
           NsfLog(interp, NSF_LOG_WARN,
-                 "Problem registering %s as a object mixin of %s\n",
+                 "Problem registering %s as an object mixin of %s\n",
                  ObjStr(valueObj), ObjectName_(object));
         }
       }
@@ -35690,7 +35690,7 @@
    *  [info frame /number/] or TclInfoFrame()) without
    *  verification. However, NSF non-proc frames, in particular
    *  initcmd blocks, point to the fakeProc structure which does not
-   *  contain a initialized Command pointer. For now, we default to
+   *  contain an initialized Command pointer. For now, we default to
    *  an internal command. However, we might have to revisit this decision
    *  as non-proc frames (e.g., initcmds) report a "proc" entry
    *  for c-based functions with a proc scope, such as "::nsf::colon"),
Index: generic/nsfEnumerationType.c
===================================================================
diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision a963e8896fd07c345ccfa034cbd043344edbf083)
+++ generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -168,7 +168,7 @@
  *----------------------------------------------------------------------
  * Register --
  *
- *    Register a enumeration-type converter and its domain.
+ *    Register an enumeration-type converter and its domain.
  *
  * Results:
  *    Tcl result code.
Index: generic/nsfPointer.c
===================================================================
diff -u -ra963e8896fd07c345ccfa034cbd043344edbf083 -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- generic/nsfPointer.c	(.../nsfPointer.c)	(revision a963e8896fd07c345ccfa034cbd043344edbf083)
+++ generic/nsfPointer.c	(.../nsfPointer.c)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -178,7 +178,7 @@
  *
  * Nsf_PointerDelete --
  *
- *      Delete an hash entry from the locally maintained hash table and
+ *      Delete a hash entry from the locally maintained hash table and
  *      free the associated memory, if the hash entry is
  *      found. Normally, the key should be provided. If the key is not
  *      available, we perform a reverse lookup from the hash table.
Index: generic/nsfStack.c
===================================================================
diff -u -r7ad03f0f42ae651084aefb409c6c00b2318821c7 -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 7ad03f0f42ae651084aefb409c6c00b2318821c7)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -297,7 +297,7 @@
  * Push and pop operations.
  *
  * Note that it is possible that between push and pop
- * a object->nsPtr can be created (e.g. during a read trace)
+ * an object->nsPtr can be created (e.g. during a read trace)
  */
 
 /*
Index: tests/methods.test
===================================================================
diff -u -r8024df76962dab57646dc206e07a7ae66e7990ad -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- tests/methods.test	(.../methods.test)	(revision 8024df76962dab57646dc206e07a7ae66e7990ad)
+++ tests/methods.test	(.../methods.test)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -359,7 +359,7 @@
   nx::Class create C
   nx::Class create M
 
-  # register the mixin on C as a object mixin and define a mixinguard
+  # register the mixin on C as an object mixin and define a mixinguard
 
   #C mixins set M
   #C mixins guard M {1 == 1}
@@ -689,7 +689,7 @@
 
 #
 # Test the current namespaces and resolution for methods
-# registered on a object in a certain namespace
+# registered on an object in a certain namespace
 # a) top-level methods
 # b) ensemble methods on level 1
 # c) ensemble methods on level 2
Index: tests/nsf-cmd.test
===================================================================
diff -u -r9e281d5110f397a9e9b8317325d0675f1793246d -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- tests/nsf-cmd.test	(.../nsf-cmd.test)	(revision 9e281d5110f397a9e9b8317325d0675f1793246d)
+++ tests/nsf-cmd.test	(.../nsf-cmd.test)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -491,7 +491,7 @@
 
   #
   # now we add the debug flag to foo, therefore, "foo" will call
-  # "nsf::log", which might become a infinite recursion loop.
+  # "nsf::log", which might become an infinite recursion loop.
   #
   nsf::proc -debug foo {} {return 1}
 
Index: tests/parameters.test
===================================================================
diff -u -rf10f6e087eba19df21585a1776e095862306855d -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9
--- tests/parameters.test	(.../parameters.test)	(revision f10f6e087eba19df21585a1776e095862306855d)
+++ tests/parameters.test	(.../parameters.test)	(revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9)
@@ -671,7 +671,7 @@
 
   #
   # Create a user-defined value-checker for method parameters,
-  # with a extra argument
+  # with an extra argument
   #
   ::nx::methodParameterSlot object method type=in {name value arg} {
     if {$value ni [split $arg |]} {