Index: generic/asm/asmAssembleTemplate.c
===================================================================
diff -u -rfcfefac791a3baf9193ab0a39f782dcd0d74b522 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- generic/asm/asmAssembleTemplate.c	(.../asmAssembleTemplate.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
+++ generic/asm/asmAssembleTemplate.c	(.../asmAssembleTemplate.c)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -51,7 +51,7 @@
  *----------------------------------------------------------------------
  * AsmAssemble --
  *
- *      The assmbler, takes an assembly script in the form of a nested
+ *      The assembler, takes an assembly script in the form of a nested
  *      list and emits the internal representation for the execution
  *      engine.
  *
Index: generic/asm/nsfAsmAssemble.c
===================================================================
diff -u -rfcfefac791a3baf9193ab0a39f782dcd0d74b522 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- generic/asm/nsfAsmAssemble.c	(.../nsfAsmAssemble.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
+++ generic/asm/nsfAsmAssemble.c	(.../nsfAsmAssemble.c)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -132,7 +132,7 @@
  *----------------------------------------------------------------------
  * AsmAssemble --
  *
- *      The assmbler, takes an assembly script in the form of a nested
+ *      The assembler, takes an assembly script in the form of a nested
  *      list and emits the internal representation for the execution
  *      engine.
  *
Index: generic/nsf.c
===================================================================
diff -u -rb44ba341aa4dc2d759201f6413dc2ef36eba555d -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- generic/nsf.c	(.../nsf.c)	(revision b44ba341aa4dc2d759201f6413dc2ef36eba555d)
+++ generic/nsf.c	(.../nsf.c)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -12858,7 +12858,7 @@
 /*----------------------------------------------------------------------
  * ParamDefsSetReturns --
  *
- *      Set the "returns" value in a NsfProcContext.  If the member is already
+ *      Set the "returns" value in an NsfProcContext.  If the member is already
  *      in use, release the old value first.
  *
  * Results:
@@ -15734,7 +15734,7 @@
       && ccCtxPtr->cmd != NULL
       && CmdIsProc(ccCtxPtr->cmd)) {
 
-    /* fprintf(stderr, "cached scipted call %s (object %s class %s) cmd %p (proc %p) cmdName %s \n",
+    /* fprintf(stderr, "cached scripted call %s (object %s class %s) cmd %p (proc %p) cmdName %s \n",
        methodName, ObjectName(object), ClassName(object->cl), ccCtxPtr->cmd, Tcl_Command_objClientData(ccCtxPtr->cmd), Tcl_GetCommandName(interp, ccCtxPtr->cmd));*/
 
     Proc *procPtr = Tcl_Command_objClientData(ccCtxPtr->cmd);
Index: library/xotcl/apps/comm/secure-webserver.xotcl
===================================================================
diff -u -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- library/xotcl/apps/comm/secure-webserver.xotcl	(.../secure-webserver.xotcl)	(revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0)
+++ library/xotcl/apps/comm/secure-webserver.xotcl	(.../secure-webserver.xotcl)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -6,7 +6,7 @@
     This small secure web server that provides its documents
     via SSL (https, port 8443) and plain http (port 8086).
     <br>
-    This file requires TLS. If you experice problems with 
+    This file requires TLS. If you experience problems with 
     versions obtained from the Web, contact gustaf.neumann@wu-wien.ac.at
     for a patch.
   }
Index: library/xotcl/library/lib/trace.xotcl
===================================================================
diff -u -r2352fb1a509bd00ec49c9677798caad6bfec4d71 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- library/xotcl/library/lib/trace.xotcl	(.../trace.xotcl)	(revision 2352fb1a509bd00ec49c9677798caad6bfec4d71)
+++ library/xotcl/library/lib/trace.xotcl	(.../trace.xotcl)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -30,12 +30,12 @@
       write to trace stream.
     }
   }
