Index: doc/example-scripts/rosetta-unknown-method.html
===================================================================
diff -u -r1617c4f080e984ae2725d8337f994d5e5fa3d4cc -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/example-scripts/rosetta-unknown-method.html	(.../rosetta-unknown-method.html)	(revision 1617c4f080e984ae2725d8337f994d5e5fa3d4cc)
+++ doc/example-scripts/rosetta-unknown-method.html	(.../rosetta-unknown-method.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -3,7 +3,7 @@
 <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.5" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
 <title>Listing of doc/example-scripts/rosetta-unknown-method.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,11 +87,15 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
 
+
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -179,7 +183,7 @@
   margin-left: 1.0em;
   margin-right: 10%;
   border-left: 5px solid #f0f0f0;
-  color: #777777;
+  color: #888;
 }
 
 div.quoteblock > div.attribution {
@@ -349,7 +353,7 @@
   margin-bottom: 0.1em;
 }
 
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -407,18 +411,14 @@
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
+div.unbreakable { page-break-inside: avoid; }
 
+
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -452,12 +452,6 @@
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -514,6 +508,31 @@
 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
   vertical-align: bottom;
 }
+
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  border-top: 2px solid silver;
+  border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+  border-style: none;
+}
+body.manpage div.sectionbody {
+  margin-left: 3em;
+}
+
+@media print {
+  body.manpage div#toc { display: none; }
+}
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -558,7 +577,7 @@
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -587,7 +606,7 @@
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName == 'DIV'
+    if (entry.nodeName.toLowerCase() == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -633,7 +652,7 @@
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName == 'DIV' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -731,7 +750,8 @@
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
 <pre class='nx'><span class='nx-keyword'>package</span> req nx</pre></div></div>
-<div class="paragraph"><p>Modelled after the Python version:</p></div>
+<div class="paragraph"><p>Define a class Example modelled after the
+Python version of Rosetta:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -745,10 +765,10 @@
 </style>
 <pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Example {
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> <span class='nx-string'>"This is foo."</span>}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> <span class='nx-string'>"This is bar."</span>}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> foo {} {<span class='nx-keyword'>return</span> <span class='nx-string'>"This is foo."</span>}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> bar {} {<span class='nx-keyword'>return</span> <span class='nx-string'>"This is bar."</span>}
 
-  :<span class='nx-keyword'>method</span> unknown {<span class='nx-keyword'>method</span> args} {
+  <span class='nx-keyword'>:method</span> <span class='nx-keyword'>unknown</span> {<span class='nx-keyword'>method</span> args} {
     <span class='nx-keyword'>set</span> result <span class='nx-string'>"Tried to handle unknown method '$method'."</span>
     <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>llength</span> <span class='nx-variable'>$args</span>] &gt; 0} {
       <span class='nx-keyword'>append</span> result <span class='nx-string'>" It had arguments '$args'."</span>
@@ -758,7 +778,7 @@
 }</pre></div></div>
 <div class="sect2">
 <h3 id="_demonstrating_the_behavior_in_a_shell">Demonstrating the behavior in a shell:</h3>
-<div class="paragraph"><p>Create an instance of Example</p></div>
+<div class="paragraph"><p>Create an instance of the class Example:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -779,18 +799,18 @@
 This is bar.
 
 % <span class='nx-variable'>$e</span> grill
-Tried to handle unknown <span class='nx-keyword'>method</span> 'grill'.
+Tried to handle <span class='nx-keyword'>unknown</span> <span class='nx-keyword'>method</span> 'grill'.
 
 % <span class='nx-variable'>$e</span> ding dong
-Tried to handle unknown <span class='nx-keyword'>method</span> 'ding'. It had arguments 'dong'.</pre></div></div>
+Tried to handle <span class='nx-keyword'>unknown</span> <span class='nx-keyword'>method</span> 'ding'. It had arguments 'dong'.</pre></div></div>
 </div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-08-17 19:50:22 CEST
