@@ -121,13 +121,20 @@
 -------------------
 
 Trim trailing spaces
 ~~~~~~~~~~~~~~~~~~~~
 
+NOTE: As of Megatest version v1.6548 trim-trailing-spaces defaults to yes.
+
 ------------------
-[configf:settings trim-trailing-spaces yes]
+[configf:settings trim-trailing-spaces no]
+#                 |<== next line padded with spaces to here
+DEFAULT_INDENT
+[configf:settings trim-trailing-spaces no]
 ------------------
+
+The variable DEFAULT_INDENT would be a string of 3 spaces
 
 Job Submission Control
 ~~~~~~~~~~~~~~~~~~~~~~
 
 Submit jobs to Host Types based on Test Name
@@ -334,10 +341,29 @@
 -------------------
 # A normal waiton waits for the prior tests to be COMPLETED 
 # and PASS, CHECK or WAIVED
 waiton test1 test2
 -------------------
+
+NOTE: Dynamic waiton lists must be capable of being calculated at the
+beginning of a run. This is because Megatest walks the tree of waitons
+to create the list of tests to execute.
+
+.This works
+-------------------
+waiton [system somescript.sh]
+-------------------
+
+.This does NOT work (the full context for the test is not available so #{shell ...} is NOT enabled to evaluate.
+-------------------
+waiton #{shell somescript.sh}
+-------------------
+
+.This does NOT work
+-------------------
+waiton [system somescript_that_depends_on_a_prior_test.sh]
+-------------------
 
 Mode
 ~~~~
 
 The default (i.e. if mode is not specified) is normal. All pre-dependent tests