Index: docs/manual/Makefile
==================================================================
--- docs/manual/Makefile
+++ docs/manual/Makefile
@@ -13,11 +13,11 @@
 #         asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 design_spec.txt
 #
 
 all : server.ps megatest_manual.html client.ps
 
-megatest_manual.html : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt
+megatest_manual.html : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt *png
 	asciidoc  -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 megatest_manual.txt
 #	dos2unix megatest_manual.html
 
 server.ps : server.dot
 	dot -Tps server.dot > server.ps

ADDED   docs/manual/complex-itemmap.dot
Index: docs/manual/complex-itemmap.dot
==================================================================
--- /dev/null
+++ docs/manual/complex-itemmap.dot
@@ -0,0 +1,35 @@
+digraph G {
+
+    // put client after server so server_start node is visible
+    //
+    subgraph cluster_2 {
+        node [style=filled,shape=box];
+	
+	"test1"                  -> test2;
+	runremote_lookup_server  -> login_attempt [label="have server"];
+	runremote_lookup_server  -> monitordb_lookup_server [label="no server"];
+
+	monitordb_lookup_server  -> login_attempt [label="have server"];
+	monitordb_lookup_server  -> server_start_remote [label="no server"];
+
+	server_start_remote      -> delay_2_sec;
+	delay_2_sec              -> runremote_lookup_server;
+
+	login_attempt            -> "rmt:send-receive_start" [label="login sucessful"];
+	"rmt:send-receive_start" -> "rmt:send-receive_start";
+
+	"rmt:send-receive_start" -> runremote_lookup_server [label=exception];
+	login_attempt            -> clear_runremote [label="login failed"];
+
+	"remove_running > 5s"    -> runremote_lookup_server;
+
+	subgraph cluster_3 {
+		node [style=filled];
+		clear_runremote          -> "remove_running > 5s";
+	}
+
+        label = "client:setup";
+        color=green;
+    }
+
+}

ADDED   docs/manual/itemmap.fig
Index: docs/manual/itemmap.fig
==================================================================
--- /dev/null
+++ docs/manual/itemmap.fig
@@ -0,0 +1,129 @@
+#FIG 3.2  Produced by xfig version 3.2.5c
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #c6b797
+0 33 #eff8ff
+0 34 #dccba6
+0 35 #404040
+0 36 #808080
+0 37 #c0c0c0
+0 38 #e0e0e0
+0 39 #8e8f8e
+0 40 #aaaaaa
+0 41 #555555
+0 42 #c7c3c7
+0 43 #565151
+0 44 #8e8e8e
+0 45 #d7d7d7
+0 46 #85807d
+0 47 #d2d2d2
+0 48 #3a3a3a
+0 49 #4573aa
+0 50 #aeaeae
+0 51 #7b79a5
+0 52 #444444
+0 53 #73758c
+0 54 #f7f7f7
+0 55 #414541
+0 56 #635dce
+0 57 #bebebe
+0 58 #515151
+0 59 #e7e3e7
+0 60 #000049
+0 61 #797979
+0 62 #303430
+0 63 #414141
+0 64 #c7b696
+6 3600 2700 4455 3555
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3600 2700 4050 2700 4050 3150 3600 3150 3600 2700
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3690 3150 3690 3285 4185 3285 4185 2790 4050 2790
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3825 3285 3825 3420 4320 3420 4320 2925 4185 2925
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3960 3420 3960 3555 4455 3555 4455 3060 4320 3060
+-6
+6 1845 4500 2700 5355
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1845 4500 2295 4500 2295 4950 1845 4950 1845 4500
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1935 4950 1935 5085 2430 5085 2430 4590 2295 4590
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2070 5085 2070 5220 2565 5220 2565 4725 2430 4725
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2205 5220 2205 5355 2700 5355 2700 4860 2565 4860
+-6
+6 1800 900 2655 1755
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1800 900 2250 900 2250 1350 1800 1350 1800 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1890 1350 1890 1485 2385 1485 2385 990 2250 990
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2025 1485 2025 1620 2520 1620 2520 1125 2385 1125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2160 1620 2160 1755 2655 1755 2655 1260 2520 1260
+-6
+6 5400 900 6255 1755
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5400 900 5850 900 5850 1350 5400 1350 5400 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5490 1350 5490 1485 5985 1485 5985 990 5850 990
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5625 1485 5625 1620 6120 1620 6120 1125 5985 1125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5760 1620 5760 1755 6255 1755 6255 1260 6120 1260
+-6
+6 5400 4500 6255 5355
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5400 4500 5850 4500 5850 4950 5400 4950 5400 4500
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5490 4950 5490 5085 5985 5085 5985 4590 5850 4590
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5625 5085 5625 5220 6120 5220 6120 4725 5985 4725
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 5760 5220 5760 5355 6255 5355 6255 4860 6120 4860
+-6
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5355 4455 4500 3600
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5400 1800 4500 2700
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 3600 3600 2700 4500
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 3510 2610 2790 1890
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1530 675 3060 675 3060 5580 1530 5580 1530 675
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3195 675 4815 675 4815 5580 3195 5580 3195 675
+2 2 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 675 6660 675 6660 5580 4950 5580 4950 675
+2 2 0 2 7 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 0 45 8550 45 8550 7245 0 7245 0 45
+2 1 0 2 23 7 50 -1 -1 0.000 0 0 -1 1 0 3
+	0 0 1.00 60.00 120.00
+	 5040 6300 4050 5175 4050 3690
+2 1 0 2 23 7 50 -1 -1 0.000 0 0 -1 1 0 3
+	0 0 1.00 60.00 120.00
+	 1080 5850 1080 2115 1755 1530
+4 0 0 50 -1 0 16 0.0000 4 135 360 1935 4725 TstB\001
+4 0 0 50 -1 0 16 0.0000 4 135 360 5445 1170 TstC\001
+4 0 0 50 -1 0 16 0.0000 4 135 360 5445 4770 TstD\001
+4 0 0 50 -1 0 16 0.0000 4 135 360 3600 2970 TstE\001
+4 0 0 50 -1 0 16 0.0000 4 135 360 1845 1170 TstA\001
+4 0 0 50 -1 0 16 0.0000 4 180 1260 900 6210 [requirements]\001
+4 0 0 50 -1 0 16 0.0000 4 135 990 900 6405 waiton TstE\001
+4 0 0 50 -1 0 16 0.0000 4 180 2070 900 6600 itemap foo/(\\d+) \\1/bar\001
+4 0 0 50 -1 0 16 0.0000 4 180 810 5220 6165 [itemmap]\001
+4 0 0 50 -1 0 16 0.0000 4 150 1260 5220 6360 TstC  .*/ foo/\001
+4 0 0 50 -1 0 16 0.0000 4 165 1080 5220 6555 TstD ab/ xy/\001