+Last updated 2013-06-07 09:47:49 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-locomotive.html
===================================================================
diff -u -r9ab6a86b4aee196f04363d13e5eadbdfdb814a06 -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/example-scripts/tk-locomotive.html	(.../tk-locomotive.html)	(revision 9ab6a86b4aee196f04363d13e5eadbdfdb814a06)
+++ doc/example-scripts/tk-locomotive.html	(.../tk-locomotive.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -3,7 +3,7 @@
 <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.5" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
 <title>Listing of doc/example-scripts/tk-locomotive.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,11 +87,15 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
 
+
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -179,7 +183,7 @@
   margin-left: 1.0em;
   margin-right: 10%;
   border-left: 5px solid #f0f0f0;
-  color: #777777;
+  color: #888;
 }
 
 div.quoteblock > div.attribution {
@@ -349,7 +353,7 @@
   margin-bottom: 0.1em;
 }
 
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -407,18 +411,14 @@
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
+div.unbreakable { page-break-inside: avoid; }
 
+
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -452,12 +452,6 @@
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -514,6 +508,31 @@
 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
   vertical-align: bottom;
 }
+
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  border-top: 2px solid silver;
+  border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+  border-style: none;
+}
+body.manpage div.sectionbody {
+  margin-left: 3em;
+}
+
+@media print {
+  body.manpage div#toc { display: none; }
+}
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -558,7 +577,7 @@
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -587,7 +606,7 @@
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName == 'DIV'
+    if (entry.nodeName.toLowerCase() == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -633,7 +652,7 @@
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName == 'DIV' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -748,20 +767,20 @@
 .nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
-<pre class='nx'><span class='nx-keyword'>package</span> require Tk
-<span class='nx-keyword'>package</span> require nx
+<pre class='nx'><span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> Tk
+<span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx
 
 <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Wheel {
-  :<span class='nx-keyword'>property</span> x
-  :<span class='nx-keyword'>property</span> y
-  :<span class='nx-keyword'>property</span> r
-  :<span class='nx-keyword'>property</span> {spokes 24}
-  :<span class='nx-keyword'>property</span> {pivot 0}
-  :<span class='nx-keyword'>property</span> {color red}
-  :<span class='nx-keyword'>property</span> {tag <span class='nx-string'>""</span>}
+  <span class='nx-keyword'>:property</span> x
+  <span class='nx-keyword'>:property</span> y
+  <span class='nx-keyword'>:property</span> r
+  <span class='nx-keyword'>:property</span> {spokes 24}
+  <span class='nx-keyword'>:property</span> {pivot 0}
+  <span class='nx-keyword'>:property</span> {color red}
+  <span class='nx-keyword'>:property</span> {tag <span class='nx-string'>""</span>}
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> drawSpokes {} {
-    ::nx::var import [:<span class='nx-keyword'>info</span> parent] c alpha
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> drawSpokes {} {
+    ::nx::var import [<span class='nx-keyword'>:info</span> parent] c alpha
     <span class='nx-keyword'>set</span> delta [<span class='nx-keyword'>expr</span> {360.0 / <span class='nx-variable'>${</span><span class='nx-variable'>:spokes}</span>}]
     <span class='nx-keyword'>set</span> deg2arc [<span class='nx-keyword'>expr</span> {atan(1.0)*8/360.}]
     <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> i 0} {<span class='nx-variable'>$i</span> &lt; <span class='nx-variable'>${</span><span class='nx-variable'>:spokes}</span>} {<span class='nx-keyword'>incr</span> i} {
@@ -771,16 +790,16 @@
       <span class='nx-keyword'>set</span> alpha [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$alpha</span> + <span class='nx-variable'>$delta</span>}]
     }
     <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>info</span> exists :act_pivot]} {
-      <span class='nx-keyword'>foreach</span> {item perc} [<span class='nx-keyword'>set</span> :act_pivot] <span class='nx-keyword'>break</span>
+      <span class='nx-keyword'>lassign</span> [<span class='nx-keyword'>set</span> :act_pivot] item perc
       <span class='nx-keyword'>set</span> rp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:r}</span> * <span class='nx-variable'>$perc</span>}]
       <span class='nx-keyword'>set</span> xp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$rp</span> * cos(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
       <span class='nx-keyword'>set</span> yp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$rp</span> * sin(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
       <span class='nx-variable'>$c</span> coords <span class='nx-variable'>$item</span> <span class='nx-variable'>$xp</span> <span class='nx-variable'>$yp</span> [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$xp</span> + 1}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$yp</span> + 1}]
     }
   }
 
