Index: ChangeLog-2.0b3-2.0b5.log
===================================================================
diff -u -r2a955681817e4db4776d7ae904babe8053c5ad74 -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- ChangeLog-2.0b3-2.0b5.log	(.../ChangeLog-2.0b3-2.0b5.log)	(revision 2a955681817e4db4776d7ae904babe8053c5ad74)
+++ ChangeLog-2.0b3-2.0b5.log	(.../ChangeLog-2.0b3-2.0b5.log)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -1231,7 +1231,7 @@
 	- added compile macro NSF_STACKCHECK to provide stack
 	  monitoring/debugging (especially useful for multi threaded
 	  programs, where stack is more limited)
-	- make ::nsf::log more robust for aolserver/NaviServer, since ::ns_log
+	- make ::nsf::log more robust for AOLserver/NaviServer, since ::ns_log
 	  is not always around when an output is needed
 	- don't hide call to make.tcl
 
Index: ChangeLog-2.1.0-2.2.0.log
===================================================================
diff -u -rf17453331846c13fb7914276b18157b8ba3ee609 -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- ChangeLog-2.1.0-2.2.0.log	(.../ChangeLog-2.1.0-2.2.0.log)	(revision f17453331846c13fb7914276b18157b8ba3ee609)
+++ ChangeLog-2.1.0-2.2.0.log	(.../ChangeLog-2.1.0-2.2.0.log)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -664,7 +664,7 @@
 	  method parameters, nsf::is, nsf::parseargs, setter methods. Type=* in
 	  object parameters are currently expanded at the slot level, could also
 	  be added. New tests were added, existing ones adjusted to reflect the
-	  new behaviour. [f0d2956f]
+	  new behavior. [f0d2956f]
 
 2018-01-03  Gustaf Neumann  <neumann@wu-wien.ac.at>
 
@@ -789,7 +789,7 @@
 	  expressions. [20c5ebb6]
 	* nsf.c (ObjectCmdMethodDispatch), submethods.test: Enable private
 	  checking on ensembles, added test cases to capture the intended
-	  behaviour behind -local and/or private for ensemble methods. [96e318fb]
+	  behavior behind -local and/or private for ensemble methods. [96e318fb]
 
 2017-10-24  Gustaf Neumann  <neumann@wu-wien.ac.at>
 
Index: doc/Class.man
===================================================================
diff -u -rbf42a9bc9fffff123de76674ddabb3125eb1faa0 -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- doc/Class.man	(.../Class.man)	(revision bf42a9bc9fffff123de76674ddabb3125eb1faa0)
+++ doc/Class.man	(.../Class.man)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -400,7 +400,7 @@
 [enum] Finally, the initialization method [method init] is dispatched, if
 available for [arg instance]. [method "init"] can be defined by [arg cls] on
 behalf of its instance [arg instance], e.g. to lay out a
-class-specific initialisation behaviour.
+class-specific initialization behavior.
 
 [example_begin]
 % nx::Class create Foo {:property x}
Index: generic/aolstub.c
===================================================================
diff -u -rae081c0f1926da915e0584d8561abaa8a2a022a4 -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- generic/aolstub.c	(.../aolstub.c)	(revision ae081c0f1926da915e0584d8561abaa8a2a022a4)
+++ generic/aolstub.c	(.../aolstub.c)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -116,7 +116,7 @@
  *    delete callbacks declared, are ever copied from the startup thread.
  *    Additionally, we also made sure that AOLserver properly invokes any
  *    AtCreate callbacks. So, instead of activating those callbacks *after*
- *    running the Tcl-initialization script (which is the standard behaviour)
+ *    running the Tcl-initialization script (which is the standard behavior)
  *    we activate them *before*. So we may get a chance to configure the
  *    interpreter correctly for any commands within the init script.
  *
Index: generic/nsfStubLib.c
===================================================================
diff -u -r369069ef5cf2f2c76fdbe78d865618f136e8b341 -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision 369069ef5cf2f2c76fdbe78d865618f136e8b341)
+++ generic/nsfStubLib.c	(.../nsfStubLib.c)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -82,7 +82,7 @@
  *
  * Nsf_InitStubs --
  *
- *      Tries to initialise the stub table pointers and ensures that
+ *      Tries to initialize the stub table pointers and ensures that
  *      the correct version of nsf is loaded.
  *
  * Results:
Index: win/pkg.vc
===================================================================
diff -u -r9b831c84733568b14118c288e19191bdc7e35a8e -r9aa53ef688133d4af8bdff20f8913fe34f8a44ad
--- win/pkg.vc	(.../pkg.vc)	(revision 9b831c84733568b14118c288e19191bdc7e35a8e)
+++ win/pkg.vc	(.../pkg.vc)	(revision 9aa53ef688133d4af8bdff20f8913fe34f8a44ad)
@@ -2,8 +2,8 @@
 # (then re-autoconf)
 
 PACKAGE_MAJOR	= 2
-PACKAGE_MINOR	= 2
-PACKAGE_VERSION	= "2.2.0"
+PACKAGE_MINOR	= 3
+PACKAGE_VERSION	= "2.3d0"
 
 !if exists("..\COMMIT")
 NSF_COMMIT = \