ADDED   docs/manual/itemmap.png
Index: docs/manual/itemmap.png
==================================================================
--- /dev/null
+++ docs/manual/itemmap.png
cannot compute difference between binary files

Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1145,10 +1145,18 @@
 <div class="content monospaced">
 <pre>[setup]
 reruns 5</pre>
 </div></div>
 </div>
+<div class="sect3">
+<h4 id="_run_time_limit">Run time limit</h4>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[setup]
+runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s</pre>
+</div></div>
+</div>
 </div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_the_testconfig_file">The testconfig File</h2>
@@ -1229,12 +1237,28 @@
 # ## Remove everything up to the last /
 itemmap .*/
 #
 # ## Example
 # ## Replace foo/ with bar/
-itemmap foo/ bar/</pre>
+itemmap foo/ bar/
+
+# multi-line; matches are applied in the listed order
+# The following would map:
+#   a123b321 to b321fooa123 then to 321fooa123p
+#
+itemmap (a\d+)(b\d+) \2foo\1
+  b(.*) \1p</pre>
 </div></div>
+</div>
+<div class="sect3">
+<h4 id="_complex_mappings">Complex mappings</h4>
+<div class="paragraph"><p>Complex mappings can be handled with the [itemmap] section</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="itemmap.png" alt="itemmap.png">
+</div>
+</div>
 <div class="listingblock">
 <div class="title">Autogeneration waiton list for dynamic flow dependency trees</div>
 <div class="content monospaced">
 <pre>[requirements]
 # With a toplevel test you may wish to generate your list
@@ -1242,11 +1266,11 @@
 #
 # waiton #{shell get-valid-tests-to-run.sh}</pre>
 </div></div>
 </div>
 <div class="sect3">
-<h4 id="_run_time_limit">Run time limit</h4>
+<h4 id="_run_time_limit_2">Run time limit</h4>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s</pre>
 </div></div>
 </div>
@@ -1578,10 +1602,10 @@
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Version 1.0<br>
 Last updated
- 2015-08-24 19:48:43 MST
+ 2015-09-10 21:54:17 MST
 </div>
 </div>
 </body>
 </html>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -154,12 +154,27 @@
 itemmap .*/
 #
 # ## Example
 # ## Replace foo/ with bar/
 itemmap foo/ bar/
+
+# multi-line; matches are applied in the listed order
+# The following would map:
+#   a123b321 to b321fooa123 then to 321fooa123p
+#
+itemmap (a\d+)(b\d+) \2foo\1
+  b(.*) \1p
 -------------------
 
+Complex mappings
+^^^^^^^^^^^^^^^^
+
+Complex mappings can be handled with the [itemmap] section
+
+image::itemmap.png[]
+
+.Complex mapping from 
 .Autogeneration waiton list for dynamic flow dependency trees
 -------------------
 [requirements]
 # With a toplevel test you may wish to generate your list 
 # of tests to run dynamically