Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -773,13 +773,13 @@
 <h1>The Megatest Users Manual</h1>
 <span id="author">Matt Welland</span><br>
 <span id="email" class="monospaced">&lt;<a href="mailto:matt@kiatoa.com">matt@kiatoa.com</a>&gt;</span><br>
 <span id="revnumber">version 1.0,</span>
 <span id="revdate">April 2012</span>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+<div id="toc">
+  <div id="toctitle">Table of Contents</div>
+  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
 <h2 id="_preface">Preface</h2>
@@ -1701,10 +1701,11 @@
 was historically called "itemwait" mode. The terms "itemwait" and
 "itemmatch" are synonyms.</p></div>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>[requirements]
+waiton precedingtest
 mode itemmatch</pre>
 </div></div>
 </div>
 </div>
 <div class="sect2">
@@ -1723,17 +1724,18 @@
 </div></div>
 </div>
 <div class="sect2">
 <h3 id="_itemmap_handling">Itemmap Handling</h3>
 <div class="paragraph"><p>For cases were the dependent test has a similar but not identical
-itempath to the downstream test an itemmap can allow for itemmatch
-mode</p></div>
+itempath to the downstream test an itemmap can allow for itemwait/itemmatch
+mode by specifying rules on how to map the waiton&#8217;s item name to the current test&#8217;s item name.</p></div>
 <div class="listingblock">
 <div class="title">example for removing part of itemmap for waiton test (eg: item <span class="monospaced">foo-x/bar</span> depends on waiton&#8217;s item <span class="monospaced">y/bar</span>)</div>
 <div class="content monospaced">
 <pre>[requirements]
 mode itemwait
+waiton precedingtest
 # itemmap &lt;item pattern for this test&gt;  &lt;item replacement pattern for waiton test&gt;
 itemmap .*x/ y/</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">example for removing part of itemmap for waiton test (eg: item <span class="monospaced">foo/bar/baz</span> in this test depends on waiton&#8217;s item <span class="monospaced">baz</span>)</div>
@@ -1742,10 +1744,11 @@
 #
 # ## Example
 # ## Remove everything up to the last /
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap &lt;item pattern for this test&gt; &lt;nothing here indicates removal&gt;
 itemmap .*/</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">example replacing part of itemmap for (eg: item <span class="monospaced">foo/1234</span> will imply waiton&#8217;s item <span class="monospaced">bar/1234</span>)</div>
@@ -1753,10 +1756,11 @@
 <pre>#
 # ## Example
 # ## Replace foo/ with bar/
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap &lt;item pattern for this test&gt;  &lt;item replacement pattern for waiton test&gt;
 itemmap foo/ bar/</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">example for backreference (eg: item <span class="monospaced">foo23/thud</span> will imply waiton&#8217;s item <span class="monospaced">num-23/bar/thud</span></div>
@@ -1764,10 +1768,11 @@
 <pre>#
 # ## Example
 # ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap &lt;item pattern for this test&gt;  &lt;item replacement pattern for waiton test&gt;
 itemmap foo(\d+)/ num-\1/bar/</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">example multiple itemmaps</div>
@@ -1775,10 +1780,12 @@
 <pre># multi-line; matches are applied in the listed order
 # The following would map:
 #   a123b321 to b321fooa123 then to 321fooa123p
 #
 [requirements]
+modw itemwait
+waiton precedingtest
 itemmap (a\d+)(b\d+) \2foo\1
   b(.*) \1p</pre>
 </div></div>
 <div class="sect3">
 <h4 id="_complex_mapping">Complex mapping</h4>
@@ -1803,24 +1810,27 @@
 <div class="listingblock">
 <div class="title">Testconfig for Test E has</div>
 <div class="content monospaced">
 <pre>[requirements]
 waiton C
+mode itemwait
 itemmap (\d+)/res \1/bb</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">Testconfig for Test D has</div>
 <div class="content monospaced">
 <pre>[requirements]
 waiton C
+mode itemwait
 itemmap (\d+)/res \1/aa</pre>
 </div></div>
 <div class="listingblock">
 <div class="title">Testconfig for Test C has</div>
 <div class="content monospaced">
 <pre>[requirements]
 waiton A B
+mode itemwait
 
 [itemmap]
 A (\d+)/aa aa/\1
 B (\d+)/bb bb/\1</pre>
 </div></div>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -274,10 +274,11 @@
 was historically called "itemwait" mode. The terms "itemwait" and
 "itemmatch" are synonyms.
 
 -------------------
 [requirements]
+waiton precedingtest
 mode itemmatch
 -------------------
 
 Overriding Enviroment Variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -297,17 +298,18 @@
 
 Itemmap Handling
 ~~~~~~~~~~~~~~~~
 
 For cases were the dependent test has a similar but not identical
-itempath to the downstream test an itemmap can allow for itemmatch
-mode
+itempath to the downstream test an itemmap can allow for itemwait/itemmatch
+mode by specifying rules on how to map the waiton's item name to the current test's item name.
 
 .example for removing part of itemmap for waiton test (eg: item +foo-x/bar+ depends on waiton's item +y/bar+)
 -------------------
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap <item pattern for this test>  <item replacement pattern for waiton test>
 itemmap .*x/ y/
 
 -------------------
 
@@ -318,10 +320,11 @@
 #
 # ## Example
 # ## Remove everything up to the last /
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap <item pattern for this test> <nothing here indicates removal>
 itemmap .*/
 -------------------
 
 .example replacing part of itemmap for (eg: item +foo/1234+ will imply waiton's item +bar/1234+)
@@ -330,10 +333,11 @@
 #
 # ## Example
 # ## Replace foo/ with bar/
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap <item pattern for this test>  <item replacement pattern for waiton test>
 itemmap foo/ bar/
 
 -------------------
 
@@ -342,10 +346,11 @@
 #
 # ## Example
 # ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
 [requirements]
 mode itemwait
+waiton precedingtest
 # itemmap <item pattern for this test>  <item replacement pattern for waiton test>
 itemmap foo(\d+)/ num-\1/bar/
 
 -------------------
 
@@ -355,10 +360,12 @@
 # multi-line; matches are applied in the listed order
 # The following would map:
 #   a123b321 to b321fooa123 then to 321fooa123p
 #
 [requirements]
+modw itemwait
+waiton precedingtest
 itemmap (a\d+)(b\d+) \2foo\1
   b(.*) \1p
 -------------------
 
 
@@ -389,24 +396,27 @@
 
 .Testconfig for Test E has
 ----------------------
 [requirements]
 waiton C
+mode itemwait
 itemmap (\d+)/res \1/bb
 ----------------------
 
 .Testconfig for Test D has
 ----------------------
 [requirements]
 waiton C
+mode itemwait
 itemmap (\d+)/res \1/aa
 ----------------------
 
 .Testconfig for Test C has
 ----------------------
 [requirements]
 waiton A B
+mode itemwait
 
 [itemmap]
 A (\d+)/aa aa/\1
 B (\d+)/bb bb/\1
 ----------------------