Index: doc/Class.3
===================================================================
diff -u -rf817725e88751339be58485d579241a0b97e15b9 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/Class.3	(.../Class.3)	(revision f817725e88751339be58485d579241a0b97e15b9)
+++ doc/Class.3	(.../Class.3)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'Class\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-2019 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nx::Class" 3 2\&.3\&.0 Class "NX API"
+.TH "nx::Class" 3 2\&.4\&.0 Class "NX API"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -1315,4 +1315,4 @@
 .nf
 Copyright (c) 2014-2019 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/Object.3
===================================================================
diff -u -rf10f6e087eba19df21585a1776e095862306855d -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/Object.3	(.../Object.3)	(revision f10f6e087eba19df21585a1776e095862306855d)
+++ doc/Object.3	(.../Object.3)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'Object\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-19 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nx::Object" 3 2\&.3\&.0 Object "NX API"
+.TH "nx::Object" 3 2\&.4\&.0 Object "NX API"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
Index: doc/configure.3
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/configure.3	(.../configure.3)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/configure.3	(.../configure.3)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'configure\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nx::configure" 3 2\&.3\&.0 configure "NX API"
+.TH "nx::configure" 3 2\&.4\&.0 configure "NX API"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -292,4 +292,4 @@
 .nf
 Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/current.3
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/current.3	(.../current.3)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/current.3	(.../current.3)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'current\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nx::current" 3 2\&.3\&.0 current "NX API"
+.TH "nx::current" 3 2\&.4\&.0 current "NX API"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -363,4 +363,4 @@
 .nf
 Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/next-migration.html
===================================================================
diff -u -rf35ab630098876f0efbd8117aa981eb199a45227 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/next-migration.html	(.../next-migration.html)	(revision f35ab630098876f0efbd8117aa981eb199a45227)
+++ doc/next-migration.html	(.../next-migration.html)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.1.3" />
 <title>Migration Guide for the Next Scripting Language</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -535,6 +536,53 @@
 }
 
 
+@media print {
+
+body            {font-size: 10pt; text-align: justify;}
+#header         {text-align: left;}
+.nx             {font-size: 90%; color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
+table.nx        {border-collapse: collapse; border-spacing: 3px;}
+.nx-linenr      {font-size: 90%; border-right: 1px solid #DDDDDD;padding-right: 5px; color: #2B547D; font-style: italic;}
+.nx-string      {color: #779977; font-weight: normal; font-style: italic;}
+.nx-comment     {color: #717ab3; font-weight: normal; font-style: italic;}
+.nx-keyword     {color: #7f0055; font-weight: normal; font-style: normal;}
+.nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
+.nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
+
+.listingblock   {font-size: 80%;}
+div.toclevel1   {display: block;}
+div.toclevel2   {display: block;}
+div.toclevel3   {display: block;}
+div.toclevel4   {display: block;}
+
+div.tableblock table {
+    page-break-inside: avoid;
+}
+
+div.listingblock pre {
+    page-break-inside: avoid;
+}
+
+}
+
+@page {
+    size: A4;
+     /* DIV 15 for A4 paper */
+    margin: 19.80mm 14mm;
+
+    /* Not supported by Chrome, kept for later reference */
+    @top-center {
+	color: #717ab3;font-style: italic;
+	font-size: 80%;
+	content: string(chapter-title)
+    }
+    @bottom-center {
+	font-size: 80%;
+	color: #717ab3;
+        content: "-  " counter(page) "  -"
+    }
+}
+h2 { string-set: chapter-title content() }
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -719,7 +767,11 @@
     reinstall();
   }
 
-    reinstall();
+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+  else
+    window.onload = reinstallAndRemoveTimer;
 }
 
 }
@@ -753,7 +805,7 @@
 </div></div>
 <div class="paragraph"><p>The Next Scripting Language (NX) is a successor of XOTcl 1 and is
 based on 10 years of experience with XOTcl in projects containing
-several hundert thousand lines of code. While XOTcl was the first
+several hundred thousand lines of code. While XOTcl was the first
 language designed to provide language support for design patterns, the
 focus of the Next Scripting Framework and NX are on combining this
 with Language Oriented Programming. In many respects, NX was designed
@@ -780,7 +832,7 @@
 repackage the power of XOTcl in an easy to learn environment, highly
 orthogonal environment, which is better suited for large projects,
 trying to reduce maintenance costs.</p></div>
-<div class="paragraph"><p>We expect that many user will find it attractive to upgrade
+<div class="paragraph"><p>We expect that many users will find it attractive to upgrade
 from XOTcl 1 to XOTcl 2, and some other users will upgrade to NX.
 This document focuses mainly on the differences between XOTcl 1 and
 NX, but addresses as well potential incompatibilities between XOTcl 1
@@ -841,7 +893,7 @@
 <li>
 <p>
 NX provides means for <em>method protection</em> (method modifiers
-     <code>public</code>, <code>protected</code>, and <code>private</code>). Therefore developers have
+     <code>public</code>, <code>protected</code>, and <code>private</code>). Therefore, developers have
      to define explicitly public interfaces in order to use methods
      from other objects.
 </p>
@@ -872,7 +924,7 @@
 <p>
 <strong>Orthogonal Parameterization:</strong>
    The Next Scripting Language provides an <em>orthogonal framework for
-   parametrization</em> of methods and objects.
+   parameterization</em> of methods and objects.
 </p>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
@@ -991,7 +1043,7 @@
 <li>
 <p>
 <strong>Significantly Improved Test Suite:</strong> The regression test suite of
-  Next Scripting Scripting framework contain now more than
+  Next Scripting framework contain now more than
   5.000 tests, and order of magnitude more than in XOTcl 1.6
 </p>
 </li>
@@ -1062,7 +1114,7 @@
 in the next sections.</p></div>
 <div class="paragraph"><p>NX supports a block syntax, where the methods are defined during the
 creation of the class. The XOTcl syntax is slightly more redundant,
-since every definition of a method is a single toplevel command
+since every definition of a method is a single top-level command
 starting with the class name (also NX supports the style used in
 XOTcl).  In NX, all methods are per default protected (XOTcl does not
 support protection). In NX methods are defined in the definition of
@@ -1202,13 +1254,13 @@
 
   <span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> XOTcl 2.0
 
-  <span class='nx-comment'># Define a class with a public method foo using XOTcl
+  <span class='nx-comment'># Define a class with a public method "foo" using XOTcl
 </span>  <span class='nx-keyword'>xotcl::Class</span> C1
   C1 instproc foo {} {<span class='nx-keyword'>puts</span> <span class='nx-string'>"hello world"</span>}
 
   <span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx
 
-  <span class='nx-comment'># Define a class with a public method foo using NX
+  <span class='nx-comment'># Define a class with a public method "foo" using NX
 </span>  <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> C2 {
     <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>puts</span> <span class='nx-string'>"hello world"</span>}
   }
