Merge branch 'master' into funkyfranky

docs/Documentation/Designate.html

@@ -1151,7 +1151,10 @@ function below will use the range 1-7 just in case</p>
 		<dl class="function">
 <dt>
 
+<<<<<<< HEAD
 		<em></em>
+=======
+>>>>>>> master
 <a id="#(DESIGNATE).LaserCodes" >
 <strong>DESIGNATE.LaserCodes</strong>
 </a>

docs/Documentation/Detection.html

@@ -2460,7 +2460,6 @@ The index of the DetectedItem.</p>
 		<dl class="function">
 <dt>
 
-		<em>#number</em>
 <a id="#(DETECTION_BASE).DetectedItemCount" >
 <strong>DETECTION_BASE.DetectedItemCount</strong>
 </a>

docs/Documentation/Fsm.html

@@ -1599,7 +1599,7 @@ A string defining the start state.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em>#string</em>
 <a id="#(FSM)._StartState" >
 <strong>FSM._StartState</strong>
 </a>
@@ -1898,7 +1898,6 @@ A string defining the start state.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
 <a id="#(FSM).current" >
 <strong>FSM.current</strong>
 </a>

docs/Documentation/Positionable.html

@@ -1974,6 +1974,7 @@ The height in meters to add to the altitude of the positionable.</p>
 		<dl class="function">
 <dt>
 
+		<em><a href="Core.Spot.html##(SPOT)">Core.Spot#SPOT</a></em>
 <a id="#(POSITIONABLE).Spot" >
 <strong>POSITIONABLE.Spot</strong>
 </a>

docs/Documentation/Settings.html

@@ -1241,7 +1241,11 @@ true if metric.</p>
 		<dl class="function">
 <dt>
 
+<<<<<<< HEAD
 		<em>#boolean</em>
+=======
+		<em></em>
+>>>>>>> master
 <a id="#(SETTINGS).Metric" >
 <strong>SETTINGS.Metric</strong>
 </a>

docs/Documentation/Spawn.html

@@ -2195,6 +2195,9 @@ The group that was spawned. You can use this group for further actions.</p>
 	
 
 
+	
+<p> Don't repeat the group from Take-Off till Landing and back Take-Off by ReSpawning.</p>
+
 </dd>
 </dl>
 		<dl class="function">

docs/Documentation/Task_Cargo.html

@@ -553,7 +553,7 @@ based on the tasking capabilities defined in <a href="Task.html##(TASK)">Task#TA
 		<dl class="function">
 <dt>
 
-		<em><a href="Core.Cargo.html##(CARGO)">Core.Cargo#CARGO</a></em>
+		<em><a href="Core.Cargo.html##(CARGO_GROUP)">Core.Cargo#CARGO_GROUP</a></em>
 <a id="#(FSM_PROCESS).Cargo" >
 <strong>FSM_PROCESS.Cargo</strong>
 </a>

docs/README.md

@@ -118,6 +118,7 @@ MOOSE Functional Classes provide various functions that are useful in mission de
 
 * [CLEANUP\_AIRBASE](Documentation/CleanUp.html): Keeps the airbases clean from clutter. (Only partly functional due to a bug in DCS, destroyed objects cannot be removed).
 
+* [RAT](Documentation/Rat.html): Random Air Traffic engine developed by FunkyFranky, use the available airspace!
 
 ## 2.4. MOOSE Wrapper Classes