Spelling: override has no hyphen.

vassal-app/src/main/java/VASSAL/build/module/GlobalOptions.java

@@ -290,7 +290,7 @@ public void addTo(Buildable parent) {
     }
 
     // Move Fixed Distance trait (Translate) has been substantially re-written.
-    // Use new version by default. User may over-ride to use old buggy behaviour.
+    // Use new version by default. User may override to use old buggy behaviour.
     final BooleanConfigurer classicMfd = new BooleanConfigurer(
       CLASSIC_MFD,
       Resources.getString("GlobalOptions.classic_mfd"),

vassal-app/src/main/java/VASSAL/build/module/index/IndexManager.java

@@ -121,7 +121,7 @@ public void pieceRemoved(GamePiece piece, Map map) {
    *
    * @param piece         Piece to use as origin
    * @param range         range in units appropriate to the grid at the pieces location
-   * @param forceAsPixels Force the range check to be in pixels, over-riding any grid at the target point
+   * @param forceAsPixels Force the range check to be in pixels, overriding any grid at the target point
    * @return List of pieces (not including the souurce piece)
    */
   public List<GamePiece> getPieces(GamePiece piece, int range, boolean forceAsPixels) {
@@ -139,7 +139,7 @@ public List<GamePiece> getPieces(GamePiece piece, int range) {
    * @param map           Map
    * @param point         Position to search from
    * @param range         Range in units appropriate to the grid at the search point.
-   * @param forceAsPixels Force the range check to be in pixels, over-riding any grid at the target point
+   * @param forceAsPixels Force the range check to be in pixels, overriding any grid at the target point
    * @return              List of pieces
    */
   public List<GamePiece> getPieces(Map map, Point point, int range, boolean forceAsPixels) {

vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java

@@ -3019,12 +3019,12 @@ public boolean isDataFlavorSupported(DataFlavor flavor) {
     }
   }
 
-  // ExtensionTree to over-ride
+  // ExtensionTree to override
   protected void postInsertProcessing(Configurable parent, Configurable child) {
 
   }
 
-  // ExtensionTree to over-ride
+  // ExtensionTree to override
   protected void postRemoveProcessing(Configurable parent, Configurable child) {
 
   }

vassal-app/src/main/java/VASSAL/configure/Configurer.java

@@ -258,7 +258,7 @@ public void setLabelVisibile(boolean visible) {
 
   /**
    * Set the highlighted status of this configurer.
-   * It is up to individual Configurers to over-ride this method and implement a suitable visual highlighting scheme
+   * It is up to individual Configurers to override this method and implement a suitable visual highlighting scheme
    * Note: Cannot make this abstract as it will break custom code.
    *
    * @param highlighted New Highlighted status

vassal-app/src/main/java/VASSAL/counters/Obscurable.java

@@ -322,7 +322,7 @@ else if (Properties.VISIBLE_STATE.equals(key)) {
     // If piece is obscured to me, then mask any properties returned by
     // traits between this one and the innermost BasicPiece. Return directly
     // any properties normally handled by Decorator.getproperty()
-    // Global Key Commands acting on Decks over-ride the masking by calling
+    // Global Key Commands acting on Decks override the masking by calling
     // setExposeMaskedProperties()
 //    else if (obscuredToMe() && ! exposeMaskedProperties) {
 //      if (Properties.KEY_COMMANDS.equals(key)) {

vassal-app/src/main/java/VASSAL/counters/SetPieceProperty.java

@@ -364,11 +364,11 @@ else if (changer instanceof PropertyPrompt) {
   }
 
   //
-  // The following 4 over-rides are called when the PropertyChanger is activated to determine
+  // The following 4 overrides are called when the PropertyChanger is activated to determine
   // the numeric constraints to follow when applying the change to a specific remote DP.
-  // If this trait is not over-riding the numeric constraints, then use the constraints of the
+  // If this trait is not overriding the numeric constraints, then use the constraints of the
   // target DP.
-  // NOTE: Constraints.getPropertySource() is not over-ridden, it is handled separately by the
+  // NOTE: Constraints.getPropertySource() is not overridden, it is handled separately by the
   //       Remote Property Setters.
   //
   @Override

vassal-app/src/main/java/VASSAL/i18n/Localization.java

@@ -125,8 +125,8 @@ public void saveTranslatableAttribute(Translatable component, String name, Strin
    * Translate the module. The module and all extensions have now been built,
    * so all Translations are available and all attributes that need to be
    * translated have been recorded. There may be multiple translations that
-   * match this Locale, merge them in order - Country over-rides Language
-   * over-rides default. NB - You cannot create a default translation
+   * match this Locale, merge them in order - Country overrides Language
+   * overrides default. NB - You cannot create a default translation
    * (Module.properties) using the VASSAL editor, but a default file can be
    * placed into a module or extension manually.
    *

vassal-app/src/main/java/VASSAL/script/expression/Expression.java

@@ -243,7 +243,7 @@ public String tryEvaluate(PropertySource ps, Map<String, String> properties, boo
    *
    * The default PieceFilter always returns true.
    *
-   * Individual subclasses that are capable of selecting pieces MUST over-ride these defaults. Auditing
+   * Individual subclasses that are capable of selecting pieces MUST override these defaults. Auditing
    * functionality is supplied since creating a filter usually involves evaluating an Expression.
    *
    * @param ps PropertySource to use as source of filter

vassal-doc/src/main/readme-referencemanual/ReferenceManual/Concepts.adoc

@@ -250,7 +250,7 @@ There are no Zone level components.
 
 Pieces can only 'see' the Zone level properties in their current Zone, the Map level properties on their current Map and all Module level properties.
 
-These visibility rules can be over-ridden using the <<ExpressionProperty.adoc#top,GetProperty>> <<#beanshell,BeanShell>> functions.
+These visibility rules can be overridden using the <<ExpressionProperty.adoc#top,GetProperty>> <<#beanshell,BeanShell>> functions.
 
 [#Unique]
 ==== Uniquely Identifying Pieces

vassal-doc/src/main/readme-referencemanual/ReferenceManual/GamePiece.adoc

@@ -221,7 +221,7 @@ Note, however, that Sub-Menu traits must always go *_below_* the traits that it
 
 |<<Attachment.adoc#top,Attachment>>| Create groups of 'Attached' counters that can easily interact with each other.
 
-| <<BasicName.adoc#top,Basic Name>> | Specify a primary name for a piece that over-rides the Basic Piece name.
+| <<BasicName.adoc#top,Basic Name>> | Specify a primary name for a piece that overrides the Basic Piece name.
 
 | <<BasicPiece.adoc#top,Basic Piece>> | Set the Base name and image for a piece.
 

vassal-doc/src/main/readme-referencemanual/ReferenceManual/GridNumbering.adoc

@@ -40,7 +40,7 @@ The default value of _$gridLocation$_ is the automatically generated name as dra
 +
 You can add additional information to the generated grid reference, such as a board prefix.
 +
-You can also over-ride the automatically generated reference format and use your own. The values _$row$_ and _$column$_ are provided to help with this.
+You can also override the automatically generated reference format and use your own. The values _$row$_ and _$column$_ are provided to help with this.
 
 *Draw numbering:*::  If checked, the generated grid references will be drawn on top of the board image.
 

vassal-doc/src/main/readme-referencemanual/ReferenceManual/NonStacking.adoc

@@ -15,7 +15,7 @@ This trait _also_ controls how players interact with the piece when clicking on
 Note that any selection or movement limitations do not apply when the piece is moved automatically through the operation of one of its traits (e.g.
 a <<SendToLocation.adoc#top,Send To Location>> trait).
 
-The _Does not stack_ now has an option to over-ride its primary function and allow the piece to Stack normally,
+The _Does not stack_ now has an option to override its primary function and allow the piece to Stack normally,
 giving access to the selection, movevement and Ignore Grid options for Stackable pieces.
 
 *EXAMPLE:* Use non-stacking pieces to represent playing cards in games that mix cards and counters, so that the cards can be placed on a map without interfering with stacks of counters.
@@ -53,7 +53,7 @@ Options are:
 * _never:_  The piece can never be moved manually by a player.
 
 *Piece can stack:*:: This option controls whether the piece can form Stacks with other pieces when moved. This option
-allows you to over-ride the primary _Does Not Stack_ behaviour of this trait, and apply the other options to Stacking pieces.
+allows you to override the primary _Does Not Stack_ behaviour of this trait, and apply the other options to Stacking pieces.
 +
 NOTE: Some combinations of the selection and movement options may not make much sense when used with a Stacking counter.
 +

vassal-doc/src/main/readme-referencemanual/ReferenceManual/SetPieceProperty.adoc

@@ -19,7 +19,7 @@ _{ "Resources" + GetProperty("Side")_ }. In this case when the property Side hol
 
 NOTE: The <<DynamicProperty.adoc#top,Dynamic Property>> trait must exist on the target pieces. This trait does not 'create' new <<DynamicProperty.adoc#top,Dynamic Properties>>.
 
-*Over-ride numeric constraints in target properties:*:: If left unticked, then the Set Property Piece trait will use whatever (if any) numeric constraints have been specified in the Dynamic Properties that it updates.  If ticked, then the following 4 options appear and allow you to ignore or over-ride any numeric constraints in the target property.
+*Over-ride numeric constraints in target properties:*:: If left unticked, then the Set Property Piece trait will use whatever (if any) numeric constraints have been specified in the Dynamic Properties that it updates.  If ticked, then the following 4 options appear and allow you to ignore or override any numeric constraints in the target property.
 
 
 *Is numeric:*:: If true, then changes to the value of the property by this trait will be restricted to integer values. If left unticked, then the following 3 options do not appear and this trait will set exactly the value specified.