Index: TODO
===================================================================
diff -u -r8b8e75e010beae46adb99f4902ca80c50b1a6825 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- TODO	(.../TODO)	(revision 8b8e75e010beae46adb99f4902ca80c50b1a6825)
+++ TODO	(.../TODO)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -3659,6 +3659,7 @@
 - example scripts: added tk-mini and tk-horse-race
 
 - make "/object/ require" an ensemble method
+- traits: renamed "useTrait" into "require trait"
 
 TODO:
 
Index: doc/example-scripts/tk-horse-race.html
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/tk-horse-race.html	(.../tk-horse-race.html)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ doc/example-scripts/tk-horse-race.html	(.../tk-horse-race.html)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -773,8 +773,8 @@
 </span>   :<span class='nx-keyword'>property</span> canvas:required    ;<span class='nx-comment'># the canvas, on which the horse is drawn
 </span>   :<span class='nx-keyword'>property</span> n:integer,required ;<span class='nx-comment'># the position on the canvas
 </span>
-   :useTrait nx::TCallback
-   :useTrait TListUtils
+   :require trait nx::TCallback
+   :require trait TListUtils
 
    :<span class='nx-keyword'>method</span> draw {x y} {
      <span class='nx-keyword'>set</span> hide [:lpick {black brown white gray brown3 brown4}]
@@ -812,8 +812,8 @@
 </span>   :<span class='nx-keyword'>property</span> {height 330}   ;<span class='nx-comment'># height of the canvas
 </span>   :<span class='nx-keyword'>property</span> {horses}       ;<span class='nx-comment'># a list of horse names participating in the game
 </span>
-   :useTrait nx::TCallback
-   :useTrait TListUtils
+   :require trait nx::TCallback
+   :require trait TListUtils
 
    :<span class='nx-keyword'>method</span> <span class='nx-keyword'>init</span> {} {
      <span class='nx-comment'>#
@@ -889,7 +889,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-29 13:13:42 CEST
+Last updated 2011-09-29 21:29:19 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-horse-race.tcl
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/tk-horse-race.tcl	(.../tk-horse-race.tcl)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ doc/example-scripts/tk-horse-race.tcl	(.../tk-horse-race.tcl)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -41,8 +41,8 @@
    :property canvas:required    ;# the canvas, on which the horse is drawn
    :property n:integer,required ;# the position on the canvas
    
-   :useTrait nx::TCallback
-   :useTrait TListUtils
+   :require trait nx::TCallback
+   :require trait TListUtils
    
    :method draw {x y} {
      set hide [:lpick {black brown white gray brown3 brown4}]
@@ -80,8 +80,8 @@
    :property {height 330}   ;# height of the canvas
    :property {horses}       ;# a list of horse names participating in the game
    
-   :useTrait nx::TCallback
-   :useTrait TListUtils
+   :require trait nx::TCallback
+   :require trait TListUtils
    
    :method init {} {
      #
Index: doc/example-scripts/tk-mini.html
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/tk-mini.html	(.../tk-mini.html)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ doc/example-scripts/tk-mini.html	(.../tk-mini.html)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -746,7 +746,7 @@
   <span class='nx-comment'>#
 </span>  <span class='nx-comment'># The trait TCallback imports methods "callback" and "bindvar"
 </span>  <span class='nx-comment'>#
-</span>  :useTrait nx::TCallback
+</span>  :require trait nx::TCallback
 
   :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> button-pressed {} {
     <span class='nx-comment'># When this method is invoked, the content of the ".label" widget
@@ -771,7 +771,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-29 13:06:06 CEST
+Last updated 2011-09-29 21:29:17 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-mini.tcl
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/tk-mini.tcl	(.../tk-mini.tcl)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ doc/example-scripts/tk-mini.tcl	(.../tk-mini.tcl)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -16,7 +16,7 @@
   #
   # The trait TCallback imports methods "callback" and "bindvar"
   #
-  :useTrait nx::TCallback
+  :require trait nx::TCallback
 
   :public method button-pressed {} {
     # When this method is invoked, the content of the ".label" widget
Index: doc/example-scripts/traits-composite.html
===================================================================
diff -u -r444fa56b72c6d35bd3cbbe46a44b12a4ea33088f -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/traits-composite.html	(.../traits-composite.html)	(revision 444fa56b72c6d35bd3cbbe46a44b12a4ea33088f)
+++ doc/example-scripts/traits-composite.html	(.../traits-composite.html)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -802,8 +802,8 @@
   <span class='nx-comment'># This trait requires these methods:
 </span>  :requiredMethods {setToStart atEnd nextPosition}
 
-  <span class='nx-comment'># Use the trait "TPositionableStream"
-</span>  :useTrait TPositionableStream
+  <span class='nx-comment'># Require the trait "TPositionableStream"
+</span>  :require trait TPositionableStream
 }</pre></div></div>
 <div class="paragraph"><p>Create a composite trait called <tt>TWriteStream</tt> based on the trait
 <tt>TPositionableStream</tt>:</p></div>
@@ -832,8 +832,8 @@
   <span class='nx-comment'># This trait requires these methods:
 </span>  :requiredMethods {setToEnd nextPosition}
 
-  <span class='nx-comment'># Use the trait "TPositionableStream"
-</span>  :useTrait TPositionableStream
+  <span class='nx-comment'># Require the trait "TPositionableStream"
+</span>  :require trait TPositionableStream
 }</pre></div></div>
 <div class="paragraph"><p>Define a class <tt>ReadStream</tt> with properties <tt>position</tt> and
 <tt>collection</tt> that uses the composite trait <tt>TReadStream</tt>:</p></div>
@@ -851,7 +851,7 @@
 <pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> ReadStream {
   :<span class='nx-keyword'>property</span> {collection <span class='nx-string'>""</span>}
   :<span class='nx-keyword'>property</span> {position 0}
-  :useTrait TReadStream
+  :require trait TReadStream
 }</pre></div></div>
 <div class="paragraph"><p>Create an instance of <tt>ReadStream</tt>:</p></div>
 <div class="listingblock">
@@ -892,7 +892,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-26 11:38:33 CEST
+Last updated 2011-09-29 21:29:20 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/traits-composite.tcl
===================================================================
diff -u -r444fa56b72c6d35bd3cbbe46a44b12a4ea33088f -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/traits-composite.tcl	(.../traits-composite.tcl)	(revision 444fa56b72c6d35bd3cbbe46a44b12a4ea33088f)
+++ doc/example-scripts/traits-composite.tcl	(.../traits-composite.tcl)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -55,8 +55,8 @@
   # This trait requires these methods:
   :requiredMethods {setToStart atEnd nextPosition}
 
-  # Use the trait "TPositionableStream"
-  :useTrait TPositionableStream
+  # Require the trait "TPositionableStream"
+  :require trait TPositionableStream
 }
 
 #
@@ -77,16 +77,16 @@
   # This trait requires these methods:
   :requiredMethods {setToEnd nextPosition}
 
-  # Use the trait "TPositionableStream"
-  :useTrait TPositionableStream
+  # Require the trait "TPositionableStream"
+  :require trait TPositionableStream
 }
 
 # Define a class +ReadStream+ with properties +position+ and
 # +collection+ that uses the composite trait +TReadStream+:
 nx::Class create ReadStream {
   :property {collection ""}
   :property {position 0}
-  :useTrait TReadStream
+  :require trait TReadStream
 }
 
 # Create an instance of +ReadStream+:
Index: doc/example-scripts/traits-simple.html
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/traits-simple.html	(.../traits-simple.html)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ doc/example-scripts/traits-simple.html	(.../traits-simple.html)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -783,7 +783,7 @@
   :requiredVariables collection
 }</pre></div></div>
 <div class="paragraph"><p>Define the class <tt>ReadStream</tt> with properties <tt>position</tt> and
-<tt>collection</tt> that uses the trait. The method <tt>useTrait</tt> checks the
+<tt>collection</tt> that uses the trait. The method <tt>require trait</tt> checks the
 requirements of the trait and imports the methods into <tt>ReadStream</tt>.</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
@@ -799,7 +799,7 @@
 <pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> ReadStream {
   :<span class='nx-keyword'>property</span> {collection <span class='nx-string'>""</span>}
   :<span class='nx-keyword'>property</span> {position 0}
-  :useTrait TReadStream
+  :require trait TReadStream
 }</pre></div></div>
 <div class="paragraph"><p>Create an instance of the class <tt>ReadStream</tt>:</p></div>
 <div class="listingblock">
@@ -840,7 +840,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-29 10:21:28 CEST
+Last updated 2011-09-29 21:29:22 CEST
 </div>
 </div>
 </body>
Index: doc/example-scripts/traits-simple.tcl
===================================================================
diff -u -r444fa56b72c6d35bd3cbbe46a44b12a4ea33088f -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- doc/example-scripts/traits-simple.tcl	(.../traits-simple.tcl)	(revision 444fa56b72c6d35bd3cbbe46a44b12a4ea33088f)
+++ doc/example-scripts/traits-simple.tcl	(.../traits-simple.tcl)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -45,13 +45,13 @@
 }
 
 # Define the class +ReadStream+ with properties +position+ and