-  :<span class='nx-keyword'>method</span> <span class='nx-keyword'>init</span> {} {
-    ::nx::var import [:<span class='nx-keyword'>info</span> parent] c alpha
+  <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
+    ::nx::var import [<span class='nx-keyword'>:info</span> parent] c alpha
     <span class='nx-keyword'>set</span> alpha 0.
 
     <span class='nx-keyword'>set</span> :y [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}]
@@ -821,15 +840,15 @@
 
 
 <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Locomotive {
-  :<span class='nx-keyword'>property</span> {speed 4}
+  <span class='nx-keyword'>:property</span> {speed 4}
 
-  :<span class='nx-keyword'>method</span> turn {} {
+  <span class='nx-keyword'>:method</span> turn {} {
     <span class='nx-keyword'>set</span> :alpha [<span class='nx-keyword'>expr</span> {round(<span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span> + 360 - <span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span>) % 360}]
     <span class='nx-keyword'>foreach</span> i [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> find withtag counterweight] {
       <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> itemconfig <span class='nx-variable'>$i</span> -start [<span class='nx-keyword'>expr</span> {310 - <span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span>}]
     }
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> spoke
-    <span class='nx-keyword'>foreach</span> wheel [:<span class='nx-keyword'>info</span> children] { <span class='nx-variable'>$wheel</span> drawSpokes }
+    <span class='nx-keyword'>foreach</span> wheel [<span class='nx-keyword'>:info</span> children] { <span class='nx-variable'>$wheel</span> drawSpokes }
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise hub
     <span class='nx-keyword'>set</span> xp0 [<span class='nx-keyword'>expr</span> {105 + 15 * sin((<span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span> - 90) * atan(1.0) * 8 / 360)}]
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> piston
@@ -841,15 +860,15 @@
       <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$i</span>] 3]&lt;0} {
         <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> <span class='nx-variable'>$i</span>
       } <span class='nx-keyword'>else</span> {
-        <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> move <span class='nx-variable'>$i</span> [<span class='nx-keyword'>expr</span> {rand() * <span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span> / 3.0}] [<span class='nx-keyword'>expr</span> {rand() * 2 - 2}]
+        <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$i</span> [<span class='nx-keyword'>expr</span> {rand() * <span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span> / 3.0}] [<span class='nx-keyword'>expr</span> {rand() * 2 - 2}]
       }
     }
     <span class='nx-keyword'>set</span> t [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox chimney] -fill white -outline white -tag smoke]
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> move <span class='nx-variable'>$t</span> 0 -10
+    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$t</span> 0 -10
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> lower smoke
   }
 
