Merge pull request #7212 from IllianiBird/glossaryOverrideCombatTeam

Improvement: #7208 Added Glossary Entry for Overriding Combat Team Status

Author: rjhancock

MekHQ/resources/mekhq/resources/FullGlossaryDialog.properties

@@ -63,6 +63,8 @@ FullGlossaryDialog.message.inCharacter=<div style="text-align: center;"><h2>A</h
   <h2>N</h2>\
   <p><b><a href='GLOSSARY:NEW_PLAYER_GUIDE'>New Player Guide</a></b></p>\
   <p><b><a href='GLOSSARY:RELEASE_TYPE_NIGHTLY'>Nightly Releases</a></b></p>\
+  <h2>O</h2>\
+  <p><b><a href='GLOSSARY:OVERRIDE_COMBAT_TEAM'>Override Combat Team Status</a></b></p>\
   <h2>P</h2>\
   <p><b><a href='GLOSSARY:PARTS_AVAILABILITY'>Parts Availability</a></b></p>\
   <p><b><a href='GLOSSARY:PARTS_IN_USE'>Parts in Use</a></b></p>\

MekHQ/resources/mekhq/resources/Glossary.properties

@@ -532,6 +532,15 @@ NEW_PLAYER_GUIDE.definition=MekHQ is a complicated beast, and it''s easy to get
  \ our New Player Guide. This may be found in the docs folder and guides you through many of the features and mechanics\
  \ in MekHQ. After all, "Information is Ammunition!"
 ### O
+OVERRIDE_COMBAT_TEAM.title=Override Combat Team Status
+OVERRIDE_COMBAT_TEAM.definition=While the default <a href='GLOSSARY:COMBAT_TEAMS'>Combat Team</a> assignments are \
+  suitable for most uses, sometimes you will need finer control over your <a href='GLOSSARY:TOE'>TO&E</a>.\
+  <p>By right-clicking on a force in your TO&E it is possible to tell MekHQ to either always consider the force a \
+  Combat Team. This is useful for instances where you want to field Combat Teams larger than lance-level \
+  (company-level, for example).</p>\
+  <p>Less often you may need to tell MekHQ to never consider a force a Combat Team. This is generally used in cases \
+  where you want to store something in your TO&E but want MekHQ to completely ignore it. In most cases, marking the \
+  force as a <a href='GLOSSARY:FORCE_TYPE_SUPPORT'>Support Force</a> is generally sufficient.</p>
 ### P
 PARTS_AVAILABILITY.title=Parts Availability
 PARTS_AVAILABILITY.definition=If Parts Availability is enabled in Campaign Options, your procurement attempts are going\

MekHQ/resources/mekhq/resources/TutorialHyperlinkPanel.properties

@@ -12,9 +12,11 @@ commandCenterTab.keyText=<b><a href='GLOSSARY:RELEASE_TYPES'>About MekHQ Version
 mapTab.keyText=<b><a href='GLOSSARY:NAVIGATION_INTERSTELLAR_MAP'>Navigation Shortcuts</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;<a href='GLOSSARY:CAPITAL_SYSTEMS'>Capital Systems</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;<a href='GLOSSARY:EMPTY_SYSTEMS'>Empty Systems</a></b>
-toeTab.keyText=<b><a href='GLOSSARY:TOE'>About the TO&E</a>\
+toeTab.keyText=<h2>Key</h2>\
+  <b><a href='GLOSSARY:TOE'>About the TO&E</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;Bold&nbsp;&nbsp;<a href='GLOSSARY:COMBAT_TEAMS'>Combat Team</a>\
-  &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;<u>Underlined</u>&nbsp;&nbsp;Combat Team Status Overridden\
+  &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;<u>Underlined</u>&nbsp;&nbsp;<a \
+  href='GLOSSARY:OVERRIDE_COMBAT_TEAM'>Combat Team Status Overridden</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;<s>c</s>&nbsp;&nbsp;<a href='GLOSSARY:FORCE_TYPE_COMBAT'>Factored into Contract Pay</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&#926;&nbsp;&nbsp;<a href='GLOSSARY:FORCE_TYPE_CONVOY'>Convoy Force</a>\
   &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&#10023;&nbsp;&nbsp;<a href='GLOSSARY:FORCE_TYPE_SECURITY'>Security Force</a>\