-  @ Trace proc openTraceFile {name "file name"} {
+  @ Trace proc openTraceFile {name "filename"} {
     Description {
       Redirect trace output to file.
     }
   }
-  @ Trace proc closeTraceFile {name "file name"} {
+  @ Trace proc closeTraceFile {name "filename"} {
     Description {
       Close trace  file and redirect output to stderr.
     }
Index: tests/alias.test
===================================================================
diff -u -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/alias.test	(.../alias.test)	(revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668)
+++ tests/alias.test	(.../alias.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -395,7 +395,7 @@
 ? {info exists ::nsf::alias(::o,BAR,1)} 0 "::o::BAR is not an alias"
 
 # AliasDelete in AddInstanceMethod
-? {info exists ::nsf::alias(::C,BAR,0)} 1 "delete alias via redefinition of a an instance method"
+? {info exists ::nsf::alias(::C,BAR,0)} 1 "delete alias via redefinition of an instance method"
 ::C public method BAR {} {;}
 ? {info exists ::nsf::alias(::C,BAR,0)} 0
 ? {info commands ::o::BAR} ::o::BAR "a command ::o::BAR does not exist"
@@ -659,7 +659,7 @@
   ? {::foo 1} 1
   
   #
-  # Register an already used tcl proc.  Byte compilation happened
+  # Register an already used Tcl proc.  Byte compilation happened
   # without nsf context. If the byte code is not invalidated, the
   # compiled var resolver would not kick in, we would not be able to
   # set an instance variable.
@@ -668,7 +668,7 @@
   ? {c1 vars} {a 2}
   
   #
-  # Register an unused tcl proc.  Byte compilation happens within nsf
+  # Register an unused Tcl proc.  Byte compilation happens within nsf
   # context, compiled var resolver works as expected.
   ::nsf::method::alias ::C bar ::bar
   ? {c1 bar 2} 2
Index: tests/cmdresolution.test
===================================================================
diff -u -r8e2e356e9bcef39f43dfe3690b82d9586c7adc72 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/cmdresolution.test	(.../cmdresolution.test)	(revision 8e2e356e9bcef39f43dfe3690b82d9586c7adc72)
+++ tests/cmdresolution.test	(.../cmdresolution.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -37,7 +37,7 @@
     set class [self class]
   }
   
-  # When creating an instance of the xotcl class "xowiki::Link", the
+  # When creating an instance of the XOTcl class "xowiki::Link", the
   # constructor "init" is compiled. In this step the command literal
   # "self" in the constructor has to be resolved against the
   # underlying object system (here xotcl::self) without interacting
@@ -85,7 +85,7 @@
 
   #
   # Bytecompile and execute the "foo" methods containing the cmd
-  # literals "self" and "next" in the xotcl classes
+  # literals "self" and "next" in the XOTcl classes
   #
   ? {[xowiki::X2 new] foo 1 2} 1-2-::xowiki::X1
 
Index: tests/destroy.test
===================================================================
diff -u -r982b1e8d84f71b36961ba034754f2e35e1ddb869 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/destroy.test	(.../destroy.test)	(revision 982b1e8d84f71b36961ba034754f2e35e1ddb869)
+++ tests/destroy.test	(.../destroy.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -149,7 +149,7 @@
 ? "set ::ObjectDestroy" 0 "ObjectDestroy called"
 
 #
-# cmd rename other xotcl object to current, 
+# cmd rename other XOTcl object to current, 
 # xotcl's rename invokes a move 
 #
 set case "cmd rename object to current"
@@ -280,7 +280,7 @@
 
 ? {::nsf::object::exists test::c1} 0  "$::case object still exists after proc"
 ? "set ::firstDestroy" 1 "firstDestroy called"
-? "set ::ObjectDestroy" 0 "ObjectDestroy called"  ;# toplevel destroy was blocked
+? "set ::ObjectDestroy" 0 "ObjectDestroy called"  ;# top-level destroy was blocked
 
 #
 # controlled namespace delete: xotcl has its own namespace cleanup,
@@ -733,10 +733,10 @@
 
 nx::test case nested-ordered-composite {
   # The following test case an explicit deletion/redefinition of an
-  # toplevel object (o1) will cause the implicit deletion of a nested
+  # top-level object (o1) will cause the implicit deletion of a nested
   # object o1::o2. The object o2 has as well several included objects,
   # containing an "ordered composite". The deletion of the ordered
-  # compostite causes the (explicit) deletion of its siblings (all
+  # composite causes the (explicit) deletion of its siblings (all
   # children of o1::o2). This is actually a stress test for the deletion
   # of o2's namespace, since the loop over its children will be
   # confronted with the deletion of indirectly deleted items (deleted by
Index: tests/disposition.test
===================================================================
diff -u -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/disposition.test	(.../disposition.test)	(revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668)
+++ tests/disposition.test	(.../disposition.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -124,7 +124,7 @@
       [list X Y]
 
   #
-  # Passing multiple arguments as a list, passed to a args argument
+  # Passing multiple arguments as a list, passed to an args argument
   # list.
   #
   C setObjectParams {{-multi-args:alias}}
Index: tests/methods.test
===================================================================
diff -u -r40b842e5b218cc6144506ff4689671b780c4e8c5 -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/methods.test	(.../methods.test)	(revision 40b842e5b218cc6144506ff4689671b780c4e8c5)
+++ tests/methods.test	(.../methods.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -1421,7 +1421,7 @@
 nx::test case uplevel+tcl-transparency {
   #
   # A real-world case from OpenACS + from the database abstraction
-  # layer. Frequently, nsf based methods are called from tcl procs
+  # layer. Frequently, nsf based methods are called from Tcl procs
   # (and tcl-upleveled code). In order to preserve interceptor
   # transparency (i.e. to be able to use a mixin on the tcl-called nsf
   # method), the uplevel method has to behave like tcl-uplevel when the
@@ -1548,11 +1548,11 @@
 #   Setup 2: when filters are used
 #   Setup 3: when filters + guards are used
 #
-# Forall setups, we test on the tclsh toplevel and from a proc.
+# Forall setups, we test on the tclsh top-level and from a proc.
 #
 
 nx::test configure -count 1
-nx::test case callinglevel-toplevel-setup1
+nx::test case callinglevel-top-level-setup1
 
 nx::Class create AbstractFile {
   :public method filterCall {args} {
@@ -1587,7 +1587,7 @@
 #
 # Setup 2 (with filter)
 #
-nx::test case callinglevel-toplevel-setup2
+nx::test case callinglevel-top-level-setup2
 
 AbstractFile filters add filterCall
 
@@ -1599,7 +1599,7 @@
 #
 # Setup 3 (with filter and guard)
 #
-nx::test case callinglevel-toplevel-setup3
+nx::test case callinglevel-top-level-setup3
 
 AbstractFile filters guard filterCall { [current calledproc] eq "lstat" }
 
Index: tests/volatile.test
===================================================================
diff -u -r3916bf00a3787cead96c01851af6cbce4392250b -r3e1001fff2cd8e0f82fec692a88c397b72e2bead
--- tests/volatile.test	(.../volatile.test)	(revision 3916bf00a3787cead96c01851af6cbce4392250b)
+++ tests/volatile.test	(.../volatile.test)	(revision 3e1001fff2cd8e0f82fec692a88c397b72e2bead)
@@ -67,7 +67,7 @@
   :public method foox {} [string map [list bar :bar] [info body ::foox]]
   :public method foon {} [string map [list bar :bar] [info body ::foon]]
   #
-  # call volatile in tcl proc bar
+  # call volatile in Tcl proc bar
   #
   :public method foox2 {} [info body ::foox]
   :public method foon2 {} [info body ::foon]
@@ -85,7 +85,7 @@
 }
 
 #
-# Call just in tcl procs
+# Call just in Tcl procs
 #
 nx::test case procs-procs {
   ::foox