-# +collection+ that uses the trait. The method +useTrait+ checks the
+# +collection+ that uses the trait. The method +require trait+ checks the
 # requirements of the trait and imports the methods into +ReadStream+.
 
 nx::Class create ReadStream {
   :property {collection ""}
   :property {position 0}
-  :useTrait TReadStream
+  :require trait TReadStream
 }
 
 # Create an instance of the class +ReadStream+:
Index: library/lib/nx-traits.tcl
===================================================================
diff -u -r2076ef459f42cdf6426522aab56be490b66c2436 -r6ad7855cd7aba089f7a160293802e1639d0d6198
--- library/lib/nx-traits.tcl	(.../nx-traits.tcl)	(revision 2076ef459f42cdf6426522aab56be490b66c2436)
+++ library/lib/nx-traits.tcl	(.../nx-traits.tcl)	(revision 6ad7855cd7aba089f7a160293802e1639d0d6198)
@@ -46,7 +46,7 @@
   }
 }
 
-nx::Class public method useTrait {traitName {nameMap ""}} {
+nx::Class public method "require trait" {traitName {nameMap ""}} {
   # adding a trait to a class
   foreach m [$traitName requiredMethods] {
     #puts "$m ok? [:info methods -closure $m]"
@@ -62,7 +62,7 @@
   :property {requiredMethods:0..n,incremental ""}
   :property {requiredVariables:0..n,incremental ""}
 
-  :public method useTrait {traitName {nameMap ""}} {
+  :public method "require trait" {traitName {nameMap ""}} {
     # adding a trait to a trait
     nx::addTrait [self] $traitName $nameMap
     set finalReqMethods {}