openrails
diff --git a/‎Source/Documentation/Manual/cabs.rst‎
Lines changed: 3 additions & 7 deletions b/‎Source/Documentation/Manual/cabs.rst‎
Lines changed: 3 additions & 7 deletions
diff --git a/‎Source/Documentation/Manual/physics.rst‎
Lines changed: 15 additions & 47 deletions b/‎Source/Documentation/Manual/physics.rst‎
Lines changed: 15 additions & 47 deletions
diff --git a/‎Source/Orts.Formats.Msts/CabViewFile.cs‎
Lines changed: 0 additions & 1 deletion b/‎Source/Orts.Formats.Msts/CabViewFile.cs‎
Lines changed: 0 additions & 1 deletion
@@ -684,16 +684,14 @@ Air Flow Meter
 
 .. index::
    single:  ORTS_AIR_FLOW_METER
-   single:  ORTS_TRAIN_AIR_FLOW_METER
 
 This cabview control is used on some locomotives, particularly in North America, to show the
 volumetric flow rate of air moving from the main res to the brake pipe during release/recharge.
 Such an indication can be used to determine when brake pipe charging is complete,
 measure the amount of brake pipe leakage, and so on.
 The control will only function on locomotives with air brakes.
 
-Here is an example implementation of ORTS_AIR_FLOW_METER as an analog dial (display types other
-than analog dials can be used)::
+Here is an example implementation of ORTS_AIR_FLOW_METER as an analog dial::
 
 
 		Dial (
@@ -708,10 +706,8 @@ than analog dials can be used)::
 			DirIncrease ( 0 )
 		)
 
-Alternately, a control type of ORTS_TRAIN_AIR_FLOW_METER can be used to display the total
-air flow rate of all locomotives, useful for distributed power where multiple locomotives can
-charge the brake pipe simultaneously. Applicable user-defined units are CUBIC_FT_MIN, LITERS_S,
-LITERS_MIN, and CUBIC_M_S. Cubic meters per second will be used if no units are specified.
+Applicable user-defined units are CUBIC_FT_MIN, LITERS_S, LITERS_MIN, and CUBIC_M_S. Cubic meters per
+second will be used if no units are specified.
 
 
 Animated 2D Wipers
 
@@ -2350,52 +2350,6 @@ The actual set value of traction or dynamic brake of *async* group is shown in
 lines *Throttle* and *Dynamic Brake*, respectively, in brackets, e.g.: 
 Throttle: 0% (50%).
 
-In addition to applying power and dynamic brake, remote units can also manage the
-train brake, independent brake, and emergency brake in sync with the lead locomotive.
-This can dramatically speed up brake application and release on long trains, which has
-allowed trains to increase in length substantially without major decreases in brake
-performance. Only one locomotive in each group, the 'lead' DP unit, will have brakes
-cut-in. Usually this is the same locomotive recieving throttle data from the lead
-locomotive. In Open Rails, these locomotives are designated automatically. To determine
-which units are the 'lead' in each group, check the ID row on the DPU Info window.
-
-As described earlier, operation in *sync* mode or *async* mode has no effect on air
-brake behavior. In reality, additional remote modes such as *set-out*, *bv out*,
-and *isolate* would disable air brakes on remote units, but these modes are not
-present for simplicity.
-
-.. index::
-   single: ORTSDPBrakeSynchronization
-
-By default, Open Rails will treat remote groups as manned helpers who typically
-would not assist in train brake operations, so only independent brakes will synchronize.
-To enable train brake synchronization, the token ``engine(ORTSDPBrakeSynchronization(``
-should be used. The valid settings for ``ORTSDPBrakeSynchronization`` are as follows:
-
-- ``"Apply"``: DP units will reduce the brake pipe pressure locally to match the
-  equalizing reservoir pressure of the controlling locomotive. (The controlling
-  locomotive must also have the ``"Apply"`` setting.)
-- ``"Release"``: DP units will increase the brake pipe pressure locally to match
-  the equalizing reservoir pressure of the controlling locomotive. (The controlling
-  locomotive must also have the ``"Release"`` setting.)
-- ``"Emergency"``: DP units will vent the brake pipe to 0 if an emergency application
-  is triggered by the controlling locomotive. (The controlling locomotive must also
-  have the ``"Emergency"`` setting.)
-- ``"Independent"``: DP units will match the brake cylinder pressure of the
-  controlling locomotive, and will automatically bail-off automatic brake
-  applications if needed. (The controlling locomotive must also have the
-  ``"Independent"`` setting.)
-                - NOTE: Although ``"Independent"`` is enabled by default,
-                  if ``ORTSDPBrakeSynchronization`` is present in the .eng
-                  file but ``"Independent"`` is not specified as an option,
-                  independent brakes will NOT be synchronized.
-
-All settings can be combined as needed, simply place a comma between each setting
-in the string: ``ORTSDPBrakeSynchronization("Apply, Release, Emergency, Independent")``
-will simulate the configuration of most modern locomotives. Unlike other distributed power
-features, brake synchronization can be applied to any locomotive type to simulate a wide
-variety of braking systems.
-
 Distributed power info and commands can also be displayed and operated through 
 cabview controls, as explained :ref:`here <cabs-distributed-power>`
 
@@ -3161,13 +3115,16 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
    single: ORTSEmergencyResQuickRelease
    single: ORTSMainResPipeAuxResCharging
    single: ORTSBrakeRelayValveRatio
+   single: ORTSBrakeRelayValveInshot
    single: ORTSEngineBrakeRelayValveRatio
+   single: ORTSEngineBrakeRelayValveInshot
    single: ORTSBrakeRelayValveApplicationRate
    single: ORTSBrakeRelayValveReleaseRate
    single: ORTSMaxTripleValveCylinderPressure
    single: ORTSMaxServiceCylinderPressure
    single: ORTSMaxServiceApplicationRate
    single: ORTSTwoStageLowPressure
+   single: ORTSTwoStageRelayValveRatio
    single: ORTSTwoStageIncreasingSpeed
    single: ORTSTwoStageDecreasingSpeed
    single: ORTSHighSpeedReducingPressure
@@ -3240,7 +3197,15 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
   This is achieved via a relay valve which sets BC pressure proportionally.
   Relay valves may be installed to achieve higher brake cylinder pressures,
   dynamic brake blending or variable load compensation.
-- ``Wagon(ORTSBrakeRelayValveRatio`` -- Same as above, but for the engine brake
+- ``Wagon(ORTSBrakeRelayValveInshot`` -- Sets the "in-shot" pressure for the relay
+  valve. Relay valves with a ratio less than 1 may not produce sufficient pressure
+  to extend the brake cylinders. In-shot solves this problem by applying additional
+  pressure at a 1:1 ratio, regardless of the actual relay valve ratio. The pressure
+  defined here is the maximum amount of additional pressure to apply.
+- ``Wagon(ORTSEngineBrakeRelayValveRatio`` -- Same as ``ORTSBrakeRelayValveRatio``,
+  but for the engine brake.
+- ``Wagon(ORTSEngineBrakeRelayValveInshot`` -- Same as ``ORTSBrakeRelayValveInshot``,
+  but for the engine brake.
 - ``Wagon(ORTSBrakeRelayValveApplicationRate`` -- Brake cylinder pressure application
   rate achieved by the relay valve, if fitted.
 - ``Wagon(ORTSBrakeRelayValveReleaseRate`` -- Brake cylinder pressure release
@@ -3259,6 +3224,9 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
   is reduced at lower speeds and increased at higher speeds, sets the maximum cylinder
   pressure demanded when at slower speeds (defaults to 0, disabling two stage braking).
   For high speed, use ``ORTSMaxTripleValveCylinderPressure`` to set the pressure limit.
+- ``Wagon(ORTSTwoStageRelayValveRatio`` -- Alternatey, sets a relay valve ratio to
+  be used by the two stage system at low speeds. At high speed, the relay valve
+  uses the ratio set by ``ORTSBrakeRelayValveRatio``.
 - ``Wagon(ORTSTwoStageIncreasingSpeed`` -- The speed at which the two stage braking
   system changes from low pressure to high pressure during acceleration.
 - ``Wagon(ORTSTwoStageDecreasingSpeed`` -- The speed at which the two stage braking
 
@@ -201,7 +201,6 @@ public enum CABViewControlTypes
         ORTS_QUICKRELEASE,
         ORTS_OVERCHARGE,
         ORTS_AIR_FLOW_METER,
-        ORTS_TRAIN_AIR_FLOW_METER,
         ORTS_BATTERY_SWITCH_COMMAND_SWITCH,
         ORTS_BATTERY_SWITCH_COMMAND_BUTTON_CLOSE,
         ORTS_BATTERY_SWITCH_COMMAND_BUTTON_OPEN,