@@ -1337,7 +1389,7 @@
 <h4 id="_scripted_methods_defined_in_the_init_block_of_a_class_object_or_with_separate_calls">2.2.1. Scripted Methods Defined in the Init-block of a Class/Object or with Separate Calls</h4>
 <div class="paragraph"><p>The following examples show the definition of a class and its methods
 in the init-block of a class (NX only), and the definition of methods
-via separate top level calls (XOTcl and NX).</p></div>
+via separate top-level calls (XOTcl and NX).</p></div>
 <div class="tableblock">
 <table rules="all"
 width="100%"
@@ -1366,7 +1418,7 @@
 </style>
 <pre class='nx'><span class='nx-comment'># Define instance method 'foo' and object
 </span><span class='nx-comment'># method 'bar' for a Class 'C' with separate
-</span><span class='nx-comment'># toplevel commands
+</span><span class='nx-comment'># top-level commands
 </span>
 <span class='nx-keyword'>Class</span> C
 C instproc foo args {...}
@@ -1913,7 +1965,7 @@
 <h3 id="_resolvers">2.3. Resolvers</h3>
 <div class="paragraph"><p>The Next Scripting Framework defines Tcl resolvers for method and
 variable names to implement object specific behavior. Within the
-bodies of scripted methods these resolver treat variable and function
+bodies of scripted methods these resolvers treat variable and function
 names starting with a colon <code>:</code> specially. In short, a colon-prefixed
 variable name refers to an instance variable, and a colon-prefixed
 function name refers to a method. The sub-sections below provide
@@ -2445,10 +2497,10 @@
 specifications.</p></div>
 <div class="paragraph"><p>Since the term "parameter" is underspecified, NX uses a more
 differentiated terminology. NX distinguishes between configurable
-instance variables (also called <em>properties</em>) and non configurable
+instance variables (also called <em>properties</em>) and non-configurable
 instance variables (called <em>variables</em>), which might have as well
 e.g. default values. The values of configurable properties can be
