Merge pull request modelica#2409 from HansOlsson/ConvertModifiersPrec…

…edence

Give precendence for convertModifiers.

chapters/annotations.tex

@@ -1565,15 +1565,21 @@ \subsubsection{Conversion rules}\doublelabel{conversion-rules}
   If OldModifer list is empty it is added for all uses of the class
 \item
   If OldModifier\_i is cardinality(a)=0 the conversion will only be
-  applied for a component comp if there is no inside connection to
+  applied for a component comp if there are no inside connections to
   comp.a. This can be combined with other modifiers that are handled in
   the usual way.
 \item
   If OldModifier\_i is cardinality(a)=1 the conversion will only be
-  applied for a component comp if there is are any inside connections to
-  comp.a
+  applied for a component comp if there are any inside connections to
+  comp.a.
 \end{itemize}
 
+The converted modifiers and existing modifiers are merged such that the existing modifiers take precedence over the result of convertModifiers.
+A diagnostics is recommended if this merging removes some modifiers unless those modifiers are identical or it is the special case of an empty OldModifier list.
+\begin{nonnormative}
+This can be used to handle the case where the default value was changed.
+\end{nonnormative}
+
 Converting modifiers with cardinality is used to remove the deprecated
 operator cardinality from model libraries, and replace tests on
 cardinality in models by parameters explicitly enabling the different