Merge branch 'master' into shape_hierarchy

Author: SteelFill

Source/Contrib/ContentManager/ContentManagerGUI.cs

@@ -286,7 +286,8 @@ void searchBox_TextChanged(object sender, EventArgs e)
                         finds.Add(new SearchResult(content, path));
 
                     foreach (var child in ((ContentType[])Enum.GetValues(typeof(ContentType))).SelectMany(ct => content.Get(ct)))
-                        pending.Add(path + " / " + child.Name, child);
+                        if (!pending.ContainsKey(path + " / " + child.Name))
+                            pending.Add(path + " / " + child.Name, child);
 
                     foreach (var child in ContentLink.Matches(ContentInfo.GetText(content)).Cast<Match>().Select(linkMatch => content.Get(linkMatch.Groups[1].Value, (ContentType)Enum.Parse(typeof(ContentType), linkMatch.Groups[2].Value))).Where(linkContent => linkContent != null))
                         if (!pending.ContainsKey(path + " -> " + child.Name))

Source/Documentation/Manual/options.rst

@@ -863,21 +863,23 @@ are a problem for OR, which has a more sophisticated braking model. The
 problem usually is that the train brakes require a long time to release,
 and in some times do not release at all.
 
-.. index::
-   single: AirBrakesAirCompressorPowerRating
-
 The following checks and corrections are performed if the option is
-checked (only for single-pipe brake system):
+checked:
 
 - if the compressor restart pressure is smaller or very near to the max
   system pressure, the compressor restart pressure and if necessary the max
-  main reservoir pressure are increased;
+  main reservoir pressure are increased (single pipe air brakes only)
 - if the main reservoir volume is smaller than 0.3 m\ :sup:`3` and the
   engine mass is higher than 20 tons, the reservoir volume is raised to 0.78
-  m\ :sup:`3`;
-- the charging rate of the reservoir is derived from the .eng parameter
-  ``AirBrakesAirCompressorPowerRating`` (if this generates a value greater
-  than 0.5 psi/s) instead of using a default value.
+  m\ :sup:`3`
+- the maximum brake cylinder pressure will be reduced to the maximum pressure
+  possible from a full service train brake application if it was set above this
+  amount
+- any brake pipe leakage specified by ``TrainPipeLeakRate`` is limited to 2.5 psi/minute
+- the dynamic brake delay on electric locomotives is reduced to 2 seconds
+  if it was defined to be above 4 seconds
+- dynamic brake force left at the default value of 20kN will be increased to
+  half the locomotive's continuous force, or 150kN, whichever is lower
 
 For a full list of parameters, see :ref:`Developing ORTS Content - Parameters and Tokens<parameters_and_tokens>`