-queried at runtime via <code>cget</code>, and their values can be altered via
+queried at run time via <code>cget</code>, and their values can be altered via
 <code>configure</code>. When the value of a configure parameter is provided or
 changed, the value checkers from the variable definition are used to
 ensure, the value is permissible (i.e. it is for example an integer
@@ -2461,7 +2513,8 @@
 an accessor is a method with the same name as the variable. In XOTcl,
 every <code>parameter</code> defined as well automatically a same-named accessor
 method, leading to potential name conflicts with other method names.</p></div>
-<div class="paragraph"><p>In the examples below we show the definition of configurable a non-configurable instance variables using <code>variable</code> and <code>property</code>
+<div class="paragraph"><p>In the examples below we show the definition of non-configurable
+instance variables using <code>variable</code> and <code>property</code>
 respectively.</p></div>
 <div class="tableblock">
 <table rules="all"
@@ -2590,7 +2643,7 @@
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
 <pre class='nx'>
-<span class='nx-comment'># Define a object variable "V" with value 100 and
+<span class='nx-comment'># Define an object variable "V" with value 100 and
 </span><span class='nx-comment'># an instance variable "x". "V" is defined for the
 </span><span class='nx-comment'># class object Foo, "x" is defined in the
 </span><span class='nx-comment'># instances of the class. "object variable" works
@@ -2720,7 +2773,7 @@
 </span><span class='nx-comment'># value of instance variable "b"
 </span>f1 <span class='nx-keyword'>configure</span> -b 100
 
-<span class='nx-comment'># Return the (non substituted) value of
+<span class='nx-comment'># Return the (non-substituted) value of
 </span><span class='nx-comment'># parameter "c", and the substituted value
 </span><span class='nx-comment'># of parameter "d"
 </span>f1 <span class='nx-keyword'>cget</span> -c
@@ -2929,7 +2982,7 @@
 </span><span class='nx-comment'>#
 </span><span class='nx-comment'># User defined value constraints are possible.
 </span><span class='nx-comment'># All parameter value checkers can be turned on
-</span><span class='nx-comment'># and off at runtime.
+</span><span class='nx-comment'># and off at run time.
 </span><span class='nx-comment'>#
 </span><span class='nx-comment'># Define a required boolean property "a"
 </span><span class='nx-comment'># and an integer property "b" with a default.
@@ -2964,7 +3017,7 @@
 to be passed to the constructor of the object.</p></div>
 <div class="paragraph"><p>NX allows one to define <em>optional</em> and <em>required</em> configure parameters (as
 well as method parameters). Therefore, configure parameters can be used
-as the single mechanism to parametrize objects. It is in NX not
+as the single mechanism to parameterize objects. It is in NX not
 necessary (and per default not possible) to pass arguments to the
 constructor.</p></div>
 <div class="tableblock">
@@ -3036,7 +3089,7 @@
 <div class="paragraph"><p>NX supports in contrary to XOTcl to define the <em>multiplicity</em> of values
 per parameter. In NX, one can specify that a parameter can accept the
 value "" (empty) in addition to e.g. an integer, or one can specify that the
-value is an empty or non-empty list of values via the multiplicity. For
+value is an empty or nonempty list of values via the multiplicity. For
 every specified value, the value checkers are applied.</p></div>
 <div class="tableblock">
 <table rules="all"
@@ -3079,7 +3132,7 @@
 </style>
 <pre class='nx'><span class='nx-comment'># Parameter with multiplicity
 </span><span class='nx-comment'>#   ints is a list of integers, with default
-</span><span class='nx-comment'>#   objs is a non-empty list of objects
+</span><span class='nx-comment'>#   objs is a nonempty list of objects
 </span><span class='nx-comment'>#   obj is a single object, maybe empty
 </span>
 <span class='nx-keyword'>Class</span> <span class='nx-keyword'>create</span> Foo -properties {
@@ -3203,7 +3256,7 @@
 </table>
 </div>
 <div class="paragraph"><p>Since the slots are objects, the slot objects can be configured and
-parametrized like every other object in NX. Slot objects can be
+parameterized like every other object in NX. Slot objects can be
 provided with a scripted initialization as well. We show first the
 definition of properties similar to the functionality provided as well
 by XOTcl and show afterwards how to use value constraints, optional
@@ -3348,7 +3401,7 @@
 <div class="paragraph"><p>Method parameters are used to specify the interface of a single method
 (what kind of values may be passed to a method, what default values
 are provided etc.).  The method parameters specifications in XOTcl 1
-were limited and allowed only value constraints for non positional
+were limited and allowed only value constraints for non-positional
 arguments.</p></div>
 <div class="paragraph"><p>NX and XOTcl 2 provide value constraints for all kind of method parameters.
 While XOTcl 1 required non-positional arguments to be listed in front of
@@ -3564,7 +3617,7 @@
 </span>  <span class='nx-keyword'>:forward</span> ++ -returns integer ::expr 1 +
 
  <span class='nx-comment'># Define a method that has to return a
-</span> <span class='nx-comment'># non-empty list of objects
+</span> <span class='nx-comment'># nonempty list of objects
 </span> <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> instances {} \
     -returns <span class='nx-keyword'>object</span>,1..n {
    <span class='nx-keyword'>return</span> [<span class='nx-keyword'>:info</span> instances]
@@ -4208,7 +4261,7 @@
 </div>
 <div class="sect3">
 <h4 id="_list_callable_methods">2.6.5. List callable methods</h4>
-<div class="paragraph"><p>In order to obtain for an object the set of artefacts defined in the
+<div class="paragraph"><p>In order to obtain the set of artefacts for an object defined in the
  class hierarchy, NX uses <code>info lookup</code>. One can either lookup methods
  (via <code>info lookup methods</code>) or slots (via <code>info lookup slots</code>). The
  plural term refers to a potential set of return values.</p></div>
@@ -4472,7 +4525,7 @@
 methods and for obtaining more detailed information about these
 methods.</p></div>
 <div class="paragraph"><p>In NX, this list of <code>info</code> subcommands is much shorter and more
-orthogonal. For example <code>info method definition</code> can be used to obtain
+orthogonal. For example, <code>info method definition</code> can be used to obtain
 with a single command the full definition of a <em>scripted method</em>, and
 furthermore, it works as well the same way to obtain e.g. the
 definition of a <em>forwarder</em> or an <em>alias</em>.</p></div>
@@ -4745,7 +4798,7 @@
 <h4 id="info_configure_parameter">2.6.8. List Configure Parameters</h4>
 <div class="paragraph"><p>The way, how newly created objects can be configured is determined in NX
 via properties. The configuration happens during creation via the
-methods <code>create</code> or <code>new</code> or during runtime via <code>configure</code>. These
+methods <code>create</code> or <code>new</code> or during run time via <code>configure</code>. These
 methods have therefore virtual argument lists, depending on the object
 or class on which they are applied.</p></div>
 <div class="tableblock">
@@ -6443,7 +6496,7 @@
 <div class="sect2">
 <h3 id="_obsolete_commands">3.4. Obsolete Commands</h3>
 <div class="paragraph"><p>Parameter-classes were rarely used and have been replaced by the more
-general object parametrization. Therefore, <code>cl info parameterclass</code> has
+general object parameterization. Therefore, <code>cl info parameterclass</code> has
 been removed.</p></div>
 </div>
 <div class="sect2">
@@ -6477,7 +6530,8 @@
 <div id="footer">
 <div id="footer-text">
 Version 2.3.0<br />
-Last updated 2019-05-07 11:33:18 CEST
+Last updated
+ 2022-04-29 20:06:35 CEST
 </div>
 </div>
 </body>
Index: doc/next-tutorial/next-tutorial.html
===================================================================
diff -u -rf35ab630098876f0efbd8117aa981eb199a45227 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision f35ab630098876f0efbd8117aa981eb199a45227)
+++ doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.1.3" />
 <title>Tutorial for the Next Scripting Language</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -535,6 +536,53 @@
 }
 
 
+@media print {
+
+body            {font-size: 10pt; text-align: justify;}
+#header         {text-align: left;}
+.nx             {font-size: 90%; color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
+table.nx        {border-collapse: collapse; border-spacing: 3px;}
+.nx-linenr      {font-size: 90%; border-right: 1px solid #DDDDDD;padding-right: 5px; color: #2B547D; font-style: italic;}
+.nx-string      {color: #779977; font-weight: normal; font-style: italic;}
+.nx-comment     {color: #717ab3; font-weight: normal; font-style: italic;}
+.nx-keyword     {color: #7f0055; font-weight: normal; font-style: normal;}
+.nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
+.nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
+
+.listingblock   {font-size: 80%;}
+div.toclevel1   {display: block;}
+div.toclevel2   {display: block;}
+div.toclevel3   {display: block;}
+div.toclevel4   {display: block;}
+
+div.tableblock table {
+    page-break-inside: avoid;
+}
+
+div.listingblock pre {
+    page-break-inside: avoid;
+}
+
+}
+
+@page {
+    size: A4;
+     /* DIV 15 for A4 paper */
+    margin: 19.80mm 14mm;
+
+    /* Not supported by Chrome, kept for later reference */
+    @top-center {
+	color: #717ab3;font-style: italic;
+	font-size: 80%;
+	content: string(chapter-title)
+    }
+    @bottom-center {
+	font-size: 80%;
+	color: #717ab3;
+        content: "-  " counter(page) "  -"
+    }
+}
+h2 { string-set: chapter-title content() }
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -718,8 +766,12 @@
     clearInterval(timerId);
     reinstall();
   }
-    reinstall();
 
+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+  else
+    window.onload = reinstallAndRemoveTimer;
 }
 
 }
@@ -841,7 +893,7 @@
 <div class="paragraph"><p>In our first example, we define a class named <code>Stack</code> with the methods
 <code>push</code> and <code>pop</code>. When an instance of the stack is created (e.g. a
 concrete stack <code>s1</code>) the stack will contain an instance variable named
-<code>things</code>, initialized with the an empty list.</p></div>
+<code>things</code>, initialized with an empty list.</p></div>
 <div class="paragraph" id="xmp-class-stack"><div class="title">Listing 2: Class Stack</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -904,7 +956,7 @@
 a new list is returned, where the new element is inserted at the first
 position (index 0) in the list <code>things</code>. The result of the <code>linsert</code>
 function is assigned again to the instance variable <code>things</code>, which is
-updated this way.  Finally the method <code>push</code> returns the pushed thing
+updated this way.  Finally, the method <code>push</code> returns the pushed thing
 using the <code>return</code> statement.</p></div>
 <div class="paragraph"><p>The method <code>pop</code> returns the most recently stacked element and removes
 it from the stack. Therefore, it takes the first element from the list
@@ -1070,7 +1122,7 @@
 the methods of the class are updated, all instances of the class will
 immediately get the modified behavior. However, this does not mean that
 the reuse for the methods of <code>stack</code> is not possible. NX allows for
-example to copy objects (similar to prototype based languages) or to
+example to copy objects (similar to prototype-based languages) or to
 reuse methods via e.g. aliases (more about this later).</p></div>
 <div class="paragraph"><p>Note that we use capitalized names for classes and lowercase names for
 instances. This is not required and a pure convention making it easier
@@ -1084,7 +1136,7 @@
 <code>push</code> operations are issued on a stack). Safety checking can be
 implemented mostly independent from the implementation details of the
 stack (usage of internal data structures). There are as well different
-ways of checking the safety. Therefore we say that safety checking is
+ways of checking the safety. Therefore, we say that safety checking is
 orthogonal to the stack core implementation.</p></div>
 <div class="paragraph"><p>With NX we can define stack-safety as a separate class using methods
 with the same names as the implementations before, and "mix" this
@@ -1186,7 +1238,7 @@
 <code>s1</code> and <code>s2</code> in which order the involved classes are processed. This
 order is called the <code>precedence order</code> and is obtained via <code>info
 precedence</code>. We see that the mixin class <code>Safety</code> is only in use for
-<code>s2</code>, and takes there precedence over <code>Stack</code>. The common root class
+<code>s2</code>, and takes precedence over <code>Stack</code>. The common root class
 <code>nx::Object</code> is for both <code>s1</code> and <code>s2</code> the base class.</p></div>
 <div class="imageblock" id="img-per-object-mixin" style="text-align:center;">
 <div class="content">
@@ -1197,7 +1249,7 @@
 <div class="paragraph"><p></p></div>
 <div class="paragraph"><p>Note that in <a href="#xmp-using-class-safety">Listing 8</a>,
 the class <code>Safety</code> is only mixed into a single object (here
-<code>s2</code>), therefore we refer to this case as a <em>per-object mixin</em>.
+<code>s2</code>), therefore, we refer to this case as a <em>per-object mixin</em>.
 <a href="#img-per-object-mixin">Figure 9</a> shows the class
 diagram, where the class <code>Safety</code> is used as a per-object mixin for
 <code>s2</code>.</p></div>
@@ -1266,7 +1318,7 @@
 <pre class='nx'>Stack <span class='nx-keyword'>create</span> s4 {
 
   <span class='nx-comment'>#
-</span>  <span class='nx-comment'># Create a stack with a object-specific method
+</span>  <span class='nx-comment'># Create a stack with an object-specific method
 </span>  <span class='nx-comment'># to check the type of entries
 </span>  <span class='nx-comment'>#
 </span>
@@ -1283,7 +1335,7 @@
 that only integers can be stacked. In case the argument is not an
 integer, an exception will be raised. Of course, one could perform the
 value constraint checking as well in the body of the method <code>proc</code> by
-accepting an generic argument and by performing the test for the value
+accepting a generic argument and by performing the test for the value
 in the body of the method. In the case, the passed value is an
 integer, the <code>push</code> method of <a href="#xmp-object-integer-stack">Listing 12</a> calls <code>next</code>, and therefore calls the
 shadowed generic definition of <code>push</code> as provided by <code>Stack</code>.</p></div>
@@ -1468,7 +1520,7 @@
 <div class="paragraph"><p>The term configurable means that (a) one can provide at creation time of
 an instance a value for this variable, and (b), one can query the
 value via the accessor function <code>cget</code> and (c), one can change the
-value of the variable via <code>configure</code> at runtime. Since the general
+value of the variable via <code>configure</code> at run time. Since the general
 accessor function <code>cget</code> and <code>configure</code> are available, an application
 developer does not have to program own accessor methods. When value
 checkers are provided, each time, the value of the variable is to be
@@ -1545,7 +1597,7 @@
 constructors. The declarative approach in NX reduces the need for
 tailored constructor methods significantly.</p></div>
 <div class="paragraph"><p>Note that the property <code>matnr</code> of class <code>Student</code> is required. This
-means, that if we try to create an instance of <code>Student</code>, a runtime
+means, that if we try to create an instance of <code>Student</code>, a run time
 exception will be triggered. The property <code>oncamups</code> is boolean and
 contains a default value. Providing a default value means that
 whenever we create an instance of this class the object will contain
@@ -1695,7 +1747,7 @@
 named <code>bark</code>. The method body defines the code, which is executed when
 the method is invoked. In this example, the method <code>bar</code> prints out a
 line on the terminal starting with the object name (this is determined
-by the built in command <code>self</code>) followed by "Bark, bark, bark.".  This
+by the built-in command <code>self</code>) followed by "Bark, bark, bark.".  This
 method is defined on a class and applicable to instances of the class
 (here the instance <code>fido</code>).</p></div>
 </div>
@@ -1762,7 +1814,7 @@
 </span><span class='nx-comment'># the tail of fido
 </span>fido::tail length <span class='nx-keyword'>set</span> 10
 
-<span class='nx-comment'># Proving an invalid values will raise an error
+<span class='nx-comment'># Show that an invalid value raises an error
 </span>fido::tail length <span class='nx-keyword'>set</span> <span class='nx-string'>"Hello"</span></pre></div></div>
 <div class="paragraph"><p><a href="#xmp-fido2">Listing 22</a> shows an extended example, where every dog
 has a tail. The object <code>tail</code> is created as a subobject of the dog in
@@ -1964,12 +2016,12 @@
 </span>s1 bar 3 4     ;<span class='nx-comment'># returns 12
 </span>s1 helper 3 4  ;<span class='nx-comment'># raises error: unable to dispatch method helper</span></pre></div></div>
 <div class="paragraph"><p>The base class implements a public method <code>foo</code> using the helper
-method named <code>helper</code>. The derived class implements a as well a public
+method named <code>helper</code>. The derived class implements as well a public
 method <code>bar</code>, which is also using a helper method named <code>helper</code>. When
 an instance <code>s1</code> is created from the derived class, the method <code>foo</code>
 is invoked which uses in turn the private method of the base
 class. Therefore, the invocation <code>s1 foo 3 4</code> returns its sum. If
-the <code>local</code> flag had not beed used in helper, <code>s1</code> would
+the <code>local</code> flag had not been used in helper, <code>s1</code> would
 have tried to call the helper of <code>Sub</code>, which would be incorrect. For
 all other purposes, the private methods are "invisible" in all
 situations, e.g., when mixins are used, or within the <code>next</code>-path, etc.</p></div>
@@ -2081,7 +2133,7 @@
 instance <code>c1</code> of class <code>C</code>, and as well as the object specific method
 <code>baz</code> defined on the object <code>o1</code>. An object method is defined
 via <code>object method</code>.</p></div>
-<div class="paragraph"><p>Note that we can define a object method that shadows (redefines)
+<div class="paragraph"><p>Note that we can define an object method that shadows (redefines)
 for this object methods provided from classes.</p></div>
 <div class="paragraph" id="xmp-object-applicable1"><div class="title">Listing 29: Object Method</div><p></p></div>
 <div class="listingblock">
@@ -2158,11 +2210,11 @@
 }
 
 <span class='nx-comment'># Method "bar" is a class method of class "C"
-</span><span class='nx-comment'># therefore applicable on the class object "C"
+</span><span class='nx-comment'># therefore, applicable on the class object "C"
 </span>C bar
 
 <span class='nx-comment'># Method "foo" is an instance method of "C"
-</span><span class='nx-comment'># therefore applicable on instance "c1"
+</span><span class='nx-comment'># therefore, applicable on instance "c1"
 </span>c1 foo
 
 <span class='nx-comment'># When trying to invoke the class method on the
@@ -2182,7 +2234,7 @@
 <div class="paragraph"><p>An <strong>ensemble method</strong> is a form of a hierarchical method consisting of
 a container method and sub-methods. The first argument of the
 container method is interpreted as a selector (the sub-method). Every
-sub-method can be an container method as well.</p></div>
+sub-method can be a container method as well.</p></div>
 </div></div>
 <div class="paragraph"><p>Ensemble methods provide a means to group related commands together,
 and they are extensible in various ways. It is possible to add
@@ -2321,7 +2373,7 @@
 an extension of the previous example. We define here two additional
 classes <code>M1</code> and <code>M2</code> which are used as per-object and per-class
 mixins.  Both classes define the method <code>foo</code>, these methods shadow
-the definitions of the intrinsic class hierarchy. Therefore an
+the definitions of the intrinsic class hierarchy. Therefore, an
 invocation of <code>foo</code> on object <code>d1</code> causes first an invocation of
 method in the per-object mixin.</p></div>
 <div class="paragraph" id="xmp-method-resolution3"><div class="title">Listing 34: Method Invocation Flags</div><p></p></div>
@@ -2361,9 +2413,9 @@
 situations.</p></div>
 <div class="paragraph"><p>The invocation flag <code>-local</code> means that the method has to be resolved
 from the same place, where the current method is defined. Since the
-current method is defined as a object method, <code>foo</code> is resolved as
-a object method. The effect is that the mixin definitions are
-ignored. The invocation flag <code>-local</code> was already introduced int the
+current method is defined as an object method, <code>foo</code> is resolved as
+an object method. The effect is that the mixin definitions are
+ignored. The invocation flag <code>-local</code> was already introduced in the
 section about method protection, where it was used to call <em>private</em>
 methods.</p></div>
 <div class="paragraph"><p>The invocation flag <code>-intrinsic</code> means that the method has to be resolved
@@ -2373,7 +2425,7 @@
 from basic - typically predefined - classes of the object system. This
 can be useful, when script overloads system methods, but still want to
 call the shadowed methods from the base classes. In our case, we have
-no definitions of <code>foo</code> on the base clases, therefore an error message
+no definitions of <code>foo</code> on the base sclasses, therefore, an error message
 is returned.</p></div>
 <div class="paragraph"><p>The output of <a href="#xmp-method-resolution3">Listing 34</a> is:</p></div>
 <div class="listingblock">
@@ -2496,14 +2548,14 @@
 arguments. Method <code>baz</code> provides two non-positional parameter (<code>-y</code>
 and <code>-y</code>) and one positional parameter (namely <code>a</code>). The invocation in
 line 34 passes the value of <code>1</code> to <code>x</code> and the value of <code>100</code> to <code>a</code>.
-There is no value passed to <code>y</code>, therefore value of <code>y</code> will be
+There is no value passed to <code>y</code>, therefore, value of <code>y</code> will be
 undefined in the body of <code>baz</code>, <code>info exists y</code> checks for the
 existence of the variable <code>y</code> and returns <code>0</code>.</p></div>
 <div class="paragraph"><p>The invocation in line 35 passes only a value to the positional
 parameter. A more tricky case is in line 36, where we want to pass
 <code>-y</code> as a value to the positional parameter <code>a</code>. The case is more
 tricky since syntactically the argument parser might consider <code>-y</code> as
-the name of one of the non-positional parameter. Therefore we use <code>--</code>
+the name of one of the non-positional parameters. Therefore, we use <code>--</code>
 (double dash) to indicate the end of the block of the non-positional
 parameters and therefore the value of <code>-y</code> is passed to <code>a</code>.</p></div>
 </div>
@@ -2604,17 +2656,17 @@
 </span>o3 foo
 o3 bar</pre></div></div>
 <div class="paragraph"><p>In order to define a default value for a parameter, the parameter
-specification must be of the form of a 2 element list, where the
+specification must be of the form of a 2-element list, where the
 second argument is the default value. See for an example in
 <a href="#xmp-default-value">Listing 37</a>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_value_constraints">3.7.4. Value Constraints</h4>
 <div class="paragraph"><p>NX provides value constraints for all kind of parameters. By
-specifying value constraints a developer can restrict the permissible
+specifying value constraints, a developer can restrict the permissible
 values for a parameter and document the expected values in the source
 code. Value checking in NX is conditional, it can be turned on or off
-in general or on a per-usage level (more about this later). The same
+in general, or on a per-usage level (more about this later). The same
 mechanisms can be used not only for input value checking, but as well
 for return value checking (we will address this point as well later).</p></div>
 <div class="sect4">
@@ -2858,23 +2910,23 @@
 <pre class='nx'><span class='nx-keyword'>nx::Object</span> <span class='nx-keyword'>create</span> o6 {
 
   <span class='nx-comment'>#
-</span>  <span class='nx-comment'># Positional parameter with an possibly empty
+</span>  <span class='nx-comment'># Positional parameter with a possibly empty
 </span>  <span class='nx-comment'># single value
 </span>  <span class='nx-comment'>#
 </span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> foo {x:integer,0..1} {
     <span class='nx-keyword'>puts</span> <span class='nx-string'>"x=$x"</span>
   }
 
   <span class='nx-comment'>#
-</span>  <span class='nx-comment'># Positional parameter with an possibly empty
+</span>  <span class='nx-comment'># Positional parameter with a possibly empty
 </span>  <span class='nx-comment'># list of values value
 </span>  <span class='nx-comment'>#
 </span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> bar {x:integer,0..n} {
     <span class='nx-keyword'>puts</span> <span class='nx-string'>"x=$x"</span>
   }
 
   <span class='nx-comment'>#
-</span>  <span class='nx-comment'># Positional parameter with a non-empty
+</span>  <span class='nx-comment'># Positional parameter with a nonempty
 </span>  <span class='nx-comment'># list of values
 </span>  <span class='nx-comment'>#
 </span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>object</span> <span class='nx-keyword'>method</span> baz {x:integer,1..n} {
@@ -2924,7 +2976,7 @@
 <pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> ::D
 <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> ::C {
   <span class='nx-comment'>#
-</span>  <span class='nx-comment'># By default all substitutions (command, variable, control
+</span>  <span class='nx-comment'># By default, all substitutions (command, variable, control
 </span>  <span class='nx-comment'># characters) are active, when "substdefault" is used:
 </span>  <span class='nx-comment'>#
 </span>  <span class='nx-keyword'>:property</span> {d<span class='nx-keyword'>:object</span>,type=::D,substdefault {[::D <span class='nx-keyword'>new</span>]}}
@@ -2943,8 +2995,8 @@
 class <code>::D</code>. When the parameter option <code>substdefault</code> is used
 default, all substitution kinds of Tcl are active: command, variable, and
 backslash substitution. <code>substdefault</code> can be
-parametrized to include or to exclude any combination of substitution
-kinds by providing a bitmask:</p></div>
+parameterized to include or to exclude any combination of substitution
+kinds by providing a bit mask:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -3086,7 +3138,7 @@
 <div class="paragraph"><p></p></div>
 <div class="paragraph"><p>In NX, these definitions imply that instances of the class of <code>Person</code>
 have the properties <code>name</code> and <code>birthday</code> as <em>non-positional object
-parameters</em>.  Furthermore it implies that instances of <code>Student</code> will
+parameters</em>.  Furthermore, it implies that instances of <code>Student</code> will
 have the configure parameters of <code>Person</code> augmented with the object
 parameters from <code>Student</code> (namely <code>matnr</code> and <code>oncampus</code>).  Based on
 these configure parameters, we can create a <code>Person</code> named <code>Bob</code> and a
@@ -3142,7 +3194,7 @@
       ?-birthday <span class='nx-placeholder'>/value/</span>? ?-object-mixins /mixinreg .../? ?-class /<span class='nx-keyword'>class</span>/<span class='nx-placeholder'>?
       ?</span>-object-filters /filterreg .../? ?/__initblock/?</pre></div></div>
 <div class="paragraph"><p>The given parameter show, how (a) objects can be configured
-at runtime or (b) how new instances can be configured
+at run time or (b) how new instances can be configured
 at creation time via the <code>new</code> or <code>create</code> methods.
 Introspection can be used to obtain the configuration
 parameters from an object via
@@ -3167,7 +3219,7 @@
 specified, that <code>Student</code> has <code>Person</code> as superclass via the
 non-positional configure parameter <code>-superclass</code>. If no superclass is
 specified for a class, the default superclass is
-<code>nx::Object</code>. Therefore <code>nx::Object</code> is the default value for the
+<code>nx::Object</code>. Therefore, <code>nx::Object</code> is the default value for the
 parameter <code>superclass</code>.</p></div>
 <div class="paragraph"><p>Another frequently used parameter for classes is <code>-mixins</code> to denote
 per-class mixins (see e.g. the introductory Stack example in
@@ -3212,7 +3264,7 @@
 <div class="sect3">
 <h4 id="_slot_classes_and_slot_objects">4.3.4. Slot Classes and Slot Objects</h4>
 <div class="paragraph"><p>In one of the previous sections, we defined scripted (application
-defined) checker methods on a class named <code>nx::Slot</code>.  In general NX
+defined) checker methods on a class named <code>nx::Slot</code>.  In general, NX
 offers the possibility to define value checkers not only for all
 usages of parameters but as well differently for method parameters or
 configure parameters</p></div>
@@ -3461,7 +3513,8 @@
 <div id="footer">
 <div id="footer-text">
 Version 2.3.0<br />
-Last updated 2019-05-07 11:27:03 CEST
+Last updated
+ 2022-04-29 20:06:35 CEST
 </div>
 </div>
 </body>
Index: doc/next.3
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/next.3	(.../next.3)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/next.3	(.../next.3)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'next\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>
 '\"
-.TH "nx::next" 3 2\&.3\&.0 next "NX API"
+.TH "nx::next" 3 2\&.4\&.0 next "NX API"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -322,4 +322,4 @@
 .nf
 Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>
 
-.fi
\ No newline at end of file
+.fi
Index: doc/nxsh.1
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/nxsh.1	(.../nxsh.1)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/nxsh.1	(.../nxsh.1)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'nxsh\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nxsh" 1 2\&.3\&.0 nxsh "Command-line interface"
+.TH "nxsh" 1 2\&.4\&.0 nxsh "Command-line interface"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -297,7 +297,7 @@
 the command line provided by \fIarg1\fR\&. If \fIarg1\fR is omitted,
 \fBnxsh\fR takes commands from standard input (e\&.g\&., in a pipe)\&.
 .sp
-\fBnxsh\fR can be used like \fBtclsh\fR to make NX scripts directly invokable from the shell, by providing the following first line ("shebang") in the respective script:
+\fBnxsh\fR can be used like \fBtclsh\fR to make NX scripts directly invocable from the shell, by providing the following first line ("shebang") in the respective script:
 .CS
 
 
@@ -319,4 +319,4 @@
 .nf
 Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/nxwish.1
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/nxwish.1	(.../nxwish.1)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/nxwish.1	(.../nxwish.1)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'nxwish\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "nxwish" 1 2\&.3\&.0 nxwish "Command-line interface"
+.TH "nxwish" 1 2\&.4\&.0 nxwish "Command-line interface"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -282,7 +282,7 @@
 \fBnxwish\fR ?\fIfileName\fR?
 \fBnxwish\fR is a shell-like application including Tcl and the NX extension as well as the Tk toolkit\&. \fBnxwish\fR creates a main window and, then, reads commands from its standard input or from \fIfileName\fR and evaluates them\&.  If invoked without \fIfileName\fR, then it runs in REPL mode, reading commands from standard input\&. \fBnxwish\fR will continue processing commands until all windows have been deleted or until end-of-file is reached on standard input\&.
 .sp
-\fBnxwish\fR can be used like \fBwish\fR to make NX scripts directly invokable from the shell, by providing the following first line ("shebang") in the respective script:
+\fBnxwish\fR can be used like \fBwish\fR to make NX scripts directly invocable from the shell, by providing the following first line ("shebang") in the respective script:
 .CS
 
 
@@ -304,4 +304,4 @@
 .nf
 Copyright (c) 2014-16 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/xotclsh.1
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/xotclsh.1	(.../xotclsh.1)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/xotclsh.1	(.../xotclsh.1)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'xotclsh\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "xotclsh" 1 2\&.3\&.0 xotclsh "Command-line interface"
+.TH "xotclsh" 1 2\&.4\&.0 xotclsh "Command-line interface"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -282,7 +282,7 @@
 \fBxotclsh\fR ?\fIfileName\fR?
 \fBxotclsh\fR is a shell-like application that reads XOTcl2 and Tcl commands from its standard input or from \fIfileName\fR and evaluates them\&.  If invoked without \fIfileName\fR, then it runs in REPL mode, reading commands from standard input and printing command results and error messages to standard output\&.  It runs until the exit command is invoked or until it reaches end-of-file on its standard input\&.
 .sp
-\fBxotclsh\fR can be used like \fBtclsh\fR to make XOTcl2 scripts directly invokable from the shell, by providing the following first line ("shebang") in the respective script:
+\fBxotclsh\fR can be used like \fBtclsh\fR to make XOTcl2 scripts directly invocable from the shell, by providing the following first line ("shebang") in the respective script:
 .CS
 
 
@@ -304,4 +304,4 @@
 .nf
 Copyright (c) 2014 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi
Index: doc/xowish.1
===================================================================
diff -u -r6e30c5541188221b5d2a64a624212c342d1a51f1 -rf63b1bb9f672582a828d9da3285735b18bd77095
--- doc/xowish.1	(.../xowish.1)	(revision 6e30c5541188221b5d2a64a624212c342d1a51f1)
+++ doc/xowish.1	(.../xowish.1)	(revision f63b1bb9f672582a828d9da3285735b18bd77095)
@@ -2,7 +2,7 @@
 '\" Generated from file 'xowish\&.man' by tcllib/doctools with format 'nroff'
 '\" Copyright (c) 2014 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 '\"
-.TH "xowish" 1 2\&.3\&.0 xowish "Command-line interface"
+.TH "xowish" 1 2\&.4\&.0 xowish "Command-line interface"
 .\" The -*- nroff -*- definitions below are for supplemental macros used
 .\" in Tcl/Tk manual entries.
 .\"
@@ -282,7 +282,7 @@
 \fBxowish\fR ?\fIfileName\fR?
 \fBxowish\fR is a shell-like application including Tcl and the XOTcl2 as well as the Tk toolkit\&. \fBxowish\fR creates a main window and, then, reads commands from its standard input or from \fIfileName\fR and evaluates them\&.  If invoked without \fIfileName\fR, then it runs in REPL mode, reading commands from standard input\&. \fBxowish\fR will continue processing commands until all windows have been deleted or until end-of-file is reached on standard input\&.
 .sp
-\fBxowish\fR can be used like \fBwish\fR to make XOTcl2 scripts directly invokable from the shell, by providing the following first line ("shebang") in the respective script:
+\fBxowish\fR can be used like \fBwish\fR to make XOTcl2 scripts directly invocable from the shell, by providing the following first line ("shebang") in the respective script:
 .CS
 
 
@@ -304,4 +304,4 @@
 .nf
 Copyright (c)  2014 Stefan Sobernig <stefan\&.sobernig@wu\&.ac\&.at>, Gustaf Neumann <gustaf\&.neumann@wu\&.ac\&.at>; available under the Creative Commons Attribution 3\&.0 Austria license (CC BY 3\&.0 AT)\&.
 
-.fi
\ No newline at end of file
+.fi