Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
@@ -127,9 +127,9 @@
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
+		"special/formations/battle_line",
 		"special/formations/skirmish",
-		"special/formations/wedge",
-		"special/formations/battle_line"
+		"special/formations/wedge"
 	],
 	"AINames":
 	[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -123,9 +123,9 @@
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
+		"special/formations/battle_line",
 		"special/formations/skirmish",
-		"special/formations/wedge",
-		"special/formations/battle_line"
+		"special/formations/wedge"
 	],
 	"AINames":
 	[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
@@ -121,9 +121,9 @@
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
+		"special/formations/battle_line",
 		"special/formations/skirmish",
-		"special/formations/wedge",
-		"special/formations/battle_line"
+		"special/formations/wedge"
 	],
 	"AINames":
 	[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
@@ -136,9 +136,9 @@
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
+		"special/formations/battle_line",
 		"special/formations/skirmish",
-		"special/formations/wedge",
-		"special/formations/battle_line"
+		"special/formations/wedge"
 	],
 	"AINames":
 	[
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
@@ -3,7 +3,7 @@
   <Formation>
     <Icon>formations/testudo.png</Icon>
     <RequiredMemberCount>16</RequiredMemberCount>
-    <DisabledTooltip>Requires at least 16 Melee Infantry.</DisabledTooltip>
+    <DisabledTooltip>Melee Infantry only, requires at least 16.</DisabledTooltip>
     <FormationName>Anti Cavalry</FormationName>
     <FormationShape>square</FormationShape>
     <UnitSeparationWidthMultiplier>0.50</UnitSeparationWidthMultiplier>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
@@ -3,7 +3,7 @@
   <Formation>
     <Icon>formations/phalanx.png</Icon>
     <RequiredMemberCount>10</RequiredMemberCount>
-    <DisabledTooltip>Requires at least 10 Infantry Hoplites.</DisabledTooltip>
+    <DisabledTooltip>Infantry Hoplites only, requires at least 10.</DisabledTooltip>
     <FormationName>Phalanx</FormationName>
     <UnitSeparationWidthMultiplier>0.6</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>0.6</UnitSeparationDepthMultiplier>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_formation">
   <Formation>
     <Icon>formations/skirmish.png</Icon>
-    <DisabledTooltip>At least 2 units are required (only ranged).</DisabledTooltip>
+    <DisabledTooltip>Ranged Soldiers only, requires at least 2.</DisabledTooltip>
     <FormationName>Skirmish</FormationName>
     <ShiftRows>true</ShiftRows>
     <UnitSeparationWidthMultiplier>2</UnitSeparationWidthMultiplier>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -3,7 +3,7 @@
   <Formation>
     <Icon>formations/syntagma.png</Icon>
     <RequiredMemberCount>16</RequiredMemberCount>
-    <DisabledTooltip>At least 16 units are required (only pike infantry).</DisabledTooltip>
+    <DisabledTooltip>Infantry Pikemen only, requires at least 16.</DisabledTooltip>
     <SortingClasses>Hero Champion Elite Advanced Basic</SortingClasses>
     <FormationName>Syntagma</FormationName>
     <FormationShape>square</FormationShape>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
@@ -3,7 +3,7 @@
   <Formation>
     <Icon>formations/testudo.png</Icon>
     <RequiredMemberCount>16</RequiredMemberCount>
-    <DisabledTooltip>At least 16 units are required (only melee infantry).</DisabledTooltip>
+    <DisabledTooltip>Melee Infantry only, requires at least 16.</DisabledTooltip>
     <SortingClasses>Hero Champion Elite Advanced Basic</SortingClasses>
     <FormationName>Testudo</FormationName>
     <FormationShape>square</FormationShape>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
@@ -3,7 +3,7 @@
   <Formation>
     <Icon>formations/wedge.png</Icon>
     <RequiredMemberCount>6</RequiredMemberCount>
-    <DisabledTooltip>At least 6 units are required (only cavalry).</DisabledTooltip>
+    <DisabledTooltip>Cavalry only, requires at least 6.</DisabledTooltip>
     <FormationName>Wedge</FormationName>
     <FormationShape>triangle</FormationShape>
     <ShiftRows>true</ShiftRows>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -22,7 +22,7 @@
   -->
   <Formation>
     <RequiredMemberCount>2</RequiredMemberCount>
-    <DisabledTooltip>At least 2 units are required.</DisabledTooltip>
+    <DisabledTooltip>Requires at least 2 Soldiers or Siege engines.</DisabledTooltip>
     <SpeedMultiplier>1</SpeedMultiplier>
     <FormationShape>square</FormationShape>
     <SortingClasses>Hero Champion Cavalry Melee Ranged</SortingClasses>