-  :<span class='nx-keyword'>method</span> drawRod {p0 p1 p2 p3} {
+  <span class='nx-keyword'>:method</span> drawRod {p0 p1 p2 p3} {
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> rod
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$p1</span> <span class='nx-variable'>$p3</span>] -fill white -tag rod
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line {*}[<span class='nx-keyword'>lrange</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$p0</span>] 0 1] \
@@ -858,29 +877,29 @@
     <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise pivot
   }
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> tick {} {
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> tick {} {
     :turn
     <span class='nx-keyword'>foreach</span> i [<span class='nx-keyword'>after</span> <span class='nx-keyword'>info</span>] {<span class='nx-keyword'>after</span> cancel <span class='nx-variable'>$i</span>}
     <span class='nx-keyword'>after</span> 10 [<span class='nx-keyword'>self</span>] tick
   }
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> throttle {} {
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> throttle {} {
     <span class='nx-keyword'>incr</span> :speed 2
     :tick
   }
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> <span class='nx-keyword'>break</span> {} {
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> <span class='nx-keyword'>break</span> {} {
     <span class='nx-keyword'>incr</span> :speed -2
     <span class='nx-keyword'>if</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span>&lt;0} {<span class='nx-keyword'>set</span> :speed 0}
     :tick
   }
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> emergencyBreak {} {
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> emergencyBreak {} {
     <span class='nx-keyword'>set</span> :speed 0
     :tick
   }
 
-  :<span class='nx-keyword'>method</span> <span class='nx-keyword'>init</span> {} {
+  <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
     <span class='nx-keyword'>set</span> :c [canvas .c -width 600 -height 160 -background lightblue]
     pack <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span>
 
@@ -939,7 +958,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-30 13:39:25 CEST
+Last updated 2013-06-07 09:47:50 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-locomotive.tcl
===================================================================
diff -u -r9ab6a86b4aee196f04363d13e5eadbdfdb814a06 -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/example-scripts/tk-locomotive.tcl	(.../tk-locomotive.tcl)	(revision 9ab6a86b4aee196f04363d13e5eadbdfdb814a06)
+++ doc/example-scripts/tk-locomotive.tcl	(.../tk-locomotive.tcl)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -32,7 +32,7 @@
       set alpha [expr {$alpha + $delta}]
     }
     if {[info exists :act_pivot]} {
-      foreach {item perc} [set :act_pivot] break
+      lassign [set :act_pivot] item perc
       set rp [expr {${:r} * $perc}]
       set xp [expr {${:x} - $rp * cos($deg2arc * $alpha)}]
       set yp [expr {${:y} - $rp * sin($deg2arc * $alpha)}]
Index: doc/example-scripts/tk-spread.html
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/example-scripts/tk-spread.html	(.../tk-spread.html)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ doc/example-scripts/tk-spread.html	(.../tk-spread.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -3,7 +3,7 @@
 <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.5" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
 <title>Listing of doc/example-scripts/tk-spread.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,11 +87,15 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
 
+
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -179,7 +183,7 @@
   margin-left: 1.0em;
   margin-right: 10%;
   border-left: 5px solid #f0f0f0;
-  color: #777777;
+  color: #888;
 }
 
 div.quoteblock > div.attribution {
@@ -349,7 +353,7 @@
   margin-bottom: 0.1em;
 }
 
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -407,18 +411,14 @@
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
+div.unbreakable { page-break-inside: avoid; }
 
+
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -452,12 +452,6 @@
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -514,6 +508,31 @@
 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
   vertical-align: bottom;
 }
+
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  border-top: 2px solid silver;
+  border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+  border-style: none;
+}
+body.manpage div.sectionbody {
+  margin-left: 3em;
+}
+
+@media print {
+  body.manpage div#toc { display: none; }
+}
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -558,7 +577,7 @@
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -587,7 +606,7 @@
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName == 'DIV'
+    if (entry.nodeName.toLowerCase() == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -633,7 +652,7 @@
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName == 'DIV' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -737,8 +756,8 @@
 .nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
-<pre class='nx'><span class='nx-keyword'>package</span> require Tk
-<span class='nx-keyword'>package</span> require nx::trait
+<pre class='nx'><span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> Tk
+<span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx::trait
 
  <span class='nx-comment'>##############################################################################
 </span> <span class='nx-comment'># Class SpreadSheet
@@ -750,34 +769,34 @@
 </span>   <span class='nx-comment'># The following attributes can be used for configuring the
 </span>   <span class='nx-comment'># spreadsheet.
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>property</span> {rows:integer 3}
-   :<span class='nx-keyword'>property</span> {cols:integer 2}
-   :<span class='nx-keyword'>property</span> {width:integer 8}
+</span>   <span class='nx-keyword'>:property</span> {rows:integer 3}
+   <span class='nx-keyword'>:property</span> {cols:integer 2}
+   <span class='nx-keyword'>:property</span> {width:integer 8}
 
    <span class='nx-comment'>#
 </span>   <span class='nx-comment'># If no widget is provided, use the name of the object as widget
 </span>   <span class='nx-comment'># name.
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>property</span> {widget <span class='nx-string'>".[namespace tail [self]]"</span>}
+</span>   <span class='nx-keyword'>:property</span> -accessor <span class='nx-keyword'>public</span> {widget <span class='nx-string'>".[namespace tail [self]]"</span>}
 
    <span class='nx-comment'>#
 </span>   <span class='nx-comment'># Use the nx callback trait
 </span>   <span class='nx-comment'>#
-</span>   :require trait nx::traits::callback
+</span>   <span class='nx-keyword'>:require</span> trait nx::traits::callback
 
    <span class='nx-comment'>#
 </span>   <span class='nx-comment'># The method "cell" hides the internal respresentation and sets a
 </span>   <span class='nx-comment'># cell to a value.
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>method</span> cell {pair value} {
+</span>   <span class='nx-keyword'>:method</span> cell {pair value} {
      <span class='nx-keyword'>set</span> :data(<span class='nx-variable'>$pair</span>) <span class='nx-variable'>$value</span>
    }
 
    <span class='nx-comment'>#
 </span>   <span class='nx-comment'># The constructor builds the SpreadSheet matrix via multiple text
 </span>   <span class='nx-comment'># entry fields.
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>method</span> <span class='nx-keyword'>init</span> {} {
+</span>   <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
      <span class='nx-keyword'>set</span> :last <span class='nx-variable'>${</span><span class='nx-variable'>:rows}</span>,<span class='nx-variable'>${</span><span class='nx-variable'>:cols}</span>  ;<span class='nx-comment'># keep grand total field
 </span>     <span class='nx-keyword'>trace</span> var [:bindvar data] w [:callback redo]
      frame <span class='nx-variable'>${</span><span class='nx-variable'>:widget}</span>
@@ -799,7 +818,7 @@
    <span class='nx-comment'>#
 </span>   <span class='nx-comment'># The method "redo" is triggered via the updates in the cells
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> redo {varname el op} {
+</span>   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> redo {varname el op} {
      <span class='nx-keyword'>if</span> {<span class='nx-variable'>$el</span> ne <span class='nx-variable'>${</span><span class='nx-variable'>:last}</span>} {
        <span class='nx-keyword'>lassign</span> [<span class='nx-keyword'>split</span> <span class='nx-variable'>$el</span> ,] y x
        <span class='nx-keyword'>if</span> {<span class='nx-variable'>$x</span> ne <span class='nx-string'>""</span>} {
@@ -813,7 +832,7 @@
 </span>   <span class='nx-comment'># The method "sum" adds the values matched by pattern (typically a
 </span>   <span class='nx-comment'># row or column) and sets finally the target column with the total
 </span>   <span class='nx-comment'>#
-</span>   :<span class='nx-keyword'>method</span> sum {pat target} {
+</span>   <span class='nx-keyword'>:method</span> sum {pat target} {
      <span class='nx-keyword'>set</span> sum 0
      <span class='nx-keyword'>set</span> total <span class='nx-string'>""</span> ;<span class='nx-comment'># default if no addition succeeds
 </span>     <span class='nx-keyword'>foreach</span> {i value} [<span class='nx-keyword'>array</span> get :data <span class='nx-variable'>$pat</span>] {
@@ -880,7 +899,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-10-01 20:34:14 CEST
+Last updated 2013-06-07 09:47:51 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-spread.tcl
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/example-scripts/tk-spread.tcl	(.../tk-spread.tcl)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ doc/example-scripts/tk-spread.tcl	(.../tk-spread.tcl)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -26,7 +26,7 @@
    # If no widget is provided, use the name of the object as widget
    # name.
    #
-   :property {widget ".[namespace tail [self]]"}
+   :property -accessor public {widget ".[namespace tail [self]]"}
 
    #
    # Use the nx callback trait 
Index: doc/next-migration.html
===================================================================
diff -u -re0419345b49587b5738f87c6d828dfc5ae4b3276 -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/next-migration.html	(.../next-migration.html)	(revision e0419345b49587b5738f87c6d828dfc5ae4b3276)
+++ doc/next-migration.html	(.../next-migration.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -734,8 +734,8 @@
 <h1>Migration Guide for the Next Scripting Language</h1>
 <span id="author">Gustaf Neumann</span><br />
 <span id="email"><code>&lt;<a href="mailto:neumann@wu-wien.ac.at">neumann@wu-wien.ac.at</a>&gt;</code></span><br />
-<span id="revnumber">version 2.2,</span>
-<span id="revdate">May 2013</span>
+<span id="revnumber">version 2.0b5,</span>
+<span id="revdate">June 2013</span>
 <br /><span id="revremark"></span>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
@@ -1025,29 +1025,29 @@
 <tfoot>
 <tr>
 <td align="left" valign="top"><p class="table">Total</p></td>
-<td align="right" valign="top"><p class="table">44</p></td>
+<td align="right" valign="top"><p class="table">48</p></td>
 <td align="right" valign="top"><p class="table">124</p></td>
 </tr>
 </tfoot>
 <tbody>
 <tr>
 <td align="left" valign="top"><p class="table">Methods for Objects</p></td>
-<td align="right" valign="top"><p class="table">20</p></td>
+<td align="right" valign="top"><p class="table">15</p></td>
 <td align="right" valign="top"><p class="table">51</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">Methods for Classes</p></td>
-<td align="right" valign="top"><p class="table">3</p></td>
+<td align="right" valign="top"><p class="table">9</p></td>
 <td align="right" valign="top"><p class="table">24</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">Info-methods for Objects</p></td>
-<td align="right" valign="top"><p class="table">15</p></td>
+<td align="right" valign="top"><p class="table">13</p></td>
 <td align="right" valign="top"><p class="table">25</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">Info-methods for Classes</p></td>
-<td align="right" valign="top"><p class="table">6</p></td>
+<td align="right" valign="top"><p class="table">11</p></td>
 <td align="right" valign="top"><p class="table">24</p></td>
 </tr>
 </tbody>
@@ -6273,8 +6273,8 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 2.2<br />
-Last updated 2013-06-01 18:46:23 CEST
+Version 2.0b5<br />
+Last updated 2013-06-06 11:09:40 CEST
 </div>
 </div>
 </body>
Index: doc/next-tutorial/next-tutorial.html
===================================================================
diff -u -r6be525008610d18d96705955bc46851f6dae29fe -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision 6be525008610d18d96705955bc46851f6dae29fe)
+++ doc/next-tutorial/next-tutorial.html	(.../next-tutorial.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -733,8 +733,8 @@
 <div id="header">
 <h1>Tutorial for the Next Scripting Language</h1>
 <span id="author">Gustaf Neumann &lt;neumann@wu-wien.ac.at&gt;, Stefan Sobernig &lt;stefan.sobernig@wu.ac.at&gt;</span><br />
-<span id="revnumber">version 2.3,</span>
-<span id="revdate">May 2013</span>
+<span id="revnumber">version 2.0b5,</span>
+<span id="revdate">June 2013</span>
 <br /><span id="revremark">Written for the Initial Release of the Next Scripting Framework.</span>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
@@ -822,7 +822,7 @@
 examples. In later sections we introduce the more advanced concepts of
 the language. Conceptually, most of the addressed concepts are very
 similar to XOTcl. Concerning the differences between NX and XOTcl,
-please refer to the "Migration Guide for the Next Scripting Language".</p></div>
+please refer to the <em>Migration Guide for the Next Scripting Language</em>.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1031,7 +1031,7 @@
 <div class="paragraph"><p>In our next example, we introduce <em>generic objects</em> and <em>object
 specific methods</em>. With NX, we can define generic objects, which are
 instances of the most generic class <code>nx::Object</code> (sometimes called
-"common root class"). <code>nx::Object</code> is predefined and contains a
+<em>common root class</em>). <code>nx::Object</code> is predefined and contains a
 minimal set of methods applicable to all NX objects.  In this example,
 we define a generic object named <code>stack</code> and provide methods for this
 object. The methods defined above were methods provided by a class for
@@ -1457,7 +1457,7 @@
 point in later sections in more detail). Since classes are objects, we
 can use exactly the same notation as above to define class methods by
 using <code>object method</code>. The methods defined on the class object are
-in all respects idential with object specific methods shown in the
+in all respects identical with object specific methods shown in the
 examples above.</p></div>
 <div class="paragraph" id="xmp-stack2"><div class="title">Listing 14: Class Stack2</div><p></p></div>
 <div class="listingblock">
@@ -2035,7 +2035,7 @@
 C-implemented accessor, that enforces the value constraint (here a
 floating point number, since length uses the value constraint
 <code>double</code>). Line 25 will therefore raise an exception, since the
-provided values is not converable to a double number.</p></div>
+provided values cannot be converted to a double number.</p></div>
 <div class="paragraph" id="xmp-fido3"><div class="title">Listing 23: Forwarder Methods</div><p></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -2158,7 +2158,7 @@
 <span class='nx-comment'># The following line prints "::fido Bark, bark, bark."
 </span>fido warn</pre></td></tr></table></div></div>
 <div class="paragraph"><p><a href="#xmp-fido4">Listing 24</a> extends the last example by defining an
-alias for the method "bark". The example only shows the bare
+alias for the method <code>bark</code>. The example only shows the bare
 mechanism. In general, method aliases are very powerful means for
 reusing pre-existing functionality. The full object system of NX and
 XOTcl2 is built from aliases, reusing functionality provided by the
@@ -2305,7 +2305,7 @@
 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>
-<div class="paragraph"><p>By using the <code>-local</code> flag at the call site it is possible to invoce
+<div class="paragraph"><p>By using the <code>-local</code> flag at the call site it is possible to invoke
 only the local definition of the method. If we would call the method
 without this flag, the resolution order would be the standard
 resolution order, starting with filters, mixins, object methods
@@ -2316,9 +2316,9 @@
 (object or class)". The main usage for <code>private</code> is to improve
 locality of the code e.g. for compositional operations.</p></div>
 <div class="paragraph"><p>In order to improve locality for properties, a private property
-defines therfore internally a variable with a different name to avoid
+defines therefore internally a variable with a different name to avoid
 unintended interactions. The variable should be accessed via the
-private accessor, which can be invoved with the <code>-local</code> flag.  In the
+private accessor, which can be invoked with the <code>-local</code> flag.  In the
 following example class <code>D</code> introduces a private property with the
 same name as a property in the superclass.</p></div>
 <div class="paragraph" id="xmp-private-properties"><div class="title">Listing 27: Private Properties</div><p></p></div>
@@ -2583,7 +2583,7 @@
 </div>
 <div class="sect2">
 <h3 id="_ensemble_methods">3.5. Ensemble Methods</h3>
-<div class="paragraph"><p>NX provides "ensemble methods" as a means to structure the method name
+<div class="paragraph"><p>NX provides <em>ensemble methods</em> as a means to structure the method name
 space and to group related methods. Ensemble methods are similar in
 concept to Tcl&#8217;s ensemble commands.</p></div>
 <div class="exampleblock">
@@ -3790,6 +3790,7 @@
 the same way.</p></div>
 <div class="paragraph"><p>Since <code>Student</code> is an instance of the meta-class <code>nx::Class</code> it
 inherits the configure parameters from <code>nx::Class</code> (see class diagram
+<a href="#img-configure-parameters">Figure 44</a>). Therefore, one can
 use e.g. <code>-superclass</code> in the definition of classes.</p></div>
 <div class="paragraph"><p>Since <code>nx::Class</code> is a subclass of <code>nx::Object</code>, the meta-class
 <code>nx::Class</code> inherits the parameter definitions from the most general
@@ -4112,8 +4113,8 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 2.3<br />
-Last updated 2013-05-21 21:03:38 CEST
+Version 2.0b5<br />
+Last updated 2013-06-07 10:54:59 CEST
 </div>
 </div>
 </body>
Index: doc/next-tutorial/next-tutorial.txt
===================================================================
diff -u -r6be525008610d18d96705955bc46851f6dae29fe -rc2374366bcb47c70ebd33cb16c8152eba783987f
--- doc/next-tutorial/next-tutorial.txt	(.../next-tutorial.txt)	(revision 6be525008610d18d96705955bc46851f6dae29fe)
+++ doc/next-tutorial/next-tutorial.txt	(.../next-tutorial.txt)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
@@ -1,7 +1,7 @@
 Tutorial for the Next Scripting Language
 ==========================================
 Gustaf Neumann <neumann@wu-wien.ac.at>, Stefan Sobernig <stefan.sobernig@wu.ac.at>
-v2.3, May 2013:
+v2.0b5, June 2013:
 Written for the Initial Release of the Next Scripting Framework.
 :Author Initials: GN
 :toc:
@@ -87,7 +87,7 @@
 examples. In later sections we introduce the more advanced concepts of
 the language. Conceptually, most of the addressed concepts are very
 similar to XOTcl. Concerning the differences between NX and XOTcl,
-please refer to the "Migration Guide for the Next Scripting Language".
+please refer to the _Migration Guide for the Next Scripting Language_.
 
 == Introductory Overview Example: Stack
 
@@ -255,7 +255,7 @@
 In our next example, we introduce _generic objects_ and _object
 specific methods_. With NX, we can define generic objects, which are
 instances of the most generic class +nx::Object+ (sometimes called
-"common root class"). +nx::Object+ is predefined and contains a
+_common root class_). +nx::Object+ is predefined and contains a
 minimal set of methods applicable to all NX objects.  In this example,
 we define a generic object named +stack+ and provide methods for this
 object. The methods defined above were methods provided by a class for
@@ -564,7 +564,7 @@
 point in later sections in more detail). Since classes are objects, we
 can use exactly the same notation as above to define class methods by
 using +object method+. The methods defined on the class object are
-in all respects idential with object specific methods shown in the
+in all respects identical with object specific methods shown in the
 examples above.
 
 [[xmp-stack2]]
@@ -976,7 +976,7 @@
 C-implemented accessor, that enforces the value constraint (here a
 floating point number, since length uses the value constraint
 +double+). Line 25 will therefore raise an exception, since the
-provided values is not converable to a double number. 
+provided values cannot be converted to a double number. 
 
 [[xmp-fido3]]
 .Listing {counter:figure-number}: Forwarder Methods
@@ -1061,7 +1061,7 @@
 --------------------------------------------------
 
 <<xmp-fido4,{xmp-fido4}>> extends the last example by defining an
-alias for the method "bark". The example only shows the bare
+alias for the method +bark+. The example only shows the bare
 mechanism. In general, method aliases are very powerful means for
 reusing pre-existing functionality. The full object system of NX and
 XOTcl2 is built from aliases, reusing functionality provided by the
@@ -1168,7 +1168,7 @@
 all other purposes, the private methods are "invisible" in all
 situations, e.g., when mixins are used, or within the +next+-path, etc.
 
-By using the +-local+ flag at the call site it is possible to invoce
+By using the +-local+ flag at the call site it is possible to invoke
 only the local definition of the method. If we would call the method
 without this flag, the resolution order would be the standard
 resolution order, starting with filters, mixins, object methods
@@ -1181,9 +1181,9 @@
 locality of the code e.g. for compositional operations.
 
 In order to improve locality for properties, a private property
-defines therfore internally a variable with a different name to avoid
+defines therefore internally a variable with a different name to avoid
 unintended interactions. The variable should be accessed via the
-private accessor, which can be invoved with the +-local+ flag.  In the
+private accessor, which can be invoked with the +-local+ flag.  In the
 following example class +D+ introduces a private property with the
 same name as a property in the superclass. 
 
@@ -1356,7 +1356,7 @@
 
 === Ensemble Methods 
 
-NX provides "ensemble methods" as a means to structure the method name
+NX provides _ensemble methods_ as a means to structure the method name
 space and to group related methods. Ensemble methods are similar in
 concept to Tcl's ensemble commands.
 
@@ -2203,7 +2203,7 @@
 
 Since +Student+ is an instance of the meta-class +nx::Class+ it
 inherits the configure parameters from +nx::Class+ (see class diagram
-<<img-object-parameters,{img-object-parameters}>>). Therefore, one can
+<<img-configure-parameters,{img-configure-parameters}>>). Therefore, one can
 use e.g. +-superclass+ in the definition of classes.
 
 Since +nx::Class+ is a subclass of +nx::Object+, the meta-class
