Index: configure.in
===================================================================
diff -u -N -rf265d8b18ef1925998a3ab7169f8d642769e6212 -r69cf721ea2eb81c0df8c2b4bfb831c367780a59b
--- configure.in	(.../configure.in)	(revision f265d8b18ef1925998a3ab7169f8d642769e6212)
+++ configure.in	(.../configure.in)	(revision 69cf721ea2eb81c0df8c2b4bfb831c367780a59b)
@@ -70,8 +70,6 @@
 # other systems.
 #--------------------------------------------------------------------
 
-# do not modify the following lines manually, they are generated with 
-# the script changeXOTclVersion
 NSF_MAJOR_VERSION=2
 NSF_MINOR_VERSION=0
 
@@ -122,7 +120,7 @@
 #
 # FORCE_NO_STUBS is deactivated for now
 if ! test "$with_aol3" = "no"; then
-	echo "Pre-configuring AOL-Server (xotcl)"
+	echo "Pre-configuring AOL-Server (nsf)"
 	AOL_DEFINES="-DAOL_SERVER -DUSE_TCL8X -I$with_aol3/include -I$TCL_SRC_DIR/generic"
 	FORCE_NO_STUBS=1
 else
@@ -268,7 +266,7 @@
 
 # Without the following two eval statements, NSF_SHARED_LIB_SUFFIX 
 # in nsfConfig.sh has $PACKAGE_VERSION unresolved. When another
-# app links against xotcl, the PACKAGE_VERSIONs are confused.
+# app links against nsf, the PACKAGE_VERSIONs are confused.
 #
 # Without the first eval, we get
 #   NSF_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX}
@@ -325,15 +323,16 @@
 AC_SUBST(NSF_COMPATIBLE_TCLSH)
 
 #
-# XOTcl specific configs
+# Next Scripting specific configs
 #
 
 if test "${TEA_PLATFORM}" != "windows" ; then
 
 NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}"
 NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}"
 
-# stub libs are not build for 8.0
+# If someone wants to build without stubs, as it was the case for
+# earlier Tcl versions, we keep the following block as a reference.
 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then
 	NSF_BUILD_STUB_LIB_PATH=""
 	NSF_STUB_LIB_PATH=""
@@ -345,7 +344,7 @@
 	NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}"
 	NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}"
 	AC_DEFINE(COMPILE_NSF_STUBS)
-fi 
+fi
 
 else
 
@@ -371,7 +370,7 @@
 AC_SUBST(NXSH)
 AC_SUBST(XOWISH)
 
-# include dir of xotcl during build process (i.e., does not assume installed)
+# include dirs for nsf during build process (i.e., does not assume installed)
 NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic"
 NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}"
 AC_SUBST(NSF_BUILD_INCLUDE_DIR)
@@ -389,7 +388,7 @@
 dnl Change the value of -this- macro if you want to add or remove
 dnl such files.
 
-AC_DEFUN(CONFIG_OUTPUT_FILES, [[Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/xotcl.spec unix/pkgIndex.unix nxsh nxwish]])
+AC_DEFUN(CONFIG_OUTPUT_FILES, [[Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish]])
 
 #--------------------------------------------------------------------
 # the value of this variable is set to the files which are to be