Merge remote-tracking branch 'upstream/master'

Author: Chris Jakeman

Source/Documentation/Manual/cabs.rst

@@ -16,8 +16,50 @@ OR supports with a high degree of compatibility all functions available in
 MSTS for 2D cabs, and provides some significant enhancements described in the 
 next paragraphs.
 
-OR adds support for the ETCS circular speed gauge, as described 
-:ref:`here <options-etcs>`.
+
+ETCS circular speed gauge
+-------------------------
+
+You can add to the cabview a
+circular speed gauge accordingly to the European standard train control
+system ETCS.
+
+.. image:: images/options-etcs.png
+   :scale: 60 %
+   :align: center
+
+
+.. admonition:: For content developers
+
+    The gauge is added by the insertion of a block like the following
+    into the .cvf file::
+
+        Digital (
+            Type ( SPEEDOMETER DIGITAL )
+            Style ( NEEDLE )
+            Position ( 160 255 56 56 )
+            ScaleRange ( 0 250 )
+            Units ( KM_PER_HOUR )
+        )
+
+It is also possible to display the full ETCS display using the following block
+instead::
+
+		ScreenDisplay (
+			Type ( ORTS_ETCS SCREEN_DISPLAY )
+			Position ( 280 272 320 240 )
+			Units ( KM_PER_HOUR )
+			Parameters (
+				Mode FullSize
+			)
+		)
+		
+The following DMI size variants are available: FullSize (displays the whole DMI), SpeedArea
+(displays only the left part with information about distance and speed) and PlanningArea
+(displays only the planning area and navigation buttons).
+
+The information displayed in the DMI is controlled via the TCS script. For more details,
+see :ref:`C# engine scripting - Train Control System <features-scripting-tcs>`.
 
 .. _cabs-battery-switch:
 

Source/Documentation/Manual/driving.rst

@@ -25,6 +25,33 @@ your train will be in motion or stopped. To look around in the simulation, you
 can select different views using the keyboard, as described in 
 :ref:`Changing the View <driving-changing-view>`.
 
+Cab Letter-Boxing
+----------------
+
+OR manages not only cab interiors using 2D images in a MSTS-compatible
+way, but also supports 3D models. Most 2D cab images follow MSTS practice,
+being 1024 x 768 pixels to suit monitors with a 4:3 aspect ratio.
+
+.. image:: images/options-2dstretch_1.png
+
+So, the problem arises -- how to display these 4:3 cabs on a 16:9 or 16:10
+monitor?
+
+One possibility is to enlarge these images to fill the width of wider monitors, 
+as shown in the image below.
+
+In doing so, we lose a portion from the top and bottom of the image. 
+You can use the Up and Down Arrow keys to pan and reveal these missing portions.
+
+.. image:: images/options-2dstretch_2.png
+
+Instead of enlarging the image, OR can also 'letterbox' it by showing the full height
+and filling the missing space with black bars. 
+You can activate this mode in-game by pressing Ctrl+1.
+
+.. image:: images/options-2dstretch_3.png
+
+
 Open Rails Driving Controls
 ===========================