Automatic merge of T1.5.1-1288-g58b2418aa6 and 15 pull requests

- Pull request #980 at 86bcd3a: Downloading route content (Github, zip) second part 
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at e4ba0d7: Multiple Track Profiles & Superelevation Rewrite
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #981 at 10d297f: Multiple type trainset lightglows
- Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter
- Pull request #984 at 0f8122e: Player train switching for timetable mode
- Pull request #986 at 5d7e692: Fix: The TrainCarOperations window does not resize correctly.
- Pull request #987 at 232e8fb: fix: Temporary workaround for building with NET 5+
- Pull request #900 at c27f32d: DMI updates
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder

Author: openrails-bot

Source/Documentation/Manual/images/content-form-auto-installed.png

@@ -403,7 +403,7 @@ The default setting is checked.
 
 
 At game start, Electric - power connected
------------------------------------
+-----------------------------------------
 
 When this option is checked, stationary electric locos start the simulation with power available.
 Uncheck this option for a more detailed behaviour in which the player has to switch on electrical equipment.
@@ -594,36 +594,6 @@ pressing ``<F12>`` a file with the name dump.csv is generated in the
 configured Open Rails logging folder (placed on the Desktop by default).
 This file can be used for later analysis.
 
-.. _options-Content:
-
-Content Options
-===============
-
-.. image:: images/options-content.png
-
-This window allows you to add, remove or modify access to content.
-Each profile may be a folder containing one or more routes, or an MSTS
-installation. 
-Profiles located on other drives, or on a USB key, can be added even if they are
-not always available.
-
-Click on the *Add* button, and locate the desired installation. ORTS will
-automatically enter a proposed name in the *Name:* window that will
-appear in the *Installation set:* window on the main menu form. Modify
-the name if desired, then click *OK* to add the new path and name to
-Open Rails.
-
-Please do not store content or any files within the folder containing the Open Rails software.
-This is because the Updater operates by wiping out the contents of that folder before replacing it
-with a new updated version. 
-It would be unfriendly for users to lose content that they have stored there, so
-attempts to add a profile folder stored there are blocked and lead to an error message. 
-
-To remove an entry (note that this does not remove the installation
-itself!) select the entry in the window, and click *Delete*, then *OK*
-to close the window. To modify an entry, use the *Change...* button to
-access the location and make the necessary changes.
-
 .. _options-system:
 
 System Options

Source/Documentation/Manual/images/content-form-manually-installed.png

@@ -16,14 +16,14 @@ installation profile.
 
 .. image:: images/start-activity.png
 
-If not, then the next ``Download Content`` form is shown where you can download content. This form is described in the next `Content` chapter.
+If not, then the next ``Content`` form is shown where you can download content. This form is described in the next `Content` chapter.
 
 Content
 =======
 
-Clicking on the ``Content`` button makes the ``Download Content`` form popup (if not already there for a new empty Open Rails installation):
+Clicking on the ``Content`` button makes the ``Content`` form popup with the tab ``Auto Installed`` open:
 
-.. image:: images/download-content-form.png
+.. image:: images/content-form-auto-installed.png
 
 Select the route to be installed. This list will be enlarged by the OR team when suitable routes become available.
 However it is still possible to install routes manually as described in the next chapter.
@@ -49,8 +49,36 @@ name of one of the MSTS routes in your MSTS installation.
 
 You can easily add, remove or move other content profiles and select 
 among them (e.g. if you have any so-called ``mini-routes`` installed.). 
-Click on the ``Options`` button and select the ``Content`` tab. See the 
-:ref:`Content Options <options-Content>` discussed below for more instructions.
+
+For this select the ``Manually Installed`` tab on the ``Content`` form:
+
+.. image:: images/content-form-manually-installed.png
+
+This window allows you to add, remove or modify access to content.
+Each profile may be a folder containing one or more routes, or an MSTS
+installation. 
+Profiles located on other drives, or on a USB key, can be added even if they are
+not always available.
+
+Click on the *Add* button, and locate the desired installation. ORTS will
+automatically enter a proposed name in the *Route:* window that will
+appear in the *Installation set:* window on the main menu form. Modify
+the name if desired, then click *OK* to add the new path and name to
+Open Rails.
+
+Please do not store content or any files within the folder containing the Open Rails software.
+This is because the Updater operates by wiping out the contents of that folder before replacing it
+with a new updated version. 
+It would be unfriendly for users to lose content that they have stored there, so
+attempts to add a profile folder stored there are blocked and lead to an error message. 
+
+To remove an entry (note that this does not remove the installation
+itself!) select the entry in the window, and click *Delete*, then *OK*
+to close the window. 
+
+To modify an entry, select the route to be changed. Make the necessary changes in the ``Route`` and/or ``Path`` fields.
+The *Browse...* button can be used to chnage the Path by browsing. Click *OK*
+to close the window and save the changes to OR. 
 
 .. _updating-or: