Skip to content

Commit 7b4ec67

Browse files
committed
Automatic merge of T1.5.1-1090-g9915d87ce6 and 21 pull requests
- Pull request #891 at 9a1d6b2: Auto save - Pull request #954 at 3efaf6d: Multiple Track Profiles & Superelevation Improvements - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #976 at 877cc94: Increased center of gravity range - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage - Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects - Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains - Pull request #977 at 6c1eb75: adds cache for SD files - Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 4a4b032: Downloading route content (Github, zip) - Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #952 at 8347095: Investigation - Pulsing graphics
23 parents 0a51ff5 + 9915d87 + 9a1d6b2 + 3efaf6d + 2452cb0 + e90a2aa + 877cc94 + d00beb9 + 8f695a4 + 1f5ba4c + a3bc9e7 + a519452 + 46d0472 + 6fa5eed + c35be87 + 5faea6f + 6c1eb75 + 91f3ee8 + c27f32d + 4a4b032 + dfc715e + f92de76 + 8347095 commit 7b4ec67

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Source/Documentation/Manual/options.rst

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,22 @@ The player can select the unit of measure of brake pressure in the
8383
When set to *automatic* the unit of measure is the same as that used in
8484
the cabview of the locomotive.
8585

86-
Other units
87-
-----------
86+
Other units of measure
87+
----------------------
8888

8989
This selects the units displayed for length, mass, pressure, etc. in the
9090
:ref:`F5 Train Driving Info Window and also the Alt+F5 HUD <driving-hud>` of the simulation.
9191

92+
These windows use the abbreviations *t-us* for short tons (2000 lb),
93+
*t-uk* for long tons (2240 lb) and *t* for metric tons (1000 kg).
94+
95+
The option *Route* sets the units based on the data in the route files. The route's TRK file may contain ``MilepostUnitsMiles ()`` or
96+
``MilepostUnitsKilometers ()`` to specify the units of distance for this route.
97+
9298
The option *Player's Location* sets the units according to the Windows
9399
*Language and Region* settings on the player's computer.
94100

95-
The option *Route* sets the units based on the data in the route files.
96-
The other options are self-explanatory.
97-
98-
These windows use the abbreviations *t-us* for short tons (2000 lb),
99-
*t-uk* for long tons (2240 lb) and *t* for metric tons (1000 kg).
101+
The other choices for units of measure are straightforward.
100102

101103
Note: The units displayed by the :ref:`F4 Track Monitor <driving-track-monitor>` (e.g. velocity and
102104
distance) are always based on data read from the route files.

0 commit comments

Comments
 (0)