diff --git a/Complex.mo b/Complex.mo index ea62a21702..d8591a2094 100644 --- a/Complex.mo +++ b/Complex.mo @@ -262,7 +262,7 @@ Documentation(info="

Complex number defined as a record containing real and imaginary part, utilizing operator overloading.

Licensed by the Modelica Association under the 3-Clause BSD License
-Copyright © 2010-2020, Modelica Association and contributors +Copyright © 2010-2020, Modelica Association and contributors

diff --git a/Modelica/Blocks/Continuous.mo b/Modelica/Blocks/Continuous.mo index a4ea50563f..6d13b5588a 100644 --- a/Modelica/Blocks/Continuous.mo +++ b/Modelica/Blocks/Continuous.mo @@ -75,7 +75,7 @@ y = - u

It might be difficult to initialize the integrator in steady state. This is discussed in the description of package -Continuous. +Continuous.

@@ -206,7 +206,7 @@ the integral away from the bounds.

It might be difficult to initialize the integrator in steady state. This is discussed in the description of package -Continuous. +Continuous.

@@ -570,7 +570,7 @@ Example: It might be difficult to initialize the PI component in steady state due to the integrator part. This is discussed in the description of package -Continuous. +Continuous.

"), Icon(coordinateSystem( @@ -698,7 +698,7 @@ block LimPID. The PID block can be initialized in different ways controlled by parameter initType. The possible values of initType are defined in -Modelica.Blocks.Types.Init. +Modelica.Blocks.Types.Init.

@@ -969,7 +969,7 @@ Via parameter controllerType either P, PID can be selected. If, e.g., PI is selected, all components belonging to the D-part are removed from the block (via conditional declarations). The example model -Modelica.Blocks.Examples.PID_Controller +Modelica.Blocks.Examples.PID_Controller demonstrates the usage of this controller. Several practical aspects of PID controller design are incorporated according to chapter 3 of the book: @@ -1042,7 +1042,7 @@ together) and using the following strategy: This block can be initialized in different ways controlled by parameter initType. The possible values of initType are defined in -Modelica.Blocks.Types.Init. +Modelica.Blocks.Types.Init.

@@ -1482,7 +1482,7 @@ different orders are shown in the next figure:

-\"Butterworth.png\"
@@ -1607,12 +1607,12 @@ y = ------------- * u
-\"CriticalDampingNormalized.png\"
-\"CriticalDampingNonNormalized.png\"
@@ -1852,7 +1852,7 @@ are shown in the next figure:

-\"LowPassOrder4Filters.png\"
@@ -1862,7 +1862,7 @@ starting from a steady state initial filter with initial input = 0.2:

-\"LowPassOrder4FiltersStepResponse.png\"
@@ -1883,7 +1883,7 @@ are shown in the next figure:

-\"HighPassOrder4Filters.png\"
@@ -1892,7 +1892,7 @@ The corresponding step responses of these high pass filters are shown in the next figure:

-\"HighPassOrder4FiltersStepResponse.png\"
@@ -1913,12 +1913,12 @@ CriticalDamping filters of order 1,2,3:

-\"CriticalDampingNormalized.png\"
-\"CriticalDampingNonNormalized.png\"
@@ -4459,7 +4459,7 @@ described by differential equations. All blocks of this package can be initialized in different ways controlled by parameter initType. The possible values of initType are defined in -Modelica.Blocks.Types.Init: +Modelica.Blocks.Types.Init:

diff --git a/Modelica/Blocks/Interaction.mo b/Modelica/Blocks/Interaction.mo index ff30b3fa07..86c0c184d3 100644 --- a/Modelica/Blocks/Interaction.mo +++ b/Modelica/Blocks/Interaction.mo @@ -62,13 +62,13 @@ name of the variable value that is displayed is also shown below the icon):

-\"RealValue.png\"

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.RealNetwork1. +Modelica.Blocks.Examples.RealNetwork1.

")); end RealValue; @@ -126,13 +126,13 @@ name of the variable value that is displayed is also shown below the icon):

-\"IntegerValue.png\"

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.IntegerNetwork1. +Modelica.Blocks.Examples.IntegerNetwork1.

")); end IntegerValue; @@ -189,13 +189,13 @@ name of the variable value that is displayed is also shown below the icon):

-\"BooleanValue.png\"

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); end BooleanValue; diff --git a/Modelica/Blocks/Interfaces.mo b/Modelica/Blocks/Interfaces.mo index 9676f0d186..10c703c94a 100644 --- a/Modelica/Blocks/Interfaces.mo +++ b/Modelica/Blocks/Interfaces.mo @@ -198,7 +198,7 @@ Connector with one output signal of type Integer. Documentation(info="

Real input connector that is used for a vector of connectors, -for example PartialRealMISO, +for example PartialRealMISO, and has therefore a different icon as RealInput connector.

")); @@ -229,7 +229,7 @@ and has therefore a different icon as RealInput connector.

Integer input connector that is used for a vector of connectors, -for example PartialIntegerMISO, +for example PartialIntegerMISO, and has therefore a different icon as IntegerInput connector.

")); @@ -259,7 +259,7 @@ and has therefore a different icon as IntegerInput connector. Documentation(info="

Boolean input connector that is used for a vector of connectors, -for example PartialBooleanMISO, +for example PartialBooleanMISO, and has therefore a different icon as BooleanInput connector.

")); @@ -289,7 +289,7 @@ and has therefore a different icon as BooleanInput connector. Documentation(info="

Real output connector that is used for a vector of connectors, -for example DeMultiplex, +for example DeMultiplex, and has therefore a different icon as RealOutput connector.

")); @@ -581,7 +581,7 @@ Modelica 3.3 introduced synchronous operators that avoid the need to manually pr

Block has one input and one output signal which are sampled due to the defined samplePeriod parameter. -See the base-class DiscreteBlock for more information. +See the base-class DiscreteBlock for more information.

")); end DiscreteSISO; @@ -602,7 +602,7 @@ See the base-class Block has a input and a output signal vector which are sampled due to the defined samplePeriod parameter. -See the base-class DiscreteBlock for more information. +See the base-class DiscreteBlock for more information.

")); end DiscreteMIMO; @@ -622,7 +622,7 @@ See the base-class samplePeriod parameter. -See the base-class DiscreteBlock for more information. +See the base-class DiscreteBlock for more information.

")); @@ -662,7 +662,7 @@ Real output signal that are sampled due to the defined samplePeriod parameter. The block is designed to be used as base class for a corresponding controller. -See the base-class DiscreteBlock for more information. +See the base-class DiscreteBlock for more information.

")); end SVdiscrete; @@ -707,7 +707,7 @@ Real output signal vector. The vector signals are sampled due to the defined samplePeriod parameter. The block is designed to be used as base class for a corresponding controller. -See the base-class DiscreteBlock for more information. +See the base-class DiscreteBlock for more information.

")); end MVdiscrete; @@ -1399,7 +1399,7 @@ of noise blocks.
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
diff --git a/Modelica/Blocks/Logical.mo b/Modelica/Blocks/Logical.mo index 79704e5f8c..0f62f3de7c 100644 --- a/Modelica/Blocks/Logical.mo +++ b/Modelica/Blocks/Logical.mo @@ -394,7 +394,7 @@ this block is usually identically to false, because the output may only be true at an event instant, but not during continuous integration. In order to check that this component is actually working as expected, one should connect its output to, e.g., -component Modelica.Blocks.Discrete.TriggeredSampler. +component Modelica.Blocks.Discrete.TriggeredSampler.

"), Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100}, {100,100}}), graphics={ @@ -609,7 +609,7 @@ output signal y:

-\"Hysteresis.png\"
@@ -733,7 +733,7 @@ input signal u.

-\"TriggeredTrapezoid.png\"
@@ -795,7 +795,7 @@ When the input becomes false, the timer stops and the output is

-\"Timer.png\"
@@ -952,7 +952,7 @@ either abort with an error (if assertionLevel is set to assertionLevel is set to warning). The message will be reported in either case. For further information, refer to the documentation of -ModelicaReference.Operators.'assert()' +ModelicaReference.Operators.'assert()' – an operator which this block is based on.

@@ -1016,7 +1016,7 @@ network built with package Logical is shown in the next figure:

-\"LogicalNetwork1.png\"
diff --git a/Modelica/Blocks/Math.mo b/Modelica/Blocks/Math.mo index 0ffb0e28fd..621a56f9dd 100644 --- a/Modelica/Blocks/Math.mo +++ b/Modelica/Blocks/Math.mo @@ -523,7 +523,7 @@ Exchange input and output signals of a block, i.e., the previous block inputs become block outputs and the previous block outputs become block inputs. This block is used to construct inverse models. Its usage is demonstrated in example: -Modelica.Blocks.Examples.InverseModel. +Modelica.Blocks.Examples.InverseModel.

@@ -649,7 +649,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.RealNetwork1. +Modelica.Blocks.Examples.RealNetwork1.

@@ -690,7 +690,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.RealNetwork1. +Modelica.Blocks.Examples.RealNetwork1.

@@ -778,7 +778,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.RealNetwork1. +Modelica.Blocks.Examples.RealNetwork1.

")); @@ -1211,7 +1211,7 @@ y = sin( u );
-\"sin.png\"
@@ -1259,7 +1259,7 @@ y = cos( u );
-\"cos.png\"
@@ -1306,7 +1306,7 @@ y = tan( u );
-\"tan.png\"
@@ -1357,7 +1357,7 @@ Otherwise an error occurs.

-\"atan.png\"
@@ -1407,7 +1407,7 @@ Otherwise an error occurs.

-\"acos.png\"
@@ -1453,7 +1453,7 @@ y= atan( u );
-\"atan.png\"
@@ -1514,7 +1514,7 @@ block Atan gives a solution in the range

-\"atan2.png\"
@@ -1561,7 +1561,7 @@ y = sinh( u );
-\"sinh.png\"
@@ -1609,7 +1609,7 @@ y = cosh( u );
-\"cosh.png\"
@@ -1655,7 +1655,7 @@ y = tanh( u );
-\"tanh.png\"
@@ -1702,7 +1702,7 @@ y = exp( u );
-\"exp.png\"
@@ -1841,7 +1841,7 @@ zero or negative.

-\"log.png\"
@@ -1891,7 +1891,7 @@ zero or negative.

-\"log10.png\"
@@ -2320,7 +2320,7 @@ explicitly set to 0.0, if the mean value results in a negative value. annotation (Documentation(info="

This block calculates the rectified mean of the input signal u over the given period 1/f, using the -mean block. +mean block.

Note: The output is updated after each period defined by 1/f. @@ -2365,7 +2365,7 @@ Note: The output is updated after each period defined by 1/f.
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -2381,15 +2381,15 @@ Note: The output is updated after each period defined by 1/f. y = ------------------------ time - startTime -

This can be used to determine the empirical expectation value of a random signal, such as generated by the Noise blocks.

+

This can be used to determine the empirical expectation value of a random signal, such as generated by the Noise blocks.

The parameter t_eps is used to avoid large fluctuations but can be set to zero (the mean value computation starts at <simulation start time> but is only returned after an additional t_eps and before that time instant y = u).

-

See also the Mean block for a sampled implementation.

+

See also the Mean block for a sampled implementation.

This block is demonstrated in the examples -UniformNoiseProperties and -NormalNoiseProperties. +UniformNoiseProperties and +NormalNoiseProperties.

"), Icon(coordinateSystem( preserveAspectRatio=false, extent={{-100,-100},{100,100}}), @@ -2447,7 +2447,7 @@ This block is demonstrated in the examples annotation (Documentation(info="

This block calculates the root mean square of the input signal u over the given period 1/f, using the -mean block. +mean block.

Note: The output is updated after each period defined by 1/f. @@ -2608,7 +2608,7 @@ For differentiable input signals, an extremum is detected if the derivative of t

To handle non-differentiable input signals, the input signal u is conditioned by a first order with time constant T. -Like in the derivative block, +Like in the derivative block, the derivative of the input signal is approximated by (u - x)/T. This way even steps with local extrema just before and after the step are taken into account.

@@ -2686,7 +2686,7 @@ Additionally, when the simulation terminates, y_min and y_max
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -2710,8 +2710,8 @@ starts at <simulation start time> + t_eps and before that time in

This block is demonstrated in the examples -UniformNoiseProperties and -NormalNoiseProperties. +UniformNoiseProperties and +NormalNoiseProperties.

"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, @@ -2777,7 +2777,7 @@ This block is demonstrated in the examples - + - + - + @@ -49,7 +49,7 @@ spatial domain which also applies to polyphase systems. @@ -64,9 +64,9 @@ In symmetrical polyphase systems odd and even phase numbers have to be distingui
Odd number of phases

-For a symmetrical polyphase system with +For a symmetrical polyphase system with phases the displacement in the time and spatial domain is -, +, as depicted in Fig. 1 and 2.

@@ -74,31 +74,31 @@ as depicted in Fig. 1 and 2. Mathematically, this symmetry is expressed in terms of phase currents by:

-
+

The orientation of the winding axis of such winding is given by:

-
+
Even number of phases

In the current implementation of the FundamentalWave library, phase numbers equal to the power of two are not supported. However, any other polyphase system with even -an phase number, , +an phase number, , can be recursively split into various symmetrical systems with odd phase numbers, as depicted in Fig. 3 and 4. The displacement between the two symmetrical systems is -. -A function for calculating the symmetricOrientation is available. +. +A function for calculating the symmetricOrientation is available.

- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -2792,7 +2792,7 @@ This block is demonstrated in the examples y = sqrt( variance(u) )

-The Variance block is used to +The Variance block is used to calculate variance(u).

The parameter t_eps is used to guard against division by zero (the computation of the standard deviation @@ -2801,8 +2801,8 @@ starts at <simulation start time> + t_eps and before that time in

This block is demonstrated in the examples -UniformNoiseProperties and -NormalNoiseProperties. +UniformNoiseProperties and +NormalNoiseProperties.

"), Icon(graphics={ @@ -2911,7 +2911,7 @@ This block is demonstrated in the examples annotation (Documentation(info="

This block calculates the root mean square and the phase angle of a single harmonic k of the input signal u over the given period 1/f, using the -mean block. +mean block.

Note: The output is updated after each period defined by 1/f. @@ -3012,7 +3012,7 @@ Consider that the input u consists of harmonic RMS components The total RMS component is then determined by:

- +

@@ -3026,13 +3026,13 @@ calculates the THD typically used for the assessment of audio signals.

If useFirstHarmonic = true, the total higher harmonic content (harmonic order numbers > 1) refers to the RMS value of the fundamental wave:
- +

If useFirstHarmonic = false, the total higher harmonic content (harmonic order numbers > 1) refers to the total RMS:
- +

@@ -3077,8 +3077,8 @@ calculations are indicated by valid = true. end when; annotation (Documentation(info="

-This block samples the input signal, calculates the Fast Fourier Transform by function Math.realFFT, -and (when simulation terminates) writes the output to result file resultFileName by function Math.realFFTwriteToFile. +This block samples the input signal, calculates the Fast Fourier Transform by function Math.realFFT, +and (when simulation terminates) writes the output to result file resultFileName by function Math.realFFTwriteToFile.

The number of sampling points as well as the samplePeriod is calculated from desired maximum frequency f_max and frequency resolution f_res. diff --git a/Modelica/Blocks/MathBoolean.mo b/Modelica/Blocks/MathBoolean.mo index 4dbfae5479..0c1150df1d 100644 --- a/Modelica/Blocks/MathBoolean.mo +++ b/Modelica/Blocks/MathBoolean.mo @@ -85,7 +85,7 @@ y = if i==0 then (if use_pre_

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); @@ -116,7 +116,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

@@ -151,7 +151,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

@@ -188,7 +188,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

@@ -224,7 +224,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

@@ -260,7 +260,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

@@ -294,7 +294,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); end Not; @@ -318,7 +318,7 @@ time instant. At all other time instants, y = false.

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); @@ -345,7 +345,7 @@ time instant. At all other time instants, y = false.

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); @@ -374,7 +374,7 @@ time instant. At all other time instants, y = false.

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); @@ -427,16 +427,16 @@ is shown in the next figure.

-\"OnDelay1.png\"
-\"OnDelay2.png\"

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.BooleanNetwork1. +Modelica.Blocks.Examples.BooleanNetwork1.

")); diff --git a/Modelica/Blocks/MathInteger.mo b/Modelica/Blocks/MathInteger.mo index 2bb0ba9b70..44085bc528 100644 --- a/Modelica/Blocks/MathInteger.mo +++ b/Modelica/Blocks/MathInteger.mo @@ -86,7 +86,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.IntegerNetwork1. +Modelica.Blocks.Examples.IntegerNetwork1.

")); @@ -124,7 +124,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.IntegerNetwork1. +Modelica.Blocks.Examples.IntegerNetwork1.

@@ -164,7 +164,7 @@ connectorSizing annotation).

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.IntegerNetwork1. +Modelica.Blocks.Examples.IntegerNetwork1.

@@ -272,7 +272,7 @@ port has a rising edge.

The usage is demonstrated, e.g., in example -Modelica.Blocks.Examples.IntegerNetwork1. +Modelica.Blocks.Examples.IntegerNetwork1.

")); diff --git a/Modelica/Blocks/Noise.mo b/Modelica/Blocks/Noise.mo index 8857e34e50..8edfcde567 100644 --- a/Modelica/Blocks/Noise.mo +++ b/Modelica/Blocks/Noise.mo @@ -65,7 +65,7 @@ into your model and specify the seed.
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -76,7 +76,7 @@ into your model and specify the seed.
", info="

-When using one of the blocks of sublibrary Noise, +When using one of the blocks of sublibrary Noise, on the same or a higher hierarchical level, Noise.GlobalSeed must be dragged resulting in a declaration

@@ -95,7 +95,7 @@ hierarchical level. The following options can be selected:
Icon Description
useAutomaticSeed=false (= default):
A fixed global seed is defined with Integer parameter fixedSeed. The value of fixedSeed is displayed in the icon. By default all Noise blocks use fixedSeed for initialization of their @@ -108,7 +108,7 @@ hierarchical level. The following options can be selected: fixedSeed is changed from the environment for every simulation, in order to produce different noise at every simulation run.
useAutomaticSeed=true:
An automatic global seed is computed by using the ID of the process in which the simulation takes place and the current local time. As a result, the global seed @@ -117,7 +117,7 @@ hierarchical level. The following options can be selected: with minimal effort (just performing many simulation runs) where every simulation run uses a different noise.
enableNoise=false:
The noise in all Noise instances is switched off and the blocks output a constant signal all the time (usually zero). This option is useful, if a model shall be @@ -127,23 +127,23 @@ hierarchical level. The following options can be selected:

Additionally, the globalSeed instance calls function -initializeImpureRandom +initializeImpureRandom to initialize the impure random number generators -(impureRandom and -impureRandomInteger). +(impureRandom and +impureRandomInteger). The return value of this function is stored in parameter id_impure. Whenever one of the impure random number generators need to be called, \"globalSeed.id_impure\" has to be given as input argument.

Note, the usage of this block is demonstrated with examples -AutomaticSeed and -ImpureGenerator. +AutomaticSeed and +ImpureGenerator.

Please note that only one globalSeed instance may be defined in the model due to the initialization -of the impure random number generators with initializeImpureRandom! +of the impure random number generators with initializeImpureRandom! So, the block will usually reside on the top level of the model.

")); @@ -185,13 +185,13 @@ So, the block will usually reside on the top level of the model. Documentation(info="

A summary of the common properties of the noise blocks is provided in the documentation of package -Blocks.Noise. +Blocks.Noise. This UniformNoise block generates reproducible, random noise at its output according to a uniform distribution. This means that random values are uniformly distributed within the range defined by parameters -y_min and y_max (see example Noise.UniformNoiseProperties). +y_min and y_max (see example Noise.UniformNoiseProperties). By default, two or more instances produce different, uncorrelated noise at the same time instant. The block can only be used if on the same or a higher hierarchical level, -model Blocks.Noise.GlobalSeed +model Blocks.Noise.GlobalSeed is dragged to provide global settings for all instances.

", revisions=" @@ -203,7 +203,7 @@ is dragged to provide global settings for all instances.
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -246,13 +246,13 @@ is dragged to provide global settings for all instances. Documentation(info="

A summary of the common properties of the noise blocks is provided in the documentation of package -Blocks.Noise. +Blocks.Noise. This NormalNoise block generates reproducible, random noise at its output according to a normal distribution. This means that random values are normally distributed with expectation value mu and standard deviation sigma. -(see example Examples.Noise.NormalNoiseProperties). +(see example Examples.Noise.NormalNoiseProperties). By default, two or more instances produce different, uncorrelated noise at the same time instant. The block can only be used if on the same or a higher hierarchical level, -model Blocks.Noise.GlobalSeed +model Blocks.Noise.GlobalSeed is dragged to provide global settings for all instances.

", revisions=" @@ -264,7 +264,7 @@ is dragged to provide global settings for all instances. @@ -53,33 +53,33 @@ The eddy current loss model with respect to fundamental wave effects is designed

Due to the nature of eddy current losses, which can be represented by symmetric conductors in an equivalent electric circuit (Fig. 1), the respective -number of phases \"m\" has to be taken into account. -Assume that the \"m\" conductances -of the equivalent circuit are \"G_c\", +number of phases \"m\" has to be taken into account. +Assume that the \"m\" conductances +of the equivalent circuit are \"G_c\", the conductance for the eddy current loss model is determined by

-\"GGc\"

-where \"N\" is the number of turns of the symmetric electromagnetic coupling. +where \"N\" is the number of turns of the symmetric electromagnetic coupling.

-

For such an \"m\" phase system +

For such an \"m\" phase system the relationship between the voltage and current space phasors and the magnetic flux and magnetic potential difference phasor is

-\"vPhi\",
-\"iV_m\", +\"vPhi\",
+\"iV_m\",

-where \"v_k\" -and \"i_k\" +where \"v_k\" +and \"i_k\" are the phase voltages and currents, respectively.

@@ -87,7 +87,7 @@ are the phase voltages and currents, respectively. The dissipated loss power

-\"lossPower\" +\"lossPower\"

can be determined for the space phasor @@ -95,7 +95,7 @@ relationship of the voltage and current space phasor.

See also

-

FluxTubes.Basic.EddyCurrent

+

FluxTubes.Basic.EddyCurrent

")); end EddyCurrent; diff --git a/Modelica/Magnetic/FundamentalWave/Components/Idle.mo b/Modelica/Magnetic/FundamentalWave/Components/Idle.mo index d3b65116ff..abe9620198 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/Idle.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/Idle.mo @@ -18,8 +18,8 @@ This is a simple idle running branch.

See also

-Short, -Crossing +Short, +Crossing

")); diff --git a/Modelica/Magnetic/FundamentalWave/Components/Permeance.mo b/Modelica/Magnetic/FundamentalWave/Components/Permeance.mo index 9d0e1d9640..d4c56ecd94 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/Permeance.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/Permeance.mo @@ -20,11 +20,11 @@ equation textString="%name")}), Documentation(info="

The salient permeance models the relationship between the complex magnetic potential difference -\"V_m.png\" and the complex magnetic flux : +\"V_m.png\" and the complex magnetic flux :

-\"permeance.png\" +\"permeance.png\"
")); end Permeance; diff --git a/Modelica/Magnetic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo b/Modelica/Magnetic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo index 5fcaade60d..23352991cd 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo @@ -97,7 +97,7 @@ equation textString="%name")}), Documentation(info="

-Each phase of an phase winding has an effective number of turns, and an respective winging angle and a phase current . +Each phase of an phase winding has an effective number of turns, and an respective winging angle and a phase current .

@@ -105,7 +105,7 @@ The total complex magnetic potential difference of the polyphase winding is dete

-   +  

@@ -113,19 +113,19 @@ In this equation each contribution of a winding magnetomotive force on the total

-The voltages induced in each winding depend on the cosines between the orientation of the winding and the angle of the complex magnetic flux. Additionally, the magnitudes of the induced voltages are proportional to the respective number of turns. This relationship can be modeled by means of

+The voltages induced in each winding depend on the cosines between the orientation of the winding and the angle of the complex magnetic flux. Additionally, the magnitudes of the induced voltages are proportional to the respective number of turns. This relationship can be modeled by means of

-   +  

-

for and is also illustrated by the following figure:

+

for and is also illustrated by the following figure:

- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -324,7 +324,7 @@ is dragged to provide global settings for all instances. Documentation(info="

A summary of the common properties of the noise blocks is provided in the documentation of package -Blocks.Noise. +Blocks.Noise. This TruncatedNormalNoise block generates reproducible, random noise at its output according to a truncated normal distribution. This means that normally distributed random values are truncated to the band y_min ... y_max. Measurement noise has often this distribution form. @@ -337,10 +337,10 @@ standard deviation = (y_max - y_min)/6 (= 99.7 % of the non-truncated normal dis

-For an example see Examples.Noise.Distributions. +For an example see Examples.Noise.Distributions. By default, two or more instances produce different, uncorrelated noise at the same time instant. The block can only be used if on the same or a higher hierarchical level, -model Blocks.Noise.GlobalSeed +model Blocks.Noise.GlobalSeed is dragged to provide global settings for all instances.

", revisions=" @@ -352,7 +352,7 @@ is dragged to provide global settings for all instances. - - - - - - - diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/ReleaseNotes.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/ReleaseNotes.mo index c667cb7ca0..a3d7226513 100644 --- a/Modelica/Magnetic/FluxTubes/UsersGuide/ReleaseNotes.mo +++ b/Modelica/Magnetic/FluxTubes/UsersGuide/ReleaseNotes.mo @@ -6,30 +6,30 @@ class ReleaseNotes "Release Notes"
Version 3.2.2, 2014-12-05 (Johannes Ziske, Thomas Bödrich)
Version 3.2.2, 2014-01-15 (Christian Kral)
Version 1.5, 2013-01-04 (Martin Otter, Thomas Bödrich, Johannes Ziske)
diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/ReluctanceForceCalculation.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/ReluctanceForceCalculation.mo index 31625fe0ad..3251a7a1a8 100644 --- a/Modelica/Magnetic/FluxTubes/UsersGuide/ReluctanceForceCalculation.mo +++ b/Modelica/Magnetic/FluxTubes/UsersGuide/ReluctanceForceCalculation.mo @@ -10,7 +10,7 @@ Generally, the thrust F developed by a translatory electro-magneto-mech

-\"Equation +\"Equation

@@ -18,25 +18,25 @@ Generally, the thrust F developed by a translatory electro-magneto-mech

-\"Equation +\"Equation

-where nlinear is the number of flux tube elements with constant relative permeability that change its permeance Gm i with armature position (index i), Vm i the magnetic voltage across each respective flux tube and dGm i/dx the derivative of the respective permeances with respect to armature position. Transition from the general formula based on magnetic co-energy to the latter one is outlined in [KEQ+12] for the reciprocal of the permeance, i.e., for the magnetic reluctance Rm. Note that +where nlinear is the number of flux tube elements with constant relative permeability that change its permeance Gm i with armature position (index i), Vm i the magnetic voltage across each respective flux tube and dGm i/dx the derivative of the respective permeances with respect to armature position. Transition from the general formula based on magnetic co-energy to the latter one is outlined in [KEQ+12] for the reciprocal of the permeance, i.e., for the magnetic reluctance Rm. Note that

-\"Transition +\"Transition

with Φi being the magnetic flux through each respective flux tube element.

-Flux tube elements with non-linear material characteristics μr(B) in magnetic network models do not restrict the usability of the above equation. However, it is required that these nonlinear flux tube elements do not change its shape with armature motion (e.g., portion of a solenoid plunger where the magnetic flux passes through in axial direction). This limitation is not a strong one, since the permeance of nonlinear, but highly permeable ferromagnetic flux tube elements and its change with armature position compared to that of air gap flux tubes can be neglected in most cases. Because of this constraint, the dimensions of possibly nonlinear flux tube elements in sub-package Shapes.FixedShape are fixed, whereas the dimension in direction of motion of the linear flux tube elements in sub-package Shapes.Force can vary during simulation. For the flux tubes defined in this package with their rather simple shapes, the derivative dGm/dx is given analytically. For more complex shapes and variations of dimensions with armature motion, it must be provided analytically during model development, preferably by extending the partial model BaseClasses.Force. +Flux tube elements with non-linear material characteristics μr(B) in magnetic network models do not restrict the usability of the above equation. However, it is required that these nonlinear flux tube elements do not change its shape with armature motion (e.g., portion of a solenoid plunger where the magnetic flux passes through in axial direction). This limitation is not a strong one, since the permeance of nonlinear, but highly permeable ferromagnetic flux tube elements and its change with armature position compared to that of air gap flux tubes can be neglected in most cases. Because of this constraint, the dimensions of possibly nonlinear flux tube elements in sub-package Shapes.FixedShape are fixed, whereas the dimension in direction of motion of the linear flux tube elements in sub-package Shapes.Force can vary during simulation. For the flux tubes defined in this package with their rather simple shapes, the derivative dGm/dx is given analytically. For more complex shapes and variations of dimensions with armature motion, it must be provided analytically during model development, preferably by extending the partial model BaseClasses.Force.

-The sub-package Shapes.Leakage contains flux tube shapes typical for leakage flux around prismatic or cylindrical poles. Since the permeance of these flux tubes does not change with armature position, they do not contribute to a reluctance actuator's thrust. +The sub-package Shapes.Leakage contains flux tube shapes typical for leakage flux around prismatic or cylindrical poles. Since the permeance of these flux tubes does not change with armature position, they do not contribute to a reluctance actuator's thrust.

")); diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/package.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/package.mo index 18329be98e..a5e6a518e8 100644 --- a/Modelica/Magnetic/FluxTubes/UsersGuide/package.mo +++ b/Modelica/Magnetic/FluxTubes/UsersGuide/package.mo @@ -10,6 +10,6 @@ This library contains components for modelling of electromagnetic devices with l This user's guide gives a short introduction to the underlying concept of magnetic flux tubes, summarizes the calculation of magnetic reluctance forces from lumped magnetic network models and lists reference literature.

-Examples illustrates the usage of magnetic network models with simple models from different fields of application.

+Examples illustrates the usage of magnetic network models with simple models from different fields of application.

")); end UsersGuide; diff --git a/Modelica/Magnetic/FluxTubes/package.mo b/Modelica/Magnetic/FluxTubes/package.mo index 5ed1e0da3c..95e33c281f 100644 --- a/Modelica/Magnetic/FluxTubes/package.mo +++ b/Modelica/Magnetic/FluxTubes/package.mo @@ -11,10 +11,10 @@ package FluxTubes "Library for modelling of electromagnetic devices with lumped This library contains components for modelling of electromagnetic devices with lumped magnetic networks. Those models are suited for both rough design of the magnetic subsystem of a device as well as for efficient dynamic simulation at system level together with neighbouring subsystems. At present, components and examples for modelling of translatory electromagnetic and electrodynamic actuators are provided. If needed, these components can be adapted to network modelling of rotational electrical machines.

-User's Guide gives a short introduction to the underlying concept of magnetic flux tubes, summarizes the calculation of magnetic reluctance forces from lumped magnetic network models and lists reference literature. +User's Guide gives a short introduction to the underlying concept of magnetic flux tubes, summarizes the calculation of magnetic reluctance forces from lumped magnetic network models and lists reference literature.

-Examples illustrates the usage of magnetic network models with simple models from different fields of application. +Examples illustrates the usage of magnetic network models with simple models from different fields of application.

@@ -22,7 +22,7 @@ Copyright © 2005-2020, Modelica Association and contributors

", revisions="

-See release notes +See release notes

"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100.0,-100.0},{100.0,100.0}}), graphics={ Polygon( diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo index 27c95032d3..1c6abd4b90 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo @@ -9,8 +9,8 @@ model PermanentMagnet Simple model of a permanent magnet, containing:

The permanent magnet is modeled by a magnetic potential difference. The internal reluctance of the permanent magnet is not taken into account. The internal reluctance needs to be modeled outside the permanent magnet model, e.g., by the total machine reluctance considered in the air gap model. diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo index 5d3fabb9a8..0a3cfe44cf 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo @@ -87,16 +87,16 @@ This salient air gap model can be used for machines with uniform air gaps and fo

For the mechanical interaction of the air gap model with the stator and the rotor is equipped with two -rotational connectors. The torques acting on both connectors have the same absolute values but different signs. The difference between the stator and the rotor angle, -, is required for the transformation of the magnetic stator quantities to the rotor side.

+rotational connectors. The torques acting on both connectors have the same absolute values but different signs. The difference between the stator and the rotor angle, +, is required for the transformation of the magnetic stator quantities to the rotor side.

The air gap model has two magnetic stator and two magnetic rotor -ports. The magnetic potential difference and the magnetic flux of the stator (superscript s) are transformed to the rotor fixed reference frame (superscript r). The effective reluctances of the main field with respect to the d- and q-axis are considered then in the balance equations +ports. The magnetic potential difference and the magnetic flux of the stator (superscript s) are transformed to the rotor fixed reference frame (superscript r). The effective reluctances of the main field with respect to the d- and q-axis are considered then in the balance equations

-   +  

@@ -106,17 +106,17 @@ according to the following figure.

- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
@@ -398,7 +398,7 @@ is dragged to provide global settings for all instances. Documentation(info="

A summary of the common properties of the noise blocks is provided in the documentation of package -Blocks.Noise. +Blocks.Noise. This BandLimitedWhiteNoise block generates reproducible, random noise at its output according to a band-limited white noise distribution. This is performed by using a normal distribution with mu=0 and sigma = sqrt(noisePower/samplePeriod). @@ -454,7 +454,7 @@ frequency bandwidth 1/samplePeriod: signal power = signal variance = noise

-Example Examples.Noise.DrydenContinuousTurbulence +Example Examples.Noise.DrydenContinuousTurbulence demonstrates how to utilize this block to model wind gust.

")); @@ -470,14 +470,14 @@ of a control system and re-simulating, it is important that the noise does not c otherwise it is hard to determine whether the changed control system or the differently computed noise has changed the behaviour of the controlled system). Many examples how to use the Noise blocks are provided in sublibrary -Blocks.Examples.Noise. +Blocks.Examples.Noise.

Global Options

When using one of the blocks of this sublibrary, on the same or a higher level, -block Noise.GlobalSeed +block Noise.GlobalSeed must be dragged resulting in a declaration

@@ -489,7 +489,7 @@ must be dragged resulting in a declaration This block is used to define global options that hold for all Noise block instances (such as a global seed for initializing the random number generators, and a flag to switch off noise). Furthermore, the impure random number generator -impureRandom is initialized here. +impureRandom is initialized here.

@@ -522,12 +522,12 @@ When using a noise block of this package, at a minimum the following parameters

-As a simple demonstration, see example Blocks.Examples.Noise.UniformNoise. +As a simple demonstration, see example Blocks.Examples.Noise.UniformNoise. In the next diagram, a simulation result is shown for samplePeriod=0.02 s and uniform distribution with y_min=-1, y_max=3:

- +

Advanced tab: General settings

@@ -619,7 +619,7 @@ numbers in the range 0.0 .. 1.0 (and these random numbers are transformed afterwards, see below). This sublibrary uses the xorshift random number generation suite developed in 2014 by Sebastiano Vigna (for details see http://xorshift.di.unimi.it and -Math.Random.Generators). +Math.Random.Generators). These random number generators have excellent statistical properties, produce quickly statistically relevant random numbers, even if starting from a bad initial seed, and have a reasonable length of the internal state @@ -631,7 +631,7 @@ The random number generator with a length of 33 Integer is used from the impure generator. It is suited even for massively parallel simulations where every simulation computes a large number of random values. More details of the random number generators are described in the documentation of package -Math.Random.Generators. +Math.Random.Generators.

Distributions

@@ -645,7 +645,7 @@ compared with its truncated version:

- +

@@ -653,7 +653,7 @@ The corresponding inverse cumulative distribution functions are shown in the nex

- +

@@ -666,7 +666,7 @@ when modeling noise that is known to be in a particular range, say ± 0.1 then with the TruncatedNormal distribution it is guaranteed that random values are only generated in this band). More details of truncated distributions are given in the documentation of package -Math.Distributions. +Math.Distributions.

", revisions=" @@ -677,7 +677,7 @@ distributions are given in the documentation of package
- \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
diff --git a/Modelica/Blocks/Nonlinear.mo b/Modelica/Blocks/Nonlinear.mo index 57cb86023f..4a176d9781 100644 --- a/Modelica/Blocks/Nonlinear.mo +++ b/Modelica/Blocks/Nonlinear.mo @@ -481,7 +481,7 @@ in a large norm of the system matrix [A,B;C,D] and therefore in unreliable numerical computations. When setting parameter balance = true, a state transformation is performed that considerably reduces the norm of the system matrix. This is performed without introducing round-off errors. For details see -function balanceABC. +function balanceABC. As a result, both the simulation of the PadeDelay block, and especially its linearization becomes more reliable.

diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index a75cd1203f..03f6be1d7a 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -155,7 +155,7 @@ The Real output y is a clock signal:

-\"ContinuousClock.png\"
")); @@ -163,7 +163,7 @@ The Real output y is a clock signal: block Constant "Generate constant signal of type Real" parameter Real k(start=1) "Constant output value" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Constant.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Constant.png")); extends Interfaces.SO; equation @@ -195,7 +195,7 @@ The Real output y is a constant signal:

-\"Constant.png\"
")); @@ -203,7 +203,7 @@ The Real output y is a constant signal: block Step "Generate step signal of type Real" parameter Real height=1 "Height of step" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Step.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Step.png")); extends Interfaces.SignalSource; equation @@ -234,7 +234,7 @@ The Real output y is a step signal:

-\"Step.png\"
@@ -243,7 +243,7 @@ The Real output y is a step signal: block Ramp "Generate ramp signal" parameter Real height=1 "Height of ramp" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Ramp.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Ramp.png")); parameter SI.Time duration(min=0.0, start=2) "Duration of ramp (= 0.0 gives a Step)"; extends Interfaces.SignalSource; @@ -278,7 +278,7 @@ The Real output y is a ramp signal:

-\"Ramp.png\"
@@ -291,7 +291,7 @@ If parameter duration is set to 0.0, the limiting case of a Step signal is achie block Sine "Generate sine signal" import Modelica.Constants.pi; parameter Real amplitude=1 "Amplitude of sine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Sine.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Sine.png")); parameter SI.Frequency f(start=1) "Frequency of sine wave"; parameter SI.Angle phase=0 "Phase of sine wave"; parameter Boolean continuous = false "Make output continuous by starting at offset + amplitude*sin(phase)" @@ -335,7 +335,7 @@ The Real output y is a sine signal:

-\"Sine.png\"
")); @@ -344,7 +344,7 @@ The Real output y is a sine signal: block Cosine "Generate cosine signal" import Modelica.Constants.pi; parameter Real amplitude=1 "Amplitude of cosine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Cosine.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Cosine.png")); parameter SI.Frequency f(start=1) "Frequency of cosine wave"; parameter SI.Angle phase=0 "Phase of cosine wave"; parameter Boolean continuous = false "Make output continuous by starting at offset + amplitude*cos(phase)" @@ -389,7 +389,7 @@ The Real output y is a cosine signal:

-\"Cosine.png\"
")); @@ -406,7 +406,7 @@ The Real output y is a cosine signal: parameter SI.Frequency constantFrequency=1 "Constant frequency" annotation(Dialog(enable=useConstantFrequency)); parameter Real offset=0 "Offset of the sine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/SineVariableFrequencyAndAmplitude.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/SineVariableFrequencyAndAmplitude.png")); SI.Angle phi(start=0) "Phase of the sine wave"; Blocks.Interfaces.RealInput amplitude if not useConstantAmplitude "Amplitude" annotation (Placement( @@ -509,7 +509,7 @@ and that the parameter startTime is omitted since the voltage can b parameter SI.Frequency constantFrequency=1 "Constant frequency" annotation(Dialog(enable=useConstantFrequency)); parameter Real offset=0 "Offset of the sine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/CosineVariableFrequencyAndAmplitude.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/CosineVariableFrequencyAndAmplitude.png")); SI.Angle phi(start=0) "Phase of the sine wave"; Blocks.Interfaces.RealInput amplitude if not useConstantAmplitude "Amplitude" annotation (Placement( @@ -605,7 +605,7 @@ and that the parameter startTime is omitted since the voltage can b import Modelica.Constants.pi; import Modelica.Constants.eps; parameter Real amplitude=1 "Amplitude of sine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Sinc.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Sinc.png")); parameter SI.Frequency f(start=1) "Frequency of sine wave"; parameter Boolean continuous = false "Make output (continuously) differentiable by starting at offset + amplitude rather than just offset" annotation(Evaluate=true); @@ -655,7 +655,7 @@ and that the parameter startTime is omitted since the voltage can b The Real output y is a sinc signal: amplitude*(sin(2*π*f*t))/((2*π*f*t))

-\"Sinc.png\"
")); @@ -664,7 +664,7 @@ The Real output y is a sinc signal: amplitude*(sin(2*π*f*t))/((2*π* block ExpSine "Generate exponentially damped sine signal" import Modelica.Constants.pi; parameter Real amplitude=1 "Amplitude of sine wave" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/ExpSine.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/ExpSine.png")); parameter SI.Frequency f(start=2) "Frequency of sine wave"; parameter SI.Angle phase=0 "Phase of sine wave"; parameter SI.Damping damping(start=1) @@ -706,7 +706,7 @@ The Real output y is a sine signal with exponentially changing amplitude:

-\"ExpSine.png\"
")); @@ -715,7 +715,7 @@ The Real output y is a sine signal with exponentially changing amplitude: block Exponentials "Generate a rising and falling exponential signal" parameter Real outMax=1 "Height of output for infinite riseTime" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Exponentials.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Exponentials.png")); parameter SI.Time riseTime(min=0,start=0.5) "Rise time"; parameter SI.Time riseTimeConst(min=Modelica.Constants.small) = 0.1 "Rise time constant; rising is defined as outMax*(1-exp(-riseTime/riseTimeConst))"; @@ -764,7 +764,7 @@ by a falling exponential signal:

-\"Exponentials.png\"
")); @@ -772,7 +772,7 @@ by a falling exponential signal: block Pulse "Generate pulse signal of type Real" parameter Real amplitude=1 "Amplitude of pulse" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Pulse.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Pulse.png")); parameter Real width( final min=Modelica.Constants.small, final max=100) = 50 "Width of pulse in % of period"; @@ -826,7 +826,7 @@ The Real output y is a pulse signal:

-\"Pulse.png\"
")); @@ -834,7 +834,7 @@ The Real output y is a pulse signal: block SawTooth "Generate saw tooth signal" parameter Real amplitude=1 "Amplitude of saw tooth" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/SawTooth.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/SawTooth.png")); parameter SI.Time period(final min=Modelica.Constants.small,start=1) "Time for one period"; parameter Integer nperiod=-1 @@ -882,7 +882,7 @@ The Real output y is a saw tooth signal:

-\"SawTooth.png\"
")); @@ -890,7 +890,7 @@ The Real output y is a saw tooth signal: block Trapezoid "Generate trapezoidal signal of type Real" parameter Real amplitude=1 "Amplitude of trapezoid" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/Trapezoid.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/Trapezoid.png")); parameter SI.Time rising(final min=0) = 0 "Rising duration of trapezoid"; parameter SI.Time width(final min=0) = 0.5 @@ -954,7 +954,7 @@ The Real output y is a trapezoid signal:

-\"Trapezoid\"
")); @@ -964,7 +964,7 @@ The Real output y is a trapezoid signal: extends Modelica.Blocks.Interfaces.SO; import Modelica.Constants.eps; parameter Real wMin(final min=eps) "Start frequency" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/LogFrequencySweep.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/LogFrequencySweep.png")); parameter Real wMax(final min=eps) "End frequency"; parameter SI.Time startTime=0 "Start time of frequency sweep"; parameter SI.Time duration(min=0.0, start=1) "Duration of ramp (= 0.0 gives a Step)"; @@ -984,7 +984,7 @@ The output is the decimal power of this logarithmic ramp.

For time < startTime the output is equal to wMin.

For time > startTime+duration the output is equal to wMax.

-\"LogFrequencySweep.png\"
@@ -1019,7 +1019,7 @@ The output is the decimal power of this logarithmic ramp. "Move as fast as possible along a distance within given kinematic constraints" parameter Real deltaq[:]={1} "Distance to move" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/KinematicPTP.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/KinematicPTP.png")); parameter Real qd_max[:](each final min=Modelica.Constants.small) = {1} "Maximum velocities der(q)"; parameter Real qdd_max[:](each final min=Modelica.Constants.small) = {1} @@ -1105,7 +1105,7 @@ as output:

-\"KinematicPTP.png\"
@@ -1151,7 +1151,7 @@ a flange according to a given acceleration. "Move as fast as possible from start to end position within given kinematic constraints with output signals q, qd=der(q), qdd=der(qd)" parameter Real q_begin[:]={0} "Start position" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/KinematicPTP2.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/KinematicPTP2.png")); parameter Real q_end[:]={1} "End position"; parameter Real qd_max[:](each final min=Modelica.Constants.small) = {1} "Maximum velocities der(q)"; @@ -1336,7 +1336,7 @@ the maximally allowed acceleration qdd_max:

-\"KinematicPTP2.png\"
@@ -1380,7 +1380,7 @@ a flange according to a given acceleration. parameter Real table[:, 2] = fill(0.0, 0, 2) "Table matrix (time = first column; e.g., table=[0, 0; 1, 1; 2, 4])" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/TimeTable.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/TimeTable.png")); parameter SI.Time timeScale( min=Modelica.Constants.eps)=1 "Time scale of first table column" annotation (Evaluate=true); @@ -1560,7 +1560,7 @@ If, e.g., time = 1.0, the output y = 0.0 (before event), 1.0 (after event)
-\"TimeTable.png\"
@@ -1617,7 +1617,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter Integer columns[:]=2:size(table, 2) "Columns of table to be interpolated" annotation (Dialog(group="Table data interpretation", - groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/CombiTimeTable.png")); + groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/CombiTimeTable.png")); parameter Modelica.Blocks.Types.Smoothness smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments "Smoothness of table interpolation" annotation (Dialog(group="Table data interpretation")); @@ -1723,7 +1723,7 @@ time points and the other columns contain the data to be interpolated.

-\"CombiTimeTable.png\"
@@ -1854,7 +1854,7 @@ savematfile tables.mat tab1 tab2 tab3 when the three tables tab1, tab2, tab3 should be used from the model.
Note, a fileName can be defined as URI by using the helper function - loadResource. + loadResource.
  • Statically stored in function \"usertab\" in file \"usertab.c\". The matrix is identified by \"tableName\". Parameter fileName = \"NoName\" or has only blanks. Row-wise storage is always to be @@ -1946,7 +1946,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. block BooleanConstant "Generate constant signal of type Boolean" parameter Boolean k=true "Constant output value" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/BooleanConstant.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/BooleanConstant.png")); extends Interfaces.partialBooleanSource; equation @@ -1964,7 +1964,7 @@ The Boolean output y is a constant signal:

    -\"BooleanConstant.png\"
    ")); @@ -1972,7 +1972,7 @@ The Boolean output y is a constant signal: block BooleanStep "Generate step signal of type Boolean" parameter SI.Time startTime=0 "Time instant of step start" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/BooleanStep.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/BooleanStep.png")); parameter Boolean startValue=false "Output before startTime"; extends Interfaces.partialBooleanSource; @@ -1996,7 +1996,7 @@ The Boolean output y is a step signal:

    -\"BooleanStep.png\"
    ")); @@ -2007,7 +2007,7 @@ The Boolean output y is a step signal: parameter Real width( final min=Modelica.Constants.small, final max=100) = 50 "Width of pulse in % of period" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/BooleanPulse.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/BooleanPulse.png")); parameter SI.Time period(final min=Modelica.Constants.small, start=1) "Time for one period"; parameter SI.Time startTime=0 "Time instant of first pulse"; @@ -2038,7 +2038,7 @@ The Boolean output y is a pulse signal:

    -\"Pulse.png\"
    ")); @@ -2047,7 +2047,7 @@ The Boolean output y is a pulse signal: block SampleTrigger "Generate sample trigger signal" parameter SI.Time period(final min=Modelica.Constants.small, start=0.01) "Sample period" - annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/SampleTrigger.png")); + annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/SampleTrigger.png")); parameter SI.Time startTime=0 "Time instant of first sample trigger"; extends Interfaces.partialBooleanSource; @@ -2073,7 +2073,7 @@ at sample times (defined by parameter period) and is otherwise

    -\"SampleTrigger.png\"
    ")); @@ -2086,7 +2086,7 @@ at sample times (defined by parameter period) and is otherwise "Vector of time points. At every time point, the output y gets its opposite value (e.g., table={0,1})" annotation(Dialog(group="Table data definition")); parameter Boolean startValue=false "Start value of y. At time = table[1], y changes to 'not startValue'" annotation(Dialog(group="Table data interpretation", - groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/BooleanTable.png")); + groupImage="modelica:/Modelica/Resources/Images/Blocks/Sources/BooleanTable.png")); parameter Modelica.Blocks.Types.Extrapolation extrapolation=Modelica.Blocks.Types.Extrapolation.HoldLastPoint "Extrapolation of data outside the definition range" annotation(Dialog(group="Table data interpretation")); parameter SI.Time startTime=-Modelica.Constants.inf @@ -2181,7 +2181,7 @@ extrapolation = 1: Hold the startValue or last value of the tab
    -\"BooleanTable.png\"
    @@ -2263,13 +2263,13 @@ This gives the following result:

    -\"RadioButtonSource.png\"

    This example is also available in -Modelica.Blocks.Examples.Interaction1 +Modelica.Blocks.Examples.Interaction1

    ")); @@ -2306,7 +2306,7 @@ The Integer output y is a constant signal:

    -\"IntegerConstant.png\"
    ")); @@ -2342,7 +2342,7 @@ The Integer output y is a step signal:

    -\"IntegerStep.png\"
    ")); @@ -2477,7 +2477,7 @@ results in the following output:

    -\"IntegerTable.png\"
    diff --git a/Modelica/Blocks/Tables.mo b/Modelica/Blocks/Tables.mo index 940e77578d..357a8bac8e 100644 --- a/Modelica/Blocks/Tables.mo +++ b/Modelica/Blocks/Tables.mo @@ -189,12 +189,12 @@ savematfile tables.mat tab1 tab2 tab3 when the three tables tab1, tab2, tab3 should be used from the model.
    Note, a fileName can be defined as URI by using the helper function - loadResource.
    • + loadResource.
  • Statically stored in function \"usertab\" in file \"usertab.c\". The matrix is identified by \"tableName\". Parameter fileName = \"NoName\" or has only blanks. Row-wise storage is always to be preferred as otherwise the table is reallocated and transposed. - See the Tables package + See the Tables package documentation for more details.

    • @@ -453,12 +453,12 @@ savematfile tables.mat tab1 tab2 tab3 when the three tables tab1, tab2, tab3 should be used from the model.
    Note, a fileName can be defined as URI by using the helper function - loadResource. + loadResource.

  • Statically stored in function \"usertab\" in file \"usertab.c\". The matrix is identified by \"tableName\". Parameter fileName = \"NoName\" or has only blanks. Row-wise storage is always to be preferred as otherwise the table is reallocated and transposed. - See the Tables package + See the Tables package documentation for more details.

    • @@ -654,12 +654,12 @@ savematfile tables.mat tab1 tab2 tab3 when the three tables tab1, tab2, tab3 should be used from the model.
    Note, a fileName can be defined as URI by using the helper function - loadResource. + loadResource.

  • Statically stored in function \"usertab\" in file \"usertab.c\". The matrix is identified by \"tableName\". Parameter fileName = \"NoName\" or has only blanks. Row-wise storage is always to be preferred as otherwise the table is reallocated and transposed. - See the Tables package + See the Tables package documentation for more details.

    • @@ -845,12 +845,12 @@ savematfile tables.mat tab1 tab2 tab3 when the three tables tab1, tab2, tab3 should be used from the model.
    Note, a fileName can be defined as URI by using the helper function - loadResource. + loadResource.

  • Statically stored in function \"usertab\" in file \"usertab.c\". The matrix is identified by \"tableName\". Parameter fileName = \"NoName\" or has only blanks. Row-wise storage is always to be preferred as otherwise the table is reallocated and transposed. - See the Tables package + See the Tables package documentation for more details.

    • @@ -1007,7 +1007,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. discrete input Real pre_nextTimeEvent "Pre-value of (scaled) next time event in table"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTimeTable_getValue(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative( noDerivative=nextTimeEvent, noDerivative=pre_nextTimeEvent) = getDerTimeTableValue); @@ -1023,7 +1023,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. discrete input Real pre_nextTimeEvent "Pre-value of (scaled) next time event in table"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTimeTable_getValue(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTimeTableValueNoDer; pure function getTimeTableValueNoDer2 @@ -1036,7 +1036,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. discrete input Real pre_nextTimeEvent "Pre-value of (scaled) next time event in table"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTimeTable_getValue(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative( noDerivative=nextTimeEvent, noDerivative=pre_nextTimeEvent) = getDerTimeTableValueNoDer); @@ -1053,7 +1053,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_timeIn "Derivative of (scaled) time value"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTimeTable_getDerValue(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent, der_timeIn) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative( order=2, noDerivative=nextTimeEvent, @@ -1071,7 +1071,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_timeIn "Derivative of (scaled) time value"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTimeTable_getDerValue(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent, der_timeIn) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDerTimeTableValueNoDer; pure function getDer2TimeTableValue @@ -1086,7 +1086,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der2_timeIn "Second derivative of (scaled) time value"; output Real der2_y "Second derivative of interpolated value"; external "C" der2_y = ModelicaStandardTables_CombiTimeTable_getDer2Value(tableID, icol, timeIn, nextTimeEvent, pre_nextTimeEvent, der_timeIn, der2_timeIn) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDer2TimeTableValue; pure function getTimeTableTmin @@ -1095,7 +1095,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTimeTable tableID "External table object"; output Real timeMin "Minimum abscissa value in table"; external "C" timeMin = ModelicaStandardTables_CombiTimeTable_minimumTime(tableID) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTimeTableTmin; pure function getTimeTableTmax @@ -1104,7 +1104,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTimeTable tableID "External table object"; output Real timeMax "Maximum abscissa value in table"; external "C" timeMax = ModelicaStandardTables_CombiTimeTable_maximumTime(tableID) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTimeTableTmax; pure function getNextTimeEvent @@ -1114,7 +1114,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real timeIn "(Scaled) time value"; output Real nextTimeEvent "(Scaled) next time event in table"; external "C" nextTimeEvent = ModelicaStandardTables_CombiTimeTable_nextTimeEvent(tableID, timeIn) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getNextTimeEvent; pure function getTable1DValue "Interpolate 1-dim. table defined by matrix" @@ -1124,7 +1124,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u "Abscissa value"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable1D_getValue(tableID, icol, u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative = getDerTable1DValue); end getTable1DValue; @@ -1136,7 +1136,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u "Abscissa value"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable1D_getValue(tableID, icol, u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable1DValueNoDer; pure function getTable1DValueNoDer2 @@ -1147,7 +1147,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u "Abscissa value"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable1D_getValue(tableID, icol, u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative = getDerTable1DValueNoDer); end getTable1DValueNoDer2; @@ -1160,7 +1160,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_u "Derivative of abscissa value"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTable1D_getDerValue(tableID, icol, u, der_u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative(order=2) = getDer2Table1DValue); end getDerTable1DValue; @@ -1173,7 +1173,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_u "Derivative of abscissa value"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTable1D_getDerValue(tableID, icol, u, der_u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDerTable1DValueNoDer; pure function getDer2Table1DValue @@ -1186,7 +1186,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der2_u " Second derivative of abscissa value"; output Real der2_y "Second derivative of interpolated value"; external "C" der2_y = ModelicaStandardTables_CombiTable1D_getDer2Value(tableID, icol, u, der_u, der2_u) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDer2Table1DValue; pure function getTable1DAbscissaUmin @@ -1195,7 +1195,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTable1D tableID "External table object"; output Real uMin "Minimum abscissa value in table"; external "C" uMin = ModelicaStandardTables_CombiTable1D_minimumAbscissa(tableID) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable1DAbscissaUmin; pure function getTable1DAbscissaUmax @@ -1204,7 +1204,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTable1D tableID "External table object"; output Real uMax "Maximum abscissa value in table"; external "C" uMax = ModelicaStandardTables_CombiTable1D_maximumAbscissa(tableID) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable1DAbscissaUmax; pure function getTable2DValue "Interpolate 2-dim. table defined by matrix" @@ -1214,7 +1214,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u2 "Value of second independent variable"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable2D_getValue(tableID, u1, u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative = getDerTable2DValue); end getTable2DValue; @@ -1226,7 +1226,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u2 "Value of second independent variable"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable2D_getValue(tableID, u1, u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable2DValueNoDer; pure function getTable2DValueNoDer2 @@ -1237,7 +1237,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real u2 "Value of second independent variable"; output Real y "Interpolated value"; external "C" y = ModelicaStandardTables_CombiTable2D_getValue(tableID, u1, u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative = getDerTable2DValueNoDer); end getTable2DValueNoDer2; @@ -1251,7 +1251,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_u2 "Derivative of second independent variable"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTable2D_getDerValue(tableID, u1, u2, der_u1, der_u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); annotation (derivative(order=2) = getDer2Table2DValue); end getDerTable2DValue; @@ -1265,7 +1265,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der_u2 "Derivative of second independent variable"; output Real der_y "Derivative of interpolated value"; external "C" der_y = ModelicaStandardTables_CombiTable2D_getDerValue(tableID, u1, u2, der_u1, der_u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDerTable2DValueNoDer; pure function getDer2Table2DValue @@ -1280,7 +1280,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Real der2_u2 "Second derivative of second independent variable"; output Real der2_y "Second derivative of interpolated value"; external "C" der2_y = ModelicaStandardTables_CombiTable2D_getDer2Value(tableID, u1, u2, der_u1, der_u2, der2_u1, der2_u2) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getDer2Table2DValue; pure function getTable2DAbscissaUmin @@ -1289,7 +1289,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTable2D tableID "External table object"; output Real uMin[2] "Minimum abscissa value in table"; external "C" ModelicaStandardTables_CombiTable2D_minimumAbscissa(tableID, uMin) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable2DAbscissaUmin; pure function getTable2DAbscissaUmax @@ -1298,7 +1298,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. input Modelica.Blocks.Types.ExternalCombiTable2D tableID "External table object"; output Real uMax[2] "Maximum abscissa value in table"; external "C" ModelicaStandardTables_CombiTable2D_maximumAbscissa(tableID, uMax) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end getTable2DAbscissaUmax; end Internal; annotation (Documentation(info=" @@ -1308,7 +1308,7 @@ MATLAB is a registered trademark of The MathWorks, Inc. store tables using a function "usertab" in a file conventionally named "usertab.c". This can be more efficient than providing the tables as Modelica parameter arrays.

    This is achieved by providing the tables in a specific structure as C-code and compiling that C-code together with the rest of the simulation model into a binary that can be executed on the target platform. The "Resources/Data/Tables/" subdirectory of the MSL installation directory contains the files -"usertab.c" and "usertab.h" +"usertab.c" and "usertab.h" that can be used as a template for own developments. While "usertab.c" would be typically used unmodified, the "usertab.h" needs to adapted for the own needs.

    In order to work it is necessary that the compiler pulls in the "usertab.c" file. Different Modelica tools might provide different mechanisms to do so. @@ -1328,7 +1328,7 @@ protected input Real dummy_u[:]; output Real dummy_y; external \"C\" dummy_y = mydummyfunc(dummy_u); - annotation(IncludeDirectory=\"modelica://Modelica/Resources/Data/Tables\", + annotation(IncludeDirectory=\"modelica:/Modelica/Resources/Data/Tables\", Include = \"#include \"usertab.c\" double mydummyfunc(double* dummy_in) { return 0; diff --git a/Modelica/Blocks/Types.mo b/Modelica/Blocks/Types.mo index 78809496ec..2c569834c3 100644 --- a/Modelica/Blocks/Types.mo +++ b/Modelica/Blocks/Types.mo @@ -132,14 +132,14 @@ package Types timeEvents, verboseRead, delimiter, - nHeaderLines) annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + nHeaderLines) annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end constructor; function destructor "Terminate 1-dim. table where first column is time" extends Modelica.Icons.Function; input ExternalCombiTimeTable externalCombiTimeTable; external "C" ModelicaStandardTables_CombiTimeTable_close( - externalCombiTimeTable) annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + externalCombiTimeTable) annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end destructor; end ExternalCombiTimeTable; @@ -172,14 +172,14 @@ package Types extrapolation, verboseRead, delimiter, - nHeaderLines) annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + nHeaderLines) annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end constructor; function destructor "Terminate 1-dim. table defined by matrix" extends Modelica.Icons.Function; input ExternalCombiTable1D externalCombiTable1D; external "C" ModelicaStandardTables_CombiTable1D_close(externalCombiTable1D) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end destructor; end ExternalCombiTable1D; @@ -209,14 +209,14 @@ package Types extrapolation, verboseRead, delimiter, - nHeaderLines) annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + nHeaderLines) annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end constructor; function destructor "Terminate 2-dim. table defined by matrix" extends Modelica.Icons.Function; input ExternalCombiTable2D externalCombiTable2D; external "C" ModelicaStandardTables_CombiTable2D_close(externalCombiTable2D) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"}); end destructor; end ExternalCombiTable2D; diff --git a/Modelica/Blocks/package.mo b/Modelica/Blocks/package.mo index d297b7a490..ca0f67cf67 100644 --- a/Modelica/Blocks/package.mo +++ b/Modelica/Blocks/package.mo @@ -137,10 +137,10 @@ to initialize the angle and the angular acceleration of \"inertia1\". In the following figure, results of a typical simulation are shown:

    -\"PID_controller.png\"
    -\"PID_controller2.png\"

    @@ -222,7 +222,7 @@ is forced back to its limit after a transient phase.

    This example demonstrates various options of the -Filter block. +Filter block. A step input starts at 0.1 s with an offset of 0.1, in order to demonstrate the initialization options. This step input drives 4 filter blocks that have identical parameters, with the only exception of the used analog filter type @@ -232,7 +232,7 @@ The default setting uses low pass filters of order 3 with a cut-off frequency of 2 Hz resulting in the following outputs:

    -\"Filter1.png\" ")); end Filter; @@ -272,7 +272,7 @@ The default setting uses low pass filters of order 3 with a cut-off frequency of

    This example demonstrates that the output of the -Filter block +Filter block can be differentiated up to the order of the filter. This feature can be used in order to make an inverse model realizable or to \"smooth\" a potential discontinuous control signal. @@ -321,7 +321,7 @@ the results of a simulation of this example model (riseTime = 2 s, fac=3, 4, and 5):

    -\"FilterWithRiseTime.png\"

    @@ -516,7 +516,7 @@ Modelica model. The basic construction mechanism is explained at hand of this example:

    -\"InverseModelSchematic.png\"

    @@ -540,7 +540,7 @@ is zero. The higher the cut-off frequency of the filter, the closer is the agreement. A typical simulation result is shown in the next figure:

    -\"InverseModel.png\" "), experiment(StopTime=1.0)); end InverseModel; @@ -564,7 +564,7 @@ agreement. A typical simulation result is shown in the next figure: annotation (experiment(StopTime=10), Documentation(info="

    This simple example demonstrates the logical sources in -Modelica.Blocks.Sources and demonstrate +Modelica.Blocks.Sources and demonstrate their diagram animation (see \"small circle\" close to the output connector). The \"booleanExpression\" source shows how a logical expression can be defined in its parameter menu referring to variables available on this level of the @@ -682,7 +682,7 @@ equation Documentation(info="

    This example demonstrates a network of mathematical Real blocks. -from package Modelica.Blocks.Math. +from package Modelica.Blocks.Math. Note, that

    @@ -768,7 +768,7 @@ end RealNetwork1; annotation (experiment(StopTime=10), Documentation(info="

    This example demonstrates a network of Integer blocks. -from package Modelica.Blocks.MathInteger. +from package Modelica.Blocks.MathInteger. Note, that

    @@ -908,7 +908,7 @@ Note, that annotation (experiment(StopTime=10), Documentation(info="

    This example demonstrates a network of Boolean blocks -from package Modelica.Blocks.MathBoolean. +from package Modelica.Blocks.MathBoolean. Note, that

    @@ -959,7 +959,7 @@ Note, that annotation (experiment(StopTime=10), Documentation(info="

    This example demonstrates a network of blocks -from package Modelica.Blocks.Interaction +from package Modelica.Blocks.Interaction to show how diagram animations can be constructed.

    @@ -1022,7 +1022,7 @@ to use a \"signal bus\" concept also in a Modelica model. This is demonstrated at hand of this model (Modelica.Blocks.Examples.BusUsage):

    -\"BusUsage.png\"
      @@ -1039,10 +1039,10 @@ at hand of this model (Modelica.Blocks.Examples.BusUsage):

      The control and sub-control bus icons are provided within Modelica.Icons. -In Modelica.Blocks.Examples.BusUsage_Utilities.Interfaces +In Modelica.Blocks.Examples.BusUsage_Utilities.Interfaces the buses for this example are defined. Both the \"ControlBus\" and the \"SubControlBus\" are expandable connectors that do not define any variable. For example, -Interfaces.ControlBus +Interfaces.ControlBus is defined as: 

      @@ -1067,7 +1067,7 @@ is constructed by the variables connected to instances of this connector.
 For example, if \"sine.y\" is connected to the \"controlBus\", a pop-up menu may appear:
 
      
 
-\"BusUsage2.png\"
 
 
      
@@ -1082,7 +1082,7 @@ the \"controlBus\". When typing \"realSignal1\" as \"New name\", a connection of
 
      
 is generated and the \"controlBus\" contains the new signal \"realSignal1\". Modelica tools
 may give more support in order to list potential signals for a connection. Therefore, in
-BusUsage_Utilities.Interfaces
+BusUsage_Utilities.Interfaces
 the expected implementation of the \"ControlBus\" and of the \"SubControlBus\" are given.
 For example \"Internal.ControlBus\" is defined as:
 
      
@@ -1105,7 +1105,7 @@ Consequently, when connecting now from \"sine.y\" to \"controlBus\", the menu
 looks differently:
 
      
 
-\"BusUsage3.png\"
 
 
      
@@ -1134,8 +1134,8 @@ just potential signals. The user might still add different signal names.
     annotation (experiment(StopTime=0.25, Interval=0.0001),
       Documentation(info="
 
      
-This example is based on a 6-pulse rectifier example,
-calculating the harmonics with the FFT block.
+This example is based on a 6-pulse rectifier example,
+calculating the harmonics with the FFT block.
 
      
 
      
 Sampling starts after the initial transients are settled - waiting for
@@ -1179,8 +1179,8 @@ As expected, one can see the 5th, 7th, 11th,
     annotation (experiment(StopTime=0.25, Interval=0.0001),
       Documentation(info="
 
      
-This example is based on a 12-pulse rectifier example,
-calculating the harmonics with the FFT block.
+This example is based on a 12-pulse rectifier example,
+calculating the harmonics with the FFT block.
 
      
 
      
 Sampling starts after the initial transients are settled - waiting for
@@ -1240,7 +1240,7 @@ As expected, one can see the 11th, 13th, 23th,
         Interval=0.0001,
         Tolerance=1e-06), Documentation(info="
 
      This example compares the result of the
-total harmonic distortion (THD)
+total harmonic distortion (THD)
 with respect to the fundamental wave and with respect to the total root mean square (RMS).
 In this simulation model a non-sinusoidal voltage
 wave form is created by the superposition two voltage waves:
      
@@ -1681,15 +1681,15 @@ The output is constant from the beginning.
      annotation (experiment(StopTime=2), Documentation(info="
 
      
 This example demonstrates the most simple usage of the
-Noise.UniformNoise
+Noise.UniformNoise
 block:
 
      
 
 
        
-
      •  globalSeed is the Noise.GlobalSeed
+
      •  globalSeed is the Noise.GlobalSeed
      block with default options (just dragged from sublibrary Noise).
        • 
 
      •  uniformNoise1 is an instance of
-     Noise.UniformNoise with
+     Noise.UniformNoise with
      samplePeriod = 0.02 s and a Uniform distribution with limits y_min=-1, y_max=3.
        • 
 
      •  uniformNoise2 is identical to uniformNoise1 with the exception that
       useAutomaticLocalSeed=false and fixedLocalSeed=10.
        • 
@@ -1702,7 +1702,7 @@ The result of a simulation is shown in the next diagram:
 
        
 
 
        
-
+
 
        
 ",     revisions="
 
@@ -1713,7 +1713,7 @@ The result of a simulation is shown in the next diagram:
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -1779,7 +1779,7 @@ The result of a simulation is shown in the next diagram:
      annotation (experiment(StopTime=2), Documentation(info="
 
        
 This example demonstrates manual and automatic seed selection of
-UniformNoise blocks, as well
+UniformNoise blocks, as well
 as starting the noise at startTime = 0.5 s with an output value of y = -1 before this
 time. All noise blocks in this example generate uniform noise in the
 band y_min=-1 .. y_max=3 with samplePeriod = 0.01 s.
@@ -1793,7 +1793,7 @@ diagram:
 
        
 
 
        
-
+
 
        
 
 
        
@@ -1803,7 +1803,7 @@ Again, different noise is generated, see next diagram:
 
        
 
 
        
-
+
 
        
 
 
        
@@ -1819,7 +1819,7 @@ manualSeed2 will produce exactly the same noise.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -1871,7 +1871,7 @@ Simulation results are shown in the next diagram:
 
        
 
 
        
-
+
 
        
 
 
        
@@ -1887,7 +1887,7 @@ truncated normal distribution has more values centered around the mean value 1.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -1966,15 +1966,15 @@ truncated normal distribution has more values centered around the mean value 1.
         Documentation(info="
 
        
 This example demonstrates statistical properties of the
-Blocks.Noise.UniformNoise block
+Blocks.Noise.UniformNoise block
 using a uniform random number distribution.
 Block "noise" defines a band of 0 .. 6 and from the generated noise the mean and the variance
-is computed with blocks of package Blocks.Math.
+is computed with blocks of package Blocks.Math.
 Simulation results are shown in the next diagram:
 
        
 
 
        
-
+
 
        
 
 
        
@@ -1992,7 +1992,7 @@ distribution have good statistical properties.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2070,15 +2070,15 @@ distribution have good statistical properties.
     Documentation(info="
 
        
 This example demonstrates statistical properties of the
-Blocks.Noise.NormalNoise block
+Blocks.Noise.NormalNoise block
 using a normal random number distribution with mu=3, sigma=1.
 From the generated noise the mean and the variance
-is computed with blocks of package Blocks.Math.
+is computed with blocks of package Blocks.Math.
 Simulation results are shown in the next diagram:
 
        
 
 
        
-
+
 
        
 
 
        
@@ -2096,7 +2096,7 @@ distribution have good statistical properties.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2152,7 +2152,7 @@ inputs:
 
        
 
 
        
-
+
 
        
 ",     revisions="
 
@@ -2163,7 +2163,7 @@ inputs:
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2188,14 +2188,14 @@ inputs:
      annotation (experiment(StopTime=2), Documentation(info="
 
        
 This example demonstrates how to use the
-impureRandom(..) function
+impureRandom(..) function
 to generate random values at event instants. Typically, this approach is only
 used when implementing an own, specialized block that needs a random number
 generator. Simulation results are shown in the next figure:
 
        
 
 
        
-
+
 
        
 ",     revisions="
 
@@ -2206,7 +2206,7 @@ generator. Simulation results are shown in the next figure:
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2283,7 +2283,7 @@ This example models an actuator with a noisy sensor (which is in the motor compo
 
        
 
 
        
-
+
 
        
 
 
        
@@ -2305,7 +2305,7 @@ on the position of the actuator. The effect of the noise can be seen in the moto
 
        
 
 
        
-
+
 
        
 
 
        
@@ -2321,7 +2321,7 @@ enableNoise = false in the globalSeed component.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2368,7 +2368,7 @@ enableNoise = false in the globalSeed component.
      Documentation(info="
 
        
 This example shows how to use the
-BandLimitedWhiteNoise
+BandLimitedWhiteNoise
 to feed a Dryden continuous turbulence model. This model is used to describe turbulent wind at low altitudes
 that varies randomly in space
 (see also wikipedia).
@@ -2381,7 +2381,7 @@ The turbulence model of the Dryden form is defined by the power spectral density
 
        
 
 
        
-\"Phi_w(Omega)=sigma^2*L_w/pi*((1+3*(L_w*Omega)^2)/(1+(L_w*Omega)^2)^2)\"/
+\"Phi_w(Omega)=sigma^2*L_w/pi*((1+3*(L_w*Omega)^2)/(1+(L_w*Omega)^2)^2)\"/
 
        
 
 
        
@@ -2402,7 +2402,7 @@ Using spectral factorization and a fixed airspeed V of the aircraft, a concrete
 
        
 
 
        
-\"H_w(s),
+\"H_w(s),
 
        
 
 
        
@@ -2416,13 +2416,13 @@ The input to the filter is white noise with a normal distribution, zero mean, an
 That means, for a sampling time of 1s, it is parameterized with mean=0 and variance=1.
 However, in order to account for the change of noise power due to sampling, the noise must be scaled with sqrt(samplePeriod).
 This is done automatically in the
-BandLimitedWhiteNoise block.
+BandLimitedWhiteNoise block.
 
        
 
 
        Example output
        
 
 
        
-
+
 
        
 
 
        Reference
        
@@ -2480,12 +2480,12 @@ This is done automatically in the
 
        
 This block determines the probability density y of a uniform distribution for the given input signal u
 (for details of this density function see
-Math.Distributions.Uniform.density).
+Math.Distributions.Uniform.density).
 
        
 
 
        
 This block is demonstrated in the example
-Examples.Noise.Densities .
+Examples.Noise.Densities .
 
        
 ",       revisions="
 
@@ -2496,7 +2496,7 @@ This block is demonstrated in the example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2551,12 +2551,12 @@ This block is demonstrated in the example
 
        
 This block determines the probability density y of a normal distribution for the given input signal u
 (for details of this density function see
-Math.Distributions.Normal.density).
+Math.Distributions.Normal.density).
 
        
 
 
        
 This block is demonstrated in the example
-Examples.Noise.Densities .
+Examples.Noise.Densities .
 
        
 ",       revisions="
 
@@ -2567,7 +2567,7 @@ This block is demonstrated in the example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2623,12 +2623,12 @@ This block is demonstrated in the example
 
        
 This block determines the probability density y of a Weibull distribution for the given input signal u
 (for details of this density function see
-Math.Distributions.Weibull.density).
+Math.Distributions.Weibull.density).
 
        
 
 
        
 This block is demonstrated in the example
-Examples.Noise.Densities .
+Examples.Noise.Densities .
 
        
 ",       revisions="
 
@@ -2639,7 +2639,7 @@ This block is demonstrated in the example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2669,7 +2669,7 @@ This block is demonstrated in the example
 
        
 This block demonstrates how to implement a block using the impure
 random number generator. This block is used in the example
-Examples.Noise.ImpureGenerator.
+Examples.Noise.ImpureGenerator.
 
        
 ",       revisions="
 
@@ -2680,7 +2680,7 @@ random number generator. This block is used in the example
 
 
        
@@ -44,7 +44,7 @@ For a base system with mBase phases the displacement of the sine wave
   
@@ -78,10 +78,10 @@ whereas for polygon connection (mBase - 1)/2 alternatives exist (refe
   
@@ -94,10 +94,10 @@ whereas for polygon connection (mBase - 1)/2 alternatives exist (refe
   
@@ -110,10 +110,10 @@ whereas for polygon connection (mBase - 1)/2 alternatives exist (refe
   
@@ -126,12 +126,12 @@ whereas for polygon connection (mBase - 1)/2 alternatives exist (refe
   
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2887,13 +2887,13 @@ whereas the stator voltage is influenced by the d-current.
 
 
        
 Default machine parameters of model
-SM_PermanentMagnet
+SM_PermanentMagnet
 are used.
 
        
 
 
        
 This motor is used in the
-Examples.Noise.ActuatorWithNoise
+Examples.Noise.ActuatorWithNoise
 actuator example
 
        
 ",         revisions="
@@ -2905,7 +2905,7 @@ actuator example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2986,7 +2986,7 @@ actuator example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -2999,7 +2999,7 @@ actuator example
 
        
 A simple position controller for a drive system.
 This controller is used in the
-Examples.Noise.ActuatorWithNoise
+Examples.Noise.ActuatorWithNoise
 actuator example
 
        
 "));
@@ -3013,7 +3013,7 @@ actuator example
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -3025,7 +3025,7 @@ actuator example
 ",       info="
 
        
 Parts used in the
-Examples.Noise.ActuatorWithNoise
+Examples.Noise.ActuatorWithNoise
 actuator example
 
        
 "));
@@ -3043,7 +3043,7 @@ This package contains utility models that are used for the examples.
 
 
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -3058,7 +3058,7 @@ This package contains utility models that are used for the examples.
 
        
 This package contains various example models that demonstrates how
 to utilize the blocks from sublibrary
-Blocks.Noise.
+Blocks.Noise.
 
        
 ",   revisions="
 
@@ -3069,7 +3069,7 @@ to utilize the blocks from sublibrary
 
 
        
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
        
 
        
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
        
@@ -3107,7 +3107,7 @@ to utilize the blocks from sublibrary
 
        
 This connector defines the \"expandable connector\" ControlBus that
 is used as bus in the
-BusUsage example.
+BusUsage example.
 Note, this connector contains \"default\" signals that might be utilized
 in a connection (the input/output causalities of the signals
 are determined from the connections to this bus).
@@ -3132,7 +3132,7 @@ are determined from the connections to this bus).
 
        
 This connector defines the \"expandable connector\" SubControlBus that
 is used as sub-bus in the
-BusUsage example.
+BusUsage example.
 Note, this is an expandable connector which has a \"default\" set of
 signals (the input/output causalities of the signals are
 determined from the connections to this bus).
@@ -3144,7 +3144,7 @@ determined from the connections to this bus).
       annotation (Documentation(info="
 
        
 This package contains the bus definitions needed for the
-BusUsage example.
+BusUsage example.
 
        
 "));
     end Interfaces;
@@ -3177,7 +3177,7 @@ This package contains the bus definitions needed for the
               textColor={0,0,255})}), Documentation(info="
 
        
 This model is used to demonstrate the bus usage in example
-BusUsage.
+BusUsage.
 
        
 "));
     end Part;
@@ -3185,7 +3185,7 @@ This model is used to demonstrate the bus usage in example
     annotation (Documentation(info="
 
        
 This package contains utility models and bus definitions needed for the
-BusUsage example.
+BusUsage example.
 
        
 "));
   end BusUsage_Utilities;
diff --git a/Modelica/Clocked/BooleanSignals/NonPeriodic/BooleanChange.mo b/Modelica/Clocked/BooleanSignals/NonPeriodic/BooleanChange.mo
index f70eb3c697..a99e59fe53 100644
--- a/Modelica/Clocked/BooleanSignals/NonPeriodic/BooleanChange.mo
+++ b/Modelica/Clocked/BooleanSignals/NonPeriodic/BooleanChange.mo
@@ -24,7 +24,7 @@ equation
         textString = "change()")}),
     Documentation(info="
        
 This block is a synchronous version of
-Modelica.Blocks.Math.BooleanChange.
+Modelica.Blocks.Math.BooleanChange.
 It uses previous instead of the implicit pre of
 change to set the Boolean output y to
 true when the boolean input u changed. Thus, it's
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/AssignClock.mo b/Modelica/Clocked/BooleanSignals/Sampler/AssignClock.mo
index 310cc344e0..7c166f31de 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/AssignClock.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/AssignClock.mo
@@ -65,10 +65,10 @@ equation
           thickness=0.5)}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClock).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClock).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end AssignClock;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/AssignClockVectorized.mo b/Modelica/Clocked/BooleanSignals/Sampler/AssignClockVectorized.mo
index 0cc5ac8179..27dd7009b8 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/AssignClockVectorized.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/AssignClockVectorized.mo
@@ -73,10 +73,10 @@ equation
           thickness=0.5)}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClockVectorized).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClockVectorized).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end AssignClockVectorized;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/BackSample.mo b/Modelica/Clocked/BooleanSignals/Sampler/BackSample.mo
index 344c99499b..5a3c723697 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/BackSample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/BackSample.mo
@@ -70,10 +70,10 @@ equation
           textString="y_start=%y_start")}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.BackSample).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.BackSample).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end BackSample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/Hold.mo b/Modelica/Clocked/BooleanSignals/Sampler/Hold.mo
index 59c77034a4..d1b2d2cb2f 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/Hold.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/Hold.mo
@@ -62,12 +62,12 @@ equation
           textColor={0,0,255})}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Hold).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Hold).
 
        
 
 
        
 Analog to the corresponding Real signal block example there exists an elementary
-example for this Boolean block.
+example for this Boolean block.
 
        
 
 "));
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/Sample.mo b/Modelica/Clocked/BooleanSignals/Sampler/Sample.mo
index c63f9ee7c2..0f44394507 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/Sample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/Sample.mo
@@ -19,11 +19,11 @@ equation
           textString="%name")}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Sample).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Sample).
 
        
 
        
-Analog to the corresponding Real signal block examples there exist two elementary examples, Sample1 and
-Sample2, for this Boolean block.
+Analog to the corresponding Real signal block examples there exist two elementary examples, Sample1 and
+Sample2, for this Boolean block.
 
        
 "));
 end Sample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/SampleClocked.mo b/Modelica/Clocked/BooleanSignals/Sampler/SampleClocked.mo
index 1a21ca75cb..6a9753ddb2 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/SampleClocked.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/SampleClocked.mo
@@ -37,10 +37,10 @@ equation
           textString="%name")}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleClocked).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleClocked).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end SampleClocked;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/SampleVectorizedAndClocked.mo b/Modelica/Clocked/BooleanSignals/Sampler/SampleVectorizedAndClocked.mo
index 81511a4d93..704618d7d3 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/SampleVectorizedAndClocked.mo
@@ -43,10 +43,10 @@ equation
           textString="n=%n")}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleVectorizedAndClocked).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleVectorizedAndClocked).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end SampleVectorizedAndClocked;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/ShiftSample.mo b/Modelica/Clocked/BooleanSignals/Sampler/ShiftSample.mo
index dd919301e3..58e341a4e6 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/ShiftSample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/ShiftSample.mo
@@ -62,10 +62,10 @@ equation
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.ShiftSample).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.ShiftSample).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end ShiftSample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/SubSample.mo b/Modelica/Clocked/BooleanSignals/Sampler/SubSample.mo
index 3611733b23..952738a7ff 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/SubSample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/SubSample.mo
@@ -86,10 +86,10 @@ equation
           rotation=-90)}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SubSample).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SubSample).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end SubSample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/SuperSample.mo b/Modelica/Clocked/BooleanSignals/Sampler/SuperSample.mo
index 2e4f11171d..175288cb90 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/SuperSample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/SuperSample.mo
@@ -94,10 +94,10 @@ equation
           rotation=90)}),
     Documentation(info="
 
        
-This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SuperSample).
+This block for Boolean signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SuperSample).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end SuperSample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
index 640500231b..8f13625ca3 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
@@ -43,7 +43,7 @@ equation
     Documentation(info="
 
        
 This block for Boolean signals works similarly as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold).
+RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold).
 
        
 "));
 end AssignClockToSquareWaveHold;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToTriggerHold.mo b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
index 6e3cf3e889..5390204db2 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
@@ -51,7 +51,7 @@ equation
     Documentation(info="
 
        
 This block for Boolean signals works similarly as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.AssignClockToTriggerHold).
+RealSignals.Sampler.Utilities.AssignClockToTriggerHold).
 
        
 "));
 end AssignClockToTriggerHold;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/UpSample.mo b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/UpSample.mo
index be4b347e3e..25a5eda308 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/Utilities/UpSample.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/Utilities/UpSample.mo
@@ -108,10 +108,10 @@ equation
     Documentation(info="
 
        
 This block for Boolean signals works similarly as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.UpSample).
+RealSignals.Sampler.Utilities.UpSample).
 
        
 
        
-Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Boolean block.
 
        
 "));
 end UpSample;
diff --git a/Modelica/Clocked/BooleanSignals/Sampler/package.mo b/Modelica/Clocked/BooleanSignals/Sampler/package.mo
index 23f0769edb..c3232a318b 100644
--- a/Modelica/Clocked/BooleanSignals/Sampler/package.mo
+++ b/Modelica/Clocked/BooleanSignals/Sampler/package.mo
@@ -15,56 +15,56 @@ the following blocks are provided:
         
             		Description
        
 
 
        continuous-time → clockedSampleSample
       Sample a continuous-time signal.
     
        
     
        SampleClockedSampleClocked
       Sample and associate a clock to the sampled scalar signal.
     
        
     
        SampleVectorizedAndClockedSampleVectorizedAndClocked
       Sample an input vector and associate a clock to the sampled vector signal.
     
        
 
 
        clocked → continuous-timeHoldHold
       Hold a clocked signal with zero-order hold.
     
        
 
 
        clocked → clockedSubSampleSubSample
       Sub-sample a signal (output clock is slower as input clock).
     
        
 
     
        SuperSampleSuperSample
       Super-sample a signal (output clock is faster as input clock).
     
        
 
     
        ShiftSampleShiftSample
       Shift a signal (output clock is delayed with respect to input clock).
     
        
 
     
        BackSampleBackSample
       Shift a signal and start the output clock before the input clock with a start value.
     
        
 
 
        within clocked partitionAssignClockAssignClock
       Assign a clock to a clocked scalar signal.
     
        
     
        AssignClockVectorizedAssignClockVectorized
       Assign a clock to a clocked vector signal.
     
        
 
        
 
 
        
 Additionally, package
-Utilities
+Utilities
 contains utility blocks that are used as building blocks for user-relevant blocks.
 
        
 "));
diff --git a/Modelica/Clocked/BooleanSignals/TickBasedSources/Pulse.mo b/Modelica/Clocked/BooleanSignals/TickBasedSources/Pulse.mo
index 55c4f5a97d..13be51111b 100644
--- a/Modelica/Clocked/BooleanSignals/TickBasedSources/Pulse.mo
+++ b/Modelica/Clocked/BooleanSignals/TickBasedSources/Pulse.mo
@@ -152,7 +152,7 @@ Diagram(coordinateSystem(
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
-
        The block is similar to the block in Modelica.Blocks.Sources.BooleanPulse,
+
        The block is similar to the block in Modelica.Blocks.Sources.BooleanPulse,
 but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
 
        
 
        
@@ -160,11 +160,11 @@ The Boolean output y is a pulse signal:
 
        
 
 
        
-\"TickBasedSources_Pulse.png\"
+\"TickBasedSources_Pulse.png\"
 
        
 
        Example
        
 
        
-See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TickBasedPulse.
+See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TickBasedPulse.
 
        
 "));
 end Pulse;
diff --git a/Modelica/Clocked/BooleanSignals/TickBasedSources/Step.mo b/Modelica/Clocked/BooleanSignals/TickBasedSources/Step.mo
index 8732dc7bc7..cfbb1dcac3 100644
--- a/Modelica/Clocked/BooleanSignals/TickBasedSources/Step.mo
+++ b/Modelica/Clocked/BooleanSignals/TickBasedSources/Step.mo
@@ -130,12 +130,12 @@ The Boolean output y is a step signal. The signal is defined in terms of clock t
 
        
 
 
        
-\"TickBasedSources_Step\"
+\"TickBasedSources_Step\"
 
        
 
 
        Example
        
 
        
-See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TickBasedStep.
+See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TickBasedStep.
 
        
 "));
 end Step;
diff --git a/Modelica/Clocked/BooleanSignals/TickBasedSources/package.mo b/Modelica/Clocked/BooleanSignals/TickBasedSources/package.mo
index a32cce1437..e37b165034 100644
--- a/Modelica/Clocked/BooleanSignals/TickBasedSources/package.mo
+++ b/Modelica/Clocked/BooleanSignals/TickBasedSources/package.mo
@@ -3,7 +3,7 @@ package TickBasedSources "Package of signal source blocks generating clocked tic
    extends Modelica.Icons.SourcesPackage;
 
   annotation (Documentation(info="
-
        This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide
        
+
        This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide
        
 
          
 
        1. a clocked output signal and
          2. 
 
        2. are parametrized in terms of clock ticks rather than simulation time.
          3. 
diff --git a/Modelica/Clocked/BooleanSignals/TimeBasedSources/Pulse.mo b/Modelica/Clocked/BooleanSignals/TimeBasedSources/Pulse.mo
index 9e5598b3df..00427fde86 100644
--- a/Modelica/Clocked/BooleanSignals/TimeBasedSources/Pulse.mo
+++ b/Modelica/Clocked/BooleanSignals/TimeBasedSources/Pulse.mo
@@ -149,7 +149,7 @@ equation
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
-
          The block is similar to the block in Modelica.Blocks.Sources.BooleanPulse,
+
          The block is similar to the block in Modelica.Blocks.Sources.BooleanPulse,
 but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
 
          
 
          
@@ -157,11 +157,11 @@ The Boolean output y is a pulse signal:
 
          
 
 
          
-\"Pulse.png\"
+\"Pulse.png\"
 
          
 
          Example
          
 
          
-See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TimeBasedPulse.
+See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TimeBasedPulse.
 
          
 
          
 "));
diff --git a/Modelica/Clocked/BooleanSignals/TimeBasedSources/Step.mo b/Modelica/Clocked/BooleanSignals/TimeBasedSources/Step.mo
index 6c4af241a8..8d94caa369 100644
--- a/Modelica/Clocked/BooleanSignals/TimeBasedSources/Step.mo
+++ b/Modelica/Clocked/BooleanSignals/TimeBasedSources/Step.mo
@@ -121,19 +121,19 @@ equation
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
-
          The block is similar to the block in Modelica.Blocks.Sources.BooleanStep,
+
          The block is similar to the block in Modelica.Blocks.Sources.BooleanStep,
 but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
          
 
          
 The Boolean output y is a step signal:
 
          
 
 
          
-\"BooleanStep.png\"
+\"BooleanStep.png\"
 
          
 
 
          Example
          
 
          
-See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TimeBasedStep.
+See model Modelica.Clocked.Examples.Elementary.BooleanSignals.TimeBasedStep.
 
          
 
          
 "));
diff --git a/Modelica/Clocked/BooleanSignals/TimeBasedSources/package.mo b/Modelica/Clocked/BooleanSignals/TimeBasedSources/package.mo
index 19f9cb679a..634cd21507 100644
--- a/Modelica/Clocked/BooleanSignals/TimeBasedSources/package.mo
+++ b/Modelica/Clocked/BooleanSignals/TimeBasedSources/package.mo
@@ -5,13 +5,13 @@ package TimeBasedSources "Package of signal source blocks generating clocked sim
   annotation (Documentation(info="
 
          
 This package provides source components akin to the blocks provided in
-Modelica.Blocks.Sources, but with the difference
+Modelica.Blocks.Sources, but with the difference
 that they provide a clocked output signal.
 
          
 
          
 As an effect it is not necessary to use an intermediate Sample block if the output signal
 is connected to a system that requires a clocked input signal. Therefore, it it can be slightly more convenient
-to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
+to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
 (since one does not need to add an additional Sample block for the transition from a continuous time signal to a clocked signal).
 
          
 "));
diff --git a/Modelica/Clocked/ClockSignals/Clocks/EventClock.mo b/Modelica/Clocked/ClockSignals/Clocks/EventClock.mo
index d959bf814e..195955492e 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/EventClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/EventClock.mo
@@ -29,7 +29,7 @@ clock signal y ticks.
 
 
          
 For an introduction to clocks see
-UsersGuide.Clocks.
+UsersGuide.Clocks.
 
          
 
 
          
@@ -39,7 +39,7 @@ to the current clock tick. This is performed by setting parameter useSol
 = true and defining the integration method as String with
 parameter solver. Both parameters are in tab Advanced.
 For an example, see
-Examples.Systems.ControlledMixingUnit.
+Examples.Systems.ControlledMixingUnit.
 
          
 "));
 end EventClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/Logical/ConjunctiveClock.mo b/Modelica/Clocked/ClockSignals/Clocks/Logical/ConjunctiveClock.mo
index 4f500ef89b..a1a9d4e9e9 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/Logical/ConjunctiveClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/Logical/ConjunctiveClock.mo
@@ -13,6 +13,6 @@ block ConjunctiveClock
         textString = "∧")}),
     Documentation(info="
 For a simple example cf. the
-logical sampling example.
+logical sampling example.
 "));
 end ConjunctiveClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/Logical/DisjunctiveClock.mo b/Modelica/Clocked/ClockSignals/Clocks/Logical/DisjunctiveClock.mo
index 9349138f7b..188cfafa80 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/Logical/DisjunctiveClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/Logical/DisjunctiveClock.mo
@@ -13,6 +13,6 @@ block DisjunctiveClock
         textString = "∨")}),
     Documentation(info="
 For a simple example cf. the
-logical sampling example.
+logical sampling example.
 "));
 end DisjunctiveClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/PeriodicExactClock.mo b/Modelica/Clocked/ClockSignals/Clocks/PeriodicExactClock.mo
index 94cab5dbf3..3ba1e82954 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/PeriodicExactClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/PeriodicExactClock.mo
@@ -66,7 +66,7 @@ equation
 This component generates a periodic clock that starts ticking when
 the simulation starts. The period is defined as the product
 of a resolution, defined with enumeration
-Resolution,
+Resolution,
 and Integer parameter factor. Internally, the period is
 represented as a rational number. All clocks with rational number definitions
 are exactly time synchronized to each other.
@@ -86,7 +86,7 @@ Clocks.PeriodicExactClock periodicClock(factor=10,
 
 
          
 For an introduction to clocks see
-UsersGuide.Clocks.
+UsersGuide.Clocks.
 
          
 
 
          
@@ -96,7 +96,7 @@ to the current clock tick. This is performed by setting parameter useSol
 = true and defining the integration method as String with
 parameter solver. Both parameters are in tab Advanced.
 For an example, see
-Examples.Systems.ControlledMixingUnit.
+Examples.Systems.ControlledMixingUnit.
 
          
 "));
 end PeriodicExactClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/PeriodicRealClock.mo b/Modelica/Clocked/ClockSignals/Clocks/PeriodicRealClock.mo
index ec60f645f0..7bc7b6fd3e 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/PeriodicRealClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/PeriodicRealClock.mo
@@ -48,10 +48,10 @@ then only one of the clocks can be defined with PeriodicRealClock.
 
 
          
 For an introduction to clocks see
-UsersGuide.Clocks.
+UsersGuide.Clocks.
 If exact, integer based, time synchronization with absolute period definitions is
 desired, use block
-PeriodicExactClock
+PeriodicExactClock
 to generate a periodic clock signal.
 
          
 
@@ -62,7 +62,7 @@ to the current clock tick. This is performed by setting parameter useSol
 = true and defining the integration method as String with
 parameter solver. Both parameters are in tab Advanced.
 For an example, see
-Examples.Systems.ControlledMixingUnit.
+Examples.Systems.ControlledMixingUnit.
 
          
 "));
 end PeriodicRealClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/Rotational/RotationalClock.mo b/Modelica/Clocked/ClockSignals/Clocks/Rotational/RotationalClock.mo
index cc4bc83ed0..c1d456d137 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/Rotational/RotationalClock.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/Rotational/RotationalClock.mo
@@ -126,6 +126,6 @@ equation
         color = {0,0,127})}),
     Documentation(info="
     For a simple example cf. the
-    rotational sampling example.
+    rotational sampling example.
     "));
 end RotationalClock;
diff --git a/Modelica/Clocked/ClockSignals/Clocks/package.mo b/Modelica/Clocked/ClockSignals/Clocks/package.mo
index cb6fd24f62..926fd4b49c 100644
--- a/Modelica/Clocked/ClockSignals/Clocks/package.mo
+++ b/Modelica/Clocked/ClockSignals/Clocks/package.mo
@@ -6,7 +6,7 @@ annotation (Documentation(info="
 
          
 This package contains blocks that generate clock signals. For an introduction
 to clocks see
-UsersGuide.Clocks.
+UsersGuide.Clocks.
 
          
 "));
 end Clocks;
diff --git a/Modelica/Clocked/ClockSignals/Sampler/ShiftSample.mo b/Modelica/Clocked/ClockSignals/Sampler/ShiftSample.mo
index 33b7b3c2c5..ce4629a124 100644
--- a/Modelica/Clocked/ClockSignals/Sampler/ShiftSample.mo
+++ b/Modelica/Clocked/ClockSignals/Sampler/ShiftSample.mo
@@ -84,16 +84,16 @@ and clock y starts at the second clock tick of cBase.
 
 
          
 The following
-example
+example
 generates a periodic clock of 20 ms period, and
 then shifts it with shiftCounter = 4 and resolution = 3:
          
 
          
 
 
-    
+    
+                        \"ShiftSample_Result.png\"
diff --git a/Modelica/Clocked/ClockSignals/Sampler/SubSample.mo b/Modelica/Clocked/ClockSignals/Sampler/SubSample.mo
index 9507e2db15..cf0c2d6be5 100644
--- a/Modelica/Clocked/ClockSignals/Sampler/SubSample.mo
+++ b/Modelica/Clocked/ClockSignals/Sampler/SubSample.mo
@@ -90,16 +90,16 @@ The clock y is factor-times slower than the clock u. The first activation of clo
 
 
          
 The following
-example
+example
 generates a periodic clock of 20 ms period, and
 then sub-samples the resulting clock signal with a factor of 3:
          
 
          
 
          \"ShiftSample_Model.png\"\"ShiftSample_Model.png\"
        
-                        \"ShiftSample_Result.png\"
     
          
 
          
     model
 
 
          
-    
+    
+                        \"SubSample_Result.png\"
diff --git a/Modelica/Clocked/ClockSignals/Sampler/SuperSample.mo b/Modelica/Clocked/ClockSignals/Sampler/SuperSample.mo
index 49fe69537c..c498df9004 100644
--- a/Modelica/Clocked/ClockSignals/Sampler/SuperSample.mo
+++ b/Modelica/Clocked/ClockSignals/Sampler/SuperSample.mo
@@ -101,16 +101,16 @@ Clock y is factor-times faster than clock u. The first activation of clock y coi
 
 
          
 The following
-example
+example
 generates a periodic clock of 20 ms period, and
 then super-samples the resulting clock with a factor of 3:
          
 
          
 
          \"SubSample_Model.png\"\"SubSample_Model.png\"
        
-                        \"SubSample_Result.png\"
     
          
 
          
     model
 
 
          
-    
+    
+                        \"SuperSample_Result.png\"
diff --git a/Modelica/Clocked/ClockSignals/package.mo b/Modelica/Clocked/ClockSignals/package.mo
index 72ddd699b9..7743216b57 100644
--- a/Modelica/Clocked/ClockSignals/package.mo
+++ b/Modelica/Clocked/ClockSignals/package.mo
@@ -8,7 +8,7 @@ package ClockSignals "Library of blocks for clocked signals"
 This package contains blocks that transform a clock signal, by
 sub-, super-, and shift-sampling a clock. For an introduction
 to clocks see
-UsersGuide.Clocks.
+UsersGuide.Clocks.
 
          "));
 end ClockSignals;
diff --git a/Modelica/Clocked/Examples/CascadeControlledDrive/package.mo b/Modelica/Clocked/Examples/CascadeControlledDrive/package.mo
index 0bdeeaccf7..0832a37bf5 100644
--- a/Modelica/Clocked/Examples/CascadeControlledDrive/package.mo
+++ b/Modelica/Clocked/Examples/CascadeControlledDrive/package.mo
@@ -8,10 +8,10 @@ This package shows the same example in different variants.
 
          
-Model CascadeControlledDrive.Continuous
+Model CascadeControlledDrive.Continuous
 is the continuous-time model from which the sampled-data versions are derived.
 The \"CascadeControlledDrive\" example adds another position control cascade to the
-SimpleControlledDrive
+SimpleControlledDrive
 example. This model demonstrates a control system with two cascaded control loops.
 The goal is to control the angle of the load inertia.
 
          
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClock.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClock.mo
index 072be70ca4..673a1e3dd8 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClock.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClock.mo
@@ -35,7 +35,7 @@ connect(unitDelay1.y, xor.u1) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.AssignClock.
+Modelica.Clocked.BooleanSignals.Sampler.AssignClock.
 
          "));
 end AssignClock;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClockVectorized.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClockVectorized.mo
index e4fdd4b187..0e7a27bd69 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClockVectorized.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/AssignClockVectorized.mo
@@ -56,7 +56,7 @@ connect(assignClock1.y[2], unitDelay2.u) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.AssignClockVectorized.
+Modelica.Clocked.BooleanSignals.Sampler.AssignClockVectorized.
 
          "));
 end AssignClockVectorized;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/BackSample.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/BackSample.mo
index a563dcd872..91d0e1522f 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/BackSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/BackSample.mo
@@ -34,7 +34,7 @@ connect(backSample1.u, shiftSample1.y) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.BackSample.
+Modelica.Clocked.BooleanSignals.Sampler.BackSample.
 
          "));
 end BackSample;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Hold.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Hold.mo
index 4dba496143..310cc06a20 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Hold.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Hold.mo
@@ -29,7 +29,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.Hold.
+Modelica.Clocked.BooleanSignals.Sampler.Hold.
 
          "));
 end Hold;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample1.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample1.mo
index 95a9372777..dd4709c56b 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample1.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample1.mo
@@ -25,7 +25,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.Sample.
+Modelica.Clocked.BooleanSignals.Sampler.Sample.
 
          "));
 end Sample1;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample2.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample2.mo
index 9b89ef36f5..9dbe4b4aaa 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample2.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/Sample2.mo
@@ -49,7 +49,7 @@ connect(xor1.u2, xor.y) annotation (Line(
     Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.Sample.
+Modelica.Clocked.BooleanSignals.Sampler.Sample.
 
          "));
 end Sample2;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleClocked.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleClocked.mo
index 90a49afcb7..5d0869ac98 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleClocked.mo
@@ -23,7 +23,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.SampleClocked.
+Modelica.Clocked.BooleanSignals.Sampler.SampleClocked.
 
          "));
 end SampleClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleVectorizedAndClocked.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleVectorizedAndClocked.mo
index f2d99c3c48..51c314264b 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SampleVectorizedAndClocked.mo
@@ -28,7 +28,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.SampleVectorizedAndClocked.
+Modelica.Clocked.BooleanSignals.Sampler.SampleVectorizedAndClocked.
 
          "));
 end SampleVectorizedAndClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/ShiftSample.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/ShiftSample.mo
index 4bc4d66d98..f8723bbc02 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/ShiftSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/ShiftSample.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.ShiftSample.
+Modelica.Clocked.BooleanSignals.Sampler.ShiftSample.
 
          "));
 end ShiftSample;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SubSample.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SubSample.mo
index 3843eada7f..0f5d794bc0 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SubSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SubSample.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.SubSample.
+Modelica.Clocked.BooleanSignals.Sampler.SubSample.
 
          "));
 end SubSample;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SuperSample.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SuperSample.mo
index b60e1cce00..7acd8aff25 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/SuperSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/SuperSample.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.SuperSample.
+Modelica.Clocked.BooleanSignals.Sampler.SuperSample.
 
          "));
 end SuperSample;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedPulse.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedPulse.mo
index ff01e1b0d8..ba2f0a10c7 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedPulse.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedPulse.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Example for block
-Modelica.Clocked.BooleanSignals.TickBasedSources.Pulse.
+Modelica.Clocked.BooleanSignals.TickBasedSources.Pulse.
 
          "));
 end TickBasedPulse;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedStep.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedStep.mo
index ac4b079211..3c59ef1f79 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TickBasedStep.mo
@@ -24,7 +24,7 @@ equation
   Documentation(info="
          
 Example for block
-Modelica.Clocked.BooleanSignals.TickBasedSources.Step.
+Modelica.Clocked.BooleanSignals.TickBasedSources.Step.
 
          "));
 end TickBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedPulse.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedPulse.mo
index 53bc7b18b3..bbde4efd14 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedPulse.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedPulse.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Example for block
-Modelica.Clocked.BooleanSignals.TimeBasedSources.Pulse.
+Modelica.Clocked.BooleanSignals.TimeBasedSources.Pulse.
 
          "));
 end TimeBasedPulse;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedStep.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedStep.mo
index ed53c43327..8c22f72bf6 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/TimeBasedStep.mo
@@ -24,7 +24,7 @@ equation
   Documentation(info="
          
 Example for block
-Modelica.Clocked.BooleanSignals.TimeBasedSources.Step.
+Modelica.Clocked.BooleanSignals.TimeBasedSources.Step.
 
          "));
 end TimeBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/UpSample.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/UpSample.mo
index e23a48da55..27cfed2c02 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/UpSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/UpSample.mo
@@ -38,7 +38,7 @@ connect(upSample2.y, and1.u2) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.BooleanSignals.Sampler.Utilities.UpSample.
+Modelica.Clocked.BooleanSignals.Sampler.Utilities.UpSample.
 
          "));
 end UpSample;
diff --git a/Modelica/Clocked/Examples/Elementary/BooleanSignals/package.mo b/Modelica/Clocked/Examples/Elementary/BooleanSignals/package.mo
index 5cd3dcae1f..6bc02739b4 100644
--- a/Modelica/Clocked/Examples/Elementary/BooleanSignals/package.mo
+++ b/Modelica/Clocked/Examples/Elementary/BooleanSignals/package.mo
@@ -6,7 +6,7 @@ annotation (Documentation(info="
          
 This package contains models that have been used to produce
 the figures in the documentation of the
-Modelica.Clocked.BooleanSignals
+Modelica.Clocked.BooleanSignals
 sub-library.
 
          "));
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/LogicalSample.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/LogicalSample.mo
index 084407fbb1..e55324ab92 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/LogicalSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/LogicalSample.mo
@@ -95,10 +95,10 @@ equation
     Both receive the very same clock inputs, produced by two rotational clocks
     with slightly shifted input angle waves (sine and cosine respectively). The
     configuration and results of the rotational clocks are explained in the
-    rotational clocks example.
+    rotational clocks example.
     The generated clocked signals of the disjunctive and conjunctive clock are
     therefore:
     
          
-    
          \"LogicalSample_Result.png\"
          .
+    
          \"LogicalSample_Result.png\"
          .
     "));
 end LogicalSample;
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/RotationalSample.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/RotationalSample.mo
index 8be7f39ef1..2b3f5a69ad 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/RotationalSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/RotationalSample.mo
@@ -47,6 +47,6 @@ equation
     the same pace; every half second it is doubled or halved respectively. The
     generated clocked signals are therefore:
     
          
-    
          \"RotationalSample_Result.png\"
          .
+    
          \"RotationalSample_Result.png\"
          .
     "));
 end RotationalSample;
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/ShiftSample.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/ShiftSample.mo
index d2c6648d0b..2dae734e46 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/ShiftSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/ShiftSample.mo
@@ -31,7 +31,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.ClockSignals.Sampler.ShiftSample.
+Modelica.Clocked.ClockSignals.Sampler.ShiftSample.
 
          "));
 end ShiftSample;
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/SubSample.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/SubSample.mo
index d3eecc6036..005d6b464c 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/SubSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/SubSample.mo
@@ -30,7 +30,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.ClockSignals.Sampler.SubSample.
+Modelica.Clocked.ClockSignals.Sampler.SubSample.
 
          "));
 end SubSample;
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/SuperSample.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/SuperSample.mo
index 5e885901b3..448233bdef 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/SuperSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/SuperSample.mo
@@ -30,7 +30,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.ClockSignals.Sampler.SuperSample.
+Modelica.Clocked.ClockSignals.Sampler.SuperSample.
 
          "));
 end SuperSample;
diff --git a/Modelica/Clocked/Examples/Elementary/ClockSignals/package.mo b/Modelica/Clocked/Examples/Elementary/ClockSignals/package.mo
index 3b216ed8dc..09711a303e 100644
--- a/Modelica/Clocked/Examples/Elementary/ClockSignals/package.mo
+++ b/Modelica/Clocked/Examples/Elementary/ClockSignals/package.mo
@@ -6,7 +6,7 @@ annotation (Documentation(info="
          
 This package contains models that have been used to produce
 the figures in the documentation of the
-Modelica.Clocked.ClockSignals
+Modelica.Clocked.ClockSignals
 sub-library.
 
          "));
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClock.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClock.mo
index 4ab3c5de44..fe0e3aeef7 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClock.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClock.mo
@@ -36,7 +36,7 @@ connect(sum.y, assignClock1.u) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.AssignClock.
+Modelica.Clocked.IntegerSignals.Sampler.AssignClock.
 
          "));
 end AssignClock;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClockVectorized.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClockVectorized.mo
index c63c701f8a..c7d9bde4fd 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClockVectorized.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/AssignClockVectorized.mo
@@ -57,7 +57,7 @@ connect(sum2.y, assignClock1.u[2]) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.AssignClockVectorized.
+Modelica.Clocked.IntegerSignals.Sampler.AssignClockVectorized.
 
          "));
 end AssignClockVectorized;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/BackSample.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/BackSample.mo
index 8ded49cf37..491502bb94 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/BackSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/BackSample.mo
@@ -35,7 +35,7 @@ connect(shiftSample1.y, backSample1.u) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.BackSample.
+Modelica.Clocked.IntegerSignals.Sampler.BackSample.
 
          "));
 end BackSample;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Hold.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Hold.mo
index efcbaa0bc0..c236f70621 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Hold.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Hold.mo
@@ -31,7 +31,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.Hold.
+Modelica.Clocked.IntegerSignals.Sampler.Hold.
 
          "));
 end Hold;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample1.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample1.mo
index 32e783de7b..5437577e05 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample1.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample1.mo
@@ -25,7 +25,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.Sample.
+Modelica.Clocked.IntegerSignals.Sampler.Sample.
 
          "));
 end Sample1;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample2.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample2.mo
index 1c3669777f..7965ec4120 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample2.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/Sample2.mo
@@ -51,7 +51,7 @@ equation
     Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.Sample.
+Modelica.Clocked.IntegerSignals.Sampler.Sample.
 
          "));
 end Sample2;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleClocked.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleClocked.mo
index cc7bdcc1c2..6efe9e2726 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleClocked.mo
@@ -23,7 +23,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.SampleClocked.
+Modelica.Clocked.IntegerSignals.Sampler.SampleClocked.
 
          "));
 end SampleClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleVectorizedAndClocked.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleVectorizedAndClocked.mo
index d371dfda47..fb905852b4 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SampleVectorizedAndClocked.mo
@@ -28,7 +28,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.SampleVectorizedAndClocked.
+Modelica.Clocked.IntegerSignals.Sampler.SampleVectorizedAndClocked.
 
          "));
 end SampleVectorizedAndClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/ShiftSample.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/ShiftSample.mo
index ef993087f8..5b072fad45 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/ShiftSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/ShiftSample.mo
@@ -27,7 +27,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.ShiftSample.
+Modelica.Clocked.IntegerSignals.Sampler.ShiftSample.
 
          "));
 end ShiftSample;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SubSample.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SubSample.mo
index 809b8f9358..9f2e20907a 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SubSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SubSample.mo
@@ -27,7 +27,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.SubSample.
+Modelica.Clocked.IntegerSignals.Sampler.SubSample.
 
          "));
 end SubSample;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SuperSample.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SuperSample.mo
index 5a58e33580..4bfbd00e45 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/SuperSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/SuperSample.mo
@@ -27,7 +27,7 @@ equation
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.SuperSample.
+Modelica.Clocked.IntegerSignals.Sampler.SuperSample.
 
          "));
 end SuperSample;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/TickBasedStep.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/TickBasedStep.mo
index 466e1f470f..83acf9d4e2 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/TickBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/TickBasedStep.mo
@@ -26,7 +26,7 @@ connect(step.y, assignClock1.u) annotation (Line(
   Documentation(info="
          
 Example for block
-Modelica.Clocked.IntegerSignals.TickBasedSources.Step.
+Modelica.Clocked.IntegerSignals.TickBasedSources.Step.
 
          "));
 end TickBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/TimeBasedStep.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/TimeBasedStep.mo
index 0d1b57a146..3beab9a5e5 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/TimeBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/TimeBasedStep.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Example for block
-Modelica.Clocked.IntegerSignals.TimeBasedSources.Step.
+Modelica.Clocked.IntegerSignals.TimeBasedSources.Step.
 
          "));
 end TimeBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/UpSample.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/UpSample.mo
index e7d9e077fe..e417c5d340 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/UpSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/UpSample.mo
@@ -39,7 +39,7 @@ connect(upSample2.y, sum.u[2]) annotation (Line(
   Documentation(info="
          
 Elementary example for the documentation of block
-Modelica.Clocked.IntegerSignals.Sampler.Utilities.UpSample.
+Modelica.Clocked.IntegerSignals.Sampler.Utilities.UpSample.
 
          "));
 end UpSample;
diff --git a/Modelica/Clocked/Examples/Elementary/IntegerSignals/package.mo b/Modelica/Clocked/Examples/Elementary/IntegerSignals/package.mo
index df879ec6d8..e5e0f0e680 100644
--- a/Modelica/Clocked/Examples/Elementary/IntegerSignals/package.mo
+++ b/Modelica/Clocked/Examples/Elementary/IntegerSignals/package.mo
@@ -6,7 +6,7 @@ annotation (Documentation(info="
          
 This package contains models that have been used to produce
 the figures in the documentation of the
-Modelica.Clocked.IntegerSignals
+Modelica.Clocked.IntegerSignals
 sub-library.
 
          "));
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClock.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClock.mo
index 93ba32bf78..0a9626e04f 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClock.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClock.mo
@@ -35,7 +35,7 @@ connect(add.y, assignClock1.u) annotation (Line(
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.AssignClock.
+Modelica.Clocked.RealSignals.Sampler.AssignClock.
 
          "));
 end AssignClock;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToSquareWaveHold.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToSquareWaveHold.mo
index 407fcec8c8..5d91ab95df 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToSquareWaveHold.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToSquareWaveHold.mo
@@ -29,7 +29,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold.
+Modelica.Clocked.RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold.
 
          "));
 end AssignClockToSquareWaveHold;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToTriggerHold.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToTriggerHold.mo
index 8aa3a1df3c..9de04797a8 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToTriggerHold.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockToTriggerHold.mo
@@ -37,7 +37,7 @@ connect(triggeredSampler.trigger, clockToTrigger.y) annotation (Line(
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.AssignClockToTriggerHold.
+Modelica.Clocked.RealSignals.Sampler.Utilities.AssignClockToTriggerHold.
 
          "));
 end AssignClockToTriggerHold;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockVectorized.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockVectorized.mo
index f3cff3562a..a78409b0d9 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockVectorized.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/AssignClockVectorized.mo
@@ -55,7 +55,7 @@ connect(assignClock1.y[1], unitDelay1.u) annotation (Line(
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.AssignClockVectorized.
+Modelica.Clocked.RealSignals.Sampler.AssignClockVectorized.
 
          "));
 end AssignClockVectorized;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/BackSample.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/BackSample.mo
index 1719f78df2..5af74dbec8 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/BackSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/BackSample.mo
@@ -36,7 +36,7 @@ connect(shiftSample1.y, backSample1.u) annotation (Line(
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.BackSample.
+Modelica.Clocked.RealSignals.Sampler.BackSample.
 
          "));
 end BackSample;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/FractionalDelay.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/FractionalDelay.mo
index 016d9829e6..e7d18bfa6e 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/FractionalDelay.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/FractionalDelay.mo
@@ -29,7 +29,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.NonPeriodic.FractionalDelay.
+Modelica.Clocked.RealSignals.NonPeriodic.FractionalDelay.
 
          "));
 end FractionalDelay;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/Hold.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/Hold.mo
index 4f0999a908..adc40ca1d5 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/Hold.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/Hold.mo
@@ -31,7 +31,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Hold.
+Modelica.Clocked.RealSignals.Sampler.Hold.
 
          "));
 end Hold;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects1.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects1.mo
index 0c41e558ba..0013524b7f 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects1.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects1.mo
@@ -37,7 +37,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.HoldWithDAeffects.
+Modelica.Clocked.RealSignals.Sampler.HoldWithDAeffects.
 
          "));
 end HoldWithDAeffects1;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects2.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects2.mo
index a9f9f3c647..1cfdb0e077 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects2.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/HoldWithDAeffects2.mo
@@ -38,7 +38,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.HoldWithDAeffects.
+Modelica.Clocked.RealSignals.Sampler.HoldWithDAeffects.
 
          "));
 end HoldWithDAeffects2;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample1.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample1.mo
index 3ad6206bef..7499c296a1 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample1.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample1.mo
@@ -27,7 +27,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Sample.
+Modelica.Clocked.RealSignals.Sampler.Sample.
 
          "));
 end Sample1;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample2.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample2.mo
index d7aa9ae19d..662a385bf8 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample2.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample2.mo
@@ -25,7 +25,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Sample.
+Modelica.Clocked.RealSignals.Sampler.Sample.
 
          "));
 end Sample2;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample3.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample3.mo
index 2a9bb7d95f..044735583e 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/Sample3.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/Sample3.mo
@@ -44,7 +44,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Sample.
+Modelica.Clocked.RealSignals.Sampler.Sample.
 
          "));
 end Sample3;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleClocked.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleClocked.mo
index 1039f582a8..6e8f5d3251 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleClocked.mo
@@ -23,7 +23,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SampleClocked.
+Modelica.Clocked.RealSignals.Sampler.SampleClocked.
 
          "));
 end SampleClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleVectorizedAndClocked.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleVectorizedAndClocked.mo
index ad54ea1e1d..4e49be7b0f 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleVectorizedAndClocked.mo
@@ -29,7 +29,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SampleVectorizedAndClocked.
+Modelica.Clocked.RealSignals.Sampler.SampleVectorizedAndClocked.
 
          "));
 end SampleVectorizedAndClocked;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleWithADeffects.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleWithADeffects.mo
index f74b9b0004..0a71043248 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SampleWithADeffects.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SampleWithADeffects.mo
@@ -35,7 +35,7 @@ equation
     Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SampleWithADeffects.
+Modelica.Clocked.RealSignals.Sampler.SampleWithADeffects.
 
          "));
 end SampleWithADeffects;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/ShiftSample.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/ShiftSample.mo
index f0b5289b06..22b7c8f861 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/ShiftSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/ShiftSample.mo
@@ -28,7 +28,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.ShiftSample.
+Modelica.Clocked.RealSignals.Sampler.ShiftSample.
 
          "));
 end ShiftSample;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SubSample.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SubSample.mo
index 456d94b539..35029b42b3 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SubSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SubSample.mo
@@ -28,7 +28,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SubSample.
+Modelica.Clocked.RealSignals.Sampler.SubSample.
 
          "));
 end SubSample;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSample.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSample.mo
index 5067f67964..8c8bb23b14 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSample.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSample.mo
@@ -28,7 +28,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SuperSample.
+Modelica.Clocked.RealSignals.Sampler.SuperSample.
 
          "));
 end SuperSample;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSampleInterpolated.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSampleInterpolated.mo
index 51b4e40a9c..dfb54115a3 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSampleInterpolated.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/SuperSampleInterpolated.mo
@@ -29,7 +29,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.SuperSampleInterpolated.
+Modelica.Clocked.RealSignals.Sampler.SuperSampleInterpolated.
 
          "));
 end SuperSampleInterpolated;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedRamp.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedRamp.mo
index b20307e7cd..4672c92256 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedRamp.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedRamp.mo
@@ -26,7 +26,7 @@ connect(ramp.y, assignClock1.u)       annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TickBasedSources.Ramp.
+Modelica.Clocked.RealSignals.TickBasedSources.Ramp.
 
          "));
 end TickBasedRamp;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedSine.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedSine.mo
index 6324348931..3c332425c0 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedSine.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedSine.mo
@@ -30,7 +30,7 @@ connect(sine.y, assignClock1.u)       annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TickBasedSources.Step.
+Modelica.Clocked.RealSignals.TickBasedSources.Step.
 
          "));
 end TickBasedSine;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedStep.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedStep.mo
index 9629bd12e6..f7861be544 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TickBasedStep.mo
@@ -22,7 +22,7 @@ connect(step.y, assignClock1.u)       annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TickBasedSources.Step.
+Modelica.Clocked.RealSignals.TickBasedSources.Step.
 
          "));
 end TickBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedRamp.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedRamp.mo
index faf1c4f33c..194b473e57 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedRamp.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedRamp.mo
@@ -23,7 +23,7 @@ connect(ramp.y, assignClock1.u) annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TimeBasedSources.Ramp.
+Modelica.Clocked.RealSignals.TimeBasedSources.Ramp.
 
          "));
 end TimeBasedRamp;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedSine.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedSine.mo
index a01cef8272..382d49e99d 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedSine.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedSine.mo
@@ -23,7 +23,7 @@ connect(sine.y, assignClock1.u) annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TimeBasedSources.Sine.
+Modelica.Clocked.RealSignals.TimeBasedSources.Sine.
 
          "));
 end TimeBasedSine;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedStep.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedStep.mo
index 01086034a8..d7a4e5f108 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedStep.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/TimeBasedStep.mo
@@ -23,7 +23,7 @@ connect(periodicClock1.y, assignClock1.clock) annotation (Line(
 annotation (experiment(StopTime=1.0), Documentation(info="
          
 Example for block
-Modelica.Clocked.RealSignals.TimeBasedSources.Step.
+Modelica.Clocked.RealSignals.TimeBasedSources.Step.
 
          "));
 end TimeBasedStep;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoise.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoise.mo
index 18e2a83ee9..fd6c855355 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoise.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoise.mo
@@ -26,7 +26,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.Internal.UniformNoise.
+Modelica.Clocked.RealSignals.Sampler.Utilities.Internal.UniformNoise.
 
          "));
 end UniformNoise;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoiseXorshift64star.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoiseXorshift64star.mo
index e66b44a894..1e1eaae0f0 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoiseXorshift64star.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/UniformNoiseXorshift64star.mo
@@ -27,7 +27,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.Internal.UniformNoiseXorshift64star.
+Modelica.Clocked.RealSignals.Sampler.Utilities.Internal.UniformNoiseXorshift64star.
 
          "));
 end UniformNoiseXorshift64star;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample1.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample1.mo
index 6755377785..05ed14c008 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample1.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample1.mo
@@ -40,7 +40,7 @@ connect(upSample1.y, add.u1) annotation (Line(
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.UpSample.
+Modelica.Clocked.RealSignals.Sampler.Utilities.UpSample.
 
          "));
 end UpSample1;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample2.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample2.mo
index 30f95adf60..5f457ccd97 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample2.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/UpSample2.mo
@@ -46,7 +46,7 @@ equation
   Documentation(info="
          
 Example used to generate a figure for the documentation of block
-Modelica.Clocked.RealSignals.Sampler.Utilities.UpSample.
+Modelica.Clocked.RealSignals.Sampler.Utilities.UpSample.
 
          "));
 end UpSample2;
diff --git a/Modelica/Clocked/Examples/Elementary/RealSignals/package.mo b/Modelica/Clocked/Examples/Elementary/RealSignals/package.mo
index a888576fe6..9bdbb87821 100644
--- a/Modelica/Clocked/Examples/Elementary/RealSignals/package.mo
+++ b/Modelica/Clocked/Examples/Elementary/RealSignals/package.mo
@@ -6,7 +6,7 @@ annotation (Documentation(info="
          
 This package contains models that have been used to produce
 the figures in the documentation of the
-Modelica.Clocked.RealSignals
+Modelica.Clocked.RealSignals
 sub-library.
 
          "));
diff --git a/Modelica/Clocked/Examples/SimpleControlledDrive/ClockedWith_AD_DA_Effects.mo b/Modelica/Clocked/Examples/SimpleControlledDrive/ClockedWith_AD_DA_Effects.mo
index a173cbcce8..b5df9e28ea 100644
--- a/Modelica/Clocked/Examples/SimpleControlledDrive/ClockedWith_AD_DA_Effects.mo
+++ b/Modelica/Clocked/Examples/SimpleControlledDrive/ClockedWith_AD_DA_Effects.mo
@@ -100,7 +100,7 @@ connect(periodicClock.y, assignClock1.clock) annotation (Line(
     Documentation(info="
          
 This is the same model as
-ClockedWithDiscreteController.
+ClockedWithDiscreteController.
 The only difference is that real world effects like limitation, value discretization, noise
 and computing time are taken into account.
 
          
diff --git a/Modelica/Clocked/Examples/SimpleControlledDrive/ExactlyClockedWithDiscreteController.mo b/Modelica/Clocked/Examples/SimpleControlledDrive/ExactlyClockedWithDiscreteController.mo
index f9f7c6ddf4..fd34f220b7 100644
--- a/Modelica/Clocked/Examples/SimpleControlledDrive/ExactlyClockedWithDiscreteController.mo
+++ b/Modelica/Clocked/Examples/SimpleControlledDrive/ExactlyClockedWithDiscreteController.mo
@@ -85,7 +85,7 @@ connect(periodicClock.y, sample2.clock) annotation (Line(
     Documentation(info="
          
 This is the same model as
-ClockedWithDiscreteController.
+ClockedWithDiscreteController.
 The only difference is that the clock is defined with an exact periodic clock and not with
 a Real periodic clock.
 
          
diff --git a/Modelica/Clocked/Examples/SimpleControlledDrive/package.mo b/Modelica/Clocked/Examples/SimpleControlledDrive/package.mo
index fbe8177779..a0ed65f7ba 100644
--- a/Modelica/Clocked/Examples/SimpleControlledDrive/package.mo
+++ b/Modelica/Clocked/Examples/SimpleControlledDrive/package.mo
@@ -8,7 +8,7 @@ This package shows the same example in different variants.
 
          
-Model SimpleControlledDrive.Continuous
+Model SimpleControlledDrive.Continuous
 is the continuous-time model from which the sampled-data versions are derived.
 The model consists of a reference controller (\"ramp\"), a feedback controller
 (\"feedback\" and \"PI\") and a plant (\"torque\", \"load\" and \"speed\").
diff --git a/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo b/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo
index 1aa907839f..353ec076e8 100644
--- a/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo
+++ b/Modelica/Clocked/Examples/Systems/ControlledMixingUnit.mo
@@ -137,7 +137,7 @@ equation
 Since a long time, Modelica is used to model advanced nonlinear control systems.
 Especially, Modelica allows a semi-automatic treatment of inverse nonlinear
 plant models. In the fundamental article (Looye et.al. 2005, see
-Literature or
+Literature or
 Download)
 this approach is described and several controller structures are presented to
 utilize an inverse plant model in the controller. This approach is attractive
@@ -178,11 +178,11 @@ its temperature T(t) in [K].
 The concentration c(t) is the signal to be primarily controlled
 and the temperature T(t) is the signal that is measured.
 These equations are collected together in input/output block
-Utilities.ComponentsMixingUnit.MixingUnit.
+Utilities.ComponentsMixingUnit.MixingUnit.
 
          
-\"ControlledMixingUnit_PlantModel.png\"
+\"ControlledMixingUnit_PlantModel.png\"
 
          
@@ -199,14 +199,14 @@ input from the filter states. The minimum needed filter order is determined
 by first inverting the continuous-time plant model from the variable
 to be primarily controlled (here: \"c\") to the actuator input
 (here: \"T_c\"). This is performed with the help of block
-Modelica.Blocks.Math.InverseBlockConstraints
+Modelica.Blocks.Math.InverseBlockConstraints
 that allows connecting an external input to an output
 in the pre-filter design block
-Utilities.ComponentsMixingUnit.FilterOrder:
+Utilities.ComponentsMixingUnit.FilterOrder:
 
          
-\"ControlledMixingUnit_FilterDesign.png\"
+\"ControlledMixingUnit_FilterDesign.png\"
 
          
@@ -217,7 +217,7 @@ has to differentiate the model, but this requires the
 second derivative of the external input c_ref and this derivative
 is not available. The conclusion is that a low pass filter of at
 least second order has to be connected between c_ref and c, for example
-Modelica.Blocks.Continuous.Filter. Only filter types should be used that do not have \"vibrations\" in the time domain for
+Modelica.Blocks.Continuous.Filter. Only filter types should be used that do not have \"vibrations\" in the time domain for
 a step input. Therefore, parameter analogFilter of the component should be
 selected as CriticalDamping (= only real poles), or
 Bessel (= nearly no vibrations, but steeper frequency response as
@@ -235,7 +235,7 @@ well as in the following figure:
 
          
-\"ControlledMixingUnit_Controller.png\"
+\"ControlledMixingUnit_Controller.png\"
 
          
@@ -273,7 +273,7 @@ still results in a reasonable control behavior as shown in the next two figures:
 
          
-\"ControlledMixingUnit_Result.png\"
+\"ControlledMixingUnit_Result.png\"
 
          
diff --git a/Modelica/Clocked/Examples/Systems/EngineThrottleControl.mo b/Modelica/Clocked/Examples/Systems/EngineThrottleControl.mo
index 5461219703..755710af9a 100644
--- a/Modelica/Clocked/Examples/Systems/EngineThrottleControl.mo
+++ b/Modelica/Clocked/Examples/Systems/EngineThrottleControl.mo
@@ -120,7 +120,7 @@ internal combustion engine. This system has the following properties:
          
 The complete system is shown in the figure below (diagram-layer):
 
          \"EngineThrottleControl_Model.png\"
          
 Block speedControl is the discrete control system. The boundaries
@@ -134,17 +134,17 @@ crankshaft in sync with the engine's internal throttle-cycle. The following diag
 illustrates the engine's respective internal setup:
 
          \"Engine_Model.png\"
          
 The crankshaftPositionEvent-clock is the event-clock synchronizing the
 engine's internal throttle-cycle and external control. It produces a clock tick for
 every half-rotation and is implemented as
-RotationalClock.
+RotationalClock.
 
          The following diagram illustrates the logic of such a rotational clock:
 
          \"RotationalClock_Model.png\"
          
 It accounts the angular of the last time a rotation has been
diff --git a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/CriticalDamping.mo b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/CriticalDamping.mo
index 1005ab058b..7b5762c865 100644
--- a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/CriticalDamping.mo
+++ b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/CriticalDamping.mo
@@ -73,7 +73,7 @@ equation
 input u and the output y
 as an n-th order filter with critical damping
 characteristics and cut-off frequency f. It is
-a slightly simplified version of the Modelica.Blocks.Continuous.CriticalDamping block.
+a slightly simplified version of the Modelica.Blocks.Continuous.CriticalDamping block.
 It doesn't provide the same initialization capabilities as the continuous block, since the initialization of
 clocked partitions is currently performed differently to the continuous time partitions.
 
          
diff --git a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/MixingUnit.mo b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/MixingUnit.mo
index 9534fea84d..2c0aee9806 100644
--- a/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/MixingUnit.mo
+++ b/Modelica/Clocked/Examples/Systems/Utilities/ComponentsMixingUnit/MixingUnit.mo
@@ -72,6 +72,6 @@ equation
         Line(points={{-86,-72},{-86,-114}}),
         Line(points={{-66,-72},{-66,-114}})}),
     Documentation(info="
-See description in ControlledMixingUnit.
+See description in ControlledMixingUnit.
 "));
 end MixingUnit;
diff --git a/Modelica/Clocked/IntegerSignals/NonPeriodic/IntegerChange.mo b/Modelica/Clocked/IntegerSignals/NonPeriodic/IntegerChange.mo
index a9a09877cf..58a32a23a2 100644
--- a/Modelica/Clocked/IntegerSignals/NonPeriodic/IntegerChange.mo
+++ b/Modelica/Clocked/IntegerSignals/NonPeriodic/IntegerChange.mo
@@ -24,7 +24,7 @@ equation
         textString = "change()")}),
     Documentation(info="
          
 This block is a synchronous version of
-Modelica.Blocks.Math.IntegerChange.
+Modelica.Blocks.Math.IntegerChange.
 It uses previous instead of the implicit pre of
 change to set the Boolean output y to
 true when the integer input u changed. Thus, it's
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/AssignClock.mo b/Modelica/Clocked/IntegerSignals/Sampler/AssignClock.mo
index 63555ece6b..3f2b12e349 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/AssignClock.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/AssignClock.mo
@@ -65,10 +65,10 @@ equation
           thickness=0.5)}),
     Documentation(info="
 
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClock).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClock).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end AssignClock;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/AssignClockVectorized.mo b/Modelica/Clocked/IntegerSignals/Sampler/AssignClockVectorized.mo
index d62d4b9aa2..ad1f09609c 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/AssignClockVectorized.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/AssignClockVectorized.mo
@@ -73,10 +73,10 @@ equation
           thickness=0.5)}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClockVectorized).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.AssignClockVectorized).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end AssignClockVectorized;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/BackSample.mo b/Modelica/Clocked/IntegerSignals/Sampler/BackSample.mo
index e057f8867a..66208a7452 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/BackSample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/BackSample.mo
@@ -67,10 +67,10 @@ equation
           textString="y_start=%y_start")}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.BackSample).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.BackSample).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end BackSample;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/Hold.mo b/Modelica/Clocked/IntegerSignals/Sampler/Hold.mo
index a90eb98bcf..2f095014c3 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/Hold.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/Hold.mo
@@ -37,12 +37,12 @@ equation
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Hold).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.Hold).
 
          
 Analog to the corresponding Real signal block example there exists an elementary
-example for this Integer block.
+example for this Integer block.
 
          "));
 end Hold;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/Sample.mo b/Modelica/Clocked/IntegerSignals/Sampler/Sample.mo
index dce055af4a..f99922bdac 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/Sample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/Sample.mo
@@ -20,12 +20,12 @@ equation
     Documentation(info="
          
 This block for Integer signals works similarly as the corresponding block for Real signals
-(see RealSignals.Sampler.Sample).
+(see RealSignals.Sampler.Sample).
 
          
 Analog to the corresponding Real signal block examples there exist two elementary examples,
-Sample1 and
-Sample2, for this Integer block.
+Sample1 and
+Sample2, for this Integer block.
 
          "));
 end Sample;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/SampleClocked.mo b/Modelica/Clocked/IntegerSignals/Sampler/SampleClocked.mo
index d34fb81b60..1ea20de1e0 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/SampleClocked.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/SampleClocked.mo
@@ -37,10 +37,10 @@ equation
           textString="%name")}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleClocked).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleClocked).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end SampleClocked;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/SampleVectorizedAndClocked.mo b/Modelica/Clocked/IntegerSignals/Sampler/SampleVectorizedAndClocked.mo
index c0bce82187..fbc5e36898 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/SampleVectorizedAndClocked.mo
@@ -41,10 +41,10 @@ equation
           textString="n=%n")}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleVectorizedAndClocked).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SampleVectorizedAndClocked).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end SampleVectorizedAndClocked;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/ShiftSample.mo b/Modelica/Clocked/IntegerSignals/Sampler/ShiftSample.mo
index 78f8855309..3904917d6c 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/ShiftSample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/ShiftSample.mo
@@ -61,10 +61,10 @@ equation
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.ShiftSample).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.ShiftSample).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end ShiftSample;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/SubSample.mo b/Modelica/Clocked/IntegerSignals/Sampler/SubSample.mo
index d62debd81a..81c559f014 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/SubSample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/SubSample.mo
@@ -83,10 +83,10 @@ equation
           rotation=-90)}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SubSample).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SubSample).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end SubSample;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/SuperSample.mo b/Modelica/Clocked/IntegerSignals/Sampler/SuperSample.mo
index df552e0502..783c3f97ec 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/SuperSample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/SuperSample.mo
@@ -91,10 +91,10 @@ equation
           rotation=90)}),
     Documentation(info="
          
-This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SuperSample).
+This block for Integer signals works similarly as the corresponding block for Real signals (see RealSignals.Sampler.SuperSample).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
 end SuperSample;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
index 46668d4962..e90bce630d 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
@@ -43,7 +43,7 @@ equation
     Documentation(info="
          
 This block for Integer signals works similar as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold).
+RealSignals.Sampler.Utilities.AssignClockToSquareWaveHold).
 
          "));
 end AssignClockToSquareWaveHold;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToTriggerHold.mo b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
index ecbda62a3e..c7807ffa25 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
@@ -50,7 +50,7 @@ equation
     Documentation(info="
          
 This block for Integer signals works similar as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.AssignClockToTriggerHold).
+RealSignals.Sampler.Utilities.AssignClockToTriggerHold).
 
          "));
 end AssignClockToTriggerHold;
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/UpSample.mo b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/UpSample.mo
index a6f7b9fed9..87f88543a2 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/Utilities/UpSample.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/Utilities/UpSample.mo
@@ -108,10 +108,10 @@ equation
     Documentation(info="
          
 This block for Integer signals works similarly as the corresponding block for Real signals (see
-RealSignals.Sampler.Utilities.UpSample).
+RealSignals.Sampler.Utilities.UpSample).
 
          
-Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
+Analog to the corresponding Real signal block example there exists an elementary example for this Integer block.
 
          "));
diff --git a/Modelica/Clocked/IntegerSignals/Sampler/package.mo b/Modelica/Clocked/IntegerSignals/Sampler/package.mo
index ad2e4bccde..eb246c6824 100644
--- a/Modelica/Clocked/IntegerSignals/Sampler/package.mo
+++ b/Modelica/Clocked/IntegerSignals/Sampler/package.mo
@@ -15,56 +15,56 @@ the following blocks are provided:
           
     
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
          
 
          \"SuperSample_Model.png\"\"SuperSample_Model.png\"
        
-                        \"SuperSample_Result.png\"
     
          
 
          
     model
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 Description
          
 
 
          continuous-time → clockedSampleSample
       Sample a continuous-time signal.
     
          
     
          SampleClockedSampleClocked
       Sample and associate a clock to the sampled scalar signal.
     
          
     
          SampleVectorizedAndClockedSampleVectorizedAndClocked
       Sample an input vector and associate a clock to the sampled vector signal.
     
          
 
 
          clocked → continuous-timeHoldHold
       Hold a clocked signal with zero-order hold.
     
          
 
 
          clocked → clockedSubSampleSubSample
       Sub-sample a signal (output clock is slower as input clock).
     
          
 
     
          SuperSampleSuperSample
       Super-sample a signal (output clock is faster as input clock).
     
          
 
     
          ShiftSampleShiftSample
       Shift a signal (output clock is delayed with respect to input clock).
     
          
 
     
          BackSampleBackSample
       Shift a signal and start the output clock before the input clock with a start value.
     
          
 
 
          within clocked partitionAssignClockAssignClock
       Assign a clock to a clocked scalar signal.
     
          
     
          AssignClockVectorizedAssignClockVectorized
       Assign a clock to a clocked vector signal.
     
          
 
          
 
 
          
 Additionally, package
-Utilities
+Utilities
 contains utility blocks that are used as building blocks for user-relevant blocks.
 
          
 "));
diff --git a/Modelica/Clocked/IntegerSignals/TickBasedSources/Step.mo b/Modelica/Clocked/IntegerSignals/TickBasedSources/Step.mo
index c299945cbf..f3f684dc83 100644
--- a/Modelica/Clocked/IntegerSignals/TickBasedSources/Step.mo
+++ b/Modelica/Clocked/IntegerSignals/TickBasedSources/Step.mo
@@ -148,12 +148,12 @@ The Integer output y is a step signal. The signal is defined in terms of clock t
 
          
 
 
          
-\"TickBasedSources_Step.png\"
+\"TickBasedSources_Step.png\"
 
          
 
 
          Example
          
 
          
-See model Modelica.Clocked.Examples.Elementary.IntgerSignals.TickBasedStep.
+See model Modelica.Clocked.Examples.Elementary.IntgerSignals.TickBasedStep.
 
          
 
          
 "));
diff --git a/Modelica/Clocked/IntegerSignals/TickBasedSources/package.mo b/Modelica/Clocked/IntegerSignals/TickBasedSources/package.mo
index 79f950309c..a70b70cb66 100644
--- a/Modelica/Clocked/IntegerSignals/TickBasedSources/package.mo
+++ b/Modelica/Clocked/IntegerSignals/TickBasedSources/package.mo
@@ -3,7 +3,7 @@ package TickBasedSources "Package of signal source blocks generating clocked tic
    extends Modelica.Icons.SourcesPackage;
 
   annotation (Documentation(info="
-
          This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide 
          
+
          This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide 
          
 
            
 
          1. a clocked output signal and
            2. 
 
          2. are parametrized in terms of clock ticks rather than simulation time.
            3. 
diff --git a/Modelica/Clocked/IntegerSignals/TimeBasedSources/Step.mo b/Modelica/Clocked/IntegerSignals/TimeBasedSources/Step.mo
index 42db676622..0f96b32346 100644
--- a/Modelica/Clocked/IntegerSignals/TimeBasedSources/Step.mo
+++ b/Modelica/Clocked/IntegerSignals/TimeBasedSources/Step.mo
@@ -142,18 +142,18 @@ equation
          fillColor={255,255,255},
          fillPattern=FillPattern.Solid)}),
    Documentation(info="
-
            The block is similar to the block in Modelica.Blocks.Sources.IntegerStep, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
            
+
            The block is similar to the block in Modelica.Blocks.Sources.IntegerStep, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
            
 
            
 The Integer output y is a step signal:
 
            
 
 
            
-\"IntegerStep.png\"
+\"IntegerStep.png\"
 
            
 
 
            Example
            
 
            
-See model Modelica.Clocked.Examples.Elementary.IntgerSignals.TimeBasedStep.
+See model Modelica.Clocked.Examples.Elementary.IntgerSignals.TimeBasedStep.
 
            
 
            
 "));
diff --git a/Modelica/Clocked/IntegerSignals/TimeBasedSources/package.mo b/Modelica/Clocked/IntegerSignals/TimeBasedSources/package.mo
index ba2efc706e..8c8cdf3b41 100644
--- a/Modelica/Clocked/IntegerSignals/TimeBasedSources/package.mo
+++ b/Modelica/Clocked/IntegerSignals/TimeBasedSources/package.mo
@@ -5,13 +5,13 @@ package TimeBasedSources "Package of signal source blocks generating clocked sim
   annotation (Documentation(info="
 
            
 This package provides source components akin to the blocks provided in
-Modelica.Blocks.Sources, but with the difference
+Modelica.Blocks.Sources, but with the difference
 that they provide a clocked output signal.
 
            
 
            
 As an effect it is not necessary to use an intermediate Sample block if the output signal
 is connected to a system that requires a clocked input signal. Therefore, it it can be slightly more convenient
-to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
+to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
 (since one does not need to add an additional Sample block for the transition from a continuous time signal to a clocked signal).
 
            
 "));
diff --git a/Modelica/Clocked/RealSignals/NonPeriodic/FractionalDelay.mo b/Modelica/Clocked/RealSignals/NonPeriodic/FractionalDelay.mo
index 822aa348cc..2cc1013275 100644
--- a/Modelica/Clocked/RealSignals/NonPeriodic/FractionalDelay.mo
+++ b/Modelica/Clocked/RealSignals/NonPeriodic/FractionalDelay.mo
@@ -63,23 +63,23 @@ equation
           fillPattern=FillPattern.Solid)}),
     Documentation(info="
 
            
-This block delays a signal. Similar to the ShiftSample block the first activation of the clock of the output y is delayed by shiftCounter/resolution*interval(u) relative to the input u (interval(u) is the sample period of the clock associated to input u). However, in contrast to ShiftSample, the block provides a buffer for the input values and truly delays the input signal.
+This block delays a signal. Similar to the ShiftSample block the first activation of the clock of the output y is delayed by shiftCounter/resolution*interval(u) relative to the input u (interval(u) is the sample period of the clock associated to input u). However, in contrast to ShiftSample, the block provides a buffer for the input values and truly delays the input signal.
 
            
 
 
            Example
            
 
 
            
 The following
-example
+example
 shows how a sample sine signal is delayed.
 
            
 
            
 
 
-    
+    
+                        \"FractionalDelay_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/NonPeriodic/package.mo b/Modelica/Clocked/RealSignals/NonPeriodic/package.mo
index 83f5034e7b..50e7fc0e0b 100644
--- a/Modelica/Clocked/RealSignals/NonPeriodic/package.mo
+++ b/Modelica/Clocked/RealSignals/NonPeriodic/package.mo
@@ -7,7 +7,7 @@ extends Modelica.Icons.Package;
 This package contains blocks that can be utilized for periodic and non-periodic
 clocks. These blocks usually utilize the duration of the last interval for the computation of the
 output signal. For example, the coefficients of the
-PI
+PI
 block are computed from the coefficients of a continuous-time PI block
 and from the duration of the last interval.
 
            
diff --git a/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo b/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo
index 948538beb9..474ec0af79 100644
--- a/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo
+++ b/Modelica/Clocked/RealSignals/Periodic/MovingAverage.mo
@@ -41,7 +41,7 @@ u and past u values that are taken into account.
 
 
            
 This block could also be implemented with block
-FIRbyCoefficients
+FIRbyCoefficients
 by using the coefficients a = fill(1/n, n). However, block MovingAverage is
 a more efficient implementation since it can be implemented recursively,
 contrary to a general FIR filter.
diff --git a/Modelica/Clocked/RealSignals/Sampler/AssignClock.mo b/Modelica/Clocked/RealSignals/Sampler/AssignClock.mo
index 177b714c42..0a816d1b12 100644
--- a/Modelica/Clocked/RealSignals/Sampler/AssignClock.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/AssignClock.mo
@@ -74,16 +74,16 @@ and provides u as output signal y.
 
 
            
 The following
-example
+example
 shows a discrete counter. In order to execute the counter with a sample period of 20ms an AssignClock block is used. Due to clock inference all equations within the blocks are deduced to be active at the clock ticks given by the periodicClock block.
 
            
 
            
 
            \"FractionalDelay_Model.png\"\"FractionalDelay_Model.png\"
        
-                        \"FractionalDelay_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
+                        \"AssignClock_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/Sampler/AssignClockVectorized.mo b/Modelica/Clocked/RealSignals/Sampler/AssignClockVectorized.mo
index a77ed40837..c289fd4b7e 100644
--- a/Modelica/Clocked/RealSignals/Sampler/AssignClockVectorized.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/AssignClockVectorized.mo
@@ -84,16 +84,16 @@ and provides u as vector output signal y.
 
 
            
 The following
-example
+example
 shows two discrete counters. In order to execute the counters with a sample period of 20ms an AssignClockVectorized block is used. Due to clock inference all equations within the blocks are deduced to be active at the clock ticks given by the periodicClock block.
 
            
 
            
 
            \"AssignClock_Model.png\"\"AssignClock_Model.png\"
        
-                        \"AssignClock_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
+                        \"AssignClockVectorized_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/Sampler/BackSample.mo b/Modelica/Clocked/RealSignals/Sampler/BackSample.mo
index 7b87a529d5..b4d48c1776 100644
--- a/Modelica/Clocked/RealSignals/Sampler/BackSample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/BackSample.mo
@@ -95,7 +95,7 @@ available value of u.
 
 
            
 Note, for
-EventClocks
+EventClocks
 there is the restriction that
 block BackSample can only shift the number of ticks of the EventClock clock,
 but cannot introduce new ticks, due to the restriction of operator superSample on
@@ -114,16 +114,16 @@ block cannot be used to recover the input signal of ShiftSample
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period,
 shift-samples it with shiftCounter = 4 and resolution = 3 and then back-samples it with backCounter=4 and resolution = 3:
            
 
            
 
            \"AssignClockVectorized_Model.png\"\"AssignClockVectorized_Model.png\"
        
-                        \"AssignClockVectorized_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
+                        \"BackSample_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/Sampler/Hold.mo b/Modelica/Clocked/RealSignals/Sampler/Hold.mo
index b73abd51c3..b89d1b9cd5 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Hold.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Hold.mo
@@ -54,7 +54,7 @@ this parameter is displayed below the icon.
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period and delays it for 2 sample periods.
 The resulting signal is hold with the Hold block. As a result, the clock of hold.u starts
 ticking at 40 ms. The output hold.y of the block is a continuous-time signal that is present
@@ -64,9 +64,9 @@ to -1.0 (= the value of parameter hold.y_start).
            
 
 
            
 
            \"BackSample_Model.png\"\"BackSample_Model.png\"
        
-                        \"BackSample_Result.png\"
     
            
 
            
     model
            
-    
+    
+                        \"Hold_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/Sampler/HoldWithDAeffects.mo b/Modelica/Clocked/RealSignals/Sampler/HoldWithDAeffects.mo
index 5b0bd6c9e2..e39d7e316b 100644
--- a/Modelica/Clocked/RealSignals/Sampler/HoldWithDAeffects.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/HoldWithDAeffects.mo
@@ -133,7 +133,7 @@ equation
     Documentation(info="
            
 This block is similar to the
-Hold
+Hold
 block. The only difference is that simulated real-world effects are applied on the
 clocked input signal u before transforming the signal to a continuous-time signal
 with a zero-order hold. In particular:
@@ -158,7 +158,7 @@ with a zero-order hold. In particular:
 
 
            
 The following
-example
+example
 samples a sine signal with an amplitude of 2.0 with a periodic clock of 20 ms period
 and delays it for 2 sample periods.
 The resulting signal is hold with the HoldWithDAeffects block. As a result, the clock of hold.u starts
@@ -173,9 +173,9 @@ the following effects are added to the hold block:
            
 
            \"Hold_Model.png\"\"Hold_Model.png\"
        
-                        \"Hold_Result.png\"
     
            
 
            
     model
 
 
 
            
-    
+    
+                        \"HoldWithDAeffects1_Result.png\"
@@ -192,15 +192,15 @@ the following effects are added to the hold block:
            
 If the hold output is delayed by one sample period, then the previous(…) value of the
 input is output, and the first tick is delayed by one sample period,
 as shown by the
-modified example
+modified example
 from above:
            
 
            \"HoldWithDAeffects1_Model.png\"\"HoldWithDAeffects1_Model.png\"
        
-                        \"HoldWithDAeffects1_Result.png\"
     
            
 
            
     model
 
 
 
            
-    
+    
+                        \"HoldWithDAeffects2_Result.png\"
diff --git a/Modelica/Clocked/RealSignals/Sampler/Sample.mo b/Modelica/Clocked/RealSignals/Sampler/Sample.mo
index 4652cea7f2..299fbf8d3b 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Sample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Sample.mo
@@ -22,7 +22,7 @@ This block samples the continuous-time, Real input signal u and provides it as
 clocked output signal y. The clock of the output signal is inferred
 (that is, it needs to be defined somewhere else in the clocked partition).
 If this is not desired, use block
-SampleClocked
+SampleClocked
 instead, to explicitly assign a clock to the output signal.
 
            
 
@@ -43,15 +43,15 @@ occur.
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period:
            
 
            
 
            \"HoldWithDAeffects2_Model.png\"\"HoldWithDAeffects2_Model.png\"
        
-                        \"HoldWithDAeffects2_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
+                        \"Sample1_Result.png\"
@@ -61,7 +61,7 @@ samples a sine signal with a periodic clock of 20 ms period:
            
 
            In the following
-example
+example
 the continuous-time input signal contains a discontinuous value change at the 0.1 s
 clock tick. It can be seen that the Sample block samples the left limit of the
 step signal:
            
@@ -69,9 +69,9 @@ step signal:
            
 
 
            
 
            \"Sample1_Model.png\"\"Sample1_Model.png\"
        
-                        \"Sample1_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
+                        \"Sample2_Result.png\"
@@ -81,7 +81,7 @@ step signal:
            
 
            In the following
-example
+example
 a direct feedthrough in the continuous-time and in the clocked partition is present.
 Without a time-delay, this would result in an algebraic loop. However, since block
 Sample samples the left limit of a continuous-time signal, sampling introduces a
@@ -91,13 +91,13 @@ delay of one sample period that breaks the algebraic loop:
 
 
            
 
            \"Sample2_Model.png\"\"Sample2_Model.png\"
        
-                        \"Sample2_Result.png\"
     
            
 
            
     model
 
 
            
-    
+    
-    
+    
diff --git a/Modelica/Clocked/RealSignals/Sampler/SampleClocked.mo b/Modelica/Clocked/RealSignals/Sampler/SampleClocked.mo
index 0919a0c578..2f17e49be2 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SampleClocked.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SampleClocked.mo
@@ -37,7 +37,7 @@ equation
     Documentation(info="
            
 This block is similar to the
-Sample
+Sample
 block. The only difference is that a clock signal is provided via a second
 input and the output is associated to this clock.
 
            
@@ -45,7 +45,7 @@ input and the output is associated to this clock.
 
            
 Note, it does not make much sense to vectorize this block, because then
 also the clock input is vectorized. Instead, if the input signal is a vector, use block
-SampleVectorizedAndClocked
+SampleVectorizedAndClocked
 that has a vector Real input and output, as well as a scalar clock input.
 
            
 
@@ -53,15 +53,15 @@ that has a vector Real input and output, as well as a s
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period:
            
 
            
 
 
            
 
            \"Sample3_Model.png\"\"Sample3_Model.png\"
     
            
 
            
     model
            		
    
            
 
            \"Sample3_Result.png\"\"Sample3_Result.png\"
     
            
 
            
     simulation result
 
            
-    
+    
+                        \"SampleClocked_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/SampleVectorizedAndClocked.mo b/Modelica/Clocked/RealSignals/Sampler/SampleVectorizedAndClocked.mo
index b22b9860d0..f41de47030 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SampleVectorizedAndClocked.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SampleVectorizedAndClocked.mo
@@ -42,7 +42,7 @@ equation
     Documentation(info="
 
            
 This block is similar to the
-SampleClocked
+SampleClocked
 block. The only difference is that the continuous-time input signal is a vector: All input
 signals are sampled and are associated with the
 scalar clock signal provided via the second input.
@@ -52,16 +52,16 @@ scalar clock signal provided via the second input.
 
 
            
 The following
-example
+example
 has a vector as input, consisting of two different sine signals. These
 signals are sampled with a periodic clock of 20 ms period:
            
 
            
 
 
            
 
            \"SampleClocked_Model.png\"\"SampleClocked_Model.png\"
        
-                        \"SampleClocked_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"SampleVectorizedAndClocked_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/SampleWithADeffects.mo b/Modelica/Clocked/RealSignals/Sampler/SampleWithADeffects.mo
index 565555f880..fb5773aeec 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SampleWithADeffects.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SampleWithADeffects.mo
@@ -131,7 +131,7 @@ equation
     Documentation(info="
 
            
 This block is similar to the
-Sample
+Sample
 block. The only difference is that after the sampling of the input signal,
 simulated real-world effects are applied on the sampled signal. In particular:
 
            
@@ -151,7 +151,7 @@ simulated real-world effects are applied on the sampled signal. In particular:
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and adds the following effects:
 
            
 
              
@@ -161,9 +161,9 @@ samples a sine signal with a periodic clock of 20 ms period, and adds the follow
 
            
 
            
 
            \"SampleVectorizedAndClocked_Model.png\"\"SampleVectorizedAndClocked_Model.png\"
        
-                        \"SampleVectorizedAndClocked_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"SampleWithADeffects_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/ShiftSample.mo b/Modelica/Clocked/RealSignals/Sampler/ShiftSample.mo
index dcdf248ed7..6964cccb18 100644
--- a/Modelica/Clocked/RealSignals/Sampler/ShiftSample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/ShiftSample.mo
@@ -84,7 +84,7 @@ the operator returns the value of u from the last tick of the clock of u.
 
 
            
 Note, for
-EventClocks
+EventClocks
 there is the restriction that
 block ShiftSample can only shift the number of ticks of the EventClock clock,
 but cannot introduce new ticks, due to the restriction of operator superSample on
@@ -95,7 +95,7 @@ EventClocks.
 Also note, that this block does not simply shift the signal in time,
 since only the value of u from the last tick of the clock of u is used for the output.
 If a time-delayed clock is desired, use instead block
-NonPeriodic.FractionalDelay
+NonPeriodic.FractionalDelay
 where the input signal is delayed by a time period and old values of u are stored in a buffer.
 If the time delay is less than one period, the two blocks, ShiftSample and FractionalDelay,
 give the same result.
@@ -105,16 +105,16 @@ give the same result.
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and
 then shifts it with shiftCounter = 4 and resolution = 3:
            
 
            
 
 
            
 
            \"SampleWithADeffects_Model.png\"\"SampleWithADeffects_Model.png\"
        
-                        \"SampleWithADeffects_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"ShiftSample_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/SubSample.mo b/Modelica/Clocked/RealSignals/Sampler/SubSample.mo
index d42f7450df..c78033638c 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SubSample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SubSample.mo
@@ -102,16 +102,16 @@ then the sub-sampling factor is defined by Integer parameter factor
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and
 then sub-samples the resulting clocked signal with a factor of 3:
            
 
            
 
 
            
 
            \"ShiftSample_Model.png\"\"ShiftSample_Model.png\"
        
-                        \"ShiftSample_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"SubSample_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/SuperSample.mo b/Modelica/Clocked/RealSignals/Sampler/SuperSample.mo
index f0257c6daa..6c5ae9d9d2 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SuperSample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SuperSample.mo
@@ -107,7 +107,7 @@ then the super-sampling factor is defined by Integer parameter factor
 For control applications this block introduces unnecessary \"vibrations\".
 In such a case it is better to use block
-SuperSampleInterpolated
+SuperSampleInterpolated
 instead.
 
            
 
@@ -115,16 +115,16 @@ instead.
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and
 then super-samples the resulting clocked signal with a factor of 3:
            
 
            
 
 
            
 
            \"SubSample_Model.png\"\"SubSample_Model.png\"
        
-                        \"SubSample_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"SuperSample_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/SuperSampleInterpolated.mo b/Modelica/Clocked/RealSignals/Sampler/SuperSampleInterpolated.mo
index 06cde65d65..374b0ec8eb 100644
--- a/Modelica/Clocked/RealSignals/Sampler/SuperSampleInterpolated.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/SuperSampleInterpolated.mo
@@ -112,7 +112,7 @@ then the super-sampling factor is defined by Integer parameter factor
 For control applications, this block is better suited as block
-SuperSample
+SuperSample
 since it does not induce \"vibrations\".
 
            
 
@@ -120,7 +120,7 @@ since it does not induce \"vibrations\".
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and
 then super-samples the resulting clocked signal with a factor of 3
 and interpolates the result linearly:
            
@@ -128,9 +128,9 @@ and interpolates the result linearly:
            
 
 
            
 
            \"SuperSample_Model.png\"\"SuperSample_Model.png\"
        
-                        \"SuperSample_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"SuperSampleInterpolated_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo b/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
index 3794eec68a..861d5cae83 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToSquareWaveHold.mo
@@ -52,15 +52,15 @@ This block creates a Boolean, continuous time, square-wave output. Whenever the
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period. After that a Boolean, continuous time, square-wave signal is generated that changes its value at every clock tick of the sampled signal:
            
 
            
 
 
            
 
            \"SuperSampleInterpolated_Model.png\"\"SuperSampleInterpolated_Model.png\"
        
-                        \"SuperSampleInterpolated_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"AssignClockToSquareWaveHold_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToTriggerHold.mo b/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
index fae987a946..76b69baa2e 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Utilities/AssignClockToTriggerHold.mo
@@ -57,15 +57,15 @@ A particular use-case in which that block might be useful is the combination of
 
 
            
 The following
-example
-samples a sine signal with a periodic clock of 20 ms period. After that a continuous time Boolean trigger signal is generated at every clock tick of that sampled signal. The generated signal is used as trigger signal for an \"old-style\" TriggeredSampler  block from the Modelica.Blocks.Discrete package:
            
+example
+samples a sine signal with a periodic clock of 20 ms period. After that a continuous time Boolean trigger signal is generated at every clock tick of that sampled signal. The generated signal is used as trigger signal for an \"old-style\" TriggeredSampler  block from the Modelica.Blocks.Discrete package:
            
 
            
 
 
            
 
            \"AssignClockToSquareWaveHold_Model.png\"\"AssignClockToSquareWaveHold_Model.png\"
        
-                        \"AssignClockToSquareWaveHold_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"AssignClockToTriggerHold_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoise.mo b/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoise.mo
index 32efd0eec9..d78f069746 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoise.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoise.mo
@@ -40,22 +40,22 @@ While of much higher quality than the rand() function supplied by
 most C libraries, the theoretical properties are much the same
 as for a single linear congruential generator of large modulus.
 For more details, see the underlying function
-Internal.random.
+Internal.random.
 
            
 
 
            Example
            
 
            
 The following
-example
+example
 samples zero signal with a periodic clock of 20 ms period, and adds
 noise in the range from -0.1 … 0.1:
            
 
            
 
 
            
 
            \"AssignClockToTriggerHold_Model.png\"\"AssignClockToTriggerHold_Model.png\"
        
-                        \"AssignClockToTriggerHold_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"UniformNoise_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoiseXorshift64star.mo b/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoiseXorshift64star.mo
index 049b8b9fa4..5384f26960 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoiseXorshift64star.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Utilities/Internal/UniformNoiseXorshift64star.mo
@@ -19,21 +19,21 @@ equation
 
            
 It is based on the xorshift64* algorithm.
 For more details, see the documentation to
-Xorshift64star.
+Xorshift64star.
 
            
 
            Example
            
 
            
 The following
-example
+example
 samples zero signal with a periodic clock of 20 ms period, and adds
 noise in the range from -0.1 … 0.1:
            
 
            
 
 
            
 
            \"UniformNoise_Model.png\"\"UniformNoise_Model.png\"
        
-                        \"UniformNoise_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"UniformNoiseXorshift64star_Result.png\"
     
diff --git a/Modelica/Clocked/RealSignals/Sampler/Utilities/UpSample.mo b/Modelica/Clocked/RealSignals/Sampler/Utilities/UpSample.mo
index c3d6c203d8..7640b27fb7 100644
--- a/Modelica/Clocked/RealSignals/Sampler/Utilities/UpSample.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/Utilities/UpSample.mo
@@ -125,16 +125,16 @@ For signal interpolation an upsample should be followed by an appropria
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period, and
 then upsamples the resulting clocked signal with a factor of 3:
            
 
            
 
 
            
 
            \"UniformNoiseXorshift64star_Model.png\"\"UniformNoiseXorshift64star_Model.png\"
        
-                        \"UniformNoiseXorshift64star_Result.png\"
            
 
            
     model
            
-    
+    
+                        \"UpSample1_Result.png\"
     
@@ -150,7 +150,7 @@ clocks of their outputs is faster than the clocks of their inputs.
 
 
            
 The following
-example
+example
 samples a sine signal with a periodic clock of 20 ms period,
 upsamples the resulting clocked signal with a factor of 3
 and applies varies filters on this signal:
            
@@ -158,19 +158,19 @@ and applies varies filters on this signal:
            
 
 
            
 
            \"UpSample1_Model.png\"\"UpSample1_Model.png\"
        
-                        \"UpSample1_Result.png\"
            
 
            
     model
            
-    
+    
-    
+    
-    
+    
@@ -187,7 +187,7 @@ block FIR2 using FIR coefficients {1/3, 2/3, 1, 2/3, 1/3}, then
 the result is a linearly interpolated super-sampled signal
 (see signal FIR2.y in figure \"simulation result 2\").
 The same result can be achieved with block
-SuperSampleInterpolated
+SuperSampleInterpolated
 (see signal superSampleIpo1.y in figure \"simulation result 2\").
 The only difference are the first clock ticks, since the FIR2 signal is
 initialized a bit differently.
diff --git a/Modelica/Clocked/RealSignals/Sampler/package.mo b/Modelica/Clocked/RealSignals/Sampler/package.mo
index 3f7323c1f3..2796cae1a9 100644
--- a/Modelica/Clocked/RealSignals/Sampler/package.mo
+++ b/Modelica/Clocked/RealSignals/Sampler/package.mo
@@ -15,74 +15,74 @@ the following blocks are provided:
             
                 
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
-      
+      
            
 
            \"UpSample2_Model.png\"\"UpSample2_Model.png\"
     
            
 
            
     model
            		
    
            
 
            \"UpSample2_Result1.png\"\"UpSample2_Result1.png\"
     
            
 
            
     simulation result 1
            		
    
            
 
            \"UpSample2_Result2.png\"\"UpSample2_Result2.png\"
     
            
 
            
     simulation result 2Description
            
 
 
            continuous-time → clockedSampleSample
       Sample a continuous-time signal.
     
            
     
            SampleClockedSampleClocked
       Sample and associate a clock to the sampled scalar signal.
     
            
     
            SampleVectorizedAndClockedSampleVectorizedAndClocked
       Sample an input vector and associate a clock to the sampled vector signal.
     
            
     
            SampleWithADeffectsSampleWithADeffects
       Sample with (simulated) Analog-Digital converter effects including noise.
     
            
 
 
            clocked → continuous-timeHoldHold
       Hold a clocked signal with zero-order hold.
     
            
     
            HoldWithDAeffectsHoldWithDAeffects
       Hold with (simulated) Digital-Analog converter effects and computational delay.
     
            
 
 
            clocked → clockedSubSampleSubSample
       Sub-sample a signal (output clock is slower as input clock).
     
            
 
     
            SuperSampleSuperSample
       Super-sample a signal (output clock is faster as input clock).
     
            
 
     
            SuperSampleInterpolatedSuperSampleInterpolated
       Super-sample a signal with linear interpolation (output clock is faster as input clock).
     
            
 
     
            ShiftSampleShiftSample
       Shift a signal (output clock is delayed with respect to input clock).
     
            
 
     
            BackSampleBackSample
       Shift a signal and start the output clock before the input clock with a start value.
     
            
 
 
            within clocked partitionAssignClockAssignClock
       Assign a clock to a clocked scalar signal.
     
            
     
            AssignClockVectorizedAssignClockVectorized
       Assign a clock to a clocked vector signal.
     
            
 
            
 
 
            
 Additionally, package
-Utilities
+Utilities
 contains utility blocks that are used as building blocks for user-relevant blocks.
 Especially, block
-UpSample
+UpSample
 can be used in combination with a
-FIR filter
+FIR filter
 block to model super-sampling with interpolation and filtering.
 
            
 "));
diff --git a/Modelica/Clocked/RealSignals/TickBasedSources/Ramp.mo b/Modelica/Clocked/RealSignals/TickBasedSources/Ramp.mo
index 95eef72d19..60a4e9a19b 100644
--- a/Modelica/Clocked/RealSignals/TickBasedSources/Ramp.mo
+++ b/Modelica/Clocked/RealSignals/TickBasedSources/Ramp.mo
@@ -174,7 +174,7 @@ The Real output y is a ramp signal. The signal is defined in terms of clock tick
 
            
 
 
            
-\"TickBasedSources_Ramp.png\"/
+\"TickBasedSources_Ramp.png\"/
 
            
 "));
 end Ramp;
diff --git a/Modelica/Clocked/RealSignals/TickBasedSources/Sine.mo b/Modelica/Clocked/RealSignals/TickBasedSources/Sine.mo
index 4b2c49ce0d..73800bba48 100644
--- a/Modelica/Clocked/RealSignals/TickBasedSources/Sine.mo
+++ b/Modelica/Clocked/RealSignals/TickBasedSources/Sine.mo
@@ -178,7 +178,7 @@ The Real output y is a sine signal. The signal is defined in terms of clock tick
 
            
 
 
            
-\"TickBasedSources_Sine.png\"/
+\"TickBasedSources_Sine.png\"/
 
            
 "));
 end Sine;
diff --git a/Modelica/Clocked/RealSignals/TickBasedSources/Step.mo b/Modelica/Clocked/RealSignals/TickBasedSources/Step.mo
index 2372f778f1..6ef6179370 100644
--- a/Modelica/Clocked/RealSignals/TickBasedSources/Step.mo
+++ b/Modelica/Clocked/RealSignals/TickBasedSources/Step.mo
@@ -150,7 +150,7 @@ The Real output y is a step signal. The signal is defined in terms of clock tick
 
            
 
 
            
-\"TickBasedSources_Step.png\"/
+\"TickBasedSources_Step.png\"/
 
            
 
 "));
diff --git a/Modelica/Clocked/RealSignals/TickBasedSources/package.mo b/Modelica/Clocked/RealSignals/TickBasedSources/package.mo
index 0ecd65e84f..9499bb695f 100644
--- a/Modelica/Clocked/RealSignals/TickBasedSources/package.mo
+++ b/Modelica/Clocked/RealSignals/TickBasedSources/package.mo
@@ -3,7 +3,7 @@ package TickBasedSources "Package of signal source blocks generating clocked tic
    extends Modelica.Icons.SourcesPackage;
 
   annotation (Documentation(info="
-
            This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide 
            
+
            This package provides source components akin to the blocks provided in Modelica.Blocks.Sources, but with the difference that they provide 
            
 
              
 
            1. a clocked output signal and
              2. 
 
            2. are parametrized in terms of clock ticks rather than simulation time.
              3. 
diff --git a/Modelica/Clocked/RealSignals/TimeBasedSources/Ramp.mo b/Modelica/Clocked/RealSignals/TimeBasedSources/Ramp.mo
index 7e93e0c60d..5d14a1512b 100644
--- a/Modelica/Clocked/RealSignals/TimeBasedSources/Ramp.mo
+++ b/Modelica/Clocked/RealSignals/TimeBasedSources/Ramp.mo
@@ -139,18 +139,18 @@ equation
       extent={{-2,-21},{37,-33}},
       textString="duration")}),
 Documentation(info="
-
              The block is similar to the block in Modelica.Blocks.Sources.Ramp, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
+
              The block is similar to the block in Modelica.Blocks.Sources.Ramp, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
 
              
 The Real output y is a ramp signal:
 
              
 
 
              
-\"Ramp.png\"
+\"Ramp.png\"
 
              
 
 
              Example
              
 
              
-See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedRamp.
+See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedRamp.
 
              
 
              
 "));
diff --git a/Modelica/Clocked/RealSignals/TimeBasedSources/Sine.mo b/Modelica/Clocked/RealSignals/TimeBasedSources/Sine.mo
index 65204c38ee..e716764750 100644
--- a/Modelica/Clocked/RealSignals/TimeBasedSources/Sine.mo
+++ b/Modelica/Clocked/RealSignals/TimeBasedSources/Sine.mo
@@ -155,13 +155,13 @@ equation
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid)}),
 Documentation(info="
-
              The block is similar to the block in Modelica.Blocks.Sources.Sine, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
+
              The block is similar to the block in Modelica.Blocks.Sources.Sine, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
 
              The Real output y is a sine signal:
              
-
              \"Sine.png\"
              
+
              \"Sine.png\"
              
 
 
              Example
              
 
              
-See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedSine.
+See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedSine.
 
              
 
              
 "));
diff --git a/Modelica/Clocked/RealSignals/TimeBasedSources/Step.mo b/Modelica/Clocked/RealSignals/TimeBasedSources/Step.mo
index 2fdbc03c7f..203b6ba6da 100644
--- a/Modelica/Clocked/RealSignals/TimeBasedSources/Step.mo
+++ b/Modelica/Clocked/RealSignals/TimeBasedSources/Step.mo
@@ -118,17 +118,17 @@ equation
       extent={{-72,100},{-31,80}},
       textString="y")}),
 Documentation(info="
-
              The block is similar to the block in Modelica.Blocks.Sources.Step, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
+
              The block is similar to the block in Modelica.Blocks.Sources.Step, but adapted to work in clocked partitions (by internal sampling of the continuous time variable).
              
 
              
 The Real output y is a step signal:
 
              
 
              
-\"Step.png\"
+\"Step.png\"
 
              
 
 
              Example
              
 
              
-See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedStep.
+See model Modelica.Clocked.Examples.Elementary.RealSignals.TimeBasedStep.
 
              
 
              
 
diff --git a/Modelica/Clocked/RealSignals/TimeBasedSources/package.mo b/Modelica/Clocked/RealSignals/TimeBasedSources/package.mo
index 59b3b9962e..41fe3fc50b 100644
--- a/Modelica/Clocked/RealSignals/TimeBasedSources/package.mo
+++ b/Modelica/Clocked/RealSignals/TimeBasedSources/package.mo
@@ -5,13 +5,13 @@ package TimeBasedSources "Package of signal source blocks generating clocked sim
   annotation (Documentation(info="
 
              
 This package provides source components akin to the blocks provided in
-Modelica.Blocks.Sources, but with the difference
+Modelica.Blocks.Sources, but with the difference
 that they provide a clocked output signal.
 
              
 
              
 As an effect it is not necessary to use an intermediate Sample block if the output signal
 is connected to a system that requires a clocked input signal. Therefore, it it can be slightly more convenient
-to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
+to use the blocks provided in this package than to use the blocks offered by Modelica.Blocks.Sources
 (since one does not need to add an additional Sample block for the transition from a continuous time signal to a clocked signal).
 
              
 "));
diff --git a/Modelica/Clocked/Types/Resolution.mo b/Modelica/Clocked/Types/Resolution.mo
index 48e30a3333..dd1dcfb0a4 100644
--- a/Modelica/Clocked/Types/Resolution.mo
+++ b/Modelica/Clocked/Types/Resolution.mo
@@ -13,7 +13,7 @@ type Resolution = enumeration(
 
              
 Enumeration defining the resolution of a clock signal, especially
 of the clock signal generated by block
-PeriodicExactClock.
+PeriodicExactClock.
 The following values are possible:
               
 
              
 
diff --git a/Modelica/Clocked/UsersGuide/Clocks.mo b/Modelica/Clocked/UsersGuide/Clocks.mo
index 13abc29e14..76fada4ca5 100644
--- a/Modelica/Clocked/UsersGuide/Clocks.mo
+++ b/Modelica/Clocked/UsersGuide/Clocks.mo
@@ -14,19 +14,19 @@ A Clock type is a base data type (introduced in Modelica 3.3, a
 
              
 
 
              
-\"Clock
+\"Clock
 
              
 
 
              
 Similarly to RealInput, RealOutput etc., clock input and output connectors, called ClockInput and ClockOutput, are defined in sublibrary
-ClockSignal.Interfaces
+ClockSignal.Interfaces
 in order to propagate clocks via connections. A clock signal can be generated with
 one of the blocks of sublibrary
-ClockSignals.Clocks:
+ClockSignals.Clocks:
 
              
 
 
              
-\"Sublibrary
+\"Sublibrary
 
              
 
 
              
@@ -36,7 +36,7 @@ by default visualized with dotted grey lines.
 
 
              
 With the blocks of sublibrary
-ClockSignals.Sampler
+ClockSignals.Sampler
 a clock signal can be sub-sampled, super-sampled, or shift-sampled to generate
 a new clock signal. For example, with the following model, a periodic clock signal of 0.1 s
 is sub-sampled with a factor 3 and therefore a clock signal with a period of 0.3 s
@@ -44,8 +44,8 @@ is generated:
 
              
 
 
              
-\"Sub-sample
              
-\"Sub-sample
+\"Sub-sample
              
+\"Sub-sample
 
              
 
 
              
@@ -66,7 +66,7 @@ The possible integration methods are tool dependent. It is expected that
 at least the solvers \"External\" (= use the integrator selected in the
 simulation environment) and \"ExplicitEuler\" (= explicit Euler method)
 are supported by every tool. For an example, see
-Examples.Systems.ControlledMixingUnit.
+Examples.Systems.ControlledMixingUnit.
 
              
 
 
              
diff --git a/Modelica/Clocked/UsersGuide/GettingStarted.mo b/Modelica/Clocked/UsersGuide/GettingStarted.mo
index bb2b0d1e38..a8e7a999bc 100644
--- a/Modelica/Clocked/UsersGuide/GettingStarted.mo
+++ b/Modelica/Clocked/UsersGuide/GettingStarted.mo
@@ -5,12 +5,12 @@ class GettingStarted "Getting started"
   annotation (Documentation(info="
 
              
 Please explore the
-Examples,
+Examples,
 which provide simple models for a broad variety of applications.
 
              
 
              
 A central element of the Modelica.Clocked library is a clock.
-For an introduction to clocks see UsersGuide.Clocks.
+For an introduction to clocks see UsersGuide.Clocks.
 
              
 "));
 end GettingStarted;
diff --git a/Modelica/Clocked/UsersGuide/Literature.mo b/Modelica/Clocked/UsersGuide/Literature.mo
index 2456b51b5b..26d32a7af2 100644
--- a/Modelica/Clocked/UsersGuide/Literature.mo
+++ b/Modelica/Clocked/UsersGuide/Literature.mo
@@ -47,7 +47,7 @@ a Modelica sampled-data system, by automatically discretizing
 this model and providing it as a clocked partition. This allows
 a convenient definition of certain nonlinear control systems,
 see example
-Examples.Systems.ControlledMixingUnit.
+Examples.Systems.ControlledMixingUnit.
 Several practical details to use nonlinear inverse plant models in
 a control system are discussed in the following reference:
 
              
diff --git a/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_91.mo b/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_91.mo
index 2fca6484c3..630fbddb85 100644
--- a/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_91.mo
+++ b/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_91.mo
@@ -13,7 +13,7 @@ Changes with respect to version 0.9:
      (nearly all elements of the library are documented now).
 
            3.  Simple examples have been added for many
      blocks of the library in the new package
-     Examples.Elementary.
+     Examples.Elementary.
      These blocks have been used to generate the figures in the documentation of
      many blocks. Furthermore, they are used for testing these blocks.
              4. 
 
diff --git a/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_93_0.mo b/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_93_0.mo
index 959d46e1f5..8040256aa2 100644
--- a/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_93_0.mo
+++ b/Modelica/Clocked/UsersGuide/ReleaseNotes/Version_0_93_0.mo
@@ -9,17 +9,17 @@ Version 0.93.0 is backward compatible to version 0.92.1
 
              Enhancements:
              
 
                
 
              • Uses latest version of Modelica Standard Library (v3.2.3) (#37).
                • 
-
              • New blocks for event clocks that generate a clock tick each time an observed input angle changed (subpackage ClockSignals.Clocks.Rotational) (#34, #36).
                • 
+
              • New blocks for event clocks that generate a clock tick each time an observed input angle changed (subpackage ClockSignals.Clocks.Rotational) (#34, #36).
                • 
 
              • Improved engine-throttle control example using the new rotational event clocks (#32, #33).
                • 
 
              • Utilizing `SolverMethod` from the (tool-specific) ModelicaServices library (#20).
                • 
 
              • Improved icons.
                • 
 
              
 
              Bug fixes:
              
 
 
 
              Other (minor) fixes and improvements.
              
diff --git a/Modelica/Clocked/UsersGuide/package.mo b/Modelica/Clocked/UsersGuide/package.mo
index be0229a8f1..5226369a80 100644
--- a/Modelica/Clocked/UsersGuide/package.mo
+++ b/Modelica/Clocked/UsersGuide/package.mo
@@ -9,18 +9,18 @@ to precisely define and synchronize sampled data systems with different sampling
 the library and has the following content:
 
              
 
                
-
              1. Getting started
+
              2. Getting started
     contains an introduction to the most important features and how
     to use them.
                3. 
-
              3. Literature
+
              4. Literature
     provides references that have been used to design and implement this
     library.
                5. 
-
              5. Release Notes
+
              6. Release Notes
     summarizes the differences between different versions of this library.
                7. 
-
              7. Requirements
+
              8. Requirements
     sketches the requirements on a Modelica tool, in order that this library
     can be utilized.
                9. 
-
              9. Contact
+
              10. Contact
     provides information about the authors of the library as well as
     acknowledgments.
                11. 
 
              
diff --git a/Modelica/Clocked/package.mo b/Modelica/Clocked/package.mo
index e8beb440c5..dac9d0ef67 100644
--- a/Modelica/Clocked/package.mo
+++ b/Modelica/Clocked/package.mo
@@ -14,7 +14,7 @@ a partition need to be defined only at one location.
 
 
              
 In the following
-example
+example
 a simple sampled data system is shown, where the borders of the
 discrete-time partition are marked by the sample and hold operators, a clocked PI
 controller is used in the partition and the sample
@@ -22,7 +22,7 @@ rate is defined at one location with a clock:
 
              
 
 
              
-\"Simple
+\"Simple
 
              
 
              
 The initial version of this library was developed and released under the name Modelica_Synchronous library
@@ -31,7 +31,7 @@ The basic principles and components are the same as in the initial library, ther
 for Modelica_Synchronous is still valid, in particular:
 
              
 
@@ -39,11 +39,11 @@ for Modelica_Synchronous is still valid, in particular:
 Furthermore:
 
              
 
 
              
@@ -58,7 +58,7 @@ revisions="
     
        		
     
 
-
+
        
     
        
-         \"DLR
+         \"DLR
     
     Initial version implemented by M. Otter and B. Thiele released as Modelica_Synchronous (version 0.9) library.
        
          DLR Institute of System Dynamics and Control
@@ -70,7 +70,7 @@ revisions="
 
 
         2019 The Modelica_Synchronous library is included as Modelica.Clocked in the Modelica Standard Library 4.0.0.
        see Release Notes.
        see Release Notes.
        
 
 
        
 "),
diff --git a/Modelica/ComplexBlocks/ComplexMath/Acos.mo b/Modelica/ComplexBlocks/ComplexMath/Acos.mo
index 867f0e83b6..9741075cfd 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Acos.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Acos.mo
@@ -33,7 +33,7 @@ y = acos(uInternal);
 
 
 
        
-\"acos.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Asin.mo b/Modelica/ComplexBlocks/ComplexMath/Asin.mo
index 4d90a601de..450ab6b9c3 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Asin.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Asin.mo
@@ -32,7 +32,7 @@ y = asin(uInternal);
 
 
 
        
-\"asin.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Atan.mo b/Modelica/ComplexBlocks/ComplexMath/Atan.mo
index ad7e98a010..7bb3ca7384 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Atan.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Atan.mo
@@ -33,7 +33,7 @@ y= atan(uInternal);
 
 
 
        
-\"atan.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Cos.mo b/Modelica/ComplexBlocks/ComplexMath/Cos.mo
index e0e5b1b067..949ebf49aa 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Cos.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Cos.mo
@@ -34,7 +34,7 @@ y = cos(uInternal);
 
 
 
        
-\"cos.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Cosh.mo b/Modelica/ComplexBlocks/ComplexMath/Cosh.mo
index ab2db821a4..3c2df63be9 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Cosh.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Cosh.mo
@@ -35,7 +35,7 @@ y = cosh(uInternal);
 
 
 
        
-\"cosh.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Exp.mo b/Modelica/ComplexBlocks/ComplexMath/Exp.mo
index 05c3557b9e..6925fff0e4 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Exp.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Exp.mo
@@ -32,7 +32,7 @@ y = exp(uInternal);
 
 
 
        
-\"exp.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Log.mo b/Modelica/ComplexBlocks/ComplexMath/Log.mo
index 298deb9fe6..482e5e2fbe 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Log.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Log.mo
@@ -37,7 +37,7 @@ An error occurs if the elements of the input u is zero.
 
        
 
 
        
-\"log.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Sin.mo b/Modelica/ComplexBlocks/ComplexMath/Sin.mo
index cb37d7b4ee..471771fd00 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Sin.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Sin.mo
@@ -35,7 +35,7 @@ y = sin(uInternal);
 
 
 
        
-\"sin.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Sinh.mo b/Modelica/ComplexBlocks/ComplexMath/Sinh.mo
index 734a17c8f9..06d834e039 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Sinh.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Sinh.mo
@@ -33,7 +33,7 @@ y = sinh(uInternal);
 
 
 
        
-\"sinh.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Tan.mo b/Modelica/ComplexBlocks/ComplexMath/Tan.mo
index ac24519dcf..3515cd0c62 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Tan.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Tan.mo
@@ -34,7 +34,7 @@ y = tan(uInternal);
 
 
 
        
-\"tan.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/ComplexMath/Tanh.mo b/Modelica/ComplexBlocks/ComplexMath/Tanh.mo
index aa3065be50..a0f395862e 100644
--- a/Modelica/ComplexBlocks/ComplexMath/Tanh.mo
+++ b/Modelica/ComplexBlocks/ComplexMath/Tanh.mo
@@ -33,7 +33,7 @@ y = tanh(uInternal);
 
 
 
        
-\"tanh.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/Sources/ComplexConstant.mo b/Modelica/ComplexBlocks/Sources/ComplexConstant.mo
index 210dc12bd7..5baa2a7f97 100644
--- a/Modelica/ComplexBlocks/Sources/ComplexConstant.mo
+++ b/Modelica/ComplexBlocks/Sources/ComplexConstant.mo
@@ -28,7 +28,7 @@ The Complex output y is a constant signal:
 
        
 
 
        
-\"Constant.png\"
 
        
 "));
diff --git a/Modelica/ComplexBlocks/Sources/ComplexRampPhasor.mo b/Modelica/ComplexBlocks/Sources/ComplexRampPhasor.mo
index 7f0a8ed555..94f4ee4ef1 100644
--- a/Modelica/ComplexBlocks/Sources/ComplexRampPhasor.mo
+++ b/Modelica/ComplexBlocks/Sources/ComplexRampPhasor.mo
@@ -3,7 +3,7 @@ block ComplexRampPhasor "Generate a phasor with ramped magnitude and constant an
   extends Modelica.ComplexBlocks.Interfaces.ComplexSO;
   import Modelica.Constants.eps;
   parameter Real magnitude1(final min=0,start=1) "Magnitude of complex phasor at startTime"
-    annotation(Dialog(groupImage="modelica://Modelica/Resources/Images/ComplexBlocks/Sources/ComplexRampPhasor.png"));
+    annotation(Dialog(groupImage="modelica:/Modelica/Resources/Images/ComplexBlocks/Sources/ComplexRampPhasor.png"));
   parameter Real magnitude2(final min=0,start=1) "Magnitude of complex phasor at startTime+duration";
   parameter Boolean useLogRamp = false "Ramp appears linear on a logarithmic scale, if true";
   parameter Modelica.Units.SI.Angle phi(start=0) "Angle of complex phasor";
@@ -65,7 +65,7 @@ The output y is a complex phasor with constant angle and a ramped magnitude.
 In case of useLogRamp == false the magnitude ramp is linear:
 
        
 
        
-\"ComplexRampPhasorLinear.png\"
 
        
 
@@ -73,7 +73,7 @@ In case of useLogRamp == false the magnitude ramp is linear:
 In case of useLogRamp == true the magnitude ramp appears linear on a logarithmic scale:
 
        
 
        
-\"ComplexRampPhasorLog.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/Sources/ComplexStep.mo b/Modelica/ComplexBlocks/Sources/ComplexStep.mo
index f4bd1e0b2c..d2c429376e 100644
--- a/Modelica/ComplexBlocks/Sources/ComplexStep.mo
+++ b/Modelica/ComplexBlocks/Sources/ComplexStep.mo
@@ -28,7 +28,7 @@ The Complex output y is a step signal (of real and imaginary part):
 
        
 
 
        
-\"Step.png\"
 
        
 
diff --git a/Modelica/ComplexBlocks/UsersGuide/ReleaseNotes.mo b/Modelica/ComplexBlocks/UsersGuide/ReleaseNotes.mo
index bf78fb0485..3701d99a41 100644
--- a/Modelica/ComplexBlocks/UsersGuide/ReleaseNotes.mo
+++ b/Modelica/ComplexBlocks/UsersGuide/ReleaseNotes.mo
@@ -13,7 +13,7 @@ class ReleaseNotes "Release Notes"
 
 
          
 
        • Added block
-    Conj for conjugate complex signal processing
+    Conj for conjugate complex signal processing
     
          • 
 
        • Added optional conjugate complex input processing to all partial interfaces and complex blocks
          • 
 
        
diff --git a/Modelica/ComplexMath.mo b/Modelica/ComplexMath.mo
index f29ef9ef7a..5e8fc91963 100644
--- a/Modelica/ComplexMath.mo
+++ b/Modelica/ComplexMath.mo
@@ -40,7 +40,7 @@ With the optional
 second argument \"p\", any other p-norm can be computed:
 
        
 
        
-\"function
+\"function
 
        
 
        
 Besides the Euclidean norm (p=2), also the 1-norm and the
@@ -79,7 +79,7 @@ v = {2, -4, -2, -1};
 
 
        See also
        
 
        
-Matrices.norm
+Matrices.norm
 
        
 "));
 end norm;
@@ -117,7 +117,7 @@ v = {2, -4, -2, -1};
 
 
        See also
        
 
        
-Vectors.norm
+Vectors.norm
 
        
 "));
 end length;
@@ -173,7 +173,7 @@ possible.
 
 
        See also
        
 
        
-Vectors.length
+Vectors.length
 
        
 "));
 end normalize;
diff --git a/Modelica/Electrical/Analog/Basic/GeneralCurrentToVoltageAdaptor.mo b/Modelica/Electrical/Analog/Basic/GeneralCurrentToVoltageAdaptor.mo
index fa1a8d2ecc..dbb0d6b783 100644
--- a/Modelica/Electrical/Analog/Basic/GeneralCurrentToVoltageAdaptor.mo
+++ b/Modelica/Electrical/Analog/Basic/GeneralCurrentToVoltageAdaptor.mo
@@ -35,7 +35,7 @@ This component is used to provide a pure signal interface around an Electrical m
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Electrical.Analog.Examples.GenerationOfFMUs.
+Electrical.Analog.Examples.GenerationOfFMUs.
 This adaptor has current and derivative of current as inputs and voltage and derivative of voltage as output signals.
 
        
 
        
@@ -45,7 +45,7 @@ Note, the input signals must be consistent to each other
 
        
 Note, the adaptor contains no ground.
 Bear in mind that separating physical components and connecting them via adaptor signals requires to place appropriate
-ground components to define electric potential within the subcircuits.
+ground components to define electric potential within the subcircuits.
 
        
 "), Icon(graphics={
             Rectangle(
diff --git a/Modelica/Electrical/Analog/Basic/GeneralVoltageToCurrentAdaptor.mo b/Modelica/Electrical/Analog/Basic/GeneralVoltageToCurrentAdaptor.mo
index be03288480..f82be66545 100644
--- a/Modelica/Electrical/Analog/Basic/GeneralVoltageToCurrentAdaptor.mo
+++ b/Modelica/Electrical/Analog/Basic/GeneralVoltageToCurrentAdaptor.mo
@@ -35,7 +35,7 @@ This component is used to provide a pure signal interface around an Electrical m
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Electrical.Analog.Examples.GenerationOfFMUs.
+Electrical.Analog.Examples.GenerationOfFMUs.
 This adaptor has voltage and derivative of voltage as input signals and current and derivative of current as output signal.
 
        
 
        
@@ -45,7 +45,7 @@ Note, the input signals must be consistent to each other
 
        
 Note, the adaptor contains no ground.
 Bear in mind that separating physical components and connecting them via adaptor signals requires to place appropriate
-ground components to define electric potential within the subcircuits.
+ground components to define electric potential within the subcircuits.
 
        
 "),
          Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Basic/M_Transformer.mo b/Modelica/Electrical/Analog/Basic/M_Transformer.mo
index 86eaebdac6..19c260364b 100644
--- a/Modelica/Electrical/Analog/Basic/M_Transformer.mo
+++ b/Modelica/Electrical/Analog/Basic/M_Transformer.mo
@@ -129,7 +129,7 @@ The user chooses a model with three inductors, that means the p
 
 
        
 \"L_m\"
 
        
 
diff --git a/Modelica/Electrical/Analog/Basic/OpAmpDetailed.mo b/Modelica/Electrical/Analog/Basic/OpAmpDetailed.mo
index 8ec0c9b92c..22177663f3 100644
--- a/Modelica/Electrical/Analog/Basic/OpAmpDetailed.mo
+++ b/Modelica/Electrical/Analog/Basic/OpAmpDetailed.mo
@@ -215,8 +215,8 @@ equation
 
   annotation (defaultComponentName="opAmp",
     Documentation(info="
-
        The OpAmpDetailed model is a general operational amplifier model. The emphasis is on separating each important data sheet parameter into a sub-circuit independent of the other parameters. The model is broken down into five functional stages input, frequency response, gain, slew rate and an output stage. Each stage contains data sheet parameters to be modeled. This partitioning and the modelling of the separate submodels are based on the description in [Conelly1992].
        
-
        Using [Conelly1992] Joachim Haase (Fraunhofer Institute for Integrated Circuits, Design Automation Division) transferred 2001 operational amplifier models into VHDL-AMS. Now one of these models, the model "amp(macro)" was transferred into Modelica.
        
+
        The OpAmpDetailed model is a general operational amplifier model. The emphasis is on separating each important data sheet parameter into a sub-circuit independent of the other parameters. The model is broken down into five functional stages input, frequency response, gain, slew rate and an output stage. Each stage contains data sheet parameters to be modeled. This partitioning and the modelling of the separate submodels are based on the description in [Conelly1992].
        
+
        Using [Conelly1992] Joachim Haase (Fraunhofer Institute for Integrated Circuits, Design Automation Division) transferred 2001 operational amplifier models into VHDL-AMS. Now one of these models, the model "amp(macro)" was transferred into Modelica.
        
 ",    revisions="
 
        
 
        June 17, 2009
        
diff --git a/Modelica/Electrical/Analog/Basic/SaturatingInductor.mo b/Modelica/Electrical/Analog/Basic/SaturatingInductor.mo
index 549a99eeef..269d5bf86e 100644
--- a/Modelica/Electrical/Analog/Basic/SaturatingInductor.mo
+++ b/Modelica/Electrical/Analog/Basic/SaturatingInductor.mo
@@ -6,7 +6,7 @@ model SaturatingInductor "Simple model of an inductor with saturation"
   import Modelica.Constants.small;
   import Modelica.Math.atan;
   parameter SI.Current Inom(start=1) "Nominal current" annotation(Dialog(
-    groupImage="modelica://Modelica/Resources/Images/Electrical/Analog/Basic/SaturatingInductor_Lact_i_tight.png"));
+    groupImage="modelica:/Modelica/Resources/Images/Electrical/Analog/Basic/SaturatingInductor_Lact_i_tight.png"));
   parameter SI.Inductance Lnom(start=1)
     "Nominal inductance at Nominal current";
   parameter SI.Inductance Lzer(start=2*Lnom)
@@ -109,7 +109,7 @@ Lnom = Linf + (Lzer - Linf)*atan(Inom/Ipar)/(Inom/Ipar)
   
        Fig. 1: Actual inductance Lact versus current i
   
        
     
-      \"Lact
+      \"Lact
     
   
        
 
        
@@ -118,7 +118,7 @@ Lnom = Linf + (Lzer - Linf)*atan(Inom/Ipar)/(Inom/Ipar)
   
        Fig. 2: Actual flux linkage Psi versus current i
   
        
     
-      \"Psi
+      \"Psi
     
   
        
 
        
diff --git a/Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo b/Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo
index a398db8941..ab9f97fa1b 100644
--- a/Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo
+++ b/Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo
@@ -278,7 +278,7 @@ equation
 ", info="
 
        The example CauerLowPassSC is a low-pass-filter of the fifth order. It is realized using an switched-capacitor network with operational amplifiers. The voltage source V is the input voltage (step), and the OP5.out.v is the filter output voltage. The pulse response is calculated.
        
 
        This model is identical to the CauerLowPassAnalog example, but inverting. To get the same response as that of the CauerLowPassAnalog example, a negative voltage step is used as input.
        
-
        This model is identical to the CauerLowPassOPV example. But the resistors are realized by switched capacitors (see SwitchedCapacitor). There are two different types of instances, one with a value of R=1 and one with a value of R=-1.
        
+
        This model is identical to the CauerLowPassOPV example. But the resistors are realized by switched capacitors (see SwitchedCapacitor). There are two different types of instances, one with a value of R=1 and one with a value of R=-1.
        
 
        The simulation end time should be 60. Please plot both V.v (which is the inverted input voltage) and OP5.out.v (output voltage). Compare this result with the CauerLowPassAnalog result.
        
 
        Due to the recharging of the capacitances after switching the performance of simulation is not as good as in the CauerLowPassOPV example.
        
 "));
diff --git a/Modelica/Electrical/Analog/Examples/GenerationOfFMUs.mo b/Modelica/Electrical/Analog/Examples/GenerationOfFMUs.mo
index 344d9f6842..e874f83858 100644
--- a/Modelica/Electrical/Analog/Examples/GenerationOfFMUs.mo
+++ b/Modelica/Electrical/Analog/Examples/GenerationOfFMUs.mo
@@ -189,7 +189,7 @@ conductance law in a target system between two inductors.
 
        
 
        
 Bear in mind that separating physical components and connecting them via adaptor signals requires to place appropriate
-ground components to define electric potential within the subcircuits.
+ground components to define electric potential within the subcircuits.
 
        
 "));
 end GenerationOfFMUs;
diff --git a/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine.mo b/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine.mo
index 6b7054ebcb..70d08ce66e 100644
--- a/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine.mo
+++ b/Modelica/Electrical/Analog/Examples/Lines/LightningLosslessTransmissionLine.mo
@@ -75,7 +75,7 @@ Note that after the source starts, the traveling wave arrives at the load 350 &m
 After 20 ms, a lightning (10/350 µs) with an amplitude of 10 kA hits the transmission line just in the middle.
 Note that the traveling wave hits source and load approximately 200 µs after the lightning hits the transmission line.
 Plot voltage and current at the load. Without overvoltage protection, the load would be destroyed.
-One could compare the results with that obtained by using a transmission line model taking losses into account.
+One could compare the results with that obtained by using a transmission line model taking losses into account.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine.mo b/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine.mo
index e5158bdbf6..861918b6bc 100644
--- a/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine.mo
+++ b/Modelica/Electrical/Analog/Examples/Lines/LightningSegmentedTransmissionLine.mo
@@ -82,7 +82,7 @@ After 20 ms, a lightning (10/350 µs) with an amplitude of 10 kA hits the t
 Note that the traveling wave hits source and load approximately 200 µs after the lightning hits the transmission line.
 Plot voltage and current at the load. Without overvoltage protection, the load would be destroyed.
 Note that using a sparse solver saves some simulation time.
-Using a lossless transmission line model simulates even much quicker.
+Using a lossless transmission line model simulates even much quicker.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Add.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Add.mo
index 79866faeed..c08bc40216 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Add.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Add.mo
@@ -41,7 +41,7 @@ equation
   connect(opAmp.out, p2) annotation (Line(points={{10,0},{80,0},{80,100},{100,100}},
         color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting adder, based on the IdealizedOpAmpLimited model.
        
+
        Inverting adder, based on the IdealizedOpAmpLimited model.
        
 
        -vOut = k1*vIn1 + k2*vIn2
        
 "), Icon(graphics={Text(
           extent={{-40,40},{40,-40}},
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo
index e7664b1ed1..0f94486ee5 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Buffer.mo
@@ -28,7 +28,7 @@ equation
   connect(opAmp.in_p, p1) annotation (Line(points={{-10,-6},{-80,-6},{-80,100},{
           -100,100}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Non-inverting amplifier = buffer, based on the IdealizedOpAmpLimited model.
        
+
        Non-inverting amplifier = buffer, based on the IdealizedOpAmpLimited model.
        
 
        vOut = k*vIn
        
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Der.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Der.mo
index 6258362db1..ae52316ffb 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Der.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Der.mo
@@ -27,7 +27,7 @@ equation
   connect(n1, opAmp.in_p) annotation (Line(points={{-100,-100},{-10,-100},{
           -10,-6}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting differentiator = der, based on the IdealizedOpAmpLimited model.
        
+
        Inverting differentiator = der, based on the IdealizedOpAmpLimited model.
        
 
        vOut = -k*der(vIn)
        
 "), Icon(graphics={Text(
           extent={{-60,40},{20,-40}},
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Derivative.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Derivative.mo
index 428d93225e..676d9698a8 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Derivative.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Derivative.mo
@@ -32,7 +32,7 @@ equation
   connect(c.p, p1)
     annotation (Line(points={{-80,30},{-80,100},{-100,100}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting highpass filter = derivative, based on the IdealizedOpAmpLimited model.
        
+
        Inverting highpass filter = derivative, based on the IdealizedOpAmpLimited model.
        
 
        Transfer function: vOut/vIn = -k*s/(1 + s*T)
        
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Feedback.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Feedback.mo
index aec0ed4a27..982dd6b701 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Feedback.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Feedback.mo
@@ -45,7 +45,7 @@ equation
   connect(n1, r4.n) annotation (Line(points={{-100,-100},{30,-100},{30,-70}},
         color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting subtracter = feedback, based on the IdealizedOpAmpLimited model.
        
+
        Inverting subtracter = feedback, based on the IdealizedOpAmpLimited model.
        
 
        vOut = -k*(vIn1 - vIn2)
        
 "), Icon(graphics={Text(
           extent={{-40,40},{40,-40}},
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/FirstOrder.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/FirstOrder.mo
index 4a6b17fb98..c3770e4137 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/FirstOrder.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/FirstOrder.mo
@@ -34,7 +34,7 @@ equation
   connect(opAmp.out, c.p)
     annotation (Line(points={{10,0},{30,0},{30,50}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting lowpass filter = first order, based on the IdealizedOpAmpLimited model.
        
+
        Inverting lowpass filter = first order, based on the IdealizedOpAmpLimited model.
        
 
        Transfer function: vOut/vIn = -k/(1 + s*T)
        
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Gain.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Gain.mo
index 90b5ad295e..9c3859703d 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Gain.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Gain.mo
@@ -26,7 +26,7 @@ equation
   connect(n1, n2)
     annotation (Line(points={{-100,-100},{100,-100}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting amplifier = gain, based on the IdealizedOpAmpLimited model.
        
+
        Inverting amplifier = gain, based on the IdealizedOpAmpLimited model.
        
 
        vOut = -k*vIn
        
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo
index ec70dd2148..43d9758909 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo
@@ -27,7 +27,7 @@ equation
   connect(opAmp.out, c.p)
     annotation (Line(points={{10,0},{30,0},{30,30}}, color={0,0,255}));
   annotation (Documentation(info="
-
        Inverting integrator, based on the IdealizedOpAmpLimited model.
        
+
        Inverting integrator, based on the IdealizedOpAmpLimited model.
        
 
        k*vin = -der(dvOut)
        
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PI.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PI.mo
index 22b7778ea4..b1ff43f5aa 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PI.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PI.mo
@@ -31,7 +31,7 @@ equation
   connect(opAmp.out, c.p)
     annotation (Line(points={{10,0},{60,0},{60,30}}, color={0,0,255}));
   annotation (defaultComponentName="PI", Documentation(info="
-
        Inverting proportional-integral controller = PI, based on the IdealizedOpAmpLimited model.
        
+
        Inverting proportional-integral controller = PI, based on the IdealizedOpAmpLimited model.
        
 
        Transfer function: vOut/vIn = -k*s/(1 + s*T)
        
 "), Icon(graphics={
         Polygon(
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PartialOpAmp.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PartialOpAmp.mo
index 6ffb3ad7cc..18f37d11e2 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PartialOpAmp.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/PartialOpAmp.mo
@@ -22,7 +22,7 @@ partial model PartialOpAmp
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid)}),    Documentation(info="
 
        
-Partial model for operational amplifier circuits, based on the IdealizedOpAmpLimited model.
+Partial model for operational amplifier circuits, based on the IdealizedOpAmpLimited model.
 Different functionality is achieved by different circuits.
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/package.mo b/Modelica/Electrical/Analog/Examples/OpAmps/package.mo
index e5703548e3..e9f063fd47 100644
--- a/Modelica/Electrical/Analog/Examples/OpAmps/package.mo
+++ b/Modelica/Electrical/Analog/Examples/OpAmps/package.mo
@@ -4,7 +4,7 @@ package OpAmps "Examples with operational amplifiers"
 
   annotation (Documentation(info="
 
        This package contains application examples of the components provided in the package
-OpAmpCircuits.
+OpAmpCircuits.
 
        
 "));
 end OpAmps;
diff --git a/Modelica/Electrical/Analog/Examples/ResonanceCircuits.mo b/Modelica/Electrical/Analog/Examples/ResonanceCircuits.mo
index 11f4edc65c..b276f9fd6a 100644
--- a/Modelica/Electrical/Analog/Examples/ResonanceCircuits.mo
+++ b/Modelica/Electrical/Analog/Examples/ResonanceCircuits.mo
@@ -217,7 +217,7 @@ Connecting these input/output blocks should give the same results as connecting
 
        
 
        
 Bear in mind that separating physical components and connecting them via adaptor signals requires to place appropriate
-ground components to define electric potential within the subcircuits.
+ground components to define electric potential within the subcircuits.
 
        
 "),
     Diagram(graphics={Text(
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo b/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo
index b508016b60..dd64614c76 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo
@@ -58,7 +58,7 @@ equation
           textString="v1"),        Text(
                 extent={{-150,-114},{150,-144}},
           textString="G=%G"),      Bitmap(extent={{-88,-36},{92,56}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/Conductor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/Conductor.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="v2"),        Text(
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo b/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo
index 17213f5048..a2f7d890cb 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo
@@ -64,7 +64,7 @@ equation
           textString="dv"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="C=%C"),      Bitmap(extent={{-96,-42},{64,54}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/DirectCapacitor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/DirectCapacitor.png"),
           Text( extent={{10,-60},{94,-90}},
                 horizontalAlignment=TextAlignment.Right,
           textString="i")}));
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/DirectInductor.mo b/Modelica/Electrical/Analog/Examples/Utilities/DirectInductor.mo
index ce4cd1a673..f140565412 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/DirectInductor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/DirectInductor.mo
@@ -57,7 +57,7 @@ equation
           textString="di"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="L=%L"),      Bitmap(extent={{-96,-42},{64,54}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/DirectInductor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/DirectInductor.png"),
           Text( extent={{10,-60},{94,-90}},
                 horizontalAlignment=TextAlignment.Right,
           textString="i")}));
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/InverseCapacitor.mo b/Modelica/Electrical/Analog/Examples/Utilities/InverseCapacitor.mo
index 55516f3c3b..467555485c 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/InverseCapacitor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/InverseCapacitor.mo
@@ -49,7 +49,7 @@ equation
           textString="dv"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="C=%C"),      Bitmap(extent={{-58,-42},{98,48}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/InverseCapacitor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/InverseCapacitor.png"),
           Text( extent={{-90,-64},{-6,-94}},
                 horizontalAlignment=TextAlignment.Left,
           textString="i")}));
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/InverseInductor.mo b/Modelica/Electrical/Analog/Examples/Utilities/InverseInductor.mo
index 778f64fa42..bc60cd6bb7 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/InverseInductor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/InverseInductor.mo
@@ -49,7 +49,7 @@ equation
           textString="di"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="L=%L"),      Bitmap(extent={{-58,-42},{98,48}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/InverseInductor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/InverseInductor.png"),
           Text( extent={{-90,-64},{-6,-94}},
                 horizontalAlignment=TextAlignment.Left,
           textString="i")}));
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/Resistor.mo b/Modelica/Electrical/Analog/Examples/Utilities/Resistor.mo
index b760238621..d379c64660 100644
--- a/Modelica/Electrical/Analog/Examples/Utilities/Resistor.mo
+++ b/Modelica/Electrical/Analog/Examples/Utilities/Resistor.mo
@@ -53,7 +53,7 @@ equation
           textString="v1"),        Text(
                 extent={{-150,-114},{150,-144}},
           textString="R=%R"),      Bitmap(extent={{-88,-36},{92,56}},
-            fileName="modelica://Modelica/Resources/Images/Electrical/Analog/Resistor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Electrical/Analog/Resistor.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="v2"),        Text(
diff --git a/Modelica/Electrical/Analog/Ideal/CloserWithArc.mo b/Modelica/Electrical/Analog/Ideal/CloserWithArc.mo
index 22bcb8cbad..d901863ba8 100644
--- a/Modelica/Electrical/Analog/Ideal/CloserWithArc.mo
+++ b/Modelica/Electrical/Analog/Ideal/CloserWithArc.mo
@@ -15,10 +15,10 @@ equation
         Line(points={{40,40},{32,14},{48,22},{40,0}}, color={255,0,0})}),
     Documentation(info="
 
        
-This model is an extension to the IdealClosingSwitch.
+This model is an extension to the IdealClosingSwitch.
 
        
 
        
-For details of the arc effect, see partial model IdealSwitchWithArc.
+For details of the arc effect, see partial model IdealSwitchWithArc.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/ControlledCloserWithArc.mo b/Modelica/Electrical/Analog/Ideal/ControlledCloserWithArc.mo
index 620d4dfcf1..f234161dc5 100644
--- a/Modelica/Electrical/Analog/Ideal/ControlledCloserWithArc.mo
+++ b/Modelica/Electrical/Analog/Ideal/ControlledCloserWithArc.mo
@@ -15,10 +15,10 @@ equation
   annotation (defaultComponentName="switch",
     Documentation(info="
 
        
-This model is an extension to the ControlledIdealClosingSwitch.
+This model is an extension to the ControlledIdealClosingSwitch.
 
        
 
        
-For details of the arc effect, see partial model IdealSwitchWithArc.
+For details of the arc effect, see partial model IdealSwitchWithArc.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/ControlledIdealClosingSwitch.mo b/Modelica/Electrical/Analog/Ideal/ControlledIdealClosingSwitch.mo
index 45518348c7..1cc65f2c37 100644
--- a/Modelica/Electrical/Analog/Ideal/ControlledIdealClosingSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/ControlledIdealClosingSwitch.mo
@@ -15,7 +15,7 @@ equation
     Documentation(info="
 
        
 The switching behaviour of the controlled ideal closing switch is controlled by the control pin: off = control.v < level
        
-For further details, see partial model IdealSwitch.
+For further details, see partial model IdealSwitch.
 
        
 
 ",
diff --git a/Modelica/Electrical/Analog/Ideal/ControlledIdealIntermediateSwitch.mo b/Modelica/Electrical/Analog/Ideal/ControlledIdealIntermediateSwitch.mo
index 6bfa7ad511..ad9fa6fdbe 100644
--- a/Modelica/Electrical/Analog/Ideal/ControlledIdealIntermediateSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/ControlledIdealIntermediateSwitch.mo
@@ -51,7 +51,7 @@ equation
 
        
 
 
        
-\"ControlledIdealIntermediateSwitch1.png\"
 
        
 
@@ -60,7 +60,7 @@ In order to prevent singularities during switching, the opened switch has a (ver
 
        
 
 
        
-\"ControlledIdealIntermediateSwitch2.png\"
 
        
 
diff --git a/Modelica/Electrical/Analog/Ideal/ControlledIdealOpeningSwitch.mo b/Modelica/Electrical/Analog/Ideal/ControlledIdealOpeningSwitch.mo
index 2adbeed49c..16ba67ed84 100644
--- a/Modelica/Electrical/Analog/Ideal/ControlledIdealOpeningSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/ControlledIdealOpeningSwitch.mo
@@ -15,7 +15,7 @@ equation
     Documentation(info="
 
        
 The switching behaviour of the controlled  ideal opening switch is controlled by the control pin: off = control.v > level
        
-For further details, see partial model IdealSwitch.
+For further details, see partial model IdealSwitch.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/ControlledOpenerWithArc.mo b/Modelica/Electrical/Analog/Ideal/ControlledOpenerWithArc.mo
index 1f1be92069..2073233d8e 100644
--- a/Modelica/Electrical/Analog/Ideal/ControlledOpenerWithArc.mo
+++ b/Modelica/Electrical/Analog/Ideal/ControlledOpenerWithArc.mo
@@ -15,10 +15,10 @@ equation
   annotation (defaultComponentName="switch",
     Documentation(info="
 
        
-This model is an extension to the ControlledIdealOpeningSwitch.
+This model is an extension to the ControlledIdealOpeningSwitch.
 
        
 
        
-For details of the arc effect, see partial model IdealSwitchWithArc.
+For details of the arc effect, see partial model IdealSwitchWithArc.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/IdealClosingSwitch.mo b/Modelica/Electrical/Analog/Ideal/IdealClosingSwitch.mo
index 788f9645e6..c3bfabed34 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealClosingSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealClosingSwitch.mo
@@ -13,7 +13,7 @@ equation
     Documentation(info="
 
        
 The switching behaviour of the ideal closing switch is controlled by the input signal control: off = not control.
        
-For further details, see partial model IdealSwitch.
+For further details, see partial model IdealSwitch.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/IdealDiode.mo b/Modelica/Electrical/Analog/Ideal/IdealDiode.mo
index 0066a11fab..cd7997f593 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealDiode.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealDiode.mo
@@ -6,7 +6,7 @@ equation
   annotation (defaultComponentName="diode",
     Documentation(info="
 
        
-This is an ideal diode, for details see partial model IdealSemiconductor
        
+This is an ideal diode, for details see partial model IdealSemiconductor
        
 The diode is conducting if voltage > Vknee.
        
 The diode is locking if current < Vknee*Goff.
 
        
diff --git a/Modelica/Electrical/Analog/Ideal/IdealGTOThyristor.mo b/Modelica/Electrical/Analog/Ideal/IdealGTOThyristor.mo
index d8f3b78f96..7bf5e25072 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealGTOThyristor.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealGTOThyristor.mo
@@ -14,7 +14,7 @@ equation
   annotation (defaultComponentName="gto",
     Documentation(info="
 
        
-This is an ideal GTO thyristor or switching transistor, for details see partial model IdealSemiconductor
        
+This is an ideal GTO thyristor or switching transistor, for details see partial model IdealSemiconductor
        
 The GTO thyristor is conducting if voltage > Vknee AND fire = true.
        
 Otherwise, the GTO thyristor is locking.
 
        
diff --git a/Modelica/Electrical/Analog/Ideal/IdealIntermediateSwitch.mo b/Modelica/Electrical/Analog/Ideal/IdealIntermediateSwitch.mo
index 34aea2ada8..8cefe0e811 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealIntermediateSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealIntermediateSwitch.mo
@@ -46,14 +46,14 @@ equation
 
        The intermediate switch has four switching contact pins p1, p2, n1, and n2. The switching behaviour is controlled by the input signal control. If control is true, the pin p1 is connected to the pin n2, and the pin p2 is connected to the pin n1. Otherwise,if control is false, the pin p1 is connected to n1, and the pin p2 is connected to n2.
        
 
 
        
-\"IdealIntermediateSwitch1.png\"
 
        
 
 
        In order to prevent singularities during switching, the opened switch has a (very low) conductance Goff and the closed switch has a (very low) resistance Ron.
        
 
 
        
-\"IdealIntermediateSwitch2.png\"
 
        
 
diff --git a/Modelica/Electrical/Analog/Ideal/IdealOpeningSwitch.mo b/Modelica/Electrical/Analog/Ideal/IdealOpeningSwitch.mo
index 9e01a61695..e390b5fbf9 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealOpeningSwitch.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealOpeningSwitch.mo
@@ -16,7 +16,7 @@ equation
     Documentation(info="
 
        
 The switching behaviour of the ideal opening switch is controlled by the input signal control: off = control.
        
-For further details, see partial model IdealSwitch.
+For further details, see partial model IdealSwitch.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Ideal/IdealThyristor.mo b/Modelica/Electrical/Analog/Ideal/IdealThyristor.mo
index 5db871d8df..b05dcb92bd 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealThyristor.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealThyristor.mo
@@ -14,7 +14,7 @@ equation
   annotation (defaultComponentName="thyristor",
     Documentation(info="
 
        
-This is an ideal thyristor, for details see partial model IdealSemiconductor
        
+This is an ideal thyristor, for details see partial model IdealSemiconductor
        
 The thyristor is conducting if voltage > Vknee AND fire = true.
        
 If fire gets false, the current has to fall below Vknee*Goff, then the thyristor gets locking.
        
 ",
diff --git a/Modelica/Electrical/Analog/Ideal/IdealTransformer.mo b/Modelica/Electrical/Analog/Ideal/IdealTransformer.mo
index 5f23a37518..b9ed6a0507 100644
--- a/Modelica/Electrical/Analog/Ideal/IdealTransformer.mo
+++ b/Modelica/Electrical/Analog/Ideal/IdealTransformer.mo
@@ -49,7 +49,7 @@ Due to this equations, the DC offset of secondary voltages and currents decremen
 
        
 
        
 Taking primary L1sigma and secondary L2ssigma leakage inductances into account,
-compared with the basic transformer
+compared with the basic transformer
 the following parameter conversion can be applied (which leads to identical results):
 
        
 
        diff --git a/Modelica/Electrical/Analog/Ideal/OpenerWithArc.mo b/Modelica/Electrical/Analog/Ideal/OpenerWithArc.mo
index 60b33aeb03..04b34abbcd 100644
--- a/Modelica/Electrical/Analog/Ideal/OpenerWithArc.mo
+++ b/Modelica/Electrical/Analog/Ideal/OpenerWithArc.mo
@@ -16,10 +16,10 @@ equation
         Line(points={{40,40},{32,30},{48,26},{40,20}}, color={255,0,0})}),
     Documentation(info="
 
        
-This model is an extension to the IdealOpeningSwitch.
+This model is an extension to the IdealOpeningSwitch.
 
        
 
        
-For details of the arc effect, see partial model IdealSwitchWithArc.
+For details of the arc effect, see partial model IdealSwitchWithArc.
 
        
 ",
         revisions="
diff --git a/Modelica/Electrical/Analog/Interfaces/IdealSwitchWithArc.mo b/Modelica/Electrical/Analog/Interfaces/IdealSwitchWithArc.mo
index d1e7309fcf..e173989399 100644
--- a/Modelica/Electrical/Analog/Interfaces/IdealSwitchWithArc.mo
+++ b/Modelica/Electrical/Analog/Interfaces/IdealSwitchWithArc.mo
@@ -59,7 +59,7 @@ equation
             fillPattern=FillPattern.Solid)}),
     Documentation(info="
 
        
-This model is an extension to the IdealSwitch.
+This model is an extension to the IdealSwitch.
 
        
 
        
 The basic model interrupts the current through the switch in an infinitesimal time span.
diff --git a/Modelica/Electrical/Analog/Lines/M_OLine.mo b/Modelica/Electrical/Analog/Lines/M_OLine.mo
index e135c02c72..688d317234 100644
--- a/Modelica/Electrical/Analog/Lines/M_OLine.mo
+++ b/Modelica/Electrical/Analog/Lines/M_OLine.mo
@@ -313,11 +313,11 @@ equation
 and several single lines. Each segment consists of resistors and inductors that 
 are connected in series in each single line, and of capacitors and conductors both 
 between the lines and to the ground. The inductors are coupled to each other like in the
-M_Transformer model. 
+M_Transformer model. 
 The following picture shows the schematic of a segment with four single lines (lines=4):
        
 
 
        
-\"segment.png\"
 
        
 
@@ -342,7 +342,7 @@ the auxiliary segment_last. For the example with 4 lines the schema
 segment_last is like this:
        
 
 
        
-\"segment_last.png\"
 
        
 
@@ -352,7 +352,7 @@ One line consists of at least two segments.
 Inside the model M_OLine the model segment is used. 
 This model represents one segment which is build as described above. 
 For modelling the inductances and their mutual couplings the model 
-M_Transformer is used. 
+M_Transformer is used. 
 To fill the resistance vector, resistance values as many as lines are needed, e.g., 
 if there are four lines, four resistances are needed. For example for a microelectronic line 
 of 0.1m length, a sensible resistance-vector would be R=[4.76e5, 1.72e5, 1.72e5, 1.72e5].
        
@@ -378,7 +378,7 @@ values from the main diagonal and from the positions that are below the main dia
 To get the following matrix
        
 
 
        
-\"Matrix\"/
+\"Matrix\"/
 
        
 
 
        the vector with dim_vector_lgc=4*5/2=10 has to appear in the following way: 
@@ -389,21 +389,21 @@ which is used as default example for the M_OLine model,
 a sensible inductance-matrix would be:
        
 
 
        
-\"L\"/
+\"L\"/
 
        
 
 
        For the example of a microelectronic line of 0.1m length, which is used as default example 
 for the M_OLine model, a sensible capacitance-matrix would be:
        
 
 
        
-\"C\"/
+\"C\"/
 
        
 
 
        For the example of a microelectronic line of 0.1m length, which is used as default example 
 for the M_OLine model, a sensible conductance-matrix would be:
        
 
 
        
-\"G\"/
+\"G\"/
 
        
 
 
        The user has the possibility to enable a conditional heatport. If so, the M_OLine 
diff --git a/Modelica/Electrical/Analog/Lines/OLine.mo b/Modelica/Electrical/Analog/Lines/OLine.mo
index 79564b9c15..e2bb103cdf 100644
--- a/Modelica/Electrical/Analog/Lines/OLine.mo
+++ b/Modelica/Electrical/Analog/Lines/OLine.mo
@@ -95,7 +95,7 @@ equation
 
        To get a symmetric line model, the first resistor and inductor are cut into two parts (R1 and R_Nplus1, L1 and L_Nplus1). These two new resistors and inductors have the half of the resistance respectively inductance the original resistor respectively inductor.
        
 
 
        
-\"OLine.png\"
 
        
 
@@ -107,7 +107,7 @@ equation
 
        The user has the possibility to enable a conditional heatport. If so, the OLine can be connected to a thermal network. When the parameter alpha is set to a value greater than zero, the OLine becomes temperature sensitive due to their resistors which resistances are calculated by R_actual = R*(1 + alpha*(heatPort.T - T_ref)) and conductors calculated by  (G_actual = G/(1 + alpha*(heatPort.T - T_ref)).
        
 
        Note, this is different to the lumped line model of SPICE.
        
 
-
        References: [Johnson1991]
        
+
        References: [Johnson1991]
        
 ",    revisions="
 
          
 
        •  2016   
diff --git a/Modelica/Electrical/Analog/Lines/TLine.mo b/Modelica/Electrical/Analog/Lines/TLine.mo
index 7749fc84dd..a65e125264 100644
--- a/Modelica/Electrical/Analog/Lines/TLine.mo
+++ b/Modelica/Electrical/Analog/Lines/TLine.mo
@@ -25,7 +25,7 @@ equation
 
          
 Lossless transmission line with characteristic impedance Z0 and transmission delay TD. The lossless transmission line TLine is a two Port. 
 Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD. 
-For further details see [Branin1967]. 
+For further details see [Branin1967]. 
 The model parameters can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L' / C').
 
          
 
          
@@ -41,8 +41,8 @@ There are three possibilities for specifying the transmission delay TD:
 
          Resistance R' and conductance G' per meter are assumed to be zero.
          
 
 
          References:
-   [Branin1967],
-   [Hoefer1985]
          
+   [Branin1967],
+   [Hoefer1985]
          
 ",    revisions="
 
            
 
          •  1998   
diff --git a/Modelica/Electrical/Analog/Lines/TLine1.mo b/Modelica/Electrical/Analog/Lines/TLine1.mo
index bcf4db94ba..36b47e5c7a 100644
--- a/Modelica/Electrical/Analog/Lines/TLine1.mo
+++ b/Modelica/Electrical/Analog/Lines/TLine1.mo
@@ -17,13 +17,13 @@ equation
   er = 2*delay(v1, TD) - delay(es, TD);
   annotation (defaultComponentName="line",
     Documentation(info="
-
            Lossless transmission line with characteristic impedance Z0 and transmission delay TD The lossless transmission line TLine1 is a two Port. Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD. For further details see [Branin1967]. The model parameters can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C') and TD = sqrt(L'*C')*length_of_line. Resistance R' and conductance C' per meter are assumed to be zero.
            
+
            Lossless transmission line with characteristic impedance Z0 and transmission delay TD The lossless transmission line TLine1 is a two Port. Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD. For further details see [Branin1967]. The model parameters can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C') and TD = sqrt(L'*C')*length_of_line. Resistance R' and conductance C' per meter are assumed to be zero.
            
 
 
            References:
-   [Branin1967],
-   [Hoefer1985]
            
+   [Branin1967],
+   [Hoefer1985]
            
 
            Note:
            
-
            This model is replaced by TLine with appropriate parameterization.
            
+
            This model is replaced by TLine with appropriate parameterization.
            
 ",    revisions="
 
              
 
            •  1998   
diff --git a/Modelica/Electrical/Analog/Lines/TLine2.mo b/Modelica/Electrical/Analog/Lines/TLine2.mo
index faad2ace53..76c40c324a 100644
--- a/Modelica/Electrical/Analog/Lines/TLine2.mo
+++ b/Modelica/Electrical/Analog/Lines/TLine2.mo
@@ -21,12 +21,12 @@ equation
   er = 2*delay(v1, TD) - delay(es, TD);
   annotation (defaultComponentName="line",
     Documentation(info="
-
              Lossless transmission line with characteristic impedance Z0, frequency F and normalized length NL The lossless transmission line TLine2 is a two Port. Both port branches consist of a resistor with the value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [Branin1967]. Resistance R' and conductance C' per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C'). The normalized length NL is equal to the length of the line divided by the wavelength corresponding to the frequency F, i. e. the transmission delay TD is the quotient of NL and F.
              
+
              Lossless transmission line with characteristic impedance Z0, frequency F and normalized length NL The lossless transmission line TLine2 is a two Port. Both port branches consist of a resistor with the value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [Branin1967]. Resistance R' and conductance C' per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C'). The normalized length NL is equal to the length of the line divided by the wavelength corresponding to the frequency F, i. e. the transmission delay TD is the quotient of NL and F.
              
 
              References:
-   [Branin1967],
-   [Hoefer1985]
              
+   [Branin1967],
+   [Hoefer1985]
              
 
              Note:
              
-
              This model is replaced by TLine with appropriate parameterization.
              
+
              This model is replaced by TLine with appropriate parameterization.
              
 ",    revisions="
 
              
 
              1998
              
diff --git a/Modelica/Electrical/Analog/Lines/TLine3.mo b/Modelica/Electrical/Analog/Lines/TLine3.mo
index 810edfbf3a..1b06ccab22 100644
--- a/Modelica/Electrical/Analog/Lines/TLine3.mo
+++ b/Modelica/Electrical/Analog/Lines/TLine3.mo
@@ -18,12 +18,12 @@ equation
   er = 2*delay(v1, TD) - delay(es, TD);
   annotation (defaultComponentName="line",
     Documentation(info="
-
              Lossless transmission line with characteristic impedance Z0 and frequency F The lossless transmission line TLine3 is a two Port. Both port branches consist of a resistor with value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [Branin1967]. Resistance R' and conductance C' per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C'). The length of the line is equal to a quarter of the wavelength corresponding to the frequency F, i. e. the transmission delay is the quotient of 4 and F. In this case, the characteristic impedance is called natural impedance.
              
+
              Lossless transmission line with characteristic impedance Z0 and frequency F The lossless transmission line TLine3 is a two Port. Both port branches consist of a resistor with value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [Branin1967]. Resistance R' and conductance C' per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L' resp. C'), i. e. Z0 = sqrt(L'/C'). The length of the line is equal to a quarter of the wavelength corresponding to the frequency F, i. e. the transmission delay is the quotient of 4 and F. In this case, the characteristic impedance is called natural impedance.
              
 
              References:
-   [Branin1967],
-   [Hoefer1985]
              
+   [Branin1967],
+   [Hoefer1985]
              
 
              Note:
              
-
              This model is replaced by TLine with appropriate parameterization.
              
+
              This model is replaced by TLine with appropriate parameterization.
              
 ",    revisions="
 
                
 
              •  1998   
diff --git a/Modelica/Electrical/Analog/Lines/ULine.mo b/Modelica/Electrical/Analog/Lines/ULine.mo
index 0bf91a3290..307dfabe6d 100644
--- a/Modelica/Electrical/Analog/Lines/ULine.mo
+++ b/Modelica/Electrical/Analog/Lines/ULine.mo
@@ -74,7 +74,7 @@ equation
 
                To get a symmetrical line model, the first resistor is cut into two parts (R1 and R_Nplus1). These two new resistors have the half of the resistance of the original resistor.
 
                
 
                
-\"ULine.png\"
 
                
 
                
@@ -84,7 +84,7 @@ The capacitances are calculated with: C=c*length/N.
 
                
 
                The user has the possibility to enable a conditional heatport. If so, the ULine can be connected to a thermal network. When the parameter alpha is set to a value greater than zero, the ULine becomes temperature sensitive due to their resistors which resistances are calculated by R_actual= R*(1 + alpha*(heatPort.T - T_ref)).
                
 
                Note, this is different compared with the lumped line model of SPICE.
                
-
                References: [Johnson1991]
                
+
                References: [Johnson1991]
                
 ",    revisions="
 
                
 
                2016
                
diff --git a/Modelica/Electrical/Analog/Semiconductors/Diode2.mo b/Modelica/Electrical/Analog/Semiconductors/Diode2.mo
index 793460764d..08c18e8b37 100644
--- a/Modelica/Electrical/Analog/Semiconductors/Diode2.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/Diode2.mo
@@ -41,7 +41,7 @@ equation
   assert(Vt>0, "Vt must be greater than zero");
   annotation (defaultComponentName="diode",
     Documentation(info="
-
                This diode model is an improved version of the simple diode model. It includes a series resistance, parallel conductance, and also models reverse breakdown. The model is divided into three parts:
                
+
                This diode model is an improved version of the simple diode model. It includes a series resistance, parallel conductance, and also models reverse breakdown. The model is divided into three parts:
                
 
                  
 
                • lower half of reversed bias region including breakdown: -Ids·(exp(-(vd+Bv)/(N·Vt)) + 1 - 2·exp(-Bv/(2·N·Vt)))
                  • 
 
                • upper half of reverse biased region and forward biased region before conduction: Ids·(exp(vd/(N·Vt)) - 1)
                  • 
diff --git a/Modelica/Electrical/Analog/Semiconductors/NMOS.mo b/Modelica/Electrical/Analog/Semiconductors/NMOS.mo
index 6b68df0c70..12d57bc7d0 100644
--- a/Modelica/Electrical/Analog/Semiconductors/NMOS.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/NMOS.mo
@@ -60,7 +60,7 @@ equation
         LossPower = D.i*(D.v - S.v);
         annotation (defaultComponentName="nMOS",
           Documentation(info="
-
                  The NMOS model is a simple model of a n-channel metal-oxide semiconductor FET. It differs slightly from the device used in the SPICE simulator. For more details please care for [Spiro1990].
+
                  The NMOS model is a simple model of a n-channel metal-oxide semiconductor FET. It differs slightly from the device used in the SPICE simulator. For more details please care for [Spiro1990].
 
                   A heating port is added for thermal electric simulation. The heating port is defined in the Modelica.Thermal library.
 
                  The model does not consider capacitances. A high drain-source resistance RDS is included to avoid numerical difficulties.
 
                  
@@ -86,7 +86,7 @@ m       m      A/V^2        V       -      -        m        m
 12.e-6  4.e-6  0.038e-3    -0.8     0.33   0.6      0        0           zero
 20.e-6  6.e-6  0.022e-3     0.8     1      0.66     0        0
 
        
-
        References: [Spiro1990]
        
+
        References: [Spiro1990]
        
 ",revisions="
 
          
 
        •  March 11, 2009   
diff --git a/Modelica/Electrical/Analog/Semiconductors/NPN.mo b/Modelica/Electrical/Analog/Semiconductors/NPN.mo
index ef08136a23..a20acfd66a 100644
--- a/Modelica/Electrical/Analog/Semiconductors/NPN.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/NPN.mo
@@ -100,7 +100,7 @@ Bf  Br  Is     Vak  Tauf    Taur  Ccs   Cje     Cjc     Phie  Me   PHic   Mc
 -   -   A      V    s       s     F     F       F       V     -    V      -      mS     mS
 50  0.1 1e-16  0.02 0.12e-9 5e-9  1e-12 0.4e-12 0.5e-12 0.8   0.4  0.8    0.333  1e-15  1e-15
 
-
          References: [Vlach1983]
          
+
          References: [Vlach1983]
          
 ",revisions="
 
            
 
          •  March 11, 2009   
diff --git a/Modelica/Electrical/Analog/Semiconductors/PMOS.mo b/Modelica/Electrical/Analog/Semiconductors/PMOS.mo
index 86830df950..3f92c7645c 100644
--- a/Modelica/Electrical/Analog/Semiconductors/PMOS.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/PMOS.mo
@@ -60,10 +60,10 @@ equation
         LossPower = D.i*(D.v - S.v);
         annotation (defaultComponentName="pMOS",
           Documentation(info="
-
            The PMOS model is a simple model of a p-channel metal-oxide semiconductor FET. It differs slightly from the device used in the SPICE simulator. For more details please care for [Spiro1990].
+
            The PMOS model is a simple model of a p-channel metal-oxide semiconductor FET. It differs slightly from the device used in the SPICE simulator. For more details please care for [Spiro1990].
 
            A heating port is added for thermal electric simulation. The heating port is defined in the Modelica.Thermal library.
 
            The model does not consider capacitances. A high drain-source resistance RDS is included to avoid numerical difficulties.
            
-
            References: [Spiro1990]
            
+
            References: [Spiro1990]
            
 
            Some typical parameter sets are:
            
 
             W       L      Beta        Vt    K2     K5      dW       dL
diff --git a/Modelica/Electrical/Analog/Semiconductors/PNP.mo b/Modelica/Electrical/Analog/Semiconductors/PNP.mo
index fc7c8b78ef..92c540a9a1 100644
--- a/Modelica/Electrical/Analog/Semiconductors/PNP.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/PNP.mo
@@ -100,7 +100,7 @@ Bf  Br  Is     Vak  Tauf    Taur  Ccs   Cje     Cjc     Phie  Me   PHic   Mc
 -   -   A      V    s       s     F     F       F       V     -    V      -      mS     mS
 50  0.1 1e-16  0.02 0.12e-9 5e-9  1e-12 0.4e-12 0.5e-12 0.8   0.4  0.8    0.333  1e-15  1e-15
 
            
-
            References: [Vlach1983]
            
+
            References: [Vlach1983]
            
 ",revisions="
 
              
 
            •  March 11, 2009   
diff --git a/Modelica/Electrical/Analog/Semiconductors/Thyristor.mo b/Modelica/Electrical/Analog/Semiconductors/Thyristor.mo
index 34e141d231..dd07594f44 100644
--- a/Modelica/Electrical/Analog/Semiconductors/Thyristor.mo
+++ b/Modelica/Electrical/Analog/Semiconductors/Thyristor.mo
@@ -66,7 +66,7 @@ equation
 
              This is a simple thyristor model with three pins: Anode, Cathode and Gate. There are three operating modes:conducting, blocking and reverse breakthrough.
 
              As long as the thyristor is in blocking mode it behaves like a linear resistance Roff=VDRM^2/(VTM*IH). But if the voltage between anode and cathode exceeds VDRM or a positive gate current flows for a sufficient time the mode changes to conducting mode. The model stays in conducting mode until the anode current falls below the holding current IH. There is no way to switch off the thyristor via the gate. If the voltage between anode and cathode is negative, the model represents a diode (parameters Vt, Nbv) with reverse breakthrough voltage VRRM.
              
 
              
-\"Thyristor.png\"
 
              
 
              The dV/dt switch on is not taken into account in this model. The gate circuit is not influenced by the main circuit.
              
diff --git a/Modelica/Electrical/Analog/Sources/CosineCurrent.mo b/Modelica/Electrical/Analog/Sources/CosineCurrent.mo
index d0111462ef..ad277d360e 100644
--- a/Modelica/Electrical/Analog/Sources/CosineCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/CosineCurrent.mo
@@ -27,7 +27,7 @@ model CosineCurrent "Cosine current source"
         info="
 
              This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"CosineCurrent.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/CosineVoltage.mo b/Modelica/Electrical/Analog/Sources/CosineVoltage.mo
index 73c54c186d..565a8ee286 100644
--- a/Modelica/Electrical/Analog/Sources/CosineVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/CosineVoltage.mo
@@ -27,7 +27,7 @@ model CosineVoltage "Cosine voltage source"
         info="
 
              This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"CosineVoltage.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/ExpSineCurrent.mo b/Modelica/Electrical/Analog/Sources/ExpSineCurrent.mo
index 7835bbd822..a21195c639 100644
--- a/Modelica/Electrical/Analog/Sources/ExpSineCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/ExpSineCurrent.mo
@@ -30,7 +30,7 @@ model ExpSineCurrent "Exponentially damped sine current source"
         info="
 
              This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"ExpSineCurrent.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/ExpSineVoltage.mo b/Modelica/Electrical/Analog/Sources/ExpSineVoltage.mo
index 35eb118ee0..37a0c243d7 100644
--- a/Modelica/Electrical/Analog/Sources/ExpSineVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/ExpSineVoltage.mo
@@ -30,7 +30,7 @@ model ExpSineVoltage "Exponentially damped sine voltage source"
         info="
 
              This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"ExpSineVoltage.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/ExponentialsCurrent.mo b/Modelica/Electrical/Analog/Sources/ExponentialsCurrent.mo
index e92672f3d9..ea7bd3087d 100644
--- a/Modelica/Electrical/Analog/Sources/ExponentialsCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/ExponentialsCurrent.mo
@@ -31,7 +31,7 @@ model ExponentialsCurrent "Rising and falling exponential current source"
         info="
 
              This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"ExponentialsCurrent.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/ExponentialsVoltage.mo b/Modelica/Electrical/Analog/Sources/ExponentialsVoltage.mo
index 455111ae83..e24328c5cf 100644
--- a/Modelica/Electrical/Analog/Sources/ExponentialsVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/ExponentialsVoltage.mo
@@ -31,7 +31,7 @@ model ExponentialsVoltage "Rising and falling exponential voltage source"
         info="
 
              This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
              
 
              
-\"ExponentialsVoltage.png\"
 
              
 "));
diff --git a/Modelica/Electrical/Analog/Sources/LightningImpulse.mo b/Modelica/Electrical/Analog/Sources/LightningImpulse.mo
index 5b98f2a45b..56422977bb 100644
--- a/Modelica/Electrical/Analog/Sources/LightningImpulse.mo
+++ b/Modelica/Electrical/Analog/Sources/LightningImpulse.mo
@@ -92,7 +92,7 @@ The decay time to half value T2 is defined as the time span between
   
        Fig. 1: Parameters of the lightning current
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Electrical/Analog/Sources/LightningImpulseCurrent.mo b/Modelica/Electrical/Analog/Sources/LightningImpulseCurrent.mo
index c0e216f1bc..6e5bdc9d19 100644
--- a/Modelica/Electrical/Analog/Sources/LightningImpulseCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/LightningImpulseCurrent.mo
@@ -23,7 +23,7 @@ model LightningImpulseCurrent "Lightning impulse current"
                                      Documentation(info="
 
        
 Lightning impulse current using either a double exponential function or a Heidler function, 
-see block LightningImpulse.
+see block LightningImpulse.
 
        
 "));
 end LightningImpulseCurrent;
diff --git a/Modelica/Electrical/Analog/Sources/LightningImpulseVoltage.mo b/Modelica/Electrical/Analog/Sources/LightningImpulseVoltage.mo
index 63974c8b5c..ca2fabcffe 100644
--- a/Modelica/Electrical/Analog/Sources/LightningImpulseVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/LightningImpulseVoltage.mo
@@ -23,7 +23,7 @@ model LightningImpulseVoltage "Lightning impulse voltage"
                                      Documentation(info="
 
        
 Lightning impulse voltage using either a double exponential function or a Heidler function, 
-see block LightningImpulse.
+see block LightningImpulse.
 
        
 "));
 end LightningImpulseVoltage;
diff --git a/Modelica/Electrical/Analog/Sources/PulseVoltage.mo b/Modelica/Electrical/Analog/Sources/PulseVoltage.mo
index 3b8fbac443..ddc73ae768 100644
--- a/Modelica/Electrical/Analog/Sources/PulseVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/PulseVoltage.mo
@@ -26,7 +26,7 @@ model PulseVoltage "Pulse voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"PulseVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/RampCurrent.mo b/Modelica/Electrical/Analog/Sources/RampCurrent.mo
index 5f16628be0..1d6c3045b0 100644
--- a/Modelica/Electrical/Analog/Sources/RampCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/RampCurrent.mo
@@ -19,7 +19,7 @@ model RampCurrent "Ramp current source"
         info="
 
        This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"RampCurrent.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/RampVoltage.mo b/Modelica/Electrical/Analog/Sources/RampVoltage.mo
index 9296dd5b73..b95ed4d7c2 100644
--- a/Modelica/Electrical/Analog/Sources/RampVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/RampVoltage.mo
@@ -19,7 +19,7 @@ model RampVoltage "Ramp voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"RampVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/SawToothCurrent.mo b/Modelica/Electrical/Analog/Sources/SawToothCurrent.mo
index 7aaf76b1ca..c59c295dea 100644
--- a/Modelica/Electrical/Analog/Sources/SawToothCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/SawToothCurrent.mo
@@ -18,7 +18,7 @@ model SawToothCurrent "Saw tooth current source"
         info="
 
        This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"SawToothCurrent.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/SawToothVoltage.mo b/Modelica/Electrical/Analog/Sources/SawToothVoltage.mo
index bf80244730..a9839330ef 100644
--- a/Modelica/Electrical/Analog/Sources/SawToothVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/SawToothVoltage.mo
@@ -18,7 +18,7 @@ model SawToothVoltage "Saw tooth voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"SawToothVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/SineCurrent.mo b/Modelica/Electrical/Analog/Sources/SineCurrent.mo
index 2f69b615d9..0a2d88d244 100644
--- a/Modelica/Electrical/Analog/Sources/SineCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/SineCurrent.mo
@@ -26,7 +26,7 @@ model SineCurrent "Sine current source"
         info="
 
        This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"SineCurrent.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/SineVoltage.mo b/Modelica/Electrical/Analog/Sources/SineVoltage.mo
index ce8d4c86ce..c79893116d 100644
--- a/Modelica/Electrical/Analog/Sources/SineVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/SineVoltage.mo
@@ -26,7 +26,7 @@ model SineVoltage "Sine voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"SineVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/StepCurrent.mo b/Modelica/Electrical/Analog/Sources/StepCurrent.mo
index 73e394e883..93f854fa21 100644
--- a/Modelica/Electrical/Analog/Sources/StepCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/StepCurrent.mo
@@ -17,7 +17,7 @@ model StepCurrent "Step current source"
         info="
 
        This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"StepCurrent.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/StepVoltage.mo b/Modelica/Electrical/Analog/Sources/StepVoltage.mo
index 34239a2aca..b3bba1cabf 100644
--- a/Modelica/Electrical/Analog/Sources/StepVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/StepVoltage.mo
@@ -17,7 +17,7 @@ model StepVoltage "Step voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"StepVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/TableCurrent.mo b/Modelica/Electrical/Analog/Sources/TableCurrent.mo
index 832fdcd1fe..a48eb0b321 100644
--- a/Modelica/Electrical/Analog/Sources/TableCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/TableCurrent.mo
@@ -36,7 +36,7 @@ If, e.g., time = 1.0, the current i =  0.0 (before event), 1.0 (after event)
 
 

         Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"TableCurrent.png\"
 
        
 ",
diff --git a/Modelica/Electrical/Analog/Sources/TableVoltage.mo b/Modelica/Electrical/Analog/Sources/TableVoltage.mo
index 06dafc0176..d5457a51f7 100644
--- a/Modelica/Electrical/Analog/Sources/TableVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/TableVoltage.mo
@@ -36,7 +36,7 @@ If, e.g., time = 1.0, the voltage v =  0.0 (before event), 1.0 (after event)
 
 

          Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"TableVoltage.png\"
 
        
 ",
diff --git a/Modelica/Electrical/Analog/Sources/TrapezoidCurrent.mo b/Modelica/Electrical/Analog/Sources/TrapezoidCurrent.mo
index d2e4cdb083..2650d2c3ea 100644
--- a/Modelica/Electrical/Analog/Sources/TrapezoidCurrent.mo
+++ b/Modelica/Electrical/Analog/Sources/TrapezoidCurrent.mo
@@ -38,7 +38,7 @@ model TrapezoidCurrent "Trapezoidal current source"
         info="
 
        This current source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"TrapezoidCurrent.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/Sources/TrapezoidVoltage.mo b/Modelica/Electrical/Analog/Sources/TrapezoidVoltage.mo
index ccec1e86d0..dd3a2928bd 100644
--- a/Modelica/Electrical/Analog/Sources/TrapezoidVoltage.mo
+++ b/Modelica/Electrical/Analog/Sources/TrapezoidVoltage.mo
@@ -38,7 +38,7 @@ model TrapezoidVoltage "Trapezoidal voltage source"
         info="
 
        This voltage source uses the corresponding signal source of the Modelica.Blocks.Sources package. Care for the meaning of the parameters in the Blocks package. Furthermore, an offset parameter is introduced, which is added to the value calculated by the blocks source. The startTime parameter allows to shift the blocks source behavior on the time axis.
        
 
        
-\"TrapezoidVoltage.png\"
 
        
 "));
diff --git a/Modelica/Electrical/Analog/UsersGuide/package.mo b/Modelica/Electrical/Analog/UsersGuide/package.mo
index ca549582aa..6bf7584824 100644
--- a/Modelica/Electrical/Analog/UsersGuide/package.mo
+++ b/Modelica/Electrical/Analog/UsersGuide/package.mo
@@ -11,14 +11,14 @@ The Analog package contains the following components:
 
        
 
 
          
-
        • Basic: basic components (ground, resistor, capacitor, conductor, inductor, transformer, gyrator)
          • 
-
        • Ideal: ideal elements (switches, diode, transformer, idle, short, ...)
          • 
-
        • Lines: transmission lines (lossy and lossless)
          • 
-
        • Semiconductors: semiconductor devices (diode, bipolar and MOS transistors)
          • 
-
        • Interfaces: ideal elements (switches, diode, transformer, idle, short, ...)
          • 
-
        • Sensors: sensors to measure potential, voltage, current and power
          • 
-
        • Sources: time-dependent and controlled voltage and current sources
          • 
-
        • Icons: domain specific icons
          • 
+
        • Basic: basic components (ground, resistor, capacitor, conductor, inductor, transformer, gyrator)
          • 
+
        • Ideal: ideal elements (switches, diode, transformer, idle, short, ...)
          • 
+
        • Lines: transmission lines (lossy and lossless)
          • 
+
        • Semiconductors: semiconductor devices (diode, bipolar and MOS transistors)
          • 
+
        • Interfaces: ideal elements (switches, diode, transformer, idle, short, ...)
          • 
+
        • Sensors: sensors to measure potential, voltage, current and power
          • 
+
        • Sources: time-dependent and controlled voltage and current sources
          • 
+
        • Icons: domain specific icons
          • 
 
        
 "));
 end UsersGuide;
diff --git a/Modelica/Electrical/Analog/package.mo b/Modelica/Electrical/Analog/package.mo
index b68583ca26..9e79352205 100644
--- a/Modelica/Electrical/Analog/package.mo
+++ b/Modelica/Electrical/Analog/package.mo
@@ -6,7 +6,7 @@ package Analog "Library for analog electrical models"
   annotation (Documentation(info="
 
        
 This package contains packages for single-phase electrical components, see
-User's Guide
        
+User's Guide
        
 "), Icon(graphics={
         Line(
           points={{12,60},{12,-60}}),
diff --git a/Modelica/Electrical/Batteries/BaseClasses/BaseCellStack.mo b/Modelica/Electrical/Batteries/BaseClasses/BaseCellStack.mo
index 362044743b..972480c754 100644
--- a/Modelica/Electrical/Batteries/BaseClasses/BaseCellStack.mo
+++ b/Modelica/Electrical/Batteries/BaseClasses/BaseCellStack.mo
@@ -83,11 +83,11 @@ equation
     Documentation(info="
 
        
 The battery is modeled by open-circuit voltage (OCV) dependent on state of charge (SOC), a self-discharge component and an inner resistance.
        
-Parameters are collected in parameter record cellData.
        
+Parameters are collected in parameter record cellData.
        
 All losses are dissipated to the optional heatPort.
 
        
 
        
-For details, see concept and parameterization.
+For details, see concept and parameterization.
 
        
 
        Note
        
 
        
diff --git a/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo b/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo
index b1c2c64885..619d3ea737 100644
--- a/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo
+++ b/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo
@@ -79,7 +79,7 @@ equation
     annotation (Line(points={{0,-50},{0,-40},{-20,-40}}, color={191,0,0}));
   annotation (Documentation(info="
 
        
-This is a single cell[Np=1, Ns=1] with measurement.
+This is a single cell[Np=1, Ns=1] with measurement.
 
        
 "));
 end BaseCellWithSensors;
diff --git a/Modelica/Electrical/Batteries/BaseClasses/BaseStackWithSensors.mo b/Modelica/Electrical/Batteries/BaseClasses/BaseStackWithSensors.mo
index c8d4528755..51095eb90a 100644
--- a/Modelica/Electrical/Batteries/BaseClasses/BaseStackWithSensors.mo
+++ b/Modelica/Electrical/Batteries/BaseClasses/BaseStackWithSensors.mo
@@ -107,7 +107,7 @@ equation
           fillPattern=FillPattern.Solid)}),
           Documentation(info="
 
        
-This is a stack of Ns x Np cell[Np=1, Ns=1] with measurement, arranged in a matrix.
+This is a stack of Ns x Np cell[Np=1, Ns=1] with measurement, arranged in a matrix.
 
        
 "));
 end BaseStackWithSensors;
diff --git a/Modelica/Electrical/Batteries/BatteryStacks/CellRCStack.mo b/Modelica/Electrical/Batteries/BatteryStacks/CellRCStack.mo
index 9d39cc5b78..4a42209e47 100644
--- a/Modelica/Electrical/Batteries/BatteryStacks/CellRCStack.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacks/CellRCStack.mo
@@ -35,18 +35,18 @@ equation
   annotation (
     Documentation(info="
 
        
-Extends the model CellStack by a series of RC-elements, describing the transient behaviour of the battery.
+Extends the model CellStack by a series of RC-elements, describing the transient behaviour of the battery.
 
        
 
        
 This model can be used for a single cell Ns = Np = 1 as well as a stack built from identical cells.
 
        
 
        
-For details, see concept and parameterization.
+For details, see concept and parameterization.
 
        
 
        Note
        
 
        
-Parameter record array rcData contained in
-parameter record cellData has to be specified.
+Parameter record array rcData contained in
+parameter record cellData has to be specified.
 
        
 
        
 The total inner resistance is the sum of the resistance of resistor r0 and the sum of the resistances of the resistors of the RC-elements.
diff --git a/Modelica/Electrical/Batteries/BatteryStacks/CellStack.mo b/Modelica/Electrical/Batteries/BatteryStacks/CellStack.mo
index f8f734bed3..541e98caf0 100644
--- a/Modelica/Electrical/Batteries/BatteryStacks/CellStack.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacks/CellStack.mo
@@ -9,18 +9,18 @@ equation
   annotation (Documentation(info="
 
        
 The battery is modeled by open-circuit voltage (OCV) dependent on state of charge (SOC), self-discharge and inner resistance,
-as implemented in partial BaseCellStack.
+as implemented in partial BaseCellStack.
 
        
 
        
 This model can be used for a single cell Ns = Np = 1 as well as a stack built from identical cells.
 
        
 
        
-For details, see concept and parameterization.
+For details, see concept and parameterization.
 
        
 
        Note
        
 
        
-Parameter record array rcData contained in
-parameter record cellData is neglected.
+Parameter record array rcData contained in
+parameter record cellData is neglected.
 
        
 "));
 end CellStack;
diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Cell.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Cell.mo
index 0ac64b4791..5cf6f20e64 100644
--- a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Cell.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Cell.mo
@@ -10,7 +10,7 @@ model Cell "Cell with measurement"
       T=T));
  annotation (Documentation(info="
 
        
-This is a single cell[Np=1, Ns=1] with measurement.
+This is a single cell[Np=1, Ns=1] with measurement.
 
        
 "));
 end Cell;
diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/CellRC.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/CellRC.mo
index ee0ef3294f..99e779835f 100644
--- a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/CellRC.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/CellRC.mo
@@ -11,7 +11,7 @@ model CellRC "Cell with measurement"
   extends Modelica.Electrical.Batteries.Icons.TransientModel;
   annotation (Documentation(info="
 
        
-This is a single transient cellRC[Np=1, Ns=1] (with RC-elements) with measurement.
+This is a single transient cellRC[Np=1, Ns=1] (with RC-elements) with measurement.
 
        
 "));
 end CellRC;
diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Stack.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Stack.mo
index 33d45988cd..38da2f9960 100644
--- a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Stack.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/Stack.mo
@@ -10,7 +10,7 @@ model Stack "Stack with sensors"
       each T=T));
   annotation (Documentation(info="
 
        
-This is a stack of Ns x Np cell[Np=1, Ns=1] with measurement, arranged in a matrix.
+This is a stack of Ns x Np cell[Np=1, Ns=1] with measurement, arranged in a matrix.
 
        
 "));
 end Stack;
diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/StackRC.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/StackRC.mo
index d8dcebc630..81bfa01c96 100644
--- a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/StackRC.mo
+++ b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/StackRC.mo
@@ -11,7 +11,7 @@ model StackRC "Stack with sensors"
   extends Modelica.Electrical.Batteries.Icons.TransientModel;
   annotation (Documentation(info="
 
        
-This is a stack of Ns x Np transient cellRC[Np=1, Ns=1] (with RC-elements) with measurement, arranged in a matrix.
+This is a stack of Ns x Np transient cellRC[Np=1, Ns=1] (with RC-elements) with measurement, arranged in a matrix.
 
        
 "));
 end StackRC;
diff --git a/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo b/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo
index 6677853214..013cbd4f74 100644
--- a/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo
+++ b/Modelica/Electrical/Batteries/Examples/BatteryDischargeCharge.mo
@@ -117,7 +117,7 @@ equation
 
      • battery2 is a battery OCV dependency on SOC is specified by a table, with self-discharge and including RC-elements.
        • 
 
 
        
-Two parameter records cellData1 and cellData2 are used to parameterize the battery models.
+Two parameter records cellData1 and cellData2 are used to parameterize the battery models.
 
        
 
        
 First the batteries are discharged with 7 current pulses of 50 A for 1 minute, and breaks between the pulses of 1 minute, ending at SOC = 5 %.
        
diff --git a/Modelica/Electrical/Batteries/Examples/package.mo b/Modelica/Electrical/Batteries/Examples/package.mo
index e8d883c152..09ba558426 100644
--- a/Modelica/Electrical/Batteries/Examples/package.mo
+++ b/Modelica/Electrical/Batteries/Examples/package.mo
@@ -4,8 +4,8 @@ package Examples "Collection of battery examples"
 
   annotation (Documentation(info="
 
        
-Collection of examples demonstrating the usage of the battery models without
-and with sensors.
+Collection of examples demonstrating the usage of the battery models without
+and with sensors.
 
        
 "));
 end Examples;
diff --git a/Modelica/Electrical/Batteries/Interfaces/StackBus.mo b/Modelica/Electrical/Batteries/Interfaces/StackBus.mo
index 31b7909354..c6f49fc2bb 100644
--- a/Modelica/Electrical/Batteries/Interfaces/StackBus.mo
+++ b/Modelica/Electrical/Batteries/Interfaces/StackBus.mo
@@ -6,7 +6,7 @@ expandable connector StackBus "Measurement signal bus for a stack"
   CellBus cellBus[Ns,Np] "Cell buses";
   annotation (Documentation(info="
 
        
-Measurement bus of a stack, containing a cellBus per cell.
+Measurement bus of a stack, containing a cellBus per cell.
 
        
 "));
 end StackBus;
diff --git a/Modelica/Electrical/Batteries/ParameterRecords/TransientData/CellData.mo b/Modelica/Electrical/Batteries/ParameterRecords/TransientData/CellData.mo
index d7300a0920..b980b66afe 100644
--- a/Modelica/Electrical/Batteries/ParameterRecords/TransientData/CellData.mo
+++ b/Modelica/Electrical/Batteries/ParameterRecords/TransientData/CellData.mo
@@ -23,7 +23,7 @@ If useLinearSOCDependency=true, the OCV versus SOC table is built u
 Otherwise, the OCV versus SOC table has to be specified: 1st column = SOC values in ascending order, 2nd column = corresponding OCV values with respect to OCVmax.
 
        
 
        
-The size of the array rcData has to be defined as parameter nRC.
+The size of the array rcData has to be defined as parameter nRC.
 The sum of the resistances rcData.R must not exceed the total inner resistance Ri.
 
        
 "));
diff --git a/Modelica/Electrical/Batteries/ParameterRecords/TransientData/package.mo b/Modelica/Electrical/Batteries/ParameterRecords/TransientData/package.mo
index 982d1698df..d6fd8c618f 100644
--- a/Modelica/Electrical/Batteries/ParameterRecords/TransientData/package.mo
+++ b/Modelica/Electrical/Batteries/ParameterRecords/TransientData/package.mo
@@ -12,7 +12,7 @@ The user can easily build up a collection of different battery types by creating
 Do not forget to add the annotation(defaultComponentPrefixes=\"parameter\"); in each individual parameter record.
 
        
 
        
-Record RCData is used in record CellData.
+Record RCData is used in record CellData.
 
        
 "));
 end TransientData;
diff --git a/Modelica/Electrical/Batteries/UsersGuide/Concept.mo b/Modelica/Electrical/Batteries/UsersGuide/Concept.mo
index 4eb095ee84..ba8e11c7eb 100644
--- a/Modelica/Electrical/Batteries/UsersGuide/Concept.mo
+++ b/Modelica/Electrical/Batteries/UsersGuide/Concept.mo
@@ -3,7 +3,7 @@ class Concept "Concept of battery models"
   extends Modelica.Icons.Information;
   annotation (DocumentationClass=true, Documentation(info="
 
        
-The core of the cell models is a signal voltage
+The core of the cell models is a signal voltage
 controlled by a look-up table OCV (open circuit voltage) dependent on SOC (state of charge). 
        
 However, other dependencies (e.g., on temperature) are not implemented yet.
 
        
@@ -22,19 +22,19 @@ A resistor r0 is connected in series to the signal voltage, represe
 The resistance can be specified as linearly dependent on temperature.
 
        
 
        
-If CellRCStack instead of
-CellStack is chosen,
+If CellRCStack instead of
+CellStack is chosen,
 RC-elements are connected in series to model the transient behaviour of the battery.
        
 Both models can be used for a single cell Ns = Np = 1 as well as a stack built from identical cells.
        
 Note that the total inner resistance Ri is the sum of the resistance of resistor r0 and the sum of the resistances of the resistors of the RC-elements.
 
        
 
        
 Additionally to these batteries that model a single cell scaled by the number of series connected cells Ns and the number of parallel connected cells Np,
-single cell models and stacks are provided in BatteryStacksWithSensors.
-The cells are equipped with sensors, the measured signals are provided in the CellBus.
+single cell models and stacks are provided in BatteryStacksWithSensors.
+The cells are equipped with sensors, the measured signals are provided in the CellBus.
 The stack models contain a matrix of Ns x Np single cells which can be parameterized differently
 to investigate the influence of a degraded cell on the behaviour of the whole stack, as well as to design battery management systems.
-The stack provides the StackBus which contains Ns x Np cell buses of the cells.
+The stack provides the StackBus which contains Ns x Np cell buses of the cells.
 Additionally, the signals of the whole stack - the same signals as of a single cell - are provided in the BatteryBus.
 
        
 
        
@@ -45,11 +45,11 @@ There are two options of series and parallel connections of cells in stacks:
 
      • useAllParallelConnections=false: Ns cells are connected in series, and these groups are connected in parallel.
        • 
 
 
        
-For convenience, a block BusTranscription transfers the signals of all cell buses in the stack bus
-to the StackBusArrays, arranged as Ns x Np matrix per measurement signal.
+For convenience, a block BusTranscription transfers the signals of all cell buses in the stack bus
+to the StackBusArrays, arranged as Ns x Np matrix per measurement signal.
 
        
 
        
-For details of parameterization, see UsersGuide.Parameterization.
+For details of parameterization, see UsersGuide.Parameterization.
 
        
 "));
 end Concept;
diff --git a/Modelica/Electrical/Batteries/UsersGuide/Parameterization.mo b/Modelica/Electrical/Batteries/UsersGuide/Parameterization.mo
index ee82651e67..a6231e7b6c 100644
--- a/Modelica/Electrical/Batteries/UsersGuide/Parameterization.mo
+++ b/Modelica/Electrical/Batteries/UsersGuide/Parameterization.mo
@@ -3,7 +3,7 @@ class Parameterization "Parameterization of battery models"
   extends Modelica.Icons.Information;
   annotation (DocumentationClass=true, Documentation(info="
 
        
-A stack from BatteryStacks is built from Ns*Np identical cells,
+A stack from BatteryStacks is built from Ns*Np identical cells,
 where Np describes the number of parallel connected cells and Ns the number of series connected cells.
 
        
 
        
@@ -18,7 +18,7 @@ The parameters of a stack built from Np*Ns identical cells are calc
 
        
 
        Cell parameters
        
 
        
-The parameters of one cell are summarized in the parameter record cellData.
+The parameters of one cell are summarized in the parameter record cellData.
 Dependency of OCV on SOC can be chosen either linear (useLinearSOCDependency=true) or based on a look-up table.
        
 By default, a linear OCV versus SOC characteristic is defined (like a capacitor), i.e. OCV_SOC[:,2]=[SOCmin,OCVmin/OCVmax; SOCmax,1].
        
 The OCV versus SOC table has to be specified with 1st column = SOC values in ascending order, 2nd column = corresponding OCV values with respect to OCVmax.
        
@@ -35,16 +35,16 @@ Linear temperature dependency of inner resistance can be specified by reference
 
        
 
        Transient parameters
        
 
        
-The parameter record for one cell of a transient battery model cellData
-extends from the basic cellData record, and adds the parameters of the additional RC-elements.
-These are specified by an array of parameter records rcData:
+The parameter record for one cell of a transient battery model cellData
+extends from the basic cellData record, and adds the parameters of the additional RC-elements.
+These are specified by an array of parameter records rcData:
 
        
 
          
 
        • R .. Resistance of RC-element
          • 
 
        • C .. Capacitance of RC-element
          • 
 
        
 
        
-The size of the array rcData has to be defined as parameter nRC.
+The size of the array rcData has to be defined as parameter nRC.
 The parameters of these RC-elements are results of sophisticated measurements, e.g. cell impedance spectroscopy.
        
 Temperature dependency of the resistors is assumed to be the same as inner resistance Ri.
 
        
@@ -67,13 +67,13 @@ Self-discharge rate is typically 1%/month.
 
        
 
        Parameters of stacks built from a matrix of Ns x Np cells:
        
 
        
-A stack from BatteryStacksWithSensors is built from Ns*Np cells
+A stack from BatteryStacksWithSensors is built from Ns*Np cells
 arranged in a matrix, where Np describes the number of parallel connected cells and Ns the number of series connected cells.
-The parameters of such a stack are summarized in the parameter record stackData.
+The parameters of such a stack are summarized in the parameter record stackData.
 Here the matrix of Ns x Np cell parameters records is compiled.
-The parameters of original cell data are propagated to all cells except those
+The parameters of original cell data are propagated to all cells except those
 whose indices are specified in the array kDegraded[:,2]. For these degraded cells the parameters of
-degraded cell data are propagated.
        
+degraded cell data are propagated.
        
 Note: Any members of the parameter array kDegraded[:,2] outside the range 1≤kDegraded[:,1]≤Ns and 1≤kDegraded[:,2]≤Np are ignored.
 
        
 "));
diff --git a/Modelica/Electrical/Batteries/UsersGuide/package.mo b/Modelica/Electrical/Batteries/UsersGuide/package.mo
index a5cdfcb656..11d36873cf 100644
--- a/Modelica/Electrical/Batteries/UsersGuide/package.mo
+++ b/Modelica/Electrical/Batteries/UsersGuide/package.mo
@@ -9,10 +9,10 @@ This library provides battery models, based on the electrical behaviour at the t
 
        Battery characteristics
        
 
        
 All battery models rely on existing components like voltage source, resistor and capacitor models provided in the
-Analog package of the Modelica Standard Library.
        
-Explore the concept of the battery models as well as
-parameterization.
-Both are based on the references.
+Analog package of the Modelica Standard Library.
        
+Explore the concept of the battery models as well as
+parameterization.
+Both are based on the references.
 
        
 
        
 Each battery is equipped with an optional heat port which can be enabled by the parameter useHeatPort;
diff --git a/Modelica/Electrical/Batteries/Utilities/BusTranscription.mo b/Modelica/Electrical/Batteries/Utilities/BusTranscription.mo
index 68ee3c9a24..79c2df9c00 100644
--- a/Modelica/Electrical/Batteries/Utilities/BusTranscription.mo
+++ b/Modelica/Electrical/Batteries/Utilities/BusTranscription.mo
@@ -71,7 +71,7 @@ equation
           horizontalAlignment=TextAlignment.Right,
           textString="v[Ns,Np] ")}),   Documentation(info="
 
        
-Transfers the information from the stackBus to the stackBusArrays.
+Transfers the information from the stackBus to the stackBusArrays.
 
        
 "));
 end BusTranscription;
diff --git a/Modelica/Electrical/Batteries/Utilities/PulseSeries.mo b/Modelica/Electrical/Batteries/Utilities/PulseSeries.mo
index 046dcd66a0..cb8806405e 100644
--- a/Modelica/Electrical/Batteries/Utilities/PulseSeries.mo
+++ b/Modelica/Electrical/Batteries/Utilities/PulseSeries.mo
@@ -11,7 +11,7 @@ block PulseSeries "Series of pulses"
   parameter SI.Time Tp2=Tp1 "Pause between pulses of 2nd series";
   parameter SI.Time Tp "Pause (in addition to TP1) between the two series"
     annotation(Dialog(groupImage=
-      "modelica://Modelica/Resources/Images/Electrical/Batteries/Utilities/PulseSeries.png"));
+      "modelica:/Modelica/Resources/Images/Electrical/Batteries/Utilities/PulseSeries.png"));
   extends Modelica.Blocks.Interfaces.SignalSource;
 protected
   parameter SI.Time Tstart1[n1]={startTime + (k-1)*(T1 + Tp1) for k in 1:n1};
@@ -46,7 +46,7 @@ Then, after the pause duration Tp1 + Tp, a series of n2<
 
        
 
 
        
-\"PulseSeries.png\"
+\"PulseSeries.png\"
 
        
 "));
 end PulseSeries;
diff --git a/Modelica/Electrical/Digital.mo b/Modelica/Electrical/Digital.mo
index ecd490a3c6..268825eda3 100644
--- a/Modelica/Electrical/Digital.mo
+++ b/Modelica/Electrical/Digital.mo
@@ -145,12 +145,12 @@ way. This package contains the User's Guide for
 the library and has the following content:
 
        
 
          
-
        1. Release Notes
+
        2. Release Notes
     summarizes the differences between different versions of this library.
          3. 
-
        3. Literature
+
        4. Literature
     provides references that have been used to design and implement this
     library.
          5. 
-
        5. Contact
+
        6. Contact
     provides information about the authors of the library as well as
     acknowledgments.
          7. 
 
        
@@ -1405,7 +1405,7 @@ sum   Adder4.c_out  Adder4.s  Adder3.s
                 points={{70,-28},{80,-28},{80,-70},{100,-70}}, color={127,0,127}));
           annotation (
             Documentation(info="
-
        Basing on the RS component RSFF is a RS (set-reset) flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
+
        Basing on the RS component RSFF is a RS (set-reset) flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
 "), Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
                   {100,100}}), graphics={
               Rectangle(
@@ -1477,7 +1477,7 @@ sum   Adder4.c_out  Adder4.s  Adder3.s
             points={{-100,0},{-10,0}}, color={127,0,127}));
           annotation (
             Documentation(info="
-
        Basing on the RS component DFF is a D flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
+
        Basing on the RS component DFF is a D flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
 "), Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
                   {100,100}}), graphics={
               Rectangle(
@@ -1573,7 +1573,7 @@ sum   Adder4.c_out  Adder4.s  Adder3.s
                     -70}}, color={127,0,127}));
           annotation (
             Documentation(info="
-
        Based on the RS component JKFF is a J-K-flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
+
        Based on the RS component JKFF is a J-K-flipflop composed according to the schematic. Its parameter delayTime is the delay time of the RS component transport delay, q0 is the initial value of that delay.
        
 "), Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
                   {100,100}}), graphics={
               Rectangle(
@@ -2317,7 +2317,7 @@ sum   Adder4.c_out  Adder4.s  Adder3.s
               parameter S strength = S.'S_X01' "Output strength";
               parameter Integer n_addr(min=1) = 2 "Addr width";
               parameter Integer n_data(min=1) = 2 "Data width";
-              parameter String fileName = Modelica.Utilities.Files.loadResource("modelica://Modelica/Resources/Data/Electrical/Digital/Memory_Matrix.txt")
+              parameter String fileName = Modelica.Utilities.Files.loadResource("modelica:/Modelica/Resources/Data/Electrical/Digital/Memory_Matrix.txt")
                 "File where matrix for memory is stored"
                 annotation(Dialog(group="Table data definition", loadSelector(filter="Text files (*.txt)", caption="Open file in which table is present")));
 
diff --git a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_ElectricalExcited.mo b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_ElectricalExcited.mo
index da2e0e4697..6885e29777 100644
--- a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_ElectricalExcited.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_ElectricalExcited.mo
@@ -7,7 +7,7 @@ model DC_ElectricalExcited
   annotation (defaultComponentName="dcee", Documentation(info="
 Quasi-static model of a DC Machine with electrical shunt or separate excitation.
        
 This model is fully compatible with the
-transient machine model of a DC machine with electrical shunt or separate excitation;
+transient machine model of a DC machine with electrical shunt or separate excitation;
 the only difference is that electrical transients are neglected.
 "));
 end DC_ElectricalExcited;
diff --git a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_PermanentMagnet.mo b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_PermanentMagnet.mo
index ce482c66eb..bc1c9c6d51 100644
--- a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_PermanentMagnet.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_PermanentMagnet.mo
@@ -6,7 +6,7 @@ model DC_PermanentMagnet "Quasi-static permanent magnet DC machine"
   annotation (defaultComponentName="dcpm", Documentation(info="
 Quasi-static model of a DC Machine with permanent magnets.
        
 This model is fully compatible with the
-transient machine model of a DC machine with permanent magnets;
+transient machine model of a DC machine with permanent magnets;
 the only difference is that electrical transients are neglected.
 "));
 end DC_PermanentMagnet;
diff --git a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_SeriesExcited.mo b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_SeriesExcited.mo
index 08668cf602..3aef2ee369 100644
--- a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_SeriesExcited.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/DC_SeriesExcited.mo
@@ -6,7 +6,7 @@ model DC_SeriesExcited "Quasi-static series excited linear DC machine"
   annotation (defaultComponentName="dcse", Documentation(info="
 Quasi-static model of a DC Machine with Series excitation.
        
 This model is fully compatible with the
-transient machine model of a DC machine with series excitation;
+transient machine model of a DC machine with series excitation;
 the only difference is that electrical transients are neglected.
 "));
 end DC_SeriesExcited;
diff --git a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/package.mo b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/package.mo
index 7064c890bd..7a3c125920 100644
--- a/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/package.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/QuasiStaticDCMachines/package.mo
@@ -6,7 +6,7 @@ package QuasiStaticDCMachines "Models of quasi-static DC machines"
 
        
 This package contains quasi-static models of DC machines;
 these models are fully compatible with the
-transient machine models of DC machines;
+transient machine models of DC machines;
 the only difference is that electrical transients are neglected.
 
        
 
        Note
        
@@ -14,7 +14,7 @@ the only difference is that electrical transients are neglected.
 Quasi-static DC machine models are basically different from quasi-static induction machine models:
 Quasi-static DC machine models neglect electrical transients, i.e., setting der(i) = 0,
 whereas quasi-static induction machine models are based on time phasor theory,
-see QuasiStatic Library,
+see QuasiStatic Library,
 where e.g., L*der(i) is replaced by j*omega*L*(I_re+j*I_im).
 
        
 ",
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd00.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd00.mo
index 82773ffd57..7f01527c56 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd00.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd00.mo
@@ -23,6 +23,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd0
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd00;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd02.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd02.mo
index cab23171b9..e07dd792b3 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd02.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd02.mo
@@ -27,6 +27,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd2
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd02;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd04.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd04.mo
index 9150c7a295..6f87ce11df 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd04.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd04.mo
@@ -23,6 +23,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd4
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd04;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd06.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd06.mo
index a173add947..54036bbe77 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd06.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd06.mo
@@ -23,6 +23,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd6
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd06;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd08.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd08.mo
index 1340ad534e..cee96656a7 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd08.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd08.mo
@@ -27,6 +27,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd8
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd08;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd10.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd10.mo
index 064db74a6f..b1980ce335 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd10.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dd/Dd10.mo
@@ -23,6 +23,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd10
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd10;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy01.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy01.mo
index 245b6b101e..89a052dd87 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy01.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy01.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy1
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy01;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy03.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy03.mo
index bac3d2e2e0..05e8a31961 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy03.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy03.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy3
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy03;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy05.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy05.mo
index de57d7e7da..cafcad716e 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy05.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy05.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy5
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy05;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy07.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy07.mo
index 4103a3124d..6f8be4dec9 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy07.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy07.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy7
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy07;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy09.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy09.mo
index f5c4a8a8ae..134503381a 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy09.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy09.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy9
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy09;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy11.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy11.mo
index 6ad1dac8af..ffe71e1d86 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy11.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dy/Dy11.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy11
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy11;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz00.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz00.mo
index da2654740e..041159760b 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz00.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz00.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz0
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz00;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz02.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz02.mo
index 34b4b8116b..7d978cc60e 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz02.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz02.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz2
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz02;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz04.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz04.mo
index 915fb6c675..bcf30fda71 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz04.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz04.mo
@@ -35,6 +35,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz4
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz04;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz06.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz06.mo
index cbd3d96bf2..1accebd2a3 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz06.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz06.mo
@@ -35,6 +35,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz6
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz06;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz08.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz08.mo
index 2aadf9be45..cb3a37e532 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz08.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz08.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz8
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz08;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz10.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz10.mo
index 679e53a67e..d875397424 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz10.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Dz/Dz10.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz10
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz10;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd01.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd01.mo
index c97230c56f..9fa3105f9a 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd01.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd01.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd1
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd01;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd03.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd03.mo
index 0b9ff983f9..886930633c 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd03.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd03.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd3
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd03;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd05.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd05.mo
index 4e2f3a539b..4c955d1ef9 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd05.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd05.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd5
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd05;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd07.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd07.mo
index 625c4c550a..b8c62b6a0c 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd07.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd07.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd7
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd07;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd09.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd09.mo
index 3d6d80ace1..4bb69d96ad 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd09.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd09.mo
@@ -32,6 +32,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd9
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd09;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd11.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd11.mo
index 98c406d876..2f5e6386b5 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd11.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yd/Yd11.mo
@@ -28,6 +28,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd11
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd11;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy00.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy00.mo
index d45a42aedb..e7651b7211 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy00.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy00.mo
@@ -33,6 +33,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy0
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy00;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy02.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy02.mo
index 128140893d..7c15f3fcbd 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy02.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy02.mo
@@ -37,6 +37,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy2
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy02;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy04.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy04.mo
index d939c2c7e9..c936afa906 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy04.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy04.mo
@@ -37,6 +37,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy4
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy04;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy06.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy06.mo
index 46f0f0abda..0c77fffd43 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy06.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy06.mo
@@ -33,6 +33,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy6
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy06;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy08.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy08.mo
index d392f488f4..74f3fab5fd 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy08.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy08.mo
@@ -37,6 +37,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy8
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy08;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy10.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy10.mo
index d3a5a18627..66ed3d97dd 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy10.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yy/Yy10.mo
@@ -37,6 +37,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy10
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy10;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz01.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz01.mo
index eae0b6d3a2..8fac35e7d8 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz01.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz01.mo
@@ -47,6 +47,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz1
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz01;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz03.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz03.mo
index f6207712c8..bfa5d28358 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz03.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz03.mo
@@ -47,6 +47,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz3
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz03;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz05.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz05.mo
index 5d7a9ef4d2..ec86d0a055 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz05.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz05.mo
@@ -40,6 +40,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz5
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz05;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz07.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz07.mo
index 1af9ff36d6..da90f63f40 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz07.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz07.mo
@@ -40,6 +40,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz7
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz07;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz09.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz09.mo
index 79663d051a..f29560aa39 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz09.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz09.mo
@@ -47,6 +47,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz9
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz09;
diff --git a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz11.mo b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz11.mo
index ef74119eb4..691c84a80a 100644
--- a/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz11.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/Transformers/Yz/Yz11.mo
@@ -47,6 +47,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz11
 
        Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz11;
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
index 8b5a8e34e6..53f00aba6b 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/CurrentControlledDCPM.mo
@@ -28,7 +28,7 @@ The current controller is parameterized according to the absolute optimum.
 
        At time=0.2 s a reference torque step is applied, causing the drive to accelerate until motor torque and load torque are at an equilibrium.
        
 
        
 Further reading:
-Tutorial at the Modelica Conference 2017
+Tutorial at the Modelica Conference 2017
 
        
 "),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
index c535d79fb4..34d63aaf0e 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/PositionControlledDCPM.mo
@@ -68,7 +68,7 @@ At time=2.3 s a load torque step is applied, causing the drive to slightly leave
 
        
 
        
 Further reading:
-Tutorial at the Modelica Conference 2017
+Tutorial at the Modelica Conference 2017
 
        
 "),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
index 2f0667a723..b3a7333253 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/SpeedControlledDCPM.mo
@@ -59,7 +59,7 @@ You may try a slewRateLimiter instead of the prefilter to limit the speed rise i
 
        
 
        
 Further reading:
-Tutorial at the Modelica Conference 2017
+Tutorial at the Modelica Conference 2017
 
        
 "),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo
index f9aff6679d..25cdeedb71 100644
--- a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo
+++ b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/PartialControlledDCPM.mo
@@ -106,7 +106,7 @@ The current controller is parameterized according to the absolute optimum.
 
        
 
        
 Further reading:
-Tutorial at the Modelica Conference 2017
+Tutorial at the Modelica Conference 2017
 
        
 "),
     Diagram(coordinateSystem(extent={{-200,-100},{100,100}})));
diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
index a33ad0c233..a134ce7c5e 100644
--- a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
+++ b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
@@ -131,7 +131,7 @@ equation
   annotation (experiment(StopTime=2.0, Interval=1E-4, Tolerance=1E-6), Documentation(
         info="
 
        
-This example demonstrates how to use a coupling 
+This example demonstrates how to use a coupling 
 to implement a drive consisting if two permanent magnet DC machines. 
 Note that dcpm1 is turning in positive direction, whereas dcpm2 is turning in the opposite direction. 
 Therefore, the armature of dcpm2 is connected reversed to the source.
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
index 023ddac098..b25513c0c5 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
@@ -193,11 +193,11 @@ This is a model of a complete inverter drive comprising:
 
        
 
          
 
        • a grid model and a line choke
          • 
-
        • a diode rectifier
          • 
+
        • a diode rectifier
          • 
 
        • a buffer capacitor
          • 
-
        • a switching inverter
          • 
-
        • a pulse width modulation
          • 
-
        • a voltage/frequency characteristic
          • 
+
        • a switching inverter
          • 
+
        • a pulse width modulation
          • 
+
        • a voltage/frequency characteristic
          • 
 
        • the reference frequency ramped up
          • 
 
        • an induction machine with squirrel cage
          • 
 
        • a load inertia and quadratic speed dependent load torque (like a fan or pump)
          • 
diff --git a/Modelica/Electrical/Machines/Losses/BrushParameters.mo b/Modelica/Electrical/Machines/Losses/BrushParameters.mo
index 8ebb20da30..ed0f8f4b35 100644
--- a/Modelica/Electrical/Machines/Losses/BrushParameters.mo
+++ b/Modelica/Electrical/Machines/Losses/BrushParameters.mo
@@ -7,8 +7,8 @@ record BrushParameters "Parameter record for brush losses"
     "Current indicating linear voltage region of brush voltage drop";
   annotation (defaultComponentPrefixes="parameter ", Documentation(info="
 
          
-Parameter record for three-phase Brush and
-DC Brush losses.
+Parameter record for three-phase Brush and
+DC Brush losses.
 
          
 "));
 end BrushParameters;
diff --git a/Modelica/Electrical/Machines/Losses/CoreParameters.mo b/Modelica/Electrical/Machines/Losses/CoreParameters.mo
index da402de7e0..85b7f9b5df 100644
--- a/Modelica/Electrical/Machines/Losses/CoreParameters.mo
+++ b/Modelica/Electrical/Machines/Losses/CoreParameters.mo
@@ -21,8 +21,8 @@ record CoreParameters "Parameter record for core losses"
   final parameter SI.AngularVelocity wMin=1e-6*wRef "Angular velocity limit";
   annotation (defaultComponentPrefixes="parameter ", Documentation(info="
 
          
-Parameter record for core losses of induction machines
-and core losses of DC machines.
+Parameter record for core losses of induction machines
+and core losses of DC machines.
 
          
 "));
 end CoreParameters;
diff --git a/Modelica/Electrical/Machines/Losses/DCMachines/Brush.mo b/Modelica/Electrical/Machines/Losses/DCMachines/Brush.mo
index 016103e33a..ce91f6b44d 100644
--- a/Modelica/Electrical/Machines/Losses/DCMachines/Brush.mo
+++ b/Modelica/Electrical/Machines/Losses/DCMachines/Brush.mo
@@ -39,7 +39,7 @@ Model of voltage drop and losses of carbon brushes. For currents between -
 
          
 
 
-  
            \"brush.png\"  
          
   
            Fig. 1: Model of voltage drop of carbon brushes 
          
 
          
@@ -51,7 +51,7 @@ The voltage drop v is the total voltage drop of all series connecte
 
          See also
          
 
 
          
-BrushParameters
+BrushParameters
 
          
 
          
 If it is desired to neglect brush losses, set brushParameters.V = 0 (this is the default).
diff --git a/Modelica/Electrical/Machines/Losses/DCMachines/Core.mo b/Modelica/Electrical/Machines/Losses/DCMachines/Core.mo
index 1f84dac94a..23ecfcead5 100644
--- a/Modelica/Electrical/Machines/Losses/DCMachines/Core.mo
+++ b/Modelica/Electrical/Machines/Losses/DCMachines/Core.mo
@@ -51,7 +51,7 @@ the dependency of total core losses on the parameter ratioHysteresis
 
 
-  
@@ -59,7 +59,7 @@ the dependency of total core losses on the parameter ratioHysteresis
            \"corelossesVw.png\" 
   
          
   
            Fig. 1: Voltage versus angular velocity
 
 
          
-  
@@ -71,7 +71,7 @@ the dependency of total core losses on the parameter ratioHysteresisSee also
          
-Core loss parameters
+Core loss parameters
 
          "));
diff --git a/Modelica/Electrical/Machines/Losses/DCMachines/StrayLoad.mo b/Modelica/Electrical/Machines/Losses/DCMachines/StrayLoad.mo
index 5851af9379..d4d1b63c62 100644
--- a/Modelica/Electrical/Machines/Losses/DCMachines/StrayLoad.mo
+++ b/Modelica/Electrical/Machines/Losses/DCMachines/StrayLoad.mo
@@ -41,7 +41,7 @@ Instead, the dissipated losses are considered through an equivalent braking torq
 
          See also
          
-StrayLoad parameters
+StrayLoad parameters
 
          
 If it is desired to neglect stray load losses, set strayLoadParameters.PRef = 0 (this is the default).
diff --git a/Modelica/Electrical/Machines/Losses/DCMachines/brushVoltageDrop.mo b/Modelica/Electrical/Machines/Losses/DCMachines/brushVoltageDrop.mo
index 26b9e07e1e..339b731f57 100644
--- a/Modelica/Electrical/Machines/Losses/DCMachines/brushVoltageDrop.mo
+++ b/Modelica/Electrical/Machines/Losses/DCMachines/brushVoltageDrop.mo
@@ -15,7 +15,7 @@ algorithm
   annotation (Documentation(info="
 
          
 Calculates the voltage drop of carbon brushes, according to
-Brush losses,
+Brush losses,
 e.g., used for initial equations.
 
          "));
diff --git a/Modelica/Electrical/Machines/Losses/Friction.mo b/Modelica/Electrical/Machines/Losses/Friction.mo
index 0056d1a0f3..3240a43089 100644
--- a/Modelica/Electrical/Machines/Losses/Friction.mo
+++ b/Modelica/Electrical/Machines/Losses/Friction.mo
@@ -105,7 +105,7 @@ in the range  -wLinear ≤ w ≤ wLinear with wLinear = 0.0
 and angular velocity is depicted in Fig. 1
 
          
 
            \"corelossesPcw.png\" 
   
          
   
            Fig. 2: Core losses versus angular velocity with parameter ratioHysteresis
 
 
 
 
 
 
 
          
-  
@@ -113,7 +113,7 @@ and angular velocity is depicted in Fig. 1
 
            \"frictiontorque.png\" 
   
          
   
            Fig. 1: Friction loss torque versus angular velocity for power_w = 2
          
 
          See also
          
 
          
-FrictionParameters
+FrictionParameters
 
          
 
          
 If it is desired to neglect friction losses, set frictionParameters.PRef = 0 (this is the default).
diff --git a/Modelica/Electrical/Machines/Losses/FrictionParameters.mo b/Modelica/Electrical/Machines/Losses/FrictionParameters.mo
index 535849eec8..df3356ac6f 100644
--- a/Modelica/Electrical/Machines/Losses/FrictionParameters.mo
+++ b/Modelica/Electrical/Machines/Losses/FrictionParameters.mo
@@ -20,7 +20,7 @@ record FrictionParameters "Parameter record for friction losses"
     "Torque corresponding with linear angular velocity range";
   annotation (defaultComponentPrefixes="parameter ", Documentation(info="
 
          
-Parameter record for Friction losses.
+Parameter record for Friction losses.
 
          
 "));
 end FrictionParameters;
diff --git a/Modelica/Electrical/Machines/Losses/InductionMachines/Brush.mo b/Modelica/Electrical/Machines/Losses/InductionMachines/Brush.mo
index 0b39fdf63c..b8b3f01d86 100644
--- a/Modelica/Electrical/Machines/Losses/InductionMachines/Brush.mo
+++ b/Modelica/Electrical/Machines/Losses/InductionMachines/Brush.mo
@@ -31,7 +31,7 @@ equation
                 textString="%name")}), Documentation(info="
 
          
 Model of voltage drop and losses of carbon brushes. This three-phase model uses three
-DC Brush loss models.
+DC Brush loss models.
 
          
 "));
 end Brush;
diff --git a/Modelica/Electrical/Machines/Losses/InductionMachines/Core.mo b/Modelica/Electrical/Machines/Losses/InductionMachines/Core.mo
index ae2090691f..bf7115fa33 100644
--- a/Modelica/Electrical/Machines/Losses/InductionMachines/Core.mo
+++ b/Modelica/Electrical/Machines/Losses/InductionMachines/Core.mo
@@ -78,7 +78,7 @@ The current implementation has thus the drawback over a model that considers 
 
 
-  
@@ -86,7 +86,7 @@ The current implementation has thus the drawback over a model that considers 
 
 
            \"corelossesVw.png\" 
   
          
   
            Fig. 1: Voltage versus angular velocity
          
-  
@@ -98,7 +98,7 @@ The current implementation has thus the drawback over a model that considers See also
 
          
-Core loss parameters
+Core loss parameters
 
          
 
 "));
diff --git a/Modelica/Electrical/Machines/Losses/InductionMachines/PermanentMagnetLosses.mo b/Modelica/Electrical/Machines/Losses/InductionMachines/PermanentMagnetLosses.mo
index 91c265bb74..11e81af3d7 100644
--- a/Modelica/Electrical/Machines/Losses/InductionMachines/PermanentMagnetLosses.mo
+++ b/Modelica/Electrical/Machines/Losses/InductionMachines/PermanentMagnetLosses.mo
@@ -44,7 +44,7 @@ The dependency of the permanent magnet loss torque on the angular velocity is mo
 
          
 
          See also
          
 
          
-Permanent magnet loss parameters
+Permanent magnet loss parameters
 
          
 
          
 If it is desired to neglect permanent magnet losses, set strayLoadParameters.PRef = 0 (this is the default).
diff --git a/Modelica/Electrical/Machines/Losses/InductionMachines/StrayLoad.mo b/Modelica/Electrical/Machines/Losses/InductionMachines/StrayLoad.mo
index 4ba60aa2ed..731026b475 100644
--- a/Modelica/Electrical/Machines/Losses/InductionMachines/StrayLoad.mo
+++ b/Modelica/Electrical/Machines/Losses/InductionMachines/StrayLoad.mo
@@ -54,7 +54,7 @@ The dependency of the stray load torque on the angular velocity is modeled by th
 
          
 
          See also
          
 
          
-StrayLoad parameters
+StrayLoad parameters
 
          
 
          
 If it is desired to neglect stray load losses, set strayLoadParameters.PRef = 0 (this is the default).
diff --git a/Modelica/Electrical/Machines/Losses/PermanentMagnetLossParameters.mo b/Modelica/Electrical/Machines/Losses/PermanentMagnetLossParameters.mo
index 867a31f531..98fb6d1119 100644
--- a/Modelica/Electrical/Machines/Losses/PermanentMagnetLossParameters.mo
+++ b/Modelica/Electrical/Machines/Losses/PermanentMagnetLossParameters.mo
@@ -22,7 +22,7 @@ record PermanentMagnetLossParameters
     "Reference permanent magnet loss torque at reference angular velocity and reference current";
   annotation (defaultComponentPrefixes="parameter ", Documentation(info="
 
          
-Parameter record for permanent magnet losses.
+Parameter record for permanent magnet losses.
 
          
 "));
 end PermanentMagnetLossParameters;
diff --git a/Modelica/Electrical/Machines/Losses/StrayLoadParameters.mo b/Modelica/Electrical/Machines/Losses/StrayLoadParameters.mo
index f0a43cf413..60041ccdb1 100644
--- a/Modelica/Electrical/Machines/Losses/StrayLoadParameters.mo
+++ b/Modelica/Electrical/Machines/Losses/StrayLoadParameters.mo
@@ -15,8 +15,8 @@ record StrayLoadParameters "Parameter record for stray load losses"
     "Reference stray load torque at reference angular velocity and reference current";
   annotation (defaultComponentPrefixes="parameter ", Documentation(info="
 
          
-Parameter record for three-phase and
-DC stray load losses.
+Parameter record for three-phase and
+DC stray load losses.
 
          
 "));
 end StrayLoadParameters;
diff --git a/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo b/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo
index 1355ed28be..4cd46ea63a 100644
--- a/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo
+++ b/Modelica/Electrical/Machines/Sensors/SinCosResolver.mo
@@ -57,7 +57,7 @@ Thus the sine and cosine signals have p periods per mechanical revo
 Adding an offset > amplitude, the loss of one track can be determined.
 Subtracting the negated signal from the signal, the offset is removed and a cosine and a sine with doubled amplitude are accessible.
 From this signal, the angle within one pole pair of a machine can be determined for field oriented control.
-Block SinCosEvaluation can be used.
+Block SinCosEvaluation can be used.
 
          
 
          
 This model can be used to export FMUs of drives to develop control strategies in other environments.
diff --git a/Modelica/Electrical/Machines/SpacePhasors/Blocks/Rotator.mo b/Modelica/Electrical/Machines/SpacePhasors/Blocks/Rotator.mo
index 57b36c0dbf..37a5600538 100644
--- a/Modelica/Electrical/Machines/SpacePhasors/Blocks/Rotator.mo
+++ b/Modelica/Electrical/Machines/SpacePhasors/Blocks/Rotator.mo
@@ -34,7 +34,7 @@ Rotates a space phasor (voltage or current) input u by the an
 
            \"corelossesPcw.png\" 
   
          
   
            Fig. 2: Core losses versus angular velocity with parameter ratioHysteresis
          
diff --git a/Modelica/Electrical/Machines/SpacePhasors/Functions/Rotator.mo b/Modelica/Electrical/Machines/SpacePhasors/Functions/Rotator.mo
index f9da58f4d9..55f8a3b785 100644
--- a/Modelica/Electrical/Machines/SpacePhasors/Functions/Rotator.mo
+++ b/Modelica/Electrical/Machines/SpacePhasors/Functions/Rotator.mo
@@ -15,7 +15,7 @@ Rotates a space phasor (voltage or current) input u by the an
 
          
   
          
     
-      
+      
     
   
          
             Fig. 1: Original and rotated reference frame of a space phasor 
          
diff --git a/Modelica/Electrical/Machines/Thermal/package.mo b/Modelica/Electrical/Machines/Thermal/package.mo
index b82efc84df..c022c3a86f 100644
--- a/Modelica/Electrical/Machines/Thermal/package.mo
+++ b/Modelica/Electrical/Machines/Thermal/package.mo
@@ -15,7 +15,7 @@ If useThermalPort == true, a thermal model or machine-specific ther
 On the other hand, all losses are dissipated to this internal or external thermal ambience.
 
          
 
          
-The machine specific thermal connector contains heatPorts
+The machine specific thermal connector contains heatPorts
 for all relevant loss sources of the machine type, although some of the loss sources are not yet implemented;
 these heatPorts are left unconnected inside the machine, i.e., the HeatFlowRate is zero,
 but they have to be connected to a constant temperature source in the internal or external thermal ambience.
@@ -25,7 +25,7 @@ or temperatures prescribed via signal inputs (useTemperatureInputs == true
 
          Loss sources
          
 
          
 Up to now, only Ohmic losses in stator and rotor windings are implemented.
-They are modeled as linearly temperature dependent resistors:
+They are modeled as linearly temperature dependent resistors:
 
          
 
           ROperational = RRef * (1 + alphaRef * (TOperational - TRef))
@@ -49,8 +49,8 @@ alphaRef = -------------------------------
             1 + alpha20 * (TRef - 293.15)
 
          
 
          
-For this reason, the function convertAlpha is provided.
-In sub-package Constants linear temperature coefficients at 20°C for commonly used materials are defined.
+For this reason, the function convertAlpha is provided.
+In sub-package Constants linear temperature coefficients at 20°C for commonly used materials are defined.
 
          
 
          Backwards compatibility
          
 
 
          Machine specific thermalPorts
          
-
          Induction machine with squirrel cage
          
+
          Induction machine with squirrel cage
          
 
-
          Induction machine with slipring rotor
          
+
          Induction machine with slipring rotor
          
 
-
          Synchronous machine with permanent magnets
          
+
          Synchronous machine with permanent magnets
          
 
-
          Synchronous machine with electrical excitation
          
+
          Synchronous machine with electrical excitation
          
 
-
          Synchronous machine with reluctance rotor
          
+
          Synchronous machine with reluctance rotor
          
 
-
          DC machine with permanent magnets
          
+
          DC machine with permanent magnets
          
 
-
          DC machine with electrical (shunt) excitation
          
+
          DC machine with electrical (shunt) excitation
          
 
-
          DC machine with serial excitation
          
+
          DC machine with serial excitation
          
 
-
          Transformers
          
+
          Transformers
          
 
            
 
          • heatPort1[m]: m=3 heatPorts for the m=3 primary phases
            • 
 
          • heatPort2[m]: m=3 heatPorts for the m=3 secondary phases
            • 
diff --git a/Modelica/Electrical/Machines/UsersGuide/Discrimination.mo b/Modelica/Electrical/Machines/UsersGuide/Discrimination.mo
index 2b1bd29868..7d00acf13b 100644
--- a/Modelica/Electrical/Machines/UsersGuide/Discrimination.mo
+++ b/Modelica/Electrical/Machines/UsersGuide/Discrimination.mo
@@ -13,33 +13,33 @@ class Discrimination "Discrimination of Machine models"
   
          
-  
-  
+  
+  
-  
-  
+  
+  
-  
+  
-  
+  
-  
-  
+  
+  
-  
-  
+  
+  
          
   
          
     
-      
+      
     
   
          
             Fig. 1: Original and rotated reference frame of a space phasor 
   
          
   TransformersModelica.Electrical.Machines.BasicMachines.TransformersModelica.Electrical.QuasiStatic.Machines.BasicMachines.TransformersModelica.Electrical.Machines.BasicMachines.TransformersModelica.Electrical.QuasiStatic.Machines.BasicMachines.Transformers
   
          
   
          
   DC machinesModelica.Electrical.Machines.BasicMachines.DCMachinesModelica.Electrical.Machines.BasicMachines.QuasiStaticDCMachinesModelica.Electrical.Machines.BasicMachines.DCMachinesModelica.Electrical.Machines.BasicMachines.QuasiStaticDCMachines
   
          
   
          
   Induction machines, limited to three phasesModelica.Electrical.Machines.BasicMachines.InductionMachinesModelica.Electrical.Machines.BasicMachines.InductionMachines
   n/a
   
          
   
          
   Synchronous machines, limited to three phasesModelica.Electrical.Machines.BasicMachines.SynchronousMachinesModelica.Electrical.Machines.BasicMachines.SynchronousMachines
   n/a
   
          
   
          
   Induction machines, arbitrary number of phasesModelica.Magnetic.FundamentalWave.BasicMachines.InductionMachinesModelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachinesModelica.Magnetic.FundamentalWave.BasicMachines.InductionMachinesModelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines
   
          
   
          
   Synchronous machines, arbitrary number of phasesModelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachinesModelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachinesModelica.Magnetic.FundamentalWave.BasicMachines.SynchronousMachinesModelica.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines
   
          
              
   
          
diff --git a/Modelica/Electrical/Machines/UsersGuide/ReleaseNotes.mo b/Modelica/Electrical/Machines/UsersGuide/ReleaseNotes.mo
index d2a3b7126f..a0c94148b8 100644
--- a/Modelica/Electrical/Machines/UsersGuide/ReleaseNotes.mo
+++ b/Modelica/Electrical/Machines/UsersGuide/ReleaseNotes.mo
@@ -8,10 +8,10 @@ class ReleaseNotes "Release Notes"
   
        • Shortened default component names, see
       #2301
          • 
   
        • Added new example
-      SMEE_DOL, see
+      SMEE_DOL, see
       #2388
          • 
   
        • Fixed bug of wrong smooth order in
-      Brush, see
+      Brush, see
       #2315
          • 
   
        • Unified communication interval, see
       #2279
          • 
@@ -68,7 +68,7 @@ class ReleaseNotes "Release Notes"
 
          Version 2.1.2, 2010-02-09 (Anton Haumer)
          
 
@@ -76,9 +76,9 @@ DC_Comparison
 
          Version 2.1.1, 2010-02-05 (Anton Haumer, Christian Kral)
          
 
 
@@ -190,7 +190,7 @@ RampedRheostat
 
          Version 1.60, 2005-11-04 (Anton Haumer)
          
 
            
   
          • Added
-      
+      
       Rotator
            • 
   
          • Corrected consistent naming of parameters and variables
            • 
 
          
@@ -203,10 +203,10 @@ RampedRheostat
 
          Version 1.52, 2005-10-12 (Anton Haumer)
          
 
diff --git a/Modelica/Electrical/Machines/Utilities/FromDQ.mo b/Modelica/Electrical/Machines/Utilities/FromDQ.mo
index ad01dec69b..479ec03689 100644
--- a/Modelica/Electrical/Machines/Utilities/FromDQ.mo
+++ b/Modelica/Electrical/Machines/Utilities/FromDQ.mo
@@ -41,7 +41,7 @@ using the provided mechanical rotor angle phi. The output are the instantaneous
 
 
          See also
          
 
          
-ToDQ
+ToDQ
 
          
 "));
 end FromDQ;
diff --git a/Modelica/Electrical/Machines/Utilities/MultiTerminalBox.mo b/Modelica/Electrical/Machines/Utilities/MultiTerminalBox.mo
index d5e9ee3f65..05c6800249 100644
--- a/Modelica/Electrical/Machines/Utilities/MultiTerminalBox.mo
+++ b/Modelica/Electrical/Machines/Utilities/MultiTerminalBox.mo
@@ -59,7 +59,7 @@ The parameter terminalConnection is used to switch between star
 The star point is a plug with
 mSystem = Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m) phases,
 representing the star points of each base system; see
-Modelica.Magnetic.FundamentalWave.UsersGuide.Polyphase.
+Modelica.Magnetic.FundamentalWave.UsersGuide.Polyphase.
 
          
 "));
 end MultiTerminalBox;
diff --git a/Modelica/Electrical/Machines/Utilities/SinCosEvaluation.mo b/Modelica/Electrical/Machines/Utilities/SinCosEvaluation.mo
index ac547f8156..4ec9a7ebc0 100644
--- a/Modelica/Electrical/Machines/Utilities/SinCosEvaluation.mo
+++ b/Modelica/Electrical/Machines/Utilities/SinCosEvaluation.mo
@@ -52,7 +52,7 @@ equation
               {57.5,-61.9},{63.9,-47.2},{72,-24.8},{80,0}}, smooth = Smooth.Bezier)}),
       Documentation(info="
 
          
-The sin-cos-resolver provides four tracks:
+The sin-cos-resolver provides four tracks:
 
          
 
            
 
          • cosine
            • 
@@ -73,7 +73,7 @@ The resulting angle is continuous, i.e. differentiating the angle results in 2*&
 If desired, the angle can be wrapped to the interval ]-π, +π].
 
            
 
            
-If the sin-cos-resolver provides one period of the tracks during a rotation of 2π/p,
+If the sin-cos-resolver provides one period of the tracks during a rotation of 2π/p,
 the result is the angle with respect to one pole pair and can be directly used for field oriented control.
 
            
 "));
diff --git a/Modelica/Electrical/Machines/Utilities/SynchronousMachineData.mo b/Modelica/Electrical/Machines/Utilities/SynchronousMachineData.mo
index 4c31a291b2..af43e6a4b1 100644
--- a/Modelica/Electrical/Machines/Utilities/SynchronousMachineData.mo
+++ b/Modelica/Electrical/Machines/Utilities/SynchronousMachineData.mo
@@ -139,7 +139,7 @@ record SynchronousMachineData
     defaultComponentPrefixes="parameter",
     Documentation(info="
 
            The parameters of the
-
+
 synchronous machine model with electrical excitation (and damper) are calculated from parameters
 normally given in a technical description, according to the standard EN 60034-4:2008 Appendix C.
            
 "));
diff --git a/Modelica/Electrical/Machines/Utilities/ToDQ.mo b/Modelica/Electrical/Machines/Utilities/ToDQ.mo
index 96f9c08bd7..2c0d84f7e6 100644
--- a/Modelica/Electrical/Machines/Utilities/ToDQ.mo
+++ b/Modelica/Electrical/Machines/Utilities/ToDQ.mo
@@ -37,7 +37,7 @@ using the provided mechanical rotor angle phi. The output are the resulting d an
 
 
            See also
            
 
            
-FromDQ
+FromDQ
 
            
 "));
 end ToDQ;
diff --git a/Modelica/Electrical/Machines/package.mo b/Modelica/Electrical/Machines/package.mo
index 10f1a6fe2a..68d02831e1 100644
--- a/Modelica/Electrical/Machines/package.mo
+++ b/Modelica/Electrical/Machines/package.mo
@@ -5,7 +5,7 @@ package Machines "Library for electric machines"
   annotation (
     preferredView="info",
     Documentation(info="
-
            For a discrimination of various machine models, see discrimination.
            
+
            For a discrimination of various machine models, see discrimination.
            
 
            
 Copyright © 1998-2020, Modelica Association and contributors
 
            
diff --git a/Modelica/Electrical/Polyphase/Basic/Delta.mo b/Modelica/Electrical/Polyphase/Basic/Delta.mo
index 9973e7444d..998012584c 100644
--- a/Modelica/Electrical/Polyphase/Basic/Delta.mo
+++ b/Modelica/Electrical/Polyphase/Basic/Delta.mo
@@ -35,9 +35,9 @@ when used in parallel to another component.
 
 
            See also
            
 
            
-Star,
-MultiStar,
-MultiDelta
+Star,
+MultiStar,
+MultiDelta
 
            
 "));
 end Delta;
diff --git a/Modelica/Electrical/Polyphase/Basic/MultiDelta.mo b/Modelica/Electrical/Polyphase/Basic/MultiDelta.mo
index 769d8b99c9..d23e51554b 100644
--- a/Modelica/Electrical/Polyphase/Basic/MultiDelta.mo
+++ b/Modelica/Electrical/Polyphase/Basic/MultiDelta.mo
@@ -43,7 +43,7 @@ equation
                               Documentation(info="
 
            
 Delta (polygon) connection of a polyphase circuit consisting of multiple base systems (see
-polyphase guidelines).
+polyphase guidelines).
 
            
 
            Note
            
 
            
@@ -52,9 +52,9 @@ In case of m=2, kPolygon=1 is the only valid choice.
 
            
 
            See also
            
 
            
-Star,
-Delta,
-MultiStar
+Star,
+Delta,
+MultiStar
 
            
 "));
 end MultiDelta;
diff --git a/Modelica/Electrical/Polyphase/Basic/MultiStar.mo b/Modelica/Electrical/Polyphase/Basic/MultiStar.mo
index 2fe436fab8..07b13a5ef6 100644
--- a/Modelica/Electrical/Polyphase/Basic/MultiStar.mo
+++ b/Modelica/Electrical/Polyphase/Basic/MultiStar.mo
@@ -54,12 +54,12 @@ equation
     Documentation(info="
 
            
 Star (wye) connection of a polyphase circuit consisting of multiple base systems (see
-polyphase guidelines). The potentials at the star points are all equal.
+polyphase guidelines). The potentials at the star points are all equal.
 
            
 
            See also
            
 
            
-Star,
-Delta,
-MultiDelta
+Star,
+Delta,
+MultiDelta
 
            "));
 end MultiStar;
diff --git a/Modelica/Electrical/Polyphase/Basic/MultiStarResistance.mo b/Modelica/Electrical/Polyphase/Basic/MultiStarResistance.mo
index f122b85df8..52d5322506 100644
--- a/Modelica/Electrical/Polyphase/Basic/MultiStarResistance.mo
+++ b/Modelica/Electrical/Polyphase/Basic/MultiStarResistance.mo
@@ -54,7 +54,7 @@ equation
     Documentation(info="
 
            
 Multi star points are connected by resistors. This model is required to operate polyphase systems with even phase numbers to avoid ideal connections of start points of base systems; see
-polyphase guidelines.
+polyphase guidelines.
 
            
 "));
 end MultiStarResistance;
diff --git a/Modelica/Electrical/Polyphase/Basic/SplitToSubsystems.mo b/Modelica/Electrical/Polyphase/Basic/SplitToSubsystems.mo
index 541a7ea586..e1ceda1689 100644
--- a/Modelica/Electrical/Polyphase/Basic/SplitToSubsystems.mo
+++ b/Modelica/Electrical/Polyphase/Basic/SplitToSubsystems.mo
@@ -21,7 +21,7 @@ equation
   annotation (Documentation(info="
 
            
 Splits the m phases in plug_p into subsystems, i.e., mSystems plugs with mBasic pins according to
-phase orientation described in the users guide.
+phase orientation described in the users guide.
 
            
 "), Icon(graphics={
         Text(
diff --git a/Modelica/Electrical/Polyphase/Basic/Star.mo b/Modelica/Electrical/Polyphase/Basic/Star.mo
index 772c29f97b..8e06ed3fa1 100644
--- a/Modelica/Electrical/Polyphase/Basic/Star.mo
+++ b/Modelica/Electrical/Polyphase/Basic/Star.mo
@@ -40,9 +40,9 @@ Connects all pins of plug_p to pin_n, thus establishing a so-called star-connect
 
 
            See also
            
 
            
-Delta,
-MultiStar,
-MultiDelta
+Delta,
+MultiStar,
+MultiDelta
 
            
 
 "));
diff --git a/Modelica/Electrical/Polyphase/Functions/indexNonPositiveSequence.mo b/Modelica/Electrical/Polyphase/Functions/indexNonPositiveSequence.mo
index c89c7766a2..5acf0815e1 100644
--- a/Modelica/Electrical/Polyphase/Functions/indexNonPositiveSequence.mo
+++ b/Modelica/Electrical/Polyphase/Functions/indexNonPositiveSequence.mo
@@ -27,7 +27,7 @@ This function determines the indices of non-positive sequence of the symmetrical
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end indexNonPositiveSequence;
diff --git a/Modelica/Electrical/Polyphase/Functions/indexPositiveSequence.mo b/Modelica/Electrical/Polyphase/Functions/indexPositiveSequence.mo
index 8d02ab2102..54d1205cb0 100644
--- a/Modelica/Electrical/Polyphase/Functions/indexPositiveSequence.mo
+++ b/Modelica/Electrical/Polyphase/Functions/indexPositiveSequence.mo
@@ -19,7 +19,7 @@ This function determines the indices of positive sequence of the symmetrical win
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end indexPositiveSequence;
diff --git a/Modelica/Electrical/Polyphase/Functions/numberOfSymmetricBaseSystems.mo b/Modelica/Electrical/Polyphase/Functions/numberOfSymmetricBaseSystems.mo
index 7263eec990..e03d0ab94f 100644
--- a/Modelica/Electrical/Polyphase/Functions/numberOfSymmetricBaseSystems.mo
+++ b/Modelica/Electrical/Polyphase/Functions/numberOfSymmetricBaseSystems.mo
@@ -25,7 +25,7 @@ This function determines the number of base systems of the symmetrical winding w
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end numberOfSymmetricBaseSystems;
diff --git a/Modelica/Electrical/Polyphase/Functions/symmetricBackTransformationMatrix.mo b/Modelica/Electrical/Polyphase/Functions/symmetricBackTransformationMatrix.mo
index b493eb8a05..e5e97d5b5e 100644
--- a/Modelica/Electrical/Polyphase/Functions/symmetricBackTransformationMatrix.mo
+++ b/Modelica/Electrical/Polyphase/Functions/symmetricBackTransformationMatrix.mo
@@ -31,7 +31,7 @@ The back transformation matrix can be used to determine the time phasors from th
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end symmetricBackTransformationMatrix;
diff --git a/Modelica/Electrical/Polyphase/Functions/symmetricOrientation.mo b/Modelica/Electrical/Polyphase/Functions/symmetricOrientation.mo
index b5f4e38246..ac004a2399 100644
--- a/Modelica/Electrical/Polyphase/Functions/symmetricOrientation.mo
+++ b/Modelica/Electrical/Polyphase/Functions/symmetricOrientation.mo
@@ -28,7 +28,7 @@ This function determines the orientation angles of the symmetrical winding with
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end symmetricOrientation;
diff --git a/Modelica/Electrical/Polyphase/Functions/symmetricOrientationMatrix.mo b/Modelica/Electrical/Polyphase/Functions/symmetricOrientationMatrix.mo
index cc41e067f8..3463373a28 100644
--- a/Modelica/Electrical/Polyphase/Functions/symmetricOrientationMatrix.mo
+++ b/Modelica/Electrical/Polyphase/Functions/symmetricOrientationMatrix.mo
@@ -34,7 +34,7 @@ This function determines the orientation matrix of the symmetrical winding with
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end symmetricOrientationMatrix;
diff --git a/Modelica/Electrical/Polyphase/Functions/symmetricTransformationMatrix.mo b/Modelica/Electrical/Polyphase/Functions/symmetricTransformationMatrix.mo
index 278b8dfcea..6e2d476502 100644
--- a/Modelica/Electrical/Polyphase/Functions/symmetricTransformationMatrix.mo
+++ b/Modelica/Electrical/Polyphase/Functions/symmetricTransformationMatrix.mo
@@ -31,7 +31,7 @@ The transformation matrix can be used to determine the symmetrical components fr
 
            
 
            See also
            
 
            
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
            
 "));
 end symmetricTransformationMatrix;
diff --git a/Modelica/Electrical/Polyphase/Sensors/AronSensor.mo b/Modelica/Electrical/Polyphase/Sensors/AronSensor.mo
index c2d9859625..3dfc6ad690 100644
--- a/Modelica/Electrical/Polyphase/Sensors/AronSensor.mo
+++ b/Modelica/Electrical/Polyphase/Sensors/AronSensor.mo
@@ -68,7 +68,7 @@ equation
           extent={{-30,-10},{30,-70}},
           textColor={64,64,64},
           textString="W")}),      Documentation(info="
-
            Contains two power meters to measure total active power in a three-phase system.
            
+
            Contains two power meters to measure total active power in a three-phase system.
            
 
            This device works only in three-phase systems without neutral.
            
 
            The rationale behind this sensor is that power exchanged between two parts of a circuit is the sum of the products of currents in the m wires connecting the two parts times wires' potentials evaluated with reference to an arbitrary potential vref:
            
 
            P=(v1-vref)*i1+(v2-vref)*i2+…+(vm-vref)*im
            
@@ -80,6 +80,6 @@ and therefore all currents between these two parts are i1, <
 
            In this way, we can just sum up the power from two wattmeters to get the three-phase power.
            
 
            Note, that this formula does not work if there are additional current paths between the left and right parts of our circuits, e.g., if both have grounds (and current flows through it).
            
 
            For more information on why power flowing in a circuit between two subcircuits is the sum of products of voltages times currents, the voltages being measured to an arbitrary reference potential, see
-[Ceraolo2014, par. 3.8.1].
            
+[Ceraolo2014, par. 3.8.1].
            
 "));
 end AronSensor;
diff --git a/Modelica/Electrical/Polyphase/Sensors/ReactivePowerSensor.mo b/Modelica/Electrical/Polyphase/Sensors/ReactivePowerSensor.mo
index 77255023b6..8512edd5cb 100644
--- a/Modelica/Electrical/Polyphase/Sensors/ReactivePowerSensor.mo
+++ b/Modelica/Electrical/Polyphase/Sensors/ReactivePowerSensor.mo
@@ -85,7 +85,7 @@ equation
 Contains 3 power meters (Modelica.Electrical.Analog.Sensors.PowerSensor) to measure total reactive power in a three-phase system.
 
            
 
            
-For more information see [Mühl2017].
+For more information see [Mühl2017].
 
            
 "));
 end ReactivePowerSensor;
diff --git a/Modelica/Electrical/Polyphase/Sources/CosineCurrent.mo b/Modelica/Electrical/Polyphase/Sources/CosineCurrent.mo
index 27a699854c..e4eedf7b90 100644
--- a/Modelica/Electrical/Polyphase/Sources/CosineCurrent.mo
+++ b/Modelica/Electrical/Polyphase/Sources/CosineCurrent.mo
@@ -49,7 +49,7 @@ equation
 
            
 Contains m cosine current sources (Modelica.Electrical.Analog.Sources.CosineCurrent)
 with a default phase shift determined by
-symmetricOrientation.
+symmetricOrientation.
 
            
 "));
 end CosineCurrent;
diff --git a/Modelica/Electrical/Polyphase/Sources/CosineVoltage.mo b/Modelica/Electrical/Polyphase/Sources/CosineVoltage.mo
index 193b939f6f..9fc80e2748 100644
--- a/Modelica/Electrical/Polyphase/Sources/CosineVoltage.mo
+++ b/Modelica/Electrical/Polyphase/Sources/CosineVoltage.mo
@@ -53,7 +53,7 @@ equation
 
            
 Contains m cosine voltage sources (Modelica.Electrical.Analog.Sources.CosineVoltage)
 with a default phase shift determined by
-symmetricOrientation.
+symmetricOrientation.
 
            
 "));
 end CosineVoltage;
diff --git a/Modelica/Electrical/Polyphase/Sources/SineCurrent.mo b/Modelica/Electrical/Polyphase/Sources/SineCurrent.mo
index 1c5bd2cc96..a85b50ae75 100644
--- a/Modelica/Electrical/Polyphase/Sources/SineCurrent.mo
+++ b/Modelica/Electrical/Polyphase/Sources/SineCurrent.mo
@@ -51,7 +51,7 @@ equation
 
            
 Contains m sine current sources (Modelica.Electrical.Analog.Sources.SineCurrent)
 with a default phase shift determined by
-symmetricOrientation.
+symmetricOrientation.
 
            
 "));
 end SineCurrent;
diff --git a/Modelica/Electrical/Polyphase/Sources/SineVoltage.mo b/Modelica/Electrical/Polyphase/Sources/SineVoltage.mo
index 6b15d3164f..9a7f02103c 100644
--- a/Modelica/Electrical/Polyphase/Sources/SineVoltage.mo
+++ b/Modelica/Electrical/Polyphase/Sources/SineVoltage.mo
@@ -49,7 +49,7 @@ equation
 
            
 Contains m sine voltage sources (Modelica.Electrical.Analog.Sources.SineVoltage)
 with a default phase shift determined by
-symmetricOrientation.
+symmetricOrientation.
 
            
 "));
 end SineVoltage;
diff --git a/Modelica/Electrical/Polyphase/Sources/package.mo b/Modelica/Electrical/Polyphase/Sources/package.mo
index 0f3e99a547..effe82a182 100644
--- a/Modelica/Electrical/Polyphase/Sources/package.mo
+++ b/Modelica/Electrical/Polyphase/Sources/package.mo
@@ -10,15 +10,15 @@ This package contains time-dependent and controlled polyphase voltage and curren
 
          • SignalVoltage: fed by Modelica.Blocks.Sources arbitrary waveforms of voltages are possible
            • 
 
          • ConstantVoltage: constant polyphase voltages
            • 
 
          • SineVoltage : phase shift between consecutive voltages by default given by
-symmetricOrientation
            • 
+symmetricOrientation
 
          • CosineVoltage : phase shift between consecutive voltages by default given by
-symmetricOrientation
            • 
+symmetricOrientation
 
          • SignalCurrent: fed by Modelica.Blocks.Sources arbitrary waveforms of currents are possible
            • 
 
          • ConstantCurrent: constant polyphase currents
            • 
 
          • SineCurrent : phase shift between consecutive currents by default given by
-symmetricOrientation
            • 
+symmetricOrientation
 
          • CosineCurrent : phase shift between consecutive currents by default given by
-symmetricOrientation
            • 
+symmetricOrientation
 
          
 ",
         revisions="
diff --git a/Modelica/Electrical/Polyphase/UsersGuide/PhaseOrientation.mo b/Modelica/Electrical/Polyphase/UsersGuide/PhaseOrientation.mo
index 6e2f8a60bd..4bc8d8703e 100644
--- a/Modelica/Electrical/Polyphase/UsersGuide/PhaseOrientation.mo
+++ b/Modelica/Electrical/Polyphase/UsersGuide/PhaseOrientation.mo
@@ -6,7 +6,7 @@ class PhaseOrientation "Orientation of phases"
     Documentation(info="
 
          
 In polyphase systems, the angular displacement of voltages and currents of the phases as well as the spatial displacement of machine windings have to follow the same rules, i.e., they are based on the same
-orientation function.
+orientation function.
 
          
 
          Symmetrical three-phase system
          
 
          
@@ -24,7 +24,7 @@ For a symmetrical polyphase system with m phases the displacement of the sine wa
   
        Fig. 1: Symmetrical (a) three-phase and (b) five-phase current system
   
        
     
-      \"phase35.png\"
     
   
        Fig. 2: Symmetrical (a) six and (b) ten phase current system
   
        
     
-      \"phase610.png\"
     
   
        Fig. 3: Line-to-neutral voltages and line-to-line voltages for different systems
   
        
     
-      \"Polygon2phase.png\"
+      \"Polygon2phase.png\"
     
     
-      \"Polygon4phase.png\"
+      \"Polygon4phase.png\"
     
   
        
   
        
   
        
     
-      \"Polygon3phase.png\"
+      \"Polygon3phase.png\"
     
     
-      \"Polygon6phase.png\"
+      \"Polygon6phase.png\"
     
   
        
   
        
   
        
     
-      \"Polygon5phase.png\"
+      \"Polygon5phase.png\"
     
     
-      \"Polygon7phase.png\"
+      \"Polygon7phase.png\"
     
   
        
   
        
 
        
 
        
-Therefore, using the MultiDelta component,
+Therefore, using the MultiDelta component,
 the alternative has to be specified by the parameter kPolygon.
 
        
 
        See also
        
 
        
-User's guide on polyphase winding.
+User's guide on polyphase winding.
 
        
 "));
 end PhaseOrientation;
diff --git a/Modelica/Electrical/Polyphase/UsersGuide/ReleaseNotes.mo b/Modelica/Electrical/Polyphase/UsersGuide/ReleaseNotes.mo
index b65c2143a8..b6b3adf732 100644
--- a/Modelica/Electrical/Polyphase/UsersGuide/ReleaseNotes.mo
+++ b/Modelica/Electrical/Polyphase/UsersGuide/ReleaseNotes.mo
@@ -9,10 +9,10 @@ class ReleaseNotes "Release Notes"
   
      • Shortened default component names, see
       #2301
        • 
 
      • Removed redundant (and not identical) parameter m from
-    MutualInductor,
+    MutualInductor,
     see #2202
        • 
 
      • Changed epsilon from constant to parameter in
-    MutualInductor,
+    MutualInductor,
     see #2200
        • 
 
      • Added User's Guide
        • 
 
      • Added blocks and functions for multiple base systems
        • 
diff --git a/Modelica/Electrical/Polyphase/UsersGuide/package.mo b/Modelica/Electrical/Polyphase/UsersGuide/package.mo
index bbaf0f4b3f..ba2cda23a3 100644
--- a/Modelica/Electrical/Polyphase/UsersGuide/package.mo
+++ b/Modelica/Electrical/Polyphase/UsersGuide/package.mo
@@ -8,12 +8,12 @@ package UsersGuide "User's Guide"
 
        
 This library contains components for modelling of polyphase electrical circuits.
 The number of phases m is not restricted to three.
-The connector (named plug) contains an array of m single-phase pins.
-Most of the components use an array of single-phase components from Modelica.Electrical.Analog.
+The connector (named plug) contains an array of m single-phase pins.
+Most of the components use an array of single-phase components from Modelica.Electrical.Analog.
 
        
 
        Note
        
 
        
-For the orientation of an arbitrary number of phases m > 3, see the phase orientation concept.
+For the orientation of an arbitrary number of phases m > 3, see the phase orientation concept.
 
        
 "));
 end UsersGuide;
diff --git a/Modelica/Electrical/PowerConverters/ACAC/Control/SoftStartControl.mo b/Modelica/Electrical/PowerConverters/ACAC/Control/SoftStartControl.mo
index 322fde9569..32a50397fb 100644
--- a/Modelica/Electrical/PowerConverters/ACAC/Control/SoftStartControl.mo
+++ b/Modelica/Electrical/PowerConverters/ACAC/Control/SoftStartControl.mo
@@ -77,7 +77,7 @@ In case the current exceeds the specified maximum current iMax duri
 When the current falls below the lower threshold of current control iMin < iMax, the ramp is continued.
 
        
 
        
-Note: It is recommended to filter the measured current, e.g. using Modelica.Blocks.Continuous.Filter
+Note: It is recommended to filter the measured current, e.g. using Modelica.Blocks.Continuous.Filter
 
        
 
        
 Boolean input start = false causes the output vRef to be lowered according to a ramp: vRef = -(time - t0)/tRampDown.
diff --git a/Modelica/Electrical/PowerConverters/ACAC/PolyphaseTriac.mo b/Modelica/Electrical/PowerConverters/ACAC/PolyphaseTriac.mo
index 647e34cd20..9197905ef5 100644
--- a/Modelica/Electrical/PowerConverters/ACAC/PolyphaseTriac.mo
+++ b/Modelica/Electrical/PowerConverters/ACAC/PolyphaseTriac.mo
@@ -63,7 +63,7 @@ equation
       Documentation(info="
 
        
 Simplified model of m
-triodes for alternating current, each built from two antiparallel thyristors.
+triodes for alternating current, each built from two antiparallel thyristors.
 thyristor1 has to be fired during the positive halfwave of the voltage.
 thyristor2 has to be fired during the negative halfwave of the voltage.
 
        
diff --git a/Modelica/Electrical/PowerConverters/ACDC/Control/Signal2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/Control/Signal2mPulse.mo
index caf5282b82..dcc185fb3f 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/Control/Signal2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/Control/Signal2mPulse.mo
@@ -176,7 +176,7 @@ equation
 
 
        
 General information about controllers is summarized in
-Control.
+Control.
 
        
 "));
 end Signal2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2Pulse.mo
index f769bbd469..7eb6aef0af 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2Pulse.mo
@@ -86,7 +86,7 @@ equation
 
 
        
 General information about controllers is summarized in
-Control.
+Control.
 
        
 
 
        
diff --git a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2mPulse.mo
index d2febf8052..72e53fa82b 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageBridge2mPulse.mo
@@ -90,7 +90,7 @@ equation
 
 
        
 General information about controllers is summarized in
-Control.
+Control.
 
        
 
 
        
diff --git a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageCenterTap2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageCenterTap2mPulse.mo
index 54c27a6ba5..845edc5b37 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageCenterTap2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/Control/VoltageCenterTap2mPulse.mo
@@ -91,7 +91,7 @@ equation
 
 
        
 General information about controllers is summarized in
-Control.
+Control.
 
        
 "));
 end VoltageCenterTap2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/Control/package.mo b/Modelica/Electrical/PowerConverters/ACDC/Control/package.mo
index b6f7fdb84b..da7c987ca1 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/Control/package.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/Control/package.mo
@@ -4,7 +4,7 @@ package Control "Control components for rectifiers"
   annotation (Documentation(info="
 
        
 A generic controller with signal input and 2*m firing signals is provided in
-Signal2mPulse,
+Signal2mPulse,
 where m is the arbitrary number of phases.
 Additional topology specific controllers with electrical connectors are also included.
 
        
@@ -13,7 +13,7 @@ Additional topology specific controllers with electrical connectors are also inc
 
 
        
 Each controller is equipped with an optional
-filter
+filter
 to filter the input voltages. By default the filter is enabled.
 
        
 
diff --git a/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2Pulse.mo
index ae8dc5abb4..e39fbd84d2 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2Pulse.mo
@@ -109,12 +109,12 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a two pulse Graetz diode rectifier bridge. The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTap2Pulse.
+Examples.ACDC.RectifierCenterTap2Pulse.
 
        
 "));
 end DiodeBridge2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2mPulse.mo
index 02ee991163..03c3f9c8fc 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/DiodeBridge2mPulse.mo
@@ -92,13 +92,13 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a 2*m pulse diode rectifier bridge. In order to operate this rectifier a voltage source with center tap is required. The circuit topology is the same as in
-Examples.ACDC.RectifierBridge2mPulse. It is important to note that for polyphase circuits with even phase numbers greater than three the
-MultiStarResistance shall be used for grounding the voltage sources.
+Examples.ACDC.RectifierBridge2mPulse. It is important to note that for polyphase circuits with even phase numbers greater than three the
+MultiStarResistance shall be used for grounding the voltage sources.
 
        
 "));
 end DiodeBridge2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2Pulse.mo
index 8bdfb0ea7b..715b3a30c4 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2Pulse.mo
@@ -77,12 +77,12 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a two pulse diode rectifier with center tap. In order to operate this rectifier a voltage with center tap is required. The center tap has to be connected with the negative pin of the load. The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTap2Pulse.
+Examples.ACDC.RectifierCenterTap2Pulse.
 
        
 "));
 end DiodeCenterTap2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2mPulse.mo
index 6c2bf0f1cf..eb035d6b9f 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTap2mPulse.mo
@@ -92,12 +92,12 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a 2*m pulse diode rectifier with center tap. In order to operate this rectifier a voltage source with center tap is required. The center tap has to be connected with the negative pin of the load. The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTap2mPulse.
+Examples.ACDC.RectifierCenterTap2mPulse.
 
        
 "));
 end DiodeCenterTap2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTapmPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTapmPulse.mo
index f26177c17b..179cf2017b 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTapmPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/DiodeCenterTapmPulse.mo
@@ -73,14 +73,14 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept.
+AC/DC converter concept.
 
        
 
 
        
 This is a m pulse diode rectifier with center tap. All voltage sources must have one interconnected plug (tap). This rectifiers works only with odd number of phases due the symmetry constrains of even phase numbers implemented in
-symmetricOrientation.
+symmetricOrientation.
 The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTapmPulse.
+Examples.ACDC.RectifierCenterTapmPulse.
 
        
 "));
 end DiodeCenterTapmPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2Pulse.mo
index 2861dda840..30690a6f93 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2Pulse.mo
@@ -142,7 +142,7 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
@@ -151,7 +151,7 @@ with thyristor thyristor_p1.
 The firing signal fire_n is connected
 with thyristor thyristor_p2.
 The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTap2Pulse.
+Examples.ACDC.RectifierCenterTap2Pulse.
 
        
 "));
 end HalfControlledBridge2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2mPulse.mo
index b52db314b1..7cdbad2b38 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/HalfControlledBridge2mPulse.mo
@@ -129,13 +129,13 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a 2*m pulse half controlled rectifier bridge. In order to operate this rectifier a voltage source with center tap is required. The circuit topology is the same as in
-Examples.ACDC.RectifierBridge2mPulse. It is important to note that for polyphase circuits with even phase numbers greater than three the
-MultiStarResistance shall be used for grounding the voltage sources.
+Examples.ACDC.RectifierBridge2mPulse. It is important to note that for polyphase circuits with even phase numbers greater than three the
+MultiStarResistance shall be used for grounding the voltage sources.
 
        
 "));
 end HalfControlledBridge2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2Pulse.mo
index 161b2f8c5d..e3bec37710 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2Pulse.mo
@@ -137,7 +137,7 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
@@ -145,7 +145,7 @@ This is a two pulse Graetz thyristor rectifier bridge. The firing signal f
 with thyristor thyristor_p1 and thyristor_n2.
 The firing signal fire_n are connected
 with thyristor thyristor_p2 and thyristor_n1. See example
-Examples.ACDC.RectifierCenterTap2Pulse.
+Examples.ACDC.RectifierCenterTap2Pulse.
 
        
 "));
 end ThyristorBridge2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2mPulse.mo
index 55f5619f80..0cadca89a8 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/ThyristorBridge2mPulse.mo
@@ -119,14 +119,14 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a 2*m pulse thyristor rectifier bridge. In order to operate this rectifier a voltage source with center tap is required. It is important to note that for polyphase circuits with phase even phase numbers greater than three the
-MultiStarResistance shall be used for grounding the voltage sources.
+MultiStarResistance shall be used for grounding the voltage sources.
 See example
-Examples.ACDC.RectifierBridge2mPulse.
+Examples.ACDC.RectifierBridge2mPulse.
 
        
 "));
 end ThyristorBridge2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2Pulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2Pulse.mo
index dee70d571a..4c1b0cfa01 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2Pulse.mo
@@ -96,11 +96,11 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        This a two pulse thyristor rectifier with center tap. In order to operate this rectifier a voltage with center tap is required. The center tap has to be connected with the negative pin of the load. The circuit topology is the same as in
-Examples.ACDC.RectifierCenterTap2Pulse.
+Examples.ACDC.RectifierCenterTap2Pulse.
 
        
 "));
 end ThyristorCenterTap2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo
index 46284ceec6..2dc316e33f 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo
@@ -109,12 +109,12 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a 2*m pulse thyristor rectifier with center tap. In order to operate this rectifier a voltage source with center tap is required. The center tap has to be connected with the negative pin of the load. See example
-Examples.ACDC.RectifierCenterTap2mPulse.
+Examples.ACDC.RectifierCenterTap2mPulse.
 
        
 "));
 end ThyristorCenterTap2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo
index 2d83f36918..119c939e25 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo
@@ -83,14 +83,14 @@ equation
     Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 
 
        
 This is a m pulse thyristor rectifier with center tap. All voltage sources must have one interconnected plug (tap). This rectifiers works only with odd number of phases due the symmetry constrains of even phase numbers implemented in
-symmetricOrientation.
+symmetricOrientation.
 See example
-Examples.ACDC.RectifierCenterTapmPulse.
+Examples.ACDC.RectifierCenterTapmPulse.
 
        
 "));
 end ThyristorCenterTapmPulse;
diff --git a/Modelica/Electrical/PowerConverters/ACDC/package.mo b/Modelica/Electrical/PowerConverters/ACDC/package.mo
index 85a6bb6c4a..bb3bf7d353 100644
--- a/Modelica/Electrical/PowerConverters/ACDC/package.mo
+++ b/Modelica/Electrical/PowerConverters/ACDC/package.mo
@@ -4,7 +4,7 @@ package ACDC "AC to DC converters"
   annotation (Documentation(info="
 
        
 General information about AC/DC converters can be found at the
-AC/DC converter concept
+AC/DC converter concept
 
        
 "));
 end ACDC;
diff --git a/Modelica/Electrical/PowerConverters/DCAC/Control/PWM.mo b/Modelica/Electrical/PowerConverters/DCAC/Control/PWM.mo
index 7095c0510d..a760c8bc92 100644
--- a/Modelica/Electrical/PowerConverters/DCAC/Control/PWM.mo
+++ b/Modelica/Electrical/PowerConverters/DCAC/Control/PWM.mo
@@ -51,8 +51,8 @@ equation
 Let the user choose the PWM type from:
 
        
 
 "));
 end PWM;
diff --git a/Modelica/Electrical/PowerConverters/DCAC/SinglePhase2Level.mo b/Modelica/Electrical/PowerConverters/DCAC/SinglePhase2Level.mo
index cc806ac17c..97010611ee 100644
--- a/Modelica/Electrical/PowerConverters/DCAC/SinglePhase2Level.mo
+++ b/Modelica/Electrical/PowerConverters/DCAC/SinglePhase2Level.mo
@@ -136,7 +136,7 @@ This is a single-phase two level inverter. The boolean signals fire_p
 An example of a single-phase inverter with PWM voltage control is included in
-Examples.DCAC.SinglePhaseTwoLevel.
+Examples.DCAC.SinglePhaseTwoLevel.
 
        
 "));
 end SinglePhase2Level;
diff --git a/Modelica/Electrical/PowerConverters/DCAC/package.mo b/Modelica/Electrical/PowerConverters/DCAC/package.mo
index 5e38e548a3..ddc9589748 100644
--- a/Modelica/Electrical/PowerConverters/DCAC/package.mo
+++ b/Modelica/Electrical/PowerConverters/DCAC/package.mo
@@ -4,7 +4,7 @@ package DCAC "DC to AC converters"
   annotation (Documentation(info="
 
        
 General information about DC/AC converters can be found at the
-DC/AC converter concept
+DC/AC converter concept
 
        
 "));
 end DCAC;
diff --git a/Modelica/Electrical/PowerConverters/DCDC/Control/SignalPWM.mo b/Modelica/Electrical/PowerConverters/DCDC/Control/SignalPWM.mo
index 5d837525e9..664e512d36 100644
--- a/Modelica/Electrical/PowerConverters/DCDC/Control/SignalPWM.mo
+++ b/Modelica/Electrical/PowerConverters/DCDC/Control/SignalPWM.mo
@@ -146,14 +146,14 @@ The output firing signal is strictly determined by the actual duty cycle, indica
   
        Fig. 1: Firing (fire) and inverse firing (notFire) signal of PWM control; d = duty cycle; f = switching frequency 
   
        
     
-      
+      
     
   
        
 
        
 
 
        
 The firing signal is generated by comparing the sampled duty cycle input with a periodic saw tooth 
-[Williams2006] or triangular signal (carrier).
+[Williams2006] or triangular signal (carrier).
 
        
 
 
        Note
        
diff --git a/Modelica/Electrical/PowerConverters/DCDC/HBridge.mo b/Modelica/Electrical/PowerConverters/DCDC/HBridge.mo
index 2e9225d6c8..42b747b034 100644
--- a/Modelica/Electrical/PowerConverters/DCDC/HBridge.mo
+++ b/Modelica/Electrical/PowerConverters/DCDC/HBridge.mo
@@ -134,13 +134,13 @@ The H bridge is a four quadrant DC/DC converter. It consists of two single-phase
   
        Fig. 1: H bridge
   
        
     
-      
+      
     
   
        
 
        
 
 
        If the firing inputs fire_p and fire_n are inverse, the two legs are controlled symmetrically so that full positive or negative output voltage can be generated.
-See examples DCDC.HBridge.
+See examples DCDC.HBridge.
 
        
 
 
        Note
        
diff --git a/Modelica/Electrical/PowerConverters/DCDC/package.mo b/Modelica/Electrical/PowerConverters/DCDC/package.mo
index dd315e768d..5c4b2a1ae1 100644
--- a/Modelica/Electrical/PowerConverters/DCDC/package.mo
+++ b/Modelica/Electrical/PowerConverters/DCDC/package.mo
@@ -5,7 +5,7 @@ package DCDC "DC to DC converters"
   annotation (Documentation(info="
 
        
 General information about DC/DC converters can be found at the
-DC/DC converter concept
+DC/DC converter concept
 
        
 "));
 end DCDC;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo
index e7a96937dd..eab4f4ff9e 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo
@@ -22,11 +22,11 @@ This model demonstrates the behaviour of a dimmer with phase-angle control with
 
        
 
        
 The reference voltage is prescribed by a trapezoid between zero and full voltage.
-The voltageToAngle block
+The voltageToAngle block
 calculates the necessary phase angle, which is processed by
-the Signal2mPulse adaptor,
+the Signal2mPulse adaptor,
 applying the firing signals to the
-triac.
+triac.
 
        
 "));
 end Dimmer_R;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_RL.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_RL.mo
index 2cdc0da507..08fdf40b57 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_RL.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_RL.mo
@@ -32,11 +32,11 @@ and the triac stays conducting until the current becomes zero.
 
        
 
        
 The reference voltage is prescribed by a trapezoid between zero and full voltage.
-The voltageToAngle block
+The voltageToAngle block
 calculates the necessary phase angle, which is processed by
-the Signal2mPulse adaptor,
+the Signal2mPulse adaptor,
 applying the firing signals to the
-triac.
+triac.
 
        
 "));
 end Dimmer_RL;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo
index 7d15468838..a3eb9c3afd 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo
@@ -203,19 +203,19 @@ but current is limited to 2.5 times nominal current.
 At 5.5 s a voltage ramp down within 3 s is required.
 
        
 
        Reference voltage is controlled by the
-softStartControl block,
+softStartControl block,
 reference voltage is converted to firing angle by the
-voltageToAngle block.
+voltageToAngle block.
 Firing angle is processed by the
-Signal2mPulse adaptor
+Signal2mPulse adaptor
 to firing signals which are applied to the
-triac.
+triac.
 
        
 
        
 Compare starting with firing angle by
-starting direct on line,
-star-delta starting, and
-starting via a transformer.
+starting direct on line,
+star-delta starting, and
+starting via a transformer.
 
        
 "));
 end SoftStarter;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/Thyristor1Pulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/Thyristor1Pulse.mo
index 10a7ea16d4..876efa383a 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/Thyristor1Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/Thyristor1Pulse.mo
@@ -69,7 +69,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 single pulse rectifiers; load is not yet included.
        
 "));
 end Thyristor1Pulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2Pulse.mo
index 941dc84bd7..752cee89c2 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2Pulse.mo
@@ -75,7 +75,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 two pulse bridge rectifiers; load is not yet included.
        
 "));
 end ThyristorBridge2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2mPulse.mo
index dfc1aa4654..8d909ab6a3 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorBridge2mPulse.mo
@@ -83,7 +83,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 2*m pulse bridge rectifiers, where m is the number of phases; load is not yet included.
        
 "));
 end ThyristorBridge2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2Pulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2Pulse.mo
index a7f654ff18..fe75376606 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2Pulse.mo
@@ -81,7 +81,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 center tap two pulse rectifiers; load is not yet included.
        
 "));
 end ThyristorCenterTap2Pulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2mPulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2mPulse.mo
index eba22b7aa2..7bb690d047 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTap2mPulse.mo
@@ -97,7 +97,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 center tap 2*m pulse rectifiers, where m is the number of phases; load is not yet included.
        
 "));
 end ThyristorCenterTap2mPulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTapmPulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTapmPulse.mo
index 2c7b3abd68..1b341db461 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTapmPulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/ExampleTemplates/ThyristorCenterTapmPulse.mo
@@ -81,7 +81,7 @@ equation
   annotation (
     Documentation(info="
 
        Template of
-
+
 center tap m pulse rectifiers, where m is the number of phases; load is not yet included.
        
 "));
 end ThyristorCenterTapmPulse;
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/HalfControlledBridge2Pulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/HalfControlledBridge2Pulse.mo
index b1acb5a978..d384e15eca 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/HalfControlledBridge2Pulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/HalfControlledBridge2Pulse.mo
@@ -94,7 +94,7 @@ equation
       Interval=0.0002),
     Documentation(info="
 
        This examples shows a two pulse half controlled bridge example with resistive load. In case of resistive load the half controlled bridge shows the same output voltage as the
-full controlled bridge.
        
+full controlled bridge.
        
 
 
        Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
        
 "));
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/ThyristorBridge2Pulse_R.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/ThyristorBridge2Pulse_R.mo
index 7d71514ce3..d8887020f4 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/ThyristorBridge2Pulse_R.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2Pulse/ThyristorBridge2Pulse_R.mo
@@ -25,7 +25,7 @@ equation
       Interval=0.0002),
     Documentation(info="
 
        This examples shows a two pulse full controlled bridge example with resistive load. In case of resistive load the full controlled bridge shows the same output voltage as the
-half controlled bridge.
        
+half controlled bridge.
        
 
 
        Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
        
 "));
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/HalfControlledBridge2mPulse.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/HalfControlledBridge2mPulse.mo
index 57b7763983..bb09376afa 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/HalfControlledBridge2mPulse.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/HalfControlledBridge2mPulse.mo
@@ -100,7 +100,7 @@ equation
       Interval=0.0002),
     Documentation(info="
 
        This example shows a half controlled 2*m pulse bridge rectifier with resistive load, where m is the number of phases. In case of resistive load the half controlled bridge shows the same output voltage as the
-full controlled bridge.
        
+full controlled bridge.
        
 
 
        Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
        
 
diff --git a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/ThyristorBridge2mPulse_R.mo b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/ThyristorBridge2mPulse_R.mo
index 8930b1b6de..8b7fb086ea 100644
--- a/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/ThyristorBridge2mPulse_R.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/ACDC/RectifierBridge2mPulse/ThyristorBridge2mPulse_R.mo
@@ -25,7 +25,7 @@ equation
       Interval=0.0002),
     Documentation(info="
 
        This example shows a full controlled 2*m pulse bridge rectifier with resistive load, where m is the number of phases. In case of resistive load the full controlled bridge shows the same output voltage as the
-half controlled bridge.
        
+half controlled bridge.
        
 
 
        Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
        
 "));
diff --git a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_R.mo b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_R.mo
index aeac93db9c..e34726e122 100644
--- a/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_R.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/DCAC/PolyphaseTwoLevel/PolyphaseTwoLevel_R.mo
@@ -105,6 +105,6 @@ equation
       Tolerance=1e-06,
       Interval=0.00002),
     Documentation(info="
-
        Plot current currentSensor.i[:], harmonic current magnitude fundamentalWaveCurrent[:].y_RMS, harmonic voltage magnitude fundamentalWaveVoltage[:].y_RMS. The instantaneous voltages voltageSensor.i[:] and currents currentSensor.i[:] directly show the switching pattern of the inverter. There is not smoothing effect due to an inductance in this example; see PolyphaseTwoLevel_RL.
        
+
        Plot current currentSensor.i[:], harmonic current magnitude fundamentalWaveCurrent[:].y_RMS, harmonic voltage magnitude fundamentalWaveVoltage[:].y_RMS. The instantaneous voltages voltageSensor.i[:] and currents currentSensor.i[:] directly show the switching pattern of the inverter. There is not smoothing effect due to an inductance in this example; see PolyphaseTwoLevel_RL.
        
 "));
 end PolyphaseTwoLevel_R;
diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL.mo
index 71671ff7b1..97f9b031c5 100644
--- a/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL.mo
+++ b/Modelica/Electrical/PowerConverters/Examples/DCDC/HBridge/HBridge_TrianglePWM_RL.mo
@@ -28,7 +28,7 @@ equation
   annotation (
     Documentation(info="
 
        
-This is the same example as HBridge_RL 
+This is the same example as HBridge_RL 
 but using a triangle (instead of a sawtooth) as pwm reference signal. 
 This enables an easy sampling of the current in the middle of the pwm period, which delivers with good approximation the mean current: 
 Compare meanCurrent.y and zeroOrderHold.y. 
diff --git a/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable.mo b/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable.mo
index 1c790e49d0..65ca0037cc 100644
--- a/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable.mo
+++ b/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable.mo
@@ -25,10 +25,10 @@ equation
 
        
 This partial model provides parameters and the conditional input signal for the enabling models:
        
 
 "));
 end Enable;
diff --git a/Modelica/Electrical/PowerConverters/UsersGuide/ACACConcept.mo b/Modelica/Electrical/PowerConverters/UsersGuide/ACACConcept.mo
index 7c11a98a02..5e4d355324 100644
--- a/Modelica/Electrical/PowerConverters/UsersGuide/ACACConcept.mo
+++ b/Modelica/Electrical/PowerConverters/UsersGuide/ACACConcept.mo
@@ -6,22 +6,22 @@ class ACACConcept "AC/AC converter concept"
 
        The following AC/AC converter topologies are currently included in the PowerConverters library.
        
 
 
          
-
        • Single-phase dimmer with triac
          • 
-
        • Polyphase induction machine soft starter with triac
          • 
+
        • Single-phase dimmer with triac
          • 
+
        • Polyphase induction machine soft starter with triac
          • 
 
        
 
 
        Control
        
 
 
        To apply firing signals to the triac, the
-SignalPWM model is provided.
+SignalPWM model is provided.
 
        
 
        
-The Voltage2Angle block
+The Voltage2Angle block
 calculates phase angle from reference voltage.
 
        
 
        
 To control the soft start of an induction machine,
-the SoftStartControl block
+the SoftStartControl block
 is provided. It applies a voltage ramp during start, setting the ramp on hold whenever the measured current exceeds the maximum current.
 Furthermore, a ramp down can be applied for stopping the drive.
 
        
@@ -29,7 +29,7 @@ Furthermore, a ramp down can be applied for stopping the drive.
 
        Examples
        
 
 
        Some examples are provided at
-Examples.ACAC.
+Examples.ACAC.
 
        
 "));
 end ACACConcept;
diff --git a/Modelica/Electrical/PowerConverters/UsersGuide/ACDCConcept.mo b/Modelica/Electrical/PowerConverters/UsersGuide/ACDCConcept.mo
index 7411bc9fa0..08d0f5cf09 100644
--- a/Modelica/Electrical/PowerConverters/UsersGuide/ACDCConcept.mo
+++ b/Modelica/Electrical/PowerConverters/UsersGuide/ACDCConcept.mo
@@ -17,12 +17,12 @@ class ACDCConcept "AC/DC converter concept"
 
        Topology classification
        
 
 
        The PowerConverters library provides bridge and center tap rectifiers for single and polyphase supply, see
-AC/DC converters.
        
+AC/DC converters.
        
 
 
        Control
        
 
 
        For each of the provided rectifiers a
-control model is available.
+control model is available.
 These control models have electrical connectors to be connected with the AC supply.
 The firing angle of thyristor rectifiers can either be set by a parameter or a signal input.
 
        
@@ -30,7 +30,7 @@ The firing angle of thyristor rectifiers can either be set by a parameter or a s
 
        Examples
        
 
 
        A variety of examples is provided at
-Examples.ACDC.
+Examples.ACDC.
 These examples include different kinds of DC loads. Even the control characteristics
 of the rectifiers can be obtained experimentally; the names of these models
 contain _Characteristic.
diff --git a/Modelica/Electrical/PowerConverters/UsersGuide/DCACConcept.mo b/Modelica/Electrical/PowerConverters/UsersGuide/DCACConcept.mo
index 059dc61bfa..174cdd1497 100644
--- a/Modelica/Electrical/PowerConverters/UsersGuide/DCACConcept.mo
+++ b/Modelica/Electrical/PowerConverters/UsersGuide/DCACConcept.mo
@@ -8,17 +8,17 @@ class DCACConcept "DC/AC converter concept"
 
        Control
        
 
 
        Currently there are
-space vector PWM and
-intersective PWM models provided.
+space vector PWM and
+intersective PWM models provided.
 However, for operating the single-phase inverter the PWM
-controller
+controller
 can be used.
 
        
 
 
        Examples
        
 
 
        Some examples are provided at
-Examples.DCAC.
+Examples.DCAC.
 
        
 "));
 end DCACConcept;
diff --git a/Modelica/Electrical/PowerConverters/UsersGuide/DCDCConcept.mo b/Modelica/Electrical/PowerConverters/UsersGuide/DCDCConcept.mo
index 27edf46129..e45deb2935 100644
--- a/Modelica/Electrical/PowerConverters/UsersGuide/DCDCConcept.mo
+++ b/Modelica/Electrical/PowerConverters/UsersGuide/DCDCConcept.mo
@@ -13,14 +13,14 @@ class DCDCConcept "DC/DC converter concept"
 
        Control
        
 
 
        A pulse width modulation (PWM)
-controller
+controller
 is provided.
 
        
 
 
        Examples
        
 
 
        Some examples are provided at
-Examples.DCDC.
+Examples.DCDC.
 
        
 "));
 end DCDCConcept;
diff --git a/Modelica/Electrical/PowerConverters/UsersGuide/package.mo b/Modelica/Electrical/PowerConverters/UsersGuide/package.mo
index d688f0c246..660b352866 100644
--- a/Modelica/Electrical/PowerConverters/UsersGuide/package.mo
+++ b/Modelica/Electrical/PowerConverters/UsersGuide/package.mo
@@ -21,8 +21,8 @@ AC/AC converters currently only provide dimmer and soft starter with triacs.
 
 
          
   
        • All converter models rely on existing diode, thyristor and switch models provided in the
-      Analog.Ideal and the
-      Polyphase.Ideal
+      Analog.Ideal and the
+      Polyphase.Ideal
       package of the Modelica Standard Library.
          • 
   
        • Switching losses and recovery effects are not considered
          • 
   
        • Only conduction losses are taken into account
          • 
@@ -46,10 +46,10 @@ AC/AC converters currently only provide dimmer and soft starter with triacs.
 
 
          
 General background knowledge on power converters and power electronics can be found in
-[Skvarenina01] and
-[Luo05].
+[Skvarenina01] and
+[Luo05].
 A freely available book is available in
-[Williams2006].
+[Williams2006].
 
          
 "));
 end UsersGuide;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd00.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd00.mo
index 2869b289be..1d5dd21528 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd00.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd00.mo
@@ -25,6 +25,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd0
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd00;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd02.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd02.mo
index d15becb4c1..bfd508ae10 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd02.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd02.mo
@@ -29,6 +29,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd2
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd02;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd04.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd04.mo
index 9d227cfafd..a5e5a9cbed 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd04.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd04.mo
@@ -25,6 +25,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd4
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd04;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd06.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd06.mo
index 63defb61ee..dbd46d10bd 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd06.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd06.mo
@@ -25,6 +25,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd6
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd06;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd08.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd08.mo
index 373c3721ab..75e13f284b 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd08.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd08.mo
@@ -29,6 +29,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd8
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd08;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd10.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd10.mo
index 68c2646c4d..af6f37f447 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd10.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dd/Dd10.mo
@@ -25,6 +25,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dd10
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dd10;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy01.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy01.mo
index 36e97018bb..f8c4f956ec 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy01.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy01.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy1
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy01;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy03.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy03.mo
index 8fcd3681b8..6dc25e51ec 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy03.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy03.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy3
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy03;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy05.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy05.mo
index 945c488e29..a11ef9d51b 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy05.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy05.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy5
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy05;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy07.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy07.mo
index 4304f67b37..4263aa3213 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy07.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy07.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy7
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy07;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy09.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy09.mo
index 427a27854a..688b54f919 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy09.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy09.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy9
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy09;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy11.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy11.mo
index b28e72fd87..6e44a78a2d 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy11.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dy/Dy11.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dy11
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dy11;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz00.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz00.mo
index d0c4673436..49cc2a764d 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz00.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz00.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz0
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz00;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz02.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz02.mo
index cc6380ffcd..02b9d0a477 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz02.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz02.mo
@@ -44,6 +44,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz2
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz02;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz04.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz04.mo
index 65bede4400..5b1932947f 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz04.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz04.mo
@@ -35,6 +35,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz4
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz04;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz06.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz06.mo
index 4744b8121f..c9dfc3cac3 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz06.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz06.mo
@@ -37,6 +37,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz6
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz06;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz08.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz08.mo
index f5e00e0b7a..6fce83c957 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz08.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz08.mo
@@ -44,6 +44,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz8
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz08;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz10.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz10.mo
index 32d51829e4..4d441e8a8e 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz10.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Dz/Dz10.mo
@@ -44,6 +44,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Dz10
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Dz10;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd01.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd01.mo
index 1f835fefb3..48b3db314a 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd01.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd01.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd1
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd01;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd03.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd03.mo
index 13f18d22b4..385b61e338 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd03.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd03.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd3
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd03;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd05.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd05.mo
index 9d031d316d..672ebf17b0 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd05.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd05.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd5
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd05;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd07.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd07.mo
index 7b5e4d5e4d..8cfc82cfb4 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd07.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd07.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd7
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd07;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd09.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd09.mo
index 45f0d54e00..8eb7d8542a 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd09.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd09.mo
@@ -34,6 +34,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd9
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd09;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd11.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd11.mo
index b091e9cce4..41727855c1 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd11.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yd/Yd11.mo
@@ -30,6 +30,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yd11
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yd11;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy00.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy00.mo
index a13d124d2a..a82dc77ce9 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy00.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy00.mo
@@ -35,6 +35,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy0
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy00;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy02.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy02.mo
index cad7f896cc..93a884e703 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy02.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy02.mo
@@ -39,6 +39,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy2
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy02;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy04.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy04.mo
index ac0905d1bf..bd1ed7e787 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy04.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy04.mo
@@ -39,6 +39,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy4
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy04;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy06.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy06.mo
index 0c6e9a0c08..0cffb947ce 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy06.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy06.mo
@@ -35,6 +35,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy6
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy06;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy08.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy08.mo
index d0aad88b61..c8b855862f 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy08.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy08.mo
@@ -39,6 +39,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy8
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy08;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy10.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy10.mo
index a291ce308e..2743d4762d 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy10.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yy/Yy10.mo
@@ -39,6 +39,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yy10
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yy10;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz01.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz01.mo
index f8e27aed02..19ef7673b3 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz01.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz01.mo
@@ -49,6 +49,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz1
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz01;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz03.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz03.mo
index 176b5578c8..c838e32a37 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz03.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz03.mo
@@ -49,6 +49,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz3
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz03;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz05.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz05.mo
index 5435e4f506..04493ebcc9 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz05.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz05.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz5
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz05;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz07.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz07.mo
index dbc6c8e0a8..039af5b616 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz07.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz07.mo
@@ -42,6 +42,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz7
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz07;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz09.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz09.mo
index 26c7543f66..aec5cc345e 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz09.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz09.mo
@@ -49,6 +49,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz9
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz09;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz11.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz11.mo
index 8f514ec91c..9606accf66 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz11.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/Transformers/Yz/Yz11.mo
@@ -49,6 +49,6 @@ equation
   annotation (defaultComponentName="transformer", Documentation(info="
 Transformer Yz11
 
          Typical parameters see:
-PartialBasicTransformer
+PartialBasicTransformer
 "));
 end Yz11;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo
index 962c3a6e5b..c3c828f109 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/BasicMachines/package.mo
@@ -36,9 +36,9 @@ package BasicMachines "Basic machine models"
 
          Note
          
 
          
 Quasi-static AC machines (induction machines and synchronous machines) based on space phasor therory are not implemented. 
-Use quasi-static fundamental wave machines instead. 
+Use quasi-static fundamental wave machines instead. 
 Fundamental wave machines (transient and quasi-static) are compatible with models based on space phasor theory with respect to connectors and parameters.
-For a discrimination of various machine models, see discrimination.
+For a discrimination of various machine models, see discrimination.
 
          
 "));
 end BasicMachines;
diff --git a/Modelica/Electrical/QuasiStatic/Machines/package.mo b/Modelica/Electrical/QuasiStatic/Machines/package.mo
index ab74907bf7..4f881e4640 100644
--- a/Modelica/Electrical/QuasiStatic/Machines/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Machines/package.mo
@@ -28,7 +28,7 @@ package Machines "Quasi-static machine models"
           fillPattern=FillPattern.Solid,
           points={{-70,-90},{-60,-90},{-30,-20},{20,-20},{50,-90},{60,-90},{60,
               -100},{-70,-100},{-70,-90}})}), preferredView="info", Documentation(info="
-
          For a discrimination of various machine models, see discrimination.
          
+
          For a discrimination of various machine models, see discrimination.
          
 
          
 Copyright © 1998-2020, Modelica Association and contributors
 
          
@@ -39,7 +39,7 @@ Copyright © 1998-2020, Modelica Association and contributors
 Quasi-static DC machines are still operated with DC voltage and current, whereas the quasi-static transformers
 are operated with sinusoidal voltages and currents represented by time phasors. 
 Quasi-static DC machine models therefore are part of the
-machines library.
+machines library.
 
          
 "));
 end Machines;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Admittance.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Admittance.mo
index 1d4e46a56c..5d5cb063db 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Admittance.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Admittance.mo
@@ -48,16 +48,16 @@ equation
 
 
          The admittance model represents a parallel connection of a resistor and either a capacitor or inductor
 in each phase.
          
-
          
+
          
 
 
          
 The linear admittance connects the voltage v with the
 current i by  i = Y*v in each phase, using m
-single-phase admittances.
+single-phase admittances.
 The resistive
 components are modeled temperature dependent, so the real parts G_actual = real(Y) are determined from
 the actual operating temperatures and the reference input conductances real(Y_ref).
-Conditional heat ports are considered.
+Conditional heat ports are considered.
 The reactive components
 B_actual = imag(Y)
 are equal to imag(Y_ref) if frequencyDependent = false.
@@ -73,17 +73,17 @@ Frequency dependency is considered by frequencyDependent = true, di
 
 
          See also
          
 
          
-Admittance,
-Resistor,
-Conductor,
-Capacitor,
-Impedance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Admittance,
+Resistor,
+Conductor,
+Capacitor,
+Impedance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Admittance;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Capacitor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Capacitor.mo
index 7a6fa8d06a..b41396da78 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Capacitor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Capacitor.mo
@@ -29,23 +29,23 @@ equation
 
          
 The linear capacitor connects the complex currents i with the complex
 voltages v by v*j*ω*C = i,
-using m single-phase Capacitors.
+using m single-phase Capacitors.
 
          
 
 
          See also
          
 
          
-Capacitor,
-Resistor,
-Conductor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Capacitor,
+Resistor,
+Conductor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Capacitor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Conductor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Conductor.mo
index 196e422261..41f3f2d996 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Conductor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Conductor.mo
@@ -41,29 +41,29 @@ equation
 
          
 The linear resistor connects the complex currents i with the complex
 voltages v by v*G = i,
-using m single-phase Conductors.
+using m single-phase Conductors.
 
          
 
 
          
 The conductor model also has m optional
-conditional heat ports.
+conditional heat ports.
 A linear temperature dependency of the conductances for enabled heat ports is also taken into account.
 
          
 
 
          See also
          
 
          
-Conductor,
-Resistor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Conductor,
+Resistor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Conductor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Delta.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Delta.mo
index d12b492892..419d2728ce 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Delta.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Delta.mo
@@ -37,8 +37,8 @@ Delta (polygon) connection of a polyphase circuit.
 
          
 
          See also
          
 
          
-Star,
-MultiStar,
-MultiDelta
+Star,
+MultiStar,
+MultiDelta
 
          "));
 end Delta;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Impedance.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Impedance.mo
index a753d5c571..3f3e354843 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Impedance.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Impedance.mo
@@ -47,16 +47,16 @@ equation
           textColor={0,0,255})}), Documentation(info="
 
          The impedance model represents a series connection of a resistor and either an inductor or capacitor
 in each phase.
          
-
          
+
          
 
 
          
 The linear impedance connects the voltage v with the
 current i by  v = Z*i in each phase, using m
-single-phase impedances.
+single-phase impedances.
 The resistive
 components are modeled temperature dependent, so the real parts R_actual = real(Z) are determined from
 the actual operating temperatures and the reference input resistances real(Z_ref).
-Conditional heat ports are considered.
+Conditional heat ports are considered.
 The reactive components X_actual = imag(Z)
 are equal to imag(Z_ref) if frequencyDependent = false.
 Frequency dependency is considered by frequencyDependent = true, distinguishing two cases:
@@ -71,18 +71,18 @@ Frequency dependency is considered by frequencyDependent = true, di
 
 
          See also
          
 
          
-Impedance,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Impedance,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Impedance;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Inductor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Inductor.mo
index 91755d4dc3..3125596bf7 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Inductor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Inductor.mo
@@ -40,23 +40,23 @@ equation
 
          
 The linear inductor connects the complex voltages v with the complex
 currents i by i*j*ω*L = v,
-using m single-phase Inductors.
+using m single-phase Inductors.
 
          
 
 
          See also
          
 
          
-Inductor,
-Resistor,
-Conductor,
-Capacitor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Inductor,
+Resistor,
+Conductor,
+Capacitor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Inductor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiDelta.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiDelta.mo
index 8145f75292..2e1991bcfe 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiDelta.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiDelta.mo
@@ -52,13 +52,13 @@ equation
           textString="m=%m")}), Documentation(info="
 
          
 Delta (polygon) connection of a polyphase circuit consisting of multiple base systems (see
-polyphase guidelines).
+polyphase guidelines).
 
          
 
          See also
          
 
          
-Star,
-Delta,
-MultiStar
+Star,
+Delta,
+MultiStar
 
          
 "));
 end MultiDelta;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStar.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStar.mo
index 87b793ff03..800b24cb3b 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStar.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStar.mo
@@ -55,12 +55,12 @@ equation
     Documentation(info="
 
          
 Star (wye) connection of a polyphase circuit consisting of multiple base systems (see
-polyphase guidelines). The potentials at the star points are all equal.
+polyphase guidelines). The potentials at the star points are all equal.
 
          
 
          See also
          
 
          
-Star,
-Delta,
-MultiDelta
+Star,
+Delta,
+MultiDelta
 
          "));
 end MultiStar;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStarResistance.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStarResistance.mo
index 960da0799b..b7acb08ff8 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStarResistance.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/MultiStarResistance.mo
@@ -55,7 +55,7 @@ equation
     Documentation(info="
 
          
 Multi star points are connected by resistors. This model is required to operate polyphase systems with even phase numbers to avoid ideal connections of start points of base systems; see
-polyphase guidelines.
+polyphase guidelines.
 
          
 "));
 end MultiStarResistance;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_n.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_n.mo
index 35f190fdc4..59678f812a 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_n.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_n.mo
@@ -36,9 +36,9 @@ Connects the single-phase (negative) pin k of the polyphase (negati
 
          
 
          See also
          
 
          
-PlugToPin_p,
-PlutToPins_p,
-PlugToPins_n
+PlugToPin_p,
+PlutToPins_p,
+PlugToPins_n
 
          
 "));
 end PlugToPin_n;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_p.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_p.mo
index 5aaf591e92..ead7a45787 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_p.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPin_p.mo
@@ -36,9 +36,9 @@ Connects the single-phase (positive) pin k of the polyphase (positi
 
          
 
          See also
          
 
          
-PlugToPin_n,
-PlutToPins_p,
-PlugToPins_n
+PlugToPin_n,
+PlutToPins_p,
+PlugToPins_n
 
          
 "));
 end PlugToPin_p;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_n.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_n.mo
index 80e0257311..5fbcdcdded 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_n.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_n.mo
@@ -36,9 +36,9 @@ Connects all m single-phase (negative) pins of the polyphase (negat
 
          
 
          See also
          
 
          
-PlugToPin_p,
-PlugToPin_n,
-PlugToPins_p
+PlugToPin_p,
+PlugToPin_n,
+PlugToPins_p
 
          
 "));
 end PlugToPins_n;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_p.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_p.mo
index adfc00dec0..0613d2637f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_p.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/PlugToPins_p.mo
@@ -36,9 +36,9 @@ Connects all m single-phase (positive) pins of the polyphase (posit
 
          
 
          See also
          
 
          
-PlugToPin_p,
-PlugToPin_n,
-PlugToPins_n
+PlugToPin_p,
+PlugToPin_n,
+PlugToPins_n
 
          
 "));
 end PlugToPins_p;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Resistor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Resistor.mo
index 7d26280807..bf518eb4e8 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Resistor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Resistor.mo
@@ -41,29 +41,29 @@ equation
 
          
 The linear resistor connects the complex voltages v with the complex
 currents i by i*R = v,
-using m single-phase Resistors.
+using m single-phase Resistors.
 
          
 
 
          
 The resistor model also has m optional
-conditional heat ports.
+conditional heat ports.
 A linear temperature dependency of the resistances for enabled heat ports is also taken into account.
 
          
 
 
          See also
          
 
          
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end Resistor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Star.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Star.mo
index 99048bc43c..0df014e0cc 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Star.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/Star.mo
@@ -37,9 +37,9 @@ Star (wye) connection of a polyphase circuit. The potentials at the star points
 
          
 
          See also
          
 
          
-Delta,
-MultiStar,
-MultiDelta
+Delta,
+MultiStar,
+MultiDelta
 
          
 "));
 end Star;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableAdmittance.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableAdmittance.mo
index 4239db9991..82812c76dc 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableAdmittance.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableAdmittance.mo
@@ -57,19 +57,19 @@ equation
     Documentation(info="
 
          The admittance model represents a parallel connection of a resistor and either a capacitor or inductor
 in each phase.
          
-
          
+
          
 
 
          
 The linear admittance connects the complex voltage v with the
 complex current i by v*Y = i in each phase,
 using m
-
+
 variable single-phase admittances.
 The admittances Y_ref = G_ref + j*B_ref are given as complex input signals, representing the
 resistive and reactive components of the input admittances. The resistive
 components are modeled temperature dependent, so the real part G_actual = real(Y) are determined from
 the actual operating temperatures and the reference input conductances real(Y_ref).
-Conditional heat ports are considered.
+Conditional heat ports are considered.
 The reactive components B_actual = imag(Y)
 are equal to imag(Y_ref) if frequencyDependent = false.
 Frequency dependency is considered by frequencyDependent = true, distinguishing two cases:
@@ -90,17 +90,17 @@ singularities due to the actual structure of the connected network.
 
 
          See also
          
 
          
-VariableResistor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable conductor,
-Variable capacitor,
-Variable inductor
-Variable impedance,
+VariableResistor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable conductor,
+Variable capacitor,
+Variable inductor
+Variable impedance,
 
          
 "));
 end VariableAdmittance;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableCapacitor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableCapacitor.mo
index 318b9dd86d..9424cb404a 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableCapacitor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableCapacitor.mo
@@ -38,24 +38,24 @@ equation
 
          
 The linear capacitors connect the complex currents i with the complex
 voltages v by v*j*ω*C = i,
-using m single-phase variable Capacitors.
+using m single-phase variable Capacitors.
 The capacitances C are given as m input signals.
 
          
 
 
          See also
          
 
          
-VariableCapacitor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable inductor
-Variable impedance,
-Variable admittance
+VariableCapacitor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable inductor
+Variable impedance,
+Variable admittance
 
          
 "));
 end VariableCapacitor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableConductor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableConductor.mo
index 23480b90bf..9a5cbd0833 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableConductor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableConductor.mo
@@ -49,30 +49,30 @@ equation
 
          
 The linear resistors connect the complex currents i with the complex
 voltages v by v*G = i,
-using m single-phase variable Conductors.
+using m single-phase variable Conductors.
 The conductances G are given as m input signals.
 
          
 
 
          
 The conductor model also has m optional
-conditional heat ports.
+conditional heat ports.
 A linear temperature dependency of the conductances is also taken into account.
 
          
 
 
          See also
          
 
          
-VariableConductor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable capacitor,
-Variable inductor
-Variable impedance,
-Variable admittance
+VariableConductor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable capacitor,
+Variable inductor
+Variable impedance,
+Variable admittance
 
          
 "));
 end VariableConductor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableImpedance.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableImpedance.mo
index bf9fa1823a..17600ba55d 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableImpedance.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableImpedance.mo
@@ -59,19 +59,19 @@ equation
     Documentation(info="
 
          The impedance model represents a series connection of a resistor and either an inductor or capacitor
 in each phase.
          
-
          
+
          
 
 
          
 The linear impedance connects the complex voltage v with the
 complex current i by i*Z = v in each phase,
 using m
-
+
 variable single-phase impedances.
 The impedances Z_ref = R_ref + j*X_ref are given as complex input signals, representing the
 resistive and reactive components of the input impedances. The resistive
 components are modeled temperature dependent, so the real part R_actual = real(Z) are determined from
 the actual operating temperatures and the reference input resistances real(Z_ref).
-Conditional heat ports are considered.
+Conditional heat ports are considered.
 The reactive components X_actual = imag(Z)
 are equal to imag(Z_ref) if frequencyDependent = false.
 Frequency dependency is considered by frequencyDependent = true, distinguishing two cases:
@@ -92,17 +92,17 @@ singularities due to the actual structure of the connected network.
 
 
          See also
          
 
          
-VariableResistor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable conductor,
-Variable capacitor,
-Variable inductor
-Variable admittance
+VariableResistor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable conductor,
+Variable capacitor,
+Variable inductor
+Variable admittance
 
          
 "));
 end VariableImpedance;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableInductor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableInductor.mo
index 2ae72c74d8..89ee2af16d 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableInductor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableInductor.mo
@@ -47,24 +47,24 @@ equation
 
          
 The linear inductors connect the complex voltages v with the complex
 currents i by i*j*ω*L = v,
-using m single-phase variable Inductors.
+using m single-phase variable Inductors.
 The inductances L are given as m input signals.
 
          
 
 
          See also
          
 
          
-Inductor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor
-Variable impedance,
-Variable admittance
+Inductor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor
+Variable impedance,
+Variable admittance
 
          
 "));
 end VariableInductor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableResistor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableResistor.mo
index da70323fb7..df16e980b8 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableResistor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/VariableResistor.mo
@@ -51,30 +51,30 @@ equation
 
          
 The linear resistors connect the complex voltages v with the complex
 currents i by i*R = v,
-using m single-phase variable Resistors.
+using m single-phase variable Resistors.
 The resistances R are given as m input signals.
 
          
 
 
          
 The resistor model also has m optional
-conditional heat ports.
+conditional heat ports.
 A linear temperature dependency of the resistances is also taken into account.
 
          
 
 
          See also
          
 
          
-VariableResistor,
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+VariableResistor,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
          
 "));
 end VariableResistor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/package.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/package.mo
index e0292b7340..337ce18aef 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Basic/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Basic/package.mo
@@ -13,11 +13,11 @@ package Basic "Basic components for AC polyphase models"
             {100,100}}, preserveAspectRatio=true)), Documentation(info="
 
          This package hosts basic models for quasi-static polyphase circuits.
 Quasi-static theory can be found in the
-references.
+references.
 
          
 
          See also
          
 
-SinglePhase.Basic
+SinglePhase.Basic
 
 "));
 end Basic;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/FromSymmetricalComponents.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/FromSymmetricalComponents.mo
index a7bb8a3b10..5737f26699 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/FromSymmetricalComponents.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/FromSymmetricalComponents.mo
@@ -70,7 +70,7 @@ Calculates the time phasors from the symmetric components according to Charles L
 
          
 
          See also
          
 
          
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
          
 "));
 end FromSymmetricalComponents;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SingleToPolyphase.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SingleToPolyphase.mo
index f78cfa0a4e..256cc0794a 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SingleToPolyphase.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SingleToPolyphase.mo
@@ -34,7 +34,7 @@ equation
           rotation=-90)}),
     Documentation(info="
 
          
-This function propagates the input phasor to m output phasors with symmetricOrientation.
+This function propagates the input phasor to m output phasors with symmetricOrientation.
 
          
 "));
 end SingleToPolyphase;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SymmetricalComponents.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SymmetricalComponents.mo
index 072bd214d8..20e57a1e8f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SymmetricalComponents.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Blocks/SymmetricalComponents.mo
@@ -71,7 +71,7 @@ Calculates the symmetric components according to Charles L. Fortescue from the t
 
          
 
          See also
          
 
          
-User's guide on symmetrical components and orientation.
+User's guide on symmetrical components and orientation.
 
          
 "));
 end SymmetricalComponents;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Idle.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Idle.mo
index 9d5810c94c..ced6a8c4be 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Idle.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Idle.mo
@@ -25,13 +25,13 @@ equation
           textString="m=%m")}), Documentation(info="
 
          
 This model describes m simple idle branches considering the complex currents i = 0;
-it uses m single-phase idle branches.
+it uses m single-phase idle branches.
 
          
 
 
          See also
          
 
          
-Idle,
-Short
+Idle,
+Short
 
          
 "));
 end Idle;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Short.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Short.mo
index e8e84b95e1..815f2cbf61 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Short.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/Short.mo
@@ -26,13 +26,13 @@ equation
                        Documentation(info="
 
          
 This model describes m simple short branches considering the complex voltages v = 0;
-it uses m single-phase short branches.
+it uses m single-phase short branches.
 
          
 
 
          See also
          
 
          
-Short,
-Idle
+Short,
+Idle
 
          
 "));
 end Short;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/package.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/package.mo
index b4d04e7170..73fbbc22fd 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Ideal/package.mo
@@ -12,11 +12,11 @@ package Ideal "Ideal components for AC polyphase models"
         info="
 
          This package hosts ideal models for quasi-static polyphase circuits.
 Quasi-static theory can be found in the
-references.
+references.
 
          
 
          See also
          
 
-SinglePhase.Ideal
+SinglePhase.Ideal
 
 "));
 end Ideal;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/AbsoluteSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/AbsoluteSensor.mo
index 08667fe2cd..39efba2654 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/AbsoluteSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/AbsoluteSensor.mo
@@ -20,7 +20,7 @@ equation
 
 
          
 The absolute sensor partial model relies on the a
-positive plug
+positive plug
 to measure the complex potential, frequency, angular frequency. Additionally this model contains
 a proper icon and a definition of the angular velocity.
 
          
@@ -28,9 +28,9 @@ a proper icon and a definition of the angular velocity.
 
          See also
          
 
 
          
-RelativeSensorElementary,
-SinglePhase.Interfaces.AbsoluteSensor,
-SinglePhase.Interfaces.RelativeSensorElementary
+RelativeSensorElementary,
+SinglePhase.Interfaces.AbsoluteSensor,
+SinglePhase.Interfaces.RelativeSensorElementary
 
          
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/NegativePlug.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/NegativePlug.mo
index 565d84a3db..85d5a122df 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/NegativePlug.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/NegativePlug.mo
@@ -19,18 +19,18 @@ connector NegativePlug "Negative quasi-static polyphase plug"
     Documentation(info="
 
 
          
-The negative plug is based on Plug.
-Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of each quasi-static voltage and current. The symbol is also designed such way to look different than the positive plug.
+The negative plug is based on Plug.
+Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of each quasi-static voltage and current. The symbol is also designed such way to look different than the positive plug.
 
          
 
 
          See also
          
 
 
          
-Pin,
-PositivePin,
-NegativePin,
-Plug,
-PositivePlug,
+Pin,
+PositivePin,
+NegativePin,
+Plug,
+PositivePlug,
 
          
 "));
 end NegativePlug;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/OnePort.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/OnePort.mo
index b15518ab98..af32ce63c2 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/OnePort.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/OnePort.mo
@@ -46,11 +46,11 @@ equation
   plug_p.pin.i + plug_n.pin.i = fill(Complex(0), m);
   annotation (Documentation(info="
 
          
-This partial model uses a positive
-and negative plug and defines
+This partial model uses a positive
+and negative plug and defines
 the complex voltage differences as well as the complex currents (into the positive plug).
-A positive and
-a negative adapter
+A positive and
+a negative adapter
 are used to give easy access to the single pins of both plugs. Additionally, the angular velocity of the
 quasi-static system is explicitly defined as variable. This model is mainly intended to be used with textual representation of user models.
 
          
@@ -58,10 +58,10 @@ quasi-static system is explicitly defined as variable. This model is mainly inte
 
          See also
          
 
 
          
-PositivePlug,
-NegativePlug,
-TwoPlug,
-OnePort
+PositivePlug,
+NegativePlug,
+TwoPlug,
+OnePort
 
          
 "));
 end OnePort;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Plug.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Plug.mo
index 7920cae331..8b55d4510f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Plug.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Plug.mo
@@ -5,20 +5,20 @@ connector Plug "Quasi-static polyphase plug"
   annotation (Documentation(info="
 
 
          
-This polyphase plug contains a vector of m single-phase pins.
-The positive and
-negative plug are
+This polyphase plug contains a vector of m single-phase pins.
+The positive and
+negative plug are
 derived from this base connector.
 
          
 
 
          See also
          
 
 
          
-Pin,
-PositivePin,
-NegativePin,
-PositivePlug,
-NegativePlug
+Pin,
+PositivePin,
+NegativePin,
+PositivePlug,
+NegativePlug
 
          
 "));
 end Plug;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/PositivePlug.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/PositivePlug.mo
index 86fb0e3f5d..3500d5b603 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/PositivePlug.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/PositivePlug.mo
@@ -19,18 +19,18 @@ connector PositivePlug "Positive quasi-static polyphase plug"
     Documentation(info="
 
 
          
-The positive plug is based on Plug.
-Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of each quasi-static voltage and current. The symbol is also designed such way to look different than the negative plug.
+The positive plug is based on Plug.
+Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of each quasi-static voltage and current. The symbol is also designed such way to look different than the negative plug.
 
          
 
 
          See also
          
 
 
          
-Pin,
-PositivePin,
-NegativePin,
-Plug,
-NegativePlug
+Pin,
+PositivePin,
+NegativePin,
+Plug,
+NegativePlug
 
          
 "));
 end PositivePlug;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/ReferenceSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/ReferenceSource.mo
index 29460dbf14..6d49a34407 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/ReferenceSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/ReferenceSource.mo
@@ -21,17 +21,17 @@ equation
               textColor={0,0,255})}), Documentation(info="
 
          
 The source partial model relies on the
-TwoPlug and contains a proper icon.
+TwoPlug and contains a proper icon.
 
          
 
 
          See also
          
 
 
          
-VoltageSource,
-VariableVoltageSource,
-CurrentSource,
-VariableCurrentSource,
-SinglePhase.Interfaces.Source.
+VoltageSource,
+VariableVoltageSource,
+CurrentSource,
+VariableCurrentSource,
+SinglePhase.Interfaces.Source.
 
          
 "));
 end ReferenceSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/RelativeSensorElementary.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/RelativeSensorElementary.mo
index 04963e5694..898ccc0755 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/RelativeSensorElementary.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/RelativeSensorElementary.mo
@@ -15,15 +15,15 @@ partial model RelativeSensorElementary "Elementary partial voltage / current sen
           textString="%name")}), Documentation(info="
 
          
 The relative sensor partial model relies on the
-TwoPlug to measure the complex voltages, currents or power. Additionally this model contains a proper icon and a definition of the angular velocity.
+TwoPlug to measure the complex voltages, currents or power. Additionally this model contains a proper icon and a definition of the angular velocity.
 
          
 
 
          See also
          
 
 
          
-AbsoluteSensor,
-SinglePhase.Interfaces.AbsoluteSensor,
-SinglePhase.Interfaces.RelativeSensorElementary
+AbsoluteSensor,
+SinglePhase.Interfaces.AbsoluteSensor,
+SinglePhase.Interfaces.RelativeSensorElementary
 
          
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Source.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Source.mo
index 62b07a650a..7f6befef2c 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Source.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/Source.mo
@@ -23,17 +23,17 @@ equation
     Documentation(info="
 
          
 The source partial model relies on the
-TwoPlug and contains a proper icon.
+TwoPlug and contains a proper icon.
 
          
 
 
          See also
          
 
 
          
-VoltageSource,
-VariableVoltageSource,
-CurrentSource,
-VariableCurrentSource,
-SinglePhase.Interfaces.Source.
+VoltageSource,
+VariableVoltageSource,
+CurrentSource,
+VariableCurrentSource,
+SinglePhase.Interfaces.Source.
 
          
 "));
 end Source;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlug.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlug.mo
index 67aa7b9e3f..d2123c0e3c 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlug.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlug.mo
@@ -34,11 +34,11 @@ equation
   i = plug_p.pin.i;
   annotation (Documentation(info="
 
          
-This partial model uses a positive
-and negative plug,
+This partial model uses a positive
+and negative plug,
 but no complex voltage and complex current.
-A positive and
-a negative adapter
+A positive and
+a negative adapter
 are used to give easy access to the single pins of both plugs. Additionally, the angular velocity of the
 quasi-static system is explicitly defined as variable. This model is mainly intended to be used with graphical representation of user models.
 
          
@@ -46,10 +46,10 @@ quasi-static system is explicitly defined as variable. This model is mainly inte
 
          See also
          
 
 
          
-PositivePlug,
-NegativePlug,
-TwoPlugElementary,
-OnePort
+PositivePlug,
+NegativePlug,
+TwoPlugElementary,
+OnePort
 
          
 "));
 end TwoPlug;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlugElementary.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlugElementary.mo
index 366280da31..ccb1299bda 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlugElementary.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Interfaces/TwoPlugElementary.mo
@@ -22,11 +22,11 @@ equation
   connect(plugToPins_n.plug_n, plug_n) annotation (Line(points={{72,0},{86,0},{100,0}}, color={85,170,255}));
   annotation (Documentation(info="
 
          
-This partial model uses a positive
-and negative plug
+This partial model uses a positive
+and negative plug
 but no complex voltage, current, power, etc.
-A positive and
-a negative adapter
+A positive and
+a negative adapter
 are used to give easy access to the single pins of both plugs. Additionally, the angular velocity of the
 quasi-static system is explicitly defined as variable. This model is mainly intended to be used with graphical representation of user models.
 
          
@@ -34,10 +34,10 @@ quasi-static system is explicitly defined as variable. This model is mainly inte
 
          See also
          
 
 
          
-PositivePlug,
-NegativePlug,
-TwoPlug,
-OnePort
+PositivePlug,
+NegativePlug,
+TwoPlug,
+OnePort
 
          
 "));
 end TwoPlugElementary;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/AronSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/AronSensor.mo
index f904ad2756..bc69232780 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/AronSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/AronSensor.mo
@@ -79,7 +79,7 @@ equation
           textString="W"),
         Line(points={{-100,0},{100,0}}, color={85,170,255})}),
                                   Documentation(info="
-
          Contains two power meters to measure total active power in a three-phase system.
          
+
          Contains two power meters to measure total active power in a three-phase system.
          
 
          This device works only in three-phase systems without neutral.
          
 
          The rationale behind this sensor is that power exchanged between two parts of a circuit is the sum of the products of currents in the m wires connecting the two parts times wires' potentials evaluated with reference to an arbitrary potential vref:
          
 
          P=(v1-vref)*i1+(v2-vref)*i2+…+(vm-vref)*im
          
@@ -91,6 +91,6 @@ and therefore all currents between these two parts are i1, <
 
          In this way, we can just sum up the power from two wattmeters to get the three-phase power.
          
 
          Note, that this formula does not work if there are additional current paths between the left and right parts of our circuits, e.g., if both have grounds (and current flows through it).
          
 
          For more information on why power flowing in a circuit between two subcircuits is the sum of products of voltages times currents, the voltages being measured to an arbitrary reference potential, see
-[Ceraolo2014, par. 3.8.1].
          
+[Ceraolo2014, par. 3.8.1].
          
 "));
 end AronSensor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentQuasiRMSSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentQuasiRMSSensor.mo
index 2e960357f0..cc9565ae28 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentQuasiRMSSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentQuasiRMSSensor.mo
@@ -54,14 +54,14 @@ value of a polyphase current system, by averaging the phase RMS current phasors
 
          See also
          
 
 
          
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+PowerSensor,
+MultiSensor
 
          
 "));
 end CurrentQuasiRMSSensor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentSensor.mo
index a5192f6bda..62322b1e70 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/CurrentSensor.mo
@@ -25,21 +25,21 @@ equation
 
 
          
 This sensor can be used to measure m complex currents, using m
-single-phase CurrentSensors.
+single-phase CurrentSensors.
 
          
 
 
          See also
          
 
 
          
-SinglePhase.Sensors.CurrentSensor,
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+SinglePhase.Sensors.CurrentSensor,
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
          
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/FrequencySensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/FrequencySensor.mo
index e322cdd330..c00b96cfcd 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/FrequencySensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/FrequencySensor.mo
@@ -25,21 +25,21 @@ equation
 
 
          
 This sensor can be used to measure the frequency of the reference system, using one
-single-phase FrequencySensor.
+single-phase FrequencySensor.
 
          
 
 
          See also
          
 
 
          
-SinglePhase.Sensors.FrequencySensor,
-ReferenceSensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+SinglePhase.Sensors.FrequencySensor,
+ReferenceSensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
          
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/MultiSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/MultiSensor.mo
index 74363faec7..c1fe2e7b4e 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/MultiSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/MultiSensor.mo
@@ -101,15 +101,15 @@ The internal resistance of each current path is zero, the internal resistance of
 
          See also
          
 
 
          
-SinglePhase.Sensors.MultiSensor
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor
+SinglePhase.Sensors.MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor
 
          
 ",        revisions="
 
            
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PotentialSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PotentialSensor.mo
index 6eff72c762..8b74f2a54f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PotentialSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PotentialSensor.mo
@@ -23,21 +23,21 @@ equation
 
 
            
 This sensor can be used to measure m complex potentials, using m
-single-phase PotentialSensors.
+single-phase PotentialSensors.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.Sensors.PotentialSensor,
-ReferenceSensor,
-FrequencySensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+SinglePhase.Sensors.PotentialSensor,
+ReferenceSensor,
+FrequencySensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
            
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PowerSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PowerSensor.mo
index a1513d1048..ad17501d29 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PowerSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/PowerSensor.mo
@@ -81,21 +81,21 @@ equation
 
 
            
 This sensor can be used to measure m complex apparent power values, using m
-single-phase PowerSensors.
+single-phase PowerSensors.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.Sensors.PowerSensor,
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-MultiSensor
+SinglePhase.Sensors.PowerSensor,
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+MultiSensor
 
            
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReactivePowerSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReactivePowerSensor.mo
index 288d07a3ed..ea96de2006 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReactivePowerSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReactivePowerSensor.mo
@@ -110,7 +110,7 @@ equation
 Contains 3 power meters (Modelica.Electrical.Analog.Sensors.PowerSensor) to measure total reactive power in a three-phase system.
 
            
 
            
-For more information see [Mühl2017].
+For more information see [Mühl2017].
 
            
 "));
 end ReactivePowerSensor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReferenceSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReferenceSensor.mo
index 769215593a..366e2bd22a 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReferenceSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/ReferenceSensor.mo
@@ -13,15 +13,15 @@ This sensor can be used to measure the reference angle.
 
            See also
            
 
 
            
-SinglePhase.Sensors.ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+SinglePhase.Sensors.ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
            
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageQuasiRMSSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageQuasiRMSSensor.mo
index 5d5514cad5..f40468772b 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageQuasiRMSSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageQuasiRMSSensor.mo
@@ -55,15 +55,15 @@ value of a polyphase voltage system, by averaging the phase RMS voltage phasors
 
            See also
            
 
 
            
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
            
 "));
 end VoltageQuasiRMSSensor;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageSensor.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageSensor.mo
index 3af2aaac56..29327f68a7 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/VoltageSensor.mo
@@ -21,21 +21,21 @@ equation
 
 
            
 This sensor can be used to measure m complex voltages, using m
-single-phase VoltageSensors.
+single-phase VoltageSensors.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.Sensors.VoltageSensor,
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageQuasiRMSSensor,
-CurrentSensor,
-CurrentQuasiRMSSensor,
-PowerSensor,
-MultiSensor
+SinglePhase.Sensors.VoltageSensor,
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageQuasiRMSSensor,
+CurrentSensor,
+CurrentQuasiRMSSensor,
+PowerSensor,
+MultiSensor
 
            
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/package.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/package.mo
index 2994ca23c5..72655cf18f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sensors/package.mo
@@ -5,11 +5,11 @@ package Sensors "AC polyphase sensors"
   annotation (Documentation(info="
 
            This package hosts sensors for quasi-static polyphase circuits.
 Quasi-static theory can be found in the
-references.
+references.
 
            
 
            See also
            
 
-SinglePhase.Sensors
+SinglePhase.Sensors
 
 "));
 end Sensors;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/CurrentSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/CurrentSource.mo
index 19511ba0e7..fdd41ce248 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/CurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/CurrentSource.mo
@@ -23,17 +23,17 @@ equation
 
            
 This model describes m constant current sources, specifying the complex currents by the RMS currents and the phase shifts
 (defaults are
--symmetricOrientation).
-m single-phase CurrentSources are used.
+-symmetricOrientation).
+m single-phase CurrentSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.CurrentSource,
-VoltageSource,
-VariableVoltageSource,
-VariableCurrentSource
+SinglePhase.CurrentSource,
+VoltageSource,
+VariableVoltageSource,
+VariableCurrentSource
 
            
 "));
 end CurrentSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepCurrentSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepCurrentSource.mo
index 3dd28df9a2..e6e81a2be2 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepCurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepCurrentSource.mo
@@ -55,7 +55,7 @@ whereas the frequency sweeps from
 fStart to fStop with duration. The frequency sweeps such
 way that on a logarithmic frequency scale, the frequency curve appears linear.
            
 
-
            \"FrequencySweepSource.png\"
            
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepVoltageSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepVoltageSource.mo
index ae3022c73c..62c1c9b813 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepVoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/FrequencySweepVoltageSource.mo
@@ -53,7 +53,7 @@ whereas the frequency sweeps from
 fStart to fStop with duration. The frequency sweeps such
 way that on a logarithmic frequency scale, the frequency curve appears linear.
            
 
-
            \"FrequencySweepSource.png\"
            
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceCurrentSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceCurrentSource.mo
index c8bd6fb279..f25e6a2496 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceCurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceCurrentSource.mo
@@ -37,16 +37,16 @@ equation
 This model describes m variable current sources, with m complex signal inputs,
 specifying the complex current by the complex RMS voltage components.
 Additionally, the frequency of the current source is defined by a real signal input.
-m single-phase VariableCurrentSources are used.
+m single-phase VariableCurrentSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.VoltageSource,
-VoltageSource,
-VariableVoltageSource,
-CurrentSource.
+SinglePhase.VoltageSource,
+VoltageSource,
+VariableVoltageSource,
+CurrentSource.
 
            
 "));
 end ReferenceCurrentSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceVoltageSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceVoltageSource.mo
index 05b32d2a97..0ac09a0695 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceVoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/ReferenceVoltageSource.mo
@@ -24,16 +24,16 @@ equation
 This model describes m variable current sources, with m complex signal inputs,
 specifying the complex current by the complex RMS voltage components.
 Additionally, the frequency of the current source is defined by a real signal input.
-m single-phase VariableCurrentSources are used.
+m single-phase VariableCurrentSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.VoltageSource,
-VoltageSource,
-VariableVoltageSource,
-CurrentSource.
+SinglePhase.VoltageSource,
+VoltageSource,
+VariableVoltageSource,
+CurrentSource.
 
            
 "),
        Icon(graphics={
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableCurrentSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableCurrentSource.mo
index b4db9994b3..d5517e0505 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableCurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableCurrentSource.mo
@@ -32,16 +32,16 @@ equation
 This model describes m variable current sources, with m complex signal inputs,
 specifying the complex current by the complex RMS voltage components.
 Additionally, the frequency of the current source is defined by a real signal input.
-m single-phase VariableCurrentSources are used.
+m single-phase VariableCurrentSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.VoltageSource,
-VoltageSource,
-VariableVoltageSource,
-CurrentSource.
+SinglePhase.VoltageSource,
+VoltageSource,
+VariableVoltageSource,
+CurrentSource.
 
            
 "));
 end VariableCurrentSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableVoltageSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableVoltageSource.mo
index 84f637deb2..6842fcb391 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableVoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VariableVoltageSource.mo
@@ -26,16 +26,16 @@ equation
 This model describes m variable voltage sources, with m complex signal inputs,
 specifying the complex voltages by the complex RMS voltage components.
 Additionally, the frequency of the voltage source is defined by a real signal input.
-m single-phase VariableVoltageSources are used.
+m single-phase VariableVoltageSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.VoltageSource,
-VoltageSource,
-CurrentSource,
-VariableCurrentSource
+SinglePhase.VoltageSource,
+VoltageSource,
+CurrentSource,
+VariableCurrentSource
 
            
 "));
 end VariableVoltageSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VoltageSource.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VoltageSource.mo
index cc675f3a43..dbcad4fc1f 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/VoltageSource.mo
@@ -23,17 +23,17 @@ equation
 
            
 This model describes m constant voltage sources, specifying the complex voltages by the RMS voltages and the phase shifts
 (defaults are
--symmetricOrientation).
-m single-phase VoltageSources are used.
+-symmetricOrientation).
+m single-phase VoltageSources are used.
 
            
 
 
            See also
            
 
 
            
-SinglePhase.VoltageSource,
-VariableVoltageSource,
-CurrentSource,
-VariableCurrentSource
+SinglePhase.VoltageSource,
+VariableVoltageSource,
+CurrentSource,
+VariableCurrentSource
 
            
 "));
 end VoltageSource;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/package.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/package.mo
index 4264e341df..bd8fbb5bab 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Sources/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Sources/package.mo
@@ -5,11 +5,11 @@ package Sources "AC polyphase sources"
   annotation (Documentation(info="
 
            This package hosts sources for quasi-static polyphase circuits.
 Quasi-static theory can be found in the
-references.
+references.
 
            
 
            See also
            
 
-SinglePhase.Sources
+SinglePhase.Sources
 
 "));
 end Sources;
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/package.mo b/Modelica/Electrical/QuasiStatic/Polyphase/package.mo
index a624296222..328cde8b99 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/package.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/package.mo
@@ -28,12 +28,12 @@ package Polyphase "Polyphase AC components"
           extent={{-20,-74},{0,-54}})}), Documentation(info="
 
            This package hosts models for quasi-static polyphase circuits.
 Quasi-static theory can be found in
-[Vaske1973]
+[Vaske1973]
 and other
-references.
+references.
 
            
 
            See also
            
-SinglePhase
+SinglePhase
 
 "));
 end Polyphase;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Admittance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Admittance.mo
index 8acbb0a3cb..3483d70a02 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Admittance.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Admittance.mo
@@ -45,14 +45,14 @@ equation
       Documentation(info="
 
 
            The admittance model represents a parallel connection of a conductor and either a capacitor or inductor.
            
-
            
+
            
 
 
            
 The linear admittance connects the voltage v with the
 current i by  i = Y*v. The resistive
 component is modeled temperature dependent, so the real part G_actual = real(Y) is determined from
 the actual operating temperature and the reference input conductance real(Y_ref).
-A conditional heat port is considered.
+A conditional heat port is considered.
 The reactive component B_actual = imag(Y)
 is equal to imag(Y_ref) if frequencyDependent = false.
 Frequency dependency is considered by frequencyDependent = true, distinguishing two cases:
@@ -67,16 +67,16 @@ Frequency dependency is considered by frequencyDependent = true, di
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Impedance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Impedance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Admittance;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Capacitor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Capacitor.mo
index e0c97b4f7b..2e891ce35f 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Capacitor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Capacitor.mo
@@ -29,17 +29,17 @@ The capacitance C is allowed to be positive, zero, or negative.
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Capacitor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Conductor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Conductor.mo
index ddac826914..8b84365c20 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Conductor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Conductor.mo
@@ -37,23 +37,23 @@ The conductance G is allowed to be positive, zero, or negative.
 
 
            
 The conductor model also has an optional
-conditional heat port.
+conditional heat port.
 A linear temperature dependency of the conductance is also taken into account.
 
            
 
 
            See also
            
 
            
-Resistor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Conductor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Ground.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Ground.mo
index 2166a58928..96de0de208 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Ground.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Ground.mo
@@ -21,7 +21,7 @@ equation
 
            
 Ground of a single-phase circuit. The potential at the ground node is zero.
 Every electrical circuit, e.g., a series resonance
-
+
           example, has to contain at least one ground object.
 
            
 
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Impedance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Impedance.mo
index 88f9db2cfb..24ba62aae3 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Impedance.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Impedance.mo
@@ -46,14 +46,14 @@ equation
       Documentation(info="
 
 
            The impedance model represents a series connection of a resistor and either an inductor or capacitor.
            
-
            
+
            
 
 
            
 The linear impedance connects the voltage v with the
 current i by  v = Z*i. The resistive
 component is modeled temperature dependent, so the real part R_actual = real(Z) is determined from
 the actual operating temperature and the reference input resistance real(Z_ref).
-A conditional heat port is considered.
+A conditional heat port is considered.
 The reactive component X_actual = imag(Z)
 is equal to imag(Z_ref) if frequencyDependent = false.
 Frequency dependency is considered by frequencyDependent = true, distinguishing two cases:
@@ -68,16 +68,16 @@ Frequency dependency is considered by frequencyDependent = true, di
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Impedance;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Inductor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Inductor.mo
index 4c4b536989..05ba2b9113 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Inductor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Inductor.mo
@@ -39,17 +39,17 @@ The Inductance L is allowed to be positive, zero, or negative.
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Inductor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Resistor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Resistor.mo
index b3609ec83d..5144042634 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Resistor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/Resistor.mo
@@ -36,23 +36,23 @@ The resistance R is allowed to be positive, zero, or negative.
 
 
            
 The resistor model also has an optional
-conditional heat port.
+conditional heat port.
 A linear temperature dependency of the resistance is also taken into account.
 
            
 
 
            See also
            
 
            
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end Resistor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableAdmittance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableAdmittance.mo
index 018de93e4c..f49e09aa6b 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableAdmittance.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableAdmittance.mo
@@ -53,7 +53,7 @@ equation
     Documentation(info="
 
 
            The admittance model represents a parallel connection of a conductor and either a capacitor or inductor.
            
-
            
+
            
 
 
            
 The linear admittance connects the complex voltage v with the
@@ -82,17 +82,17 @@ singularities due to the actual structure of the connected network.
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance
 
            
 "));
 end VariableAdmittance;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableCapacitor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableCapacitor.mo
index f549647f32..f4c7e38c94 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableCapacitor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableCapacitor.mo
@@ -40,23 +40,23 @@ The abstraction of a variable capacitor at quasi-static operation assumes:
 
            
 
 
            
-\"dc_dt.png\".
 
            
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end VariableCapacitor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableConductor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableConductor.mo
index f5044193cd..fa77ebf9fc 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableConductor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableConductor.mo
@@ -44,23 +44,23 @@ The conductance G is given as input signal.
 
 
            
 The variable conductor model also has an optional
-conditional heat port.
+conditional heat port.
 A linear temperature dependency of the conductance is also taken into account.
 
            
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end VariableConductor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableImpedance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableImpedance.mo
index 23820a370c..6b141e8803 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableImpedance.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableImpedance.mo
@@ -52,7 +52,7 @@ equation
     Documentation(info="
 
 
            The impedance model represents a series connection of a resistor and either an inductor or capacitor.
            
-
            
+
            
 
 
            
 The linear impedance connects the complex voltage v with the
@@ -81,17 +81,17 @@ singularities due to the actual structure of the connected network.
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable admittance
 
            
 "));
 end VariableImpedance;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableInductor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableInductor.mo
index 0672c60eef..5e88364877 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableInductor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableInductor.mo
@@ -49,23 +49,23 @@ The abstraction of a variable inductor at quasi-static operation assumes:
 
            
 
 
            
-\"dl_dt.png\"
 
            
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable resistor,
-Variable conductor,
-Variable capacitor,
-Variable impedance,
-Variable admittance,
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable resistor,
+Variable conductor,
+Variable capacitor,
+Variable impedance,
+Variable admittance,
 
            
 "));
 end VariableInductor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableResistor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableResistor.mo
index 0e12af0855..33f7a55fd0 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableResistor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/VariableResistor.mo
@@ -44,7 +44,7 @@ The resistance R is given as input signal.
 
 
            
 The variable resistor model also has an optional
-conditional heat port.
+conditional heat port.
 A linear temperature dependency of the resistance is also taken into account.
 
            
 
@@ -55,17 +55,17 @@ A zero crossing of the R signal could cause singularities due to the actual stru
 
 
            See also
            
 
            
-Resistor,
-Conductor,
-Capacitor,
-Inductor,
-Impedance,
-Admittance,
-Variable conductor,
-Variable capacitor,
-Variable inductor,
-Variable impedance,
-Variable admittance
+Resistor,
+Conductor,
+Capacitor,
+Inductor,
+Impedance,
+Admittance,
+Variable conductor,
+Variable capacitor,
+Variable inductor,
+Variable impedance,
+Variable admittance
 
            
 "));
 end VariableResistor;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/package.mo
index cb8d652d72..2ec7fbfca5 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Basic/package.mo
@@ -13,11 +13,11 @@ package Basic "Basic components for AC single-phase models"
             {100,100}}, preserveAspectRatio=true)), Documentation(info="
 
            This package hosts basic models for quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
            
 
            See also
            
 
-Polyphase.Basic
+Polyphase.Basic
 
 "));
 end Basic;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/Rectifier.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/Rectifier.mo
index 5557368cbf..260a3e499f 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/Rectifier.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/Rectifier.mo
@@ -115,11 +115,11 @@ equation
 
            
 This example demonstrates coupling a quasi-static circuit with a DC circuit.
 The QS voltage is rectified (using an
-
+
 ideal AC DC converter), loaded by a variable load conductor.
 The conversionFactor = DC voltage / AC rms voltage in this case is the root mean square of a rectified sine, i.e., 1.
 You may compare the quasi-static results with that of a fully transient model (using a
-
+
 Graetz rectifier), plotting:
 
            
 
              
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealIntermediateSwitch.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealIntermediateSwitch.mo
index 09db4a17d5..48c6b8788a 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealIntermediateSwitch.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/IdealIntermediateSwitch.mo
@@ -65,7 +65,7 @@ p2 is connected to n2.
 
              
 
 
              
-\"IdealIntermediateSwitch1\"
+\"IdealIntermediateSwitch1\"
 
              
 
 
              
@@ -75,7 +75,7 @@ and the closed switch has a (very low) resistance Ron.
 
              
 
 
              
-\"IdealIntermediateSwitch2\"
+\"IdealIntermediateSwitch2\"
 
              
 
 
              
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Idle.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Idle.mo
index e59b9d4c45..63cf75a21f 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Idle.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Idle.mo
@@ -21,7 +21,7 @@ This model is a simple idle branch considering the complex current i<
 
 
              See also
              
 
              
-Short
+Short
 
              
 "));
 end Idle;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Short.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Short.mo
index 3049143dbc..98f05c83f8 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Short.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/Short.mo
@@ -20,7 +20,7 @@ This model is a simple short cut branch considering the complex voltage v
 
 
              See also
              
 
              
-Idle
+Idle
 
              
 "));
 end Short;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/package.mo
index c082dd19d0..1d4d993d35 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Ideal/package.mo
@@ -11,11 +11,11 @@ package Ideal "Ideal components for AC single-phase models"
         info="
 
              This package hosts ideal models for quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
              
 
              See also
              
 
-Polyphase.Ideal
+Polyphase.Ideal
 
 "));
 end Ideal;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/AbsoluteSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/AbsoluteSensor.mo
index a0c0d3118c..3fff0df4b4 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/AbsoluteSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/AbsoluteSensor.mo
@@ -15,7 +15,7 @@ equation
           textString="%name")}),         Documentation(info="
 
              
 The absolute sensor partial model provides a single
-positive pin
+positive pin
 to measure the complex voltage, frequency, angular frequency. Additionally this model contains
 a proper icon and a definition of the angular velocity.
 
              
@@ -23,10 +23,10 @@ a proper icon and a definition of the angular velocity.
 
              See also
              
 
 
              
-RelativeSensorElementary,
-PotentialSensor,
-Polyphase.Interfaces.AbsoluteSensor,
-Polyphase.Interfaces.RelativeSensorElementary
+RelativeSensorElementary,
+PotentialSensor,
+Polyphase.Interfaces.AbsoluteSensor,
+Polyphase.Interfaces.RelativeSensorElementary
 
              
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/NegativePin.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/NegativePin.mo
index 3e476c3ffe..2927dc04ce 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/NegativePin.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/NegativePin.mo
@@ -19,18 +19,18 @@ connector NegativePin "Negative quasi-static single-phase pin"
     Documentation(info="
 
 
              
-The negative pin is based on Pin.
-Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the positive pin.
+The negative pin is based on Pin.
+Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the positive pin.
 
              
 
 
              See also
              
 
 
              
-Pin,
-PositivePin,
-Plug,
-PositivePlug,
-NegativePlug
+Pin,
+PositivePin,
+Plug,
+PositivePlug,
+NegativePlug
 
              
 "));
 end NegativePin;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/OnePort.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/OnePort.mo
index cad14bc61d..d616ebbba5 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/OnePort.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/OnePort.mo
@@ -5,20 +5,20 @@ equation
   pin_p.i + pin_n.i = Complex(0);
   annotation (Documentation(info="
 
              
-This partial model is based on TwoPin and
+This partial model is based on TwoPin and
 additionally considers the complex current balance of the
-positive and the
-negative pin.
+positive and the
+negative pin.
 This model is intended to be used with textual representation of user models.
 
              
 
 
              See also
              
 
 
              
-PositivePin,
-NegativePin,
-TwoPinElementary,
-TwoPin
+PositivePin,
+NegativePin,
+TwoPinElementary,
+TwoPin
 
              
 "));
 end OnePort;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Pin.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Pin.mo
index e9c1516bf3..3f7308ca12 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Pin.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Pin.mo
@@ -5,19 +5,19 @@ connector Pin "Quasi-static single-phase pin"
   annotation (Documentation(info="
 
              
 The potential of this connector is the complex voltage and the flow variable is the complex current.
-The positive and
-negative pin are
+The positive and
+negative pin are
 derived from this base connector.
 
              
 
 
              See also
              
 
 
              
-PositivePin,
-NegativePin,
-Plug,
-PositivePlug,
-NegativePlug
+PositivePin,
+NegativePin,
+Plug,
+PositivePlug,
+NegativePlug
 
              
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/PositivePin.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/PositivePin.mo
index fad82858f3..5fa1c2dd54 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/PositivePin.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/PositivePin.mo
@@ -19,18 +19,18 @@ connector PositivePin "Positive quasi-static single-phase pin"
     Documentation(info="
 
 
              
-The positive pin is based on Pin.
-Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the negative pin.
+The positive pin is based on Pin.
+Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the negative pin.
 
              
 
 
              See also
              
 
 
              
-Pin,
-NegativePin,
-Plug,
-PositivePlug,
-NegativePlug
+Pin,
+NegativePin,
+Plug,
+PositivePlug,
+NegativePlug
 
              
 "));
 end PositivePin;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/RelativeSensorElementary.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/RelativeSensorElementary.mo
index d40b1bd456..7f83ba39b8 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/RelativeSensorElementary.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/RelativeSensorElementary.mo
@@ -17,19 +17,19 @@ equation
       Documentation(info="
 
              
 The relative sensor partial model relies on the
-TwoPinElementary
+TwoPinElementary
 to measure the complex voltage or current. Additionally this model contains a proper icon and a definition of the angular velocity.
 
              
 
 
              See also
              
 
 
              
-AbsoluteSensor,
-VoltageSensor,
-CurrentSensor,
-PowerSensor,
-Polyphase.Interfaces.AbsoluteSensor,
-Polyphase.Interfaces.RelativeSensorElementary
+AbsoluteSensor,
+VoltageSensor,
+CurrentSensor,
+PowerSensor,
+Polyphase.Interfaces.AbsoluteSensor,
+Polyphase.Interfaces.RelativeSensorElementary
 
              
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Source.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Source.mo
index 2391c47366..64e6ae5682 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Source.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/Source.mo
@@ -19,17 +19,17 @@ equation
                                         Documentation(info="
 
              
 The source partial model relies on the
-OnePort and contains a proper icon.
+OnePort and contains a proper icon.
 
              
 
 
              See also
              
 
 
              
-VoltageSource,
-VariableVoltageSource,
-CurrentSource,
-VariableCurrentSource,
-Polyphase.Interfaces.Source.
+VoltageSource,
+VariableVoltageSource,
+CurrentSource,
+VariableCurrentSource,
+Polyphase.Interfaces.Source.
 
              
 "));
 end Source;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPin.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPin.mo
index f4ab631949..726b241e27 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPin.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPin.mo
@@ -23,8 +23,8 @@ equation
   i = pin_p.i;
   annotation (Documentation(info="
 
              
-This partial model uses a positive
-and negative pin and defines
+This partial model uses a positive
+and negative pin and defines
 the complex voltage difference as well as the complex current (into the positive pin).
 Additionally, the angular velocity of the quasi-static system is explicitly defined as variable.
 This model is mainly intended to be used with graphical representation of user models.
@@ -33,10 +33,10 @@ This model is mainly intended to be used with graphical representation of user m
 
              See also
              
 
 
              
-PositivePin,
-NegativePin,
-TwoPinElementary,
-OnePort
+PositivePin,
+NegativePin,
+TwoPinElementary,
+OnePort
 
              
 "));
 end TwoPin;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPinElementary.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPinElementary.mo
index bf437fe84f..9bff799f48 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPinElementary.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Interfaces/TwoPinElementary.mo
@@ -13,8 +13,8 @@ equation
   omega = der(pin_p.reference.gamma);
   annotation (Documentation(info="
 
              
-This partial model uses a positive
-and negative pin,
+This partial model uses a positive
+and negative pin,
 but no complex voltage, current, power, etc. Additionally, the angular velocity of the quasi-static system
 is explicitly defined as variable. This model is mainly intended to be used with graphical representation of user models.
 
              
@@ -22,10 +22,10 @@ is explicitly defined as variable. This model is mainly intended to be used with
 
              See also
              
 
 
              
-PositivePin,
-NegativePin,
-TwoPin,
-OnePort
+PositivePin,
+NegativePin,
+TwoPin,
+OnePort
 
              
 "));
 end TwoPinElementary;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentRMSSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentRMSSensor.mo
index 37b85dc661..d5dcf19c00 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentRMSSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentRMSSensor.mo
@@ -13,7 +13,7 @@ equation
   v = Complex(0,0);
   annotation (Documentation(info="
 
              
-This sensor determines the continuous root mean square (RMS)
+This sensor determines the continuous root mean square (RMS)
 value of a single-phase current system.
 
              
 
              @@ -23,14 +23,14 @@ I = abs(i)
 
              See also
              
 
 
              
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+PowerSensor,
+MultiSensor
 
              
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentSensor.mo
index 0f070f968a..89385a479d 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/CurrentSensor.mo
@@ -24,14 +24,14 @@ This sensor can be used to measure the complex current.
 
              See also
              
 
 
              
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
              
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/FrequencySensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/FrequencySensor.mo
index 7d5087c39f..ecaca0f843 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/FrequencySensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/FrequencySensor.mo
@@ -15,14 +15,14 @@ This sensor can be used to measure the frequency of the reference system.
 
              See also
              
 
 
              
-ReferenceSensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
              
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/MultiSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/MultiSensor.mo
index b8f1e142ea..347de948b1 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/MultiSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/MultiSensor.mo
@@ -99,14 +99,14 @@ The internal resistance of the current path is zero, the internal resistance of
 
              See also
              
 
 
              
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor
 
              
 ", revisions="
 
                
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PotentialSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PotentialSensor.mo
index d8358da8f0..635902ee2f 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PotentialSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PotentialSensor.mo
@@ -16,14 +16,14 @@ This sensor can be used to measure the complex potential.
 
                See also
                
 
 
                
-ReferenceSensor,
-FrequencySensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
                
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PowerSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PowerSensor.mo
index 46b2dcd98f..4cdee7f1a5 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PowerSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/PowerSensor.mo
@@ -60,14 +60,14 @@ This sensor can be used to measure the complex apparent power.
 
                See also
                
 
 
                
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+MultiSensor
 
                
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/ReferenceSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/ReferenceSensor.mo
index e11656f36e..890dfb3fb8 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/ReferenceSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/ReferenceSensor.mo
@@ -13,14 +13,14 @@ This sensor can be used to measure the reference angle.
 
                See also
                
 
 
                
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
                
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageRMSSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageRMSSensor.mo
index 8a0adaefce..01d9eb30e3 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageRMSSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageRMSSensor.mo
@@ -13,7 +13,7 @@ equation
   i = Complex(0,0);
   annotation (Documentation(info="
 
                
-This sensor determines the continuous root mean square (RMS)
+This sensor determines the continuous root mean square (RMS)
 value of a single-phase voltage system.
 
                
 
                @@ -23,14 +23,14 @@ V = abs(v)
 
                See also
                
 
 
                
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
                
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageSensor.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageSensor.mo
index 735d784324..e1a2237cb9 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageSensor.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/VoltageSensor.mo
@@ -24,14 +24,14 @@ This sensor can be used to measure the complex voltage.
 
                See also
                
 
 
                
-ReferenceSensor,
-FrequencySensor,
-PotentialSensor,
-VoltageRMSSensor,
-CurrentSensor,
-CurrentRMSSensor,
-PowerSensor,
-MultiSensor
+ReferenceSensor,
+FrequencySensor,
+PotentialSensor,
+VoltageRMSSensor,
+CurrentSensor,
+CurrentRMSSensor,
+PowerSensor,
+MultiSensor
 
                
 
 "),
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/package.mo
index 97d640025e..cbefffe3ab 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sensors/package.mo
@@ -5,11 +5,11 @@ package Sensors "AC single-phase sensors"
   annotation (Documentation(info="
 
                This package hosts sensors for quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
                
 
                See also
                
 
-Polyphase.Sensors
+Polyphase.Sensors
 
 "));
 end Sensors;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/CurrentSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/CurrentSource.mo
index 134b2fe9b7..1b256d1a08 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/CurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/CurrentSource.mo
@@ -23,9 +23,9 @@ This is a constant current source, specifying the complex current by the RMS cur
 
                See also
                
 
 
                
-VoltageSource,
-VariableVoltageSource,
-VariableCurrentSource
+VoltageSource,
+VariableVoltageSource,
+VariableCurrentSource
 
                
 "));
 end CurrentSource;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepCurrentSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepCurrentSource.mo
index 1388dc7c65..10575bf49c 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepCurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepCurrentSource.mo
@@ -54,7 +54,7 @@ whereas the frequency sweeps from
 fStart to fStop with duration. The frequency sweeps such
 way that on a logarithmic frequency scale, the frequency curve appears linear.
                
 
-
                \"FrequencySweepSource.png\"
                
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepVoltageSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepVoltageSource.mo
index 56c8921f4c..a318523b0e 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepVoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/FrequencySweepVoltageSource.mo
@@ -51,7 +51,7 @@ whereas the frequency sweeps from
 fStart to fStop with duration. The frequency sweeps such
 way that on a logarithmic frequency scale, the frequency curve appears linear.
                
 
-
                \"FrequencySweepSource.png\"
                
 
 "));
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableCurrentSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableCurrentSource.mo
index 19d97b4920..70d99e3cbc 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableCurrentSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableCurrentSource.mo
@@ -30,9 +30,9 @@ Additionally, the frequency of the voltage source is defined by a real signal in
 
                See also
                
 
 
                
-VoltageSource,
-VariableVoltageSource,
-CurrentSource,
+VoltageSource,
+VariableVoltageSource,
+CurrentSource,
 
                
 "));
 end VariableCurrentSource;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableVoltageSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableVoltageSource.mo
index cc04c96731..0c7f77e275 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableVoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VariableVoltageSource.mo
@@ -31,9 +31,9 @@ Additionally, the frequency of the voltage source is defined by a real signal in
 
                See also
                
 
 
                
-VoltageSource,
-CurrentSource,
-VariableCurrentSource
+VoltageSource,
+CurrentSource,
+VariableCurrentSource
 
                
 "));
 end VariableVoltageSource;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VoltageSource.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VoltageSource.mo
index ae068734c2..728f714530 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VoltageSource.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/VoltageSource.mo
@@ -21,9 +21,9 @@ This is a constant voltage source, specifying the complex voltage by the RMS vol
 
                See also
                
 
 
                
-VariableVoltageSource,
-CurrentSource,
-VariableCurrentSource
+VariableVoltageSource,
+CurrentSource,
+VariableCurrentSource
 
                
 "));
 end VoltageSource;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/package.mo
index 70ff889d08..0acf732580 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Sources/package.mo
@@ -4,11 +4,11 @@ package Sources "AC single-phase sources"
   annotation (Documentation(info="
 
                This package hosts sources for quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
                
 
                See also
                
 
-Polyphase.Sources
+Polyphase.Sources
 
 "));
 end Sources;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Utilities/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Utilities/package.mo
index 6a495448c7..d2e8b2b2fa 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/Utilities/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Utilities/package.mo
@@ -4,11 +4,11 @@ package Utilities "Library with auxiliary models for testing"
   annotation (Documentation(info="
 
                This package hosts utilities for test examples of quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
                
 
                See also
                
 
-Examples
+Examples
 
 "));
 end Utilities;
diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/package.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/package.mo
index ce0f8af3d8..2a58f24632 100644
--- a/Modelica/Electrical/QuasiStatic/SinglePhase/package.mo
+++ b/Modelica/Electrical/QuasiStatic/SinglePhase/package.mo
@@ -9,11 +9,11 @@ package SinglePhase "Single-phase AC components"
             100,100}}, preserveAspectRatio=true)), Documentation(info="
 
                This package hosts models for quasi-static single-phase circuits.
 Quasi-static theory for single-phase circuits can be found in the
-references.
+references.
 
                
 
                See also
                
 
-Polyphase
+Polyphase
 
 "));
 end SinglePhase;
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ACCircuit.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ACCircuit.mo
index e243f6a2d1..7e89d8129e 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ACCircuit.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ACCircuit.mo
@@ -5,7 +5,7 @@ class ACCircuit "AC circuit"
   annotation (Documentation(info="
 
                
 A simple
-
+
           example of a series connection of a resistor, an inductor and a capacitor
 as depicted in Fig. 1 should be explained in the following. For various frequencies,
 the voltage drops across the resistor, the inductor and the capacitor should be determined.
@@ -14,7 +14,7 @@ the voltage drops across the resistor, the inductor and the capacitor should be
 
@@ -28,7 +28,7 @@ The voltage drop across the resistor
 
                
 \"\\underline{v}_{r}=R\\underline{i}\"
 
                
 
@@ -39,7 +39,7 @@ and the inductor
 
                
 \"\\underline{v}_{l}=j\\omega
 
                
 
@@ -50,7 +50,7 @@ and the capacitor
 
                
 \"\\underline{v}_{l}=j\\omega
 
                
 
@@ -61,7 +61,7 @@ add up to the total voltage
 
                
 \"\\underline{v}=\\underline{v}_{r}+\\underline{v}_{l}\"
 
                
 
@@ -72,7 +72,7 @@ as illustrated in the phasor diagram of Fig. 2.
 
                
   
                
     
-      \"resonance_circuit.png\"
     
   
                
@@ -83,16 +83,16 @@ as illustrated in the phasor diagram of Fig. 2.
 
 
                
 \"img5.png\"
 
                See also
                
-
+
           Introduction,
-
+
           Power,
-
+
           Reference system"));
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Introduction.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Introduction.mo
index b916c6e0e9..e3508c2383 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Introduction.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Introduction.mo
@@ -11,19 +11,19 @@ The purely sinusoidal voltage
 
                
 \"v=\\sqrt{2}V_{\\mathrm{RMS}}\\cos(\\omega
 
                
 in the time domain can be represented by a complex
-rms phasor
+rms phasor
 
                
 \"\\underline{v}=V_{\\mathrm{RMS}}e^{j\\varphi_{v}}.\"
 
                
 
@@ -33,7 +33,7 @@ phasor the following relationship applies:
                
 \"\\begin{displaymath}
 
                
@@ -45,7 +45,7 @@ This equation is also illustrated in Fig. 1.
 
                
   
                
     
-      \"phasor_diagram.png\"
     
   
                
 
 
 
 
 
 
 
 
 
                
@@ -64,11 +64,11 @@ The explanation given for sinusoidal voltages can certainly also be applied
 to sinusoidal currents.
                See also
                
-
+
           AC circuit,
-
+
           Power,
-
+
           Reference system"));
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Power.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Power.mo
index a8e21765cc..ad606b48be 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Power.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/Power.mo
@@ -11,9 +11,9 @@ Yet, there is instantaneous power exchanged with connecting network.
 
                
 
 The
-
+
           series resonance circuit which was also addressed in the
-
+
           AC circuit
 will be investigated.
 
@@ -23,9 +23,9 @@ will be investigated.
 The instantaneous voltage and current are in phase:
 
                
-\"v_r.png\"
                
-\"i_r.png\"
 
                
 
@@ -33,7 +33,7 @@ The instantaneous voltage and current are in phase:
 Therefore, the instantaneous power is
 
                
-\"power_r.png\"
 
                
 
@@ -42,7 +42,7 @@ Therefore, the instantaneous power is
 
                
   
                
     
-      \"phasor_voltage.png\"
     
   
                
 
 
 
 
 
 
                
@@ -51,7 +51,7 @@ Therefore, the instantaneous power is
 
 
                Real power of the resistor is the average of instantaneous power:
                
-\"p_r.png\"
 
                
 
@@ -61,9 +61,9 @@ Therefore, the instantaneous power is
 The instantaneous voltage leads the current by a quarter of the period:
 
                
-\"v_l.png\"
                
-\"i_l.png\"
 
                
 
@@ -71,7 +71,7 @@ The instantaneous voltage leads the current by a quarter of the period:
 Therefore, the instantaneous power is
 
                
-\"power_l.png\"
 
                
 
@@ -80,7 +80,7 @@ Therefore, the instantaneous power is
 
                
   
                
     
-      \"power_resistor.png\"
     
   
                
 
 
 
                
@@ -89,7 +89,7 @@ Therefore, the instantaneous power is
 
 
                Reactive power of the inductor is:
                
-\"q_l.png\"
 
                
 
@@ -99,9 +99,9 @@ Therefore, the instantaneous power is
 The instantaneous voltage lags the current by a quarter of the period:
 
                
-\"v_c.png\"
                
-\"i_c.png\"
 
                
 
@@ -109,7 +109,7 @@ The instantaneous voltage lags the current by a quarter of the period:
 Therefore, the instantaneous power is
 
                
-\"power_c.png\"
 
                
 
@@ -118,7 +118,7 @@ Therefore, the instantaneous power is
 
                
   
                
     
-      \"power_inductor.png\"
     
   
                
 
 
 
                
@@ -127,7 +127,7 @@ Therefore, the instantaneous power is
 
 
                Reactive power of the capacitor is:
                
-\"q_c.png\"
 
                
 
@@ -135,7 +135,7 @@ Therefore, the instantaneous power is
 
 
                For an arbitrary component with two pins, real and reactive power can be determined by the complex phasors:
                
-\"s.png\"
 
                
 
@@ -144,11 +144,11 @@ In this equation * represents the conjugate complex operator
 
                See also
                
-
+
           Introduction,
-
+
           AC circuit,
-
+
           Reference system"));
 end Power;
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo
index 8accb6bb5c..065563eae1 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo
@@ -21,11 +21,11 @@ Designing new components, the guidelines of 
 
 
                See also
                
-                
+
           Introduction,
-
+
           AC circuit,
-
+
           Power"));
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/package.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/package.mo
index f5d2ec625c..fd26da61dc 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/package.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/package.mo
@@ -3,7 +3,7 @@ package Overview "Overview"
   extends Modelica.Icons.Information;
   annotation (Documentation(info="
                
-The Modelica.Electrical.QuasiStatic
+The Modelica.Electrical.QuasiStatic
 library addresses the analysis of electrical circuits with purely sinusoidal
 voltages and currents. The main characteristics of the library are:
 
                
@@ -20,22 +20,22 @@ voltages and currents. The main characteristics of the library are:
       since it propagated through the connector.
       Therefore, independent circuits of different frequencies can be modeled in one model.
              • The connectors contain the real and the imaginary part of the voltage and the current
-      RMS phasors
                • 
+      RMS phasors
                
 The main intention of this library is the modeling of quasi-static behavior
 of single-phase and polyphase
-AC circuits
+AC circuits
 with fixed and variable frequency. Quasi-static theory and applications can be
 found in
-[Dorf1993],
-[Burton1994],
-[Landolt1936],
-[Philippow1967],
-[Weyh1967],
-[Vaske1973].
+[Dorf1993],
+[Burton1994],
+[Landolt1936],
+[Philippow1967],
+[Weyh1967],
+[Vaske1973].
 
                Note
                
@@ -44,9 +44,9 @@ A general electrical circuit can be a DC circuit, an AC circuit with periodic si
 or a transient circuit without particular waveform of voltages and currents.
 Therefore a coupling model between a quasi-static circuit and a general (transient) electrical circuit
 has to be designed carefully taking the specific application into account.
-As an example, you may look at the 
+As an example, you may look at the 
 ideal AC DC converter, which is used in the
-rectifier example.
+rectifier example.
 
                "));
diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/ReleaseNotes.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/ReleaseNotes.mo
index 97da608f27..11c3fd531a 100644
--- a/Modelica/Electrical/QuasiStatic/UsersGuide/ReleaseNotes.mo
+++ b/Modelica/Electrical/QuasiStatic/UsersGuide/ReleaseNotes.mo
@@ -10,24 +10,24 @@ class ReleaseNotes "Release notes"
     
              • Added frequency sweep voltage and current sources, see
         #2442
     
              • Shortened default component names, see
       #2301
              • Fixed missing final useConjugateInput = false, see
     #2251
     
              • Updated icons of inductors and transformer models, see #2210
              • Added polar and power quantities in ideal quasi-static transformer model, see #2173
              • Removed redundant (and not identical) parameter m from
-    MutualInductor,
+    MutualInductor,
     see #2202
              • Added linear polyphase mutual inductor model, see #2200
              • Added complex impedance and admittance models of single-phase and polyphase package, see ticket
diff --git a/Modelica/Electrical/Spice3.mo b/Modelica/Electrical/Spice3.mo
index 7b60c3a6ec..8f2ed9535d 100644
--- a/Modelica/Electrical/Spice3.mo
+++ b/Modelica/Electrical/Spice3.mo
@@ -176,7 +176,7 @@ connect(p_out, n2);
 
 
                • 
-
+
@@ -2099,7 +2099,7 @@ RC 3 4 1K
                This Four Bit Binary Adder model is one of the five benchmark circuits described in the SPICE3 Version e3 User's Manual (see information of package Spice3).
                The model adds two 4-bit numbers (Number A and Number B). It has eight inputs where the first one is the lowest-order bit of the first number (Number A Bit0), the second is the lowest-order bit of the second number (Number B Bit0), the third one is the second-order bit of the first number (Number A Bit1) and so on. The Four Bit Binary Adder has four outputs where the first one (Sum Bit0) is the lowest-order bit, the second and the third one (Sum Bit1 and Sum Bit2) are the next two bits and the last one (Sum Bit3) is the highest-order bit. The picture illustrates the pin-assignment.
                
-\"segment.png\"
 
                
 
@@ -2442,7 +2442,7 @@ The Capacitance C is allowed to be positive, zero, or negative.
 k is the coefficient of coupling which must be in range [0,1].
 
                
-The usage is demonstrated in the example CoupledInductors.
+The usage is demonstrated in the example CoupledInductors.
 
                "));
     end K_CoupledInductors;
diff --git a/Modelica/Fluid/Dissipation.mo b/Modelica/Fluid/Dissipation.mo
index 1fabde0e29..ab5ddb0199 100644
--- a/Modelica/Fluid/Dissipation.mo
+++ b/Modelica/Fluid/Dissipation.mo
@@ -21,7 +21,7 @@ energy systems.
 This section introduces an implementation method for the integration of the provided HTPL
 functions by Fluid.Dissipation into own application models. Additionally you can find
 ready-to-use application models integrated into Modelica.Fluid as thermohydraulic
-framework  (see
+framework  (see
 package Fittings).
                
 In the following the implementation method is described in 5 steps for a straight pipe as
 example. Generally the implementation method can be used for all HTPL correlations
@@ -186,7 +186,7 @@ If the implementation of a HTPL correlation is done in an existing application m
 unknown variables out of Step 1 (M_FLOW and dp for compressible or DP and m_flow for
 incompressible case) have to be adjusted to the model variables (typically the interface
 variables). The implementation of HTPL correlation into Modelica.Fluid can be
-found for  flow
+found for  flow
 models of several devices.
 
                "));
@@ -292,9 +292,9 @@ reference 01IS07022B). The project was started in October 2007 and ended in June
 
                The User's Guide contains the following sub-sections:
 
                "));
   end UsersGuide;
@@ -374,7 +374,7 @@ reference 01IS07022B). The project was started in October 2007 and ended in June
         end for;
       annotation(Inline=false, Documentation(info="
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information.
                
+See more information.
                "), smoothOrder(normallyConstant=IN_con) = 2);
       end kc_evenGapLaminar;
 
@@ -430,7 +430,7 @@ reference 01IS07022B). The project was started in October 2007 and ended in June
         annotation(Inline=false, Documentation(info="
                
 Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations.
-See more information.
+See more information.
 
                ", revisions="
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -445,8 +445,8 @@ Calculation of the mean convective heat transfer coefficient kc
 
         annotation (Documentation(info="
                
-This record is used as input record for the heat transfer function  kc_evenGapLaminar and
- kc_evenGapLaminar_KC.
                
+This record is used as input record for the heat transfer function  kc_evenGapLaminar and
+ kc_evenGapLaminar_KC.
                "));
       end kc_evenGapLaminar_IN_con;
 
@@ -459,7 +459,7 @@ This record is used as input record for the heat transfer funct
         annotation (Documentation(info="
                
 This record is used as input record for the heat transfer function  kc_evenGapLaminar and
- kc_evenGapLaminar_KC.
                
+ kc_evenGapLaminar_KC.
                "));
       end kc_evenGapLaminar_IN_var;
 
@@ -538,7 +538,7 @@ This record is used as input record for the heat transfer funct
       annotation (Inline=false, smoothOrder(normallyConstant=IN_con) = 2,
             Documentation(info="
                
-Calculation of the mean convective heat transfer coefficient kc for an overall fluid flow through an even gap at different fluid flow and heat transfer situations. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information.
+Calculation of the mean convective heat transfer coefficient kc for an overall fluid flow through an even gap at different fluid flow and heat transfer situations. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information.
 
                "));
       end kc_evenGapOverall;
@@ -593,7 +593,7 @@ Calculation of the mean convective heat transfer coefficient kc
           IN_var);
       annotation (Inline=false, Documentation(info="
                
-Calculation of the mean convective heat transfer coefficient kc for an overall fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
+Calculation of the mean convective heat transfer coefficient kc for an overall fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
 
                ", revisions="
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -608,8 +608,8 @@ Calculation of the mean convective heat transfer coefficient kc
           Modelica.Fluid.Dissipation.Utilities.Records.HeatTransfer.EvenGap;
 
               annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_evenGapOverall and
- kc_evenGapOverall_KC.
+This record is used as input record for the heat transfer function  kc_evenGapOverall and
+ kc_evenGapOverall_KC.
 "));
       end kc_evenGapOverall_IN_con;
 
@@ -700,7 +700,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
                
-Calculation of the mean convective heat transfer coefficient kc for a developed turbulent fluid flow through an even gap at heat transfer from both sides. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information.
+Calculation of the mean convective heat transfer coefficient kc for a developed turbulent fluid flow through an even gap at heat transfer from both sides. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information.
 
                "), smoothOrder(normallyConstant=IN_con) = 2);
       end kc_evenGapTurbulent;
@@ -751,7 +751,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
       annotation (Inline=false, Documentation(info="
                
-Calculation of the mean convective heat transfer coefficient kc for a developed turbulent fluid flow through an even gap at heat transfer from both sides. See more information.
+Calculation of the mean convective heat transfer coefficient kc for a developed turbulent fluid flow through an even gap at heat transfer from both sides. See more information.
 
                ",       revisions="
                2016-04-12 Stefan Wischhusen: Limited Re to very small value (Modelica.Constant.eps).
                
@@ -767,7 +767,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
         annotation (Documentation(info="
                
-This record is used as input record for the heat transfer function  kc_evenGapTurbulent and
+This record is used as input record for the heat transfer function  kc_evenGapTurbulent and
  kc_evenGapTurbulent_KC.
 
                "));
@@ -781,7 +781,7 @@ This record is used as input record for the heat transfer funct
 
         annotation (Documentation(info="
                
-This record is used as input record for the heat transfer function  kc_evenGapTurbulent and
+This record is used as input record for the heat transfer function  kc_evenGapTurbulent and
  kc_evenGapTurbulent_KC.
 
                "));
@@ -789,13 +789,13 @@ This record is used as input record for the heat transfer funct
     annotation (preferredView="info", Documentation(info="
                Even gap
                Laminar flow
                
-
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                
+
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                Turbulent flow
                
-
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                
+
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                Overall flow
                
-
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                
+
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow through an even gap at different fluid flow and heat transfer situations. See more information.
                "));
     end Channel;
 
@@ -887,8 +887,8 @@ Approximate calculation of the mean convective heat transfer coefficient 
 A detailed documentation for this convective heat transfer calculation can be found in its underlying function
-kc_approxForcedConvection_KC .
-Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
+kc_approxForcedConvection_KC .
+Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
 
                
 "), smoothOrder(normallyConstant=IN_con) = 2);
       end kc_approxForcedConvection;
@@ -939,7 +939,7 @@ Note that additionally a failure status is observed in this function to check if
       annotation (Inline=false, Documentation(info="
 
                
 Approximate calculation of the mean convective heat transfer coefficient kc for forced convection with a fully developed fluid flow in a turbulent regime.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -983,7 +983,7 @@ This record is used as input record for the heat transfer funct
     annotation (preferredView="info", Documentation(info="
 
                General heat transfer
                
 
                Approximated forced convection
                
-
                Approximate calculation of the mean convective heat transfer coefficient kc for forced convection with a fully developed fluid flow in a turbulent regime. See more information.
                
+
                Approximate calculation of the mean convective heat transfer coefficient kc for forced convection with a fully developed fluid flow in a turbulent regime. See more information.
                
 "));
     end General;
 
@@ -1058,7 +1058,7 @@ This record is used as input record for the heat transfer funct
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with flat tubes and several fin geometries. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information .
+See more information .
 
                
 
 ", revisions="
@@ -1132,7 +1132,7 @@ Calculation of the mean convective heat transfer coefficient kc
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with flat tubes and several fin geometries.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-12 Stefan Wischhusen: Limited Re_Dh und Re_Lp to very small value (Modelica.Constant.eps).
                
@@ -1195,8 +1195,8 @@ This record is used as input record for the heat transfer funct
         SI.MassFlowRate m_flow annotation (Dialog(group="Input"));
 
         annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_flatTube and
- kc_flatTube_KC.
+This record is used as input record for the heat transfer function  kc_flatTube and
+ kc_flatTube_KC.
 "));
 
       end kc_flatTube_IN_var;
@@ -1271,7 +1271,7 @@ This record is used as input record for the heat transfer funct
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with round tubes and several fin geometries. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1415,7 +1415,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with round tubes and several fin geometries.See more information .
+Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with round tubes and several fin geometries.See more information .
 
                
 ", revisions="
 
                2016-04-11 Sven Rutkowski: Removed singularity for Re at zero mass flow rate through linearized function in wavy fin correlation.
                
@@ -1487,13 +1487,13 @@ This record is used as input record for the heat transfer funct
 
                Flat tube heat exchanger
                
 
                
 Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with flat tubes and several fin geometries.
-See more information .
+See more information .
 
                
 
 
                Round tube heat exchanger
                
 
                
 Calculation of the mean convective heat transfer coefficient kc for the air-side heat transfer of heat exchangers with round tubes and several fin geometries.
-See more information .
+See more information .
 
                
 "));
     end HeatExchanger;
@@ -1567,7 +1567,7 @@ Calculation of the mean convective heat transfer coefficient kc
         annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc for a helical pipe in the laminar flow regime. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1620,7 +1620,7 @@ Calculation of the mean convective heat transfer coefficient kc
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc for a helical pipe in the laminar flow regime.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-12 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate. 
                
@@ -1699,7 +1699,7 @@ This record is used as input record for the heat transfer funct
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc of a helical pipe in a hydrodynamically developed laminar and turbulent flow regime. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1763,7 +1763,7 @@ Calculation of the mean convective heat transfer coefficient kc
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc of a helical pipe in a hydrodynamically developed laminar and turbulent flow regime.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1860,7 +1860,7 @@ This record is used as input record for the heat transfer funct
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc of a helical pipe for turbulent flow regime. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1915,7 +1915,7 @@ Calculation of the mean convective heat transfer coefficient kc
       annotation (Inline=false, Documentation(info="
 
                
 Calculation of the mean convective heat transfer coefficient kc of a helical pipe for turbulent flow regime.
-See more information .
+See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -1949,15 +1949,15 @@ This record is used as input record for the heat transfer funct
 
                Helical pipe
                
 
                Laminar flow
                
 
                Calculation of the mean convective heat transfer coefficient kc for a helical pipe in the laminar flow regime.
-See more information.
                
+See more information.
                
 
 
                Turbulent flow
                
 
                Calculation of the mean convective heat transfer coefficient kc of a helical pipe for turbulent flow regime.
-See more information.
                
+See more information.
                
 
 
                Overall flow
                
 
                Calculation of the mean convective heat transfer coefficient kc of a helical pipe in a hydrodynamically developed laminar and turbulent flow regime.
-See more information.
                
+See more information.
                
 "));
     end HelicalPipe;
 
@@ -2020,7 +2020,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
+Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2066,7 +2066,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
                
 Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow over an even surface.
 Generally this function is numerically best used for the calculation of the mean convective heat transfer coefficient kc at known fluid velocity.
- See more information .
+ See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2079,8 +2079,8 @@ Generally this function is numerically best used for the calculation of the mean
 
       annotation (Documentation(info="
 
                
-This record is used as input record for the heat transfer function   kc_laminar and
-  kc_laminar_KC.
+This record is used as input record for the heat transfer function   kc_laminar and
+  kc_laminar_KC.
 
                
 "));
       end kc_laminar_IN_con;
@@ -2091,8 +2091,8 @@ This record is used as input record for the heat transfer funct
 
       annotation (Documentation(info="
 
                
-This record is used as input record for the heat transfer function   kc_laminar and
-  kc_laminar_KC.
+This record is used as input record for the heat transfer function   kc_laminar and
+  kc_laminar_KC.
 
                
 "));
       end kc_laminar_IN_var;
@@ -2153,7 +2153,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of the mean convective heat transfer coefficient kc for a laminar or turbulent fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
+Calculation of the mean convective heat transfer coefficient kc for a laminar or turbulent fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2191,7 +2191,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
                
 Calculation of the mean convective heat transfer coefficient kc for a laminar or turbulent fluid flow over an even surface.
 Generally this function is numerically best used for the calculation of the mean convective heat transfer coefficient kc at known fluid velocity.
- See more information .
+ See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2204,8 +2204,8 @@ Generally this function is numerically best used for the calculation of the mean
         extends Modelica.Fluid.Dissipation.Utilities.Records.HeatTransfer.Plate;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_overall and
- kc_overall_KC.
+This record is used as input record for the heat transfer function  kc_overall and
+ kc_overall_KC.
 "));
       end kc_overall_IN_con;
 
@@ -2219,8 +2219,8 @@ This record is used as input record for the heat transfer funct
         SI.Velocity velocity annotation (Dialog(group="Input"));
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_overall and
- kc_overall_KC.
+This record is used as input record for the heat transfer function  kc_overall and
+ kc_overall_KC.
 "));
       end kc_overall_IN_var;
 
@@ -2281,7 +2281,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of the mean convective heat transfer coefficient kc for a hydrodynamically developed turbulent fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
+Calculation of the mean convective heat transfer coefficient kc for a hydrodynamically developed turbulent fluid flow over an even surface. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2328,7 +2328,7 @@ Calculation of the mean convective heat transfer coefficient kc
 
                
 Calculation of the mean convective heat transfer coefficient kc for a hydrodynamically developed turbulent fluid flow over an even surface.
 Generally this function is numerically best used for the calculation of the mean convective heat transfer coefficient kc at known fluid velocity.
- See more information .
+ See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2340,8 +2340,8 @@ Generally this function is numerically best used for the calculation of the mean
         extends Modelica.Fluid.Dissipation.HeatTransfer.Plate.kc_overall_IN_con;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function   kc_turbulent and
-  kc_turbulent_KC.
+This record is used as input record for the heat transfer function   kc_turbulent and
+  kc_turbulent_KC.
 "));
       end kc_turbulent_IN_con;
 
@@ -2350,21 +2350,21 @@ This record is used as input record for the heat transfer funct
         extends Modelica.Fluid.Dissipation.HeatTransfer.Plate.kc_overall_IN_var;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function   kc_turbulent and
-  kc_turbulent_KC.
+This record is used as input record for the heat transfer function   kc_turbulent and
+  kc_turbulent_KC.
 "));
       end kc_turbulent_IN_var;
       annotation (preferredView="info", Documentation(info="
 
                Even plate
                
 
                Laminar flow
                
-
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow over an even surface. See more information .
                
+
                Calculation of the mean convective heat transfer coefficient kc for a laminar fluid flow over an even surface. See more information .
                
 
 
                Turbulent flow
                
-
                Calculation of the mean convective heat transfer coefficient kc for a hydrodynamically developed turbulent fluid flow over an even surface. See more information.
                
+
                Calculation of the mean convective heat transfer coefficient kc for a hydrodynamically developed turbulent fluid flow over an even surface. See more information.
                
 
 
                Overall flow
                
 
                
-Calculation of the mean convective heat transfer coefficient kc for an laminar and turbulent fluid flow over an even surface. See more information.
+Calculation of the mean convective heat transfer coefficient kc for an laminar and turbulent fluid flow over an even surface. See more information.
 
                
 "));
     end Plate;
@@ -2432,7 +2432,7 @@ Calculation of the mean convective heat transfer coefficient kc
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled.  See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2494,7 +2494,7 @@ Calculation of mean convective heat transfer coefficient kc of
         kc := Nu*IN_var.lambda/max(MIN, IN_con.d_hyd);
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. See more information .
 
                
 ", revisions="
 
                2014-08-05 Stefan Wischhusen: Corrected term for Uniform heat flux in developed fluid flow (Nu3).
                
@@ -2513,8 +2513,8 @@ Calculation of mean convective heat transfer coefficient kc of
 
       annotation (Documentation(info="
 
                
-This record is used as input record for the heat transfer function  kc_laminar and
- kc_laminar_KC.
+This record is used as input record for the heat transfer function  kc_laminar and
+ kc_laminar_KC.
 
                
 "));
       end kc_laminar_IN_con;
@@ -2526,8 +2526,8 @@ This record is used as input record for the heat transfer funct
 
       annotation (Documentation(info="
 
                
-This record is used as input record for the heat transfer function  kc_laminar and
- kc_laminar_KC.
+This record is used as input record for the heat transfer function  kc_laminar and
+ kc_laminar_KC.
 
                
 "));
       end kc_laminar_IN_var;
@@ -2605,7 +2605,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped overall fluid flow with neglect or consideration of pressure loss influence. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped overall fluid flow with neglect or consideration of pressure loss influence. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2661,7 +2661,7 @@ Calculation of mean convective heat transfer coefficient kc of
 
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped overall fluid flow with neglect or consideration of pressure loss influence.See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped overall fluid flow with neglect or consideration of pressure loss influence.See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2679,8 +2679,8 @@ Calculation of mean convective heat transfer coefficient kc of
         extends kc_turbulent_IN_con;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_overall and
- kc_overall_KC.
+This record is used as input record for the heat transfer function  kc_overall and
+ kc_overall_KC.
 "));
       end kc_overall_IN_con;
 
@@ -2694,8 +2694,8 @@ This record is used as input record for the heat transfer funct
         SI.MassFlowRate m_flow annotation (Dialog(group="Input"));
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_overall and
- kc_overall_KC.
+This record is used as input record for the heat transfer function  kc_overall and
+ kc_overall_KC.
 "));
       end kc_overall_IN_var;
 
@@ -2773,7 +2773,7 @@ This record is used as input record for the heat transfer funct
         end for;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or uniform heat flux with neglecting or considering of pressure loss influence. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or uniform heat flux with neglecting or considering of pressure loss influence. Note that additionally a failure status is observed in this function to check if the intended boundary conditions are fulfilled. See more information .
 
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
@@ -2821,7 +2821,7 @@ Calculation of mean convective heat transfer coefficient kc of
           0;
       annotation (Inline=false, Documentation(info="
 
                
-Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or uniform heat flux with neglecting or considering of pressure loss influence. See more information .
+Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or uniform heat flux with neglecting or considering of pressure loss influence. See more information .
 
                
 ", revisions="
 
                2016-04-12 Stefan Wischhusen: Limited Re to very small value (Modelica.Constant.eps).
                
@@ -2840,8 +2840,8 @@ Calculation of mean convective heat transfer coefficient kc of
             Dialog(group="Straight pipe", enable=roughness == Modelica.Fluid.Dissipation.Utilities.Types.Roughness.Considered));
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function kc_turbulent and
-kc_turbulent_KC.
+This record is used as input record for the heat transfer function kc_turbulent and
+kc_turbulent_KC.
 "));
       end kc_turbulent_IN_con;
 
@@ -2851,8 +2851,8 @@ This record is used as input record for the heat transfer funct
           Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_IN_var;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function kc_turbulent and
-kc_turbulent_KC.
+This record is used as input record for the heat transfer function kc_turbulent and
+kc_turbulent_KC.
 "));
       end kc_turbulent_IN_var;
 
@@ -2889,7 +2889,7 @@ This record is used as input record for the heat transfer funct
       annotation(Inline=false, smoothOrder(normallyConstant=IN_con) = 2,
             Documentation(info=
                       "
-
                Calculation of local two phase heat transfer coefficient kc_2ph for (horizontal/vertical) boiling or (horizontal) condensation for an overall flow regime. See more information .
                
+
                Calculation of local two phase heat transfer coefficient kc_2ph for (horizontal/vertical) boiling or (horizontal) condensation for an overall flow regime. See more information .
                
 ", revisions="
 
                2016-04-11 Stefan Wischhusen: Removed singularity for Re at zero mass flow rate.
                
 "));
@@ -2901,7 +2901,7 @@ This record is used as input record for the heat transfer funct
           Modelica.Fluid.Dissipation.Utilities.Records.HeatTransfer.TwoPhaseFlowHT_IN_con;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_twoPhaseOverall_KC.
+This record is used as input record for the heat transfer function  kc_twoPhaseOverall_KC.
 "));
       end kc_twoPhaseOverall_KC_IN_con;
 
@@ -2911,16 +2911,16 @@ This record is used as input record for the heat transfer funct
           Modelica.Fluid.Dissipation.Utilities.Records.HeatTransfer.TwoPhaseFlowHT_IN_var;
 
       annotation (Documentation(info="
-This record is used as input record for the heat transfer function  kc_twoPhaseOverall_KC.
+This record is used as input record for the heat transfer function  kc_twoPhaseOverall_KC.
 "));
       end kc_twoPhaseOverall_KC_IN_var;
       annotation (preferredView="info", Documentation(info="
 
                Straight pipe
                
 
                Laminar flow
                
-
                Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. See more information.
                
+
                Calculation of mean convective heat transfer coefficient kc of a straight pipe at an uniform wall temperature or uniform heat flux and for a hydrodynamically developed or undeveloped laminar fluid flow. See more information.
                
 
 
                Turbulent flow
                
-
                Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or See more information.
                
+
                Calculation of mean convective heat transfer coefficient kc of a straight pipe for a hydrodynamically developed turbulent fluid flow at uniform wall temperature or See more information.
                
 "));
     end StraightPipe;
   annotation(preferredView="info");
@@ -3067,7 +3067,7 @@ This record is used as input record for the heat transfer funct
           Documentation(info="
 
                Calculation of pressure loss in curved bends at overall flow regime for incompressible and single-phase fluid flow through circular cross sectional area considering surface roughness.
                
 
-
                Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_curvedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
                
+
                Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_curvedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
                
 ", revisions="
 2014-12-12 Stefan Wischhusen: Factor A2 corrected for R/D > 0.55-0.7. The factor is now 6e3 instead of 4e3.
                
 "));
@@ -3243,8 +3243,8 @@ Calculation of pressure loss in curved bends at overall flow regime for incompre
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_curvedOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
-See more information .
                
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_curvedOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
+See more information .
                
 ", revisions="
 2014-12-01 Stefan Wischhusen: Introduced an expansion in variables v_lam and v_tra for numerical improvement at close to zero flows.
                
 2014-12-12 Stefan Wischhusen: Factor A2 corrected for R/D > 0.55-0.7. The factor is now 6e3 instead of 4e3.
                
@@ -3259,8 +3259,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_curvedOverall_DP 
-and  dp_curvedOverall_MFLOW .
+ dp_curvedOverall_DP 
+and  dp_curvedOverall_MFLOW .
 "));
       end dp_curvedOverall_IN_con;
 
@@ -3273,8 +3273,8 @@ and  dp_curvedOverall_DP 
-and  dp_curvedOverall_MFLOW .
+ dp_curvedOverall_DP 
+and  dp_curvedOverall_MFLOW .
 "));
       end dp_curvedOverall_IN_var;
 
@@ -3400,8 +3400,8 @@ There are larger pressure losses in an edged bend compared to a curved bend unde
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_edgedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.
-See more information .
                
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_edgedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.
+See more information .
                
 "));
       end dp_edgedOverall_DP;
 
@@ -3589,8 +3589,8 @@ There are larger pressure losses in an edged bend compared to a curved bend unde
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_edgedOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
-See more information .
                
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_edgedOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
+See more information .
                
 ", revisions="
 2014-12-02 Stefan Wischhusen: Changed transition regimes for laminar to highly turbulent domain.
 "));
@@ -3605,8 +3605,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_edgedOverall_DP  and
- dp_edgedOverall_MFLOW .
+ dp_edgedOverall_DP  and
+ dp_edgedOverall_MFLOW .
 "));
       end dp_edgedOverall_IN_con;
 
@@ -3618,19 +3618,19 @@ This record is used as input record for the pressure loss funct
           Modelica.Fluid.Dissipation.Utilities.Records.General.PressureLoss;
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_edgedOverall_DP  and
- dp_edgedOverall_MFLOW .
+ dp_edgedOverall_DP  and
+ dp_edgedOverall_MFLOW .
 "));
       end dp_edgedOverall_IN_var;
       annotation (preferredView="info", Documentation(info="
 
                Bend
                
 
                Curved bend overall flow
                
-
                Calculation of pressure loss in curved bends at overall flow regime for incompressible and single-phase fluid flow through circular cross sectional area considering surface roughness.  See more information.
                
+
                Calculation of pressure loss in curved bends at overall flow regime for incompressible and single-phase fluid flow through circular cross sectional area considering surface roughness.  See more information.
                
 
 
                Edged bend overall flow
                
 
                
 Calculation of pressure loss in edged bends with sharp corners at overall flow regime for incompressible and single-phase fluid flow through circular cross sectional area considering surface roughness.
-See more information .
                
+See more information .
                
 
 "));
     end Bend;
@@ -3765,7 +3765,7 @@ Calculation of pressure loss for an internal flow through different geometries a
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_internalFlowOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_internalFlowOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
 
                
 "));
       end dp_internalFlowOverall_DP;
@@ -3918,10 +3918,10 @@ Calculation of pressure loss for an internal flow through different geometries a
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_internalFlowOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
                
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_internalFlowOverall_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.
                
 
 
                
-The pressure loss calculation for internal fluid flow in different geometries is further documented  here.
+The pressure loss calculation for internal fluid flow in different geometries is further documented  here.
 
                
 "));
       end dp_internalFlowOverall_MFLOW;
@@ -3938,8 +3938,8 @@ The pressure loss calculation for internal fluid flow in different geometries is
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_internalFlowOverall_DP and
- dp_internalFlowOverall_MFLOW.
+ dp_internalFlowOverall_DP and
+ dp_internalFlowOverall_MFLOW.
 "));
       end dp_internalFlowOverall_IN_con;
 
@@ -3952,8 +3952,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_internalFlowOverall_DP and
- dp_internalFlowOverall_MFLOW.
+ dp_internalFlowOverall_DP and
+ dp_internalFlowOverall_MFLOW.
 "));
       end dp_internalFlowOverall_IN_var;
       annotation (preferredView="info", Documentation(info="
@@ -3961,7 +3961,7 @@ This record is used as input record for the pressure loss funct
 
                Internal overall flow
                
 
                
 Calculation of pressure loss for an internal flow through different geometries at laminar and turbulent flow regime considering surface roughness.
-See more information.
+See more information.
 
                
 "));
     end Channel;
@@ -4016,7 +4016,7 @@ Calculation of a generic pressure loss for an ideal gas using m
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_idealGas_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_idealGas_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
 
                
 "));
       end dp_idealGas_DP;
@@ -4063,7 +4063,7 @@ Calculation of a generic pressure loss for an ideal gas using m
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_idealGas_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.  See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_idealGas_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.  See more information.
 
                
 "));
       end dp_idealGas_MFLOW;
@@ -4082,8 +4082,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_idealGas_DP  and
- dp_idealGas_MFLOW .
+ dp_idealGas_DP  and
+ dp_idealGas_MFLOW .
 "));
 
       end dp_idealGas_IN_con;
@@ -4097,8 +4097,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_idealGas_DP and
- dp_idealGas_MFLOW.
+ dp_idealGas_DP and
+ dp_idealGas_MFLOW.
 "));
 
       end dp_idealGas_IN_var;
@@ -4151,7 +4151,7 @@ This generic function considers the pressure loss law via a pressure loss expone
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_nominalDensityViscosity_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_nominalDensityViscosity_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
 
                
 "));
       end dp_nominalDensityViscosity_DP;
@@ -4200,7 +4200,7 @@ This generic function considers the pressure loss law via a pressure loss expone
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_genericDensityViscosity_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_genericDensityViscosity_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
 
                
 "));
       end dp_nominalDensityViscosity_MFLOW;
@@ -4214,8 +4214,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_nominalDensityViscosity_DP and
- dp_nominalDensityViscosity_MFLOW.
+ dp_nominalDensityViscosity_DP and
+ dp_nominalDensityViscosity_MFLOW.
 "));
       end dp_nominalDensityViscosity_IN_con;
 
@@ -4228,8 +4228,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_nominalDensityViscosity_DP and
- dp_nominalDensityViscosity_MFLOW.
+ dp_nominalDensityViscosity_DP and
+ dp_nominalDensityViscosity_MFLOW.
 "));
       end dp_nominalDensityViscosity_IN_var;
 
@@ -4294,7 +4294,7 @@ This generic function considers the pressure loss law via a nominal pressure los
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_nominalPressureLossLawDensity_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_nominalPressureLossLawDensity_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
 
                
 "));
       end dp_nominalPressureLossLawDensity_DP;
@@ -4353,7 +4353,7 @@ This generic function considers the pressure loss law via a nominal pressure los
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_nominalPressurelosslawDensity_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_nominalPressurelosslawDensity_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
 
                
 "));
       end dp_nominalPressureLossLawDensity_MFLOW;
@@ -4367,8 +4367,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_nominalPressureLosslawDensity_DP and
- dp_nominalPressureLosslawDensity_MFLOW.
+ dp_nominalPressureLosslawDensity_DP and
+ dp_nominalPressureLosslawDensity_MFLOW.
 "));
       end dp_nominalPressureLossLawDensity_IN_con;
 
@@ -4385,8 +4385,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_nominalPressureLosslawDensity_DP and
- dp_nominalPressureLosslawDensity_MFLOW.
+ dp_nominalPressureLosslawDensity_DP and
+ dp_nominalPressureLosslawDensity_MFLOW.
 "));
       end dp_nominalPressureLossLawDensity_IN_var;
 
@@ -4430,7 +4430,7 @@ Calculation of a generic pressure loss in dependence of a pressure loss coeffici
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_pressureLossCoefficient_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_pressureLossCoefficient_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
 
                
 "));
       end dp_pressureLossCoefficient_DP;
@@ -4474,7 +4474,7 @@ Calculation of a generic pressure loss in dependence of a pressure loss coeffici
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_pressureLossCoefficient_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_pressureLossCoefficient_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
 
                
 "));
       end dp_pressureLossCoefficient_MFLOW;
@@ -4494,8 +4494,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_pressureLossCoefficient_DP and
- dp_pressureLossCoefficient_MFLOW.
+ dp_pressureLossCoefficient_DP and
+ dp_pressureLossCoefficient_MFLOW.
 "));
       end dp_pressureLossCoefficient_IN_con;
 
@@ -4514,8 +4514,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_pressureLossCoefficient_DP and
- dp_pressureLossCoefficient_MFLOW.
+ dp_pressureLossCoefficient_DP and
+ dp_pressureLossCoefficient_MFLOW.
 "));
       end dp_pressureLossCoefficient_IN_var;
 
@@ -4573,7 +4573,7 @@ The function can be used to calculate pressure loss at known mass flow rate 
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_volumeFlowRate_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_volumeFlowRate_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
 
                
 ", revisions="
 2018-11-21 Stefan Wischhusen: Fixed problem for linear case (a=0 and b>0) and obsolete regularization for a>0 and b>0.
@@ -4634,7 +4634,7 @@ The function can be used to calculate pressure loss at known mass flow rate 
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_volumeFlowRate_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_volumeFlowRate_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. See more information.
 
                
 ",       revisions="
 2018-11-21 Stefan Wischhusen: Fixed problem for linear case (a=0 and b>0) and obsolete regularization for a>0 and b>0.
@@ -4653,8 +4653,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
-  dp_volumeFlowRate_DP and
-  dp_volumeFlowRate_MFLOW.
+  dp_volumeFlowRate_DP and
+  dp_volumeFlowRate_MFLOW.
 "));
 
       end dp_volumeFlowRate_IN_con;
@@ -4667,8 +4667,8 @@ This record is used as input record for the pressure loss funct
           annotation (Dialog(group="Fluid properties"));
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
-  dp_volumeFlowRate_DP and
-  dp_volumeFlowRate_MFLOW.
+  dp_volumeFlowRate_DP and
+  dp_volumeFlowRate_MFLOW.
 "));
 
       end dp_volumeFlowRate_IN_var;
@@ -4677,32 +4677,32 @@ This record is used as input record for the pressure loss funct
 
                General pressure loss for ideal gas
                
 
                
 Calculation of a generic pressure loss for an ideal gas using mean density.
-See more information.
+See more information.
 
                
 
 
                Generic pressure loss depending on density and viscosity 
                
 
                
 Calculation of a generic pressure loss in dependence of nominal fluid variables (e.g., nominal density, nominal dynamic viscosity) at an operation point via interpolation.
 This generic function considers the pressure loss law via a pressure loss exponent and the influence of density and dynamic viscosity on pressure loss.
-See more information.
+See more information.
 
                
 
 
                Generic pressure loss depending on density
                
 
                
 Calculation of a generic pressure loss in dependence of nominal fluid variables (e.g., nominal density) via interpolation from an operation point.
-See more information.
+See more information.
 
                
 
 
                Generic pressure loss depending on pressure loss coefficient
                
 
                
 Calculation of a generic pressure loss in dependence of a pressure loss coefficient.
- See more information.
+ See more information.
 
                
 
 
                Generic pressure loss depending on volume flow rate
                
 
                
 Calculation of a generic pressure loss with linear or quadratic dependence on volume flow rate.
- See more information.
+ See more information.
 
                
 "));
     end General;
@@ -4801,7 +4801,7 @@ Calculation of the local pressure loss at a sudden change of the cross sectional
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_suddenChange_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_suddenChange_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
 
                
 "));
       end dp_suddenChange_DP;
@@ -4882,7 +4882,7 @@ Calculation of the local pressure loss at a sudden change of the cross sectional
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_suddenChange_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.  See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_suddenChange_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.  See more information.
 
                
 "));
       end dp_suddenChange_MFLOW;
@@ -4896,8 +4896,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss functions
- dp_suddenChange_DP and
- dp_suddenChange_MFLOW.
+ dp_suddenChange_DP and
+ dp_suddenChange_MFLOW.
 "));
       end dp_suddenChange_IN_con;
 
@@ -4910,8 +4910,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss functions
- dp_suddenChange_DP and
- dp_suddenChange_MFLOW.
+ dp_suddenChange_DP and
+ dp_suddenChange_MFLOW.
 "));
       end dp_suddenChange_IN_var;
 
@@ -4991,7 +4991,7 @@ Calculation of pressure loss in thick edged orifices with sharp corners at overa
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_thickEdgedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_thickEdgedOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.  See more information.
 
                
 "));
       end dp_thickEdgedOverall_DP;
@@ -5065,7 +5065,7 @@ Calculation of pressure loss in thick edged orifices with sharp corners at overa
 
                
 
 
                
-Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_thickEdgedOverall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.  See more information.
+Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_thickEdgedOverall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.  See more information.
 
                
 "));
       end dp_thickEdgedOverall_MFLOW;
@@ -5084,8 +5084,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss functions
- dp_thickEdgedOverall_DP and
- dp_thickEdgedOverall_MFLOW.
+ dp_thickEdgedOverall_DP and
+ dp_thickEdgedOverall_MFLOW.
 "));
       end dp_thickEdgedOverall_IN_con;
 
@@ -5098,8 +5098,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss functions
- dp_thickEdgedOverall_DP  and
- dp_thickEdgedOverall_MFLOW .
+ dp_thickEdgedOverall_DP  and
+ dp_thickEdgedOverall_MFLOW .
 "));
       end dp_thickEdgedOverall_IN_var;
       annotation (preferredView="info", Documentation(info="
@@ -5107,13 +5107,13 @@ This record is used as input record for the pressure loss funct
 
                Sudden change
                
 
                
 Calculation of the local pressure loss at a sudden change of the cross sectional areas (sudden expansion or sudden contraction) with sharp corners at turbulent flow regime for incompressible and single-phase fluid flow through arbitrary shaped cross sectional area (square, circular, etc.) considering a smooth surface.
-See more information.
+See more information.
 
                
 
 
                Thick edged orifice
                
 
                
 Calculation of pressure loss in thick edged orifices with sharp corners at overall flow regime for incompressible and single-phase fluid flow through an arbitrary shaped cross sectional area (square, circular, etc.) considering constant influence of surface roughness.
-See more information.
+See more information.
 
                
 "));
     end Orifice;
@@ -5167,7 +5167,7 @@ Calculation of pressure loss in a straight pipe for laminar flo
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_laminar_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_laminar_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
 
                
 "));
       end dp_laminar_DP;
@@ -5213,7 +5213,7 @@ Calculation of pressure loss in a straight pipe for laminar flo
 
                
 
 
                
-Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_laminar_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.   See more information.
+Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_laminar_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.   See more information.
 
                
 "));
       end dp_laminar_MFLOW;
@@ -5224,8 +5224,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_laminar_DP and
- dp_laminar_MFLOW.
+ dp_laminar_DP and
+ dp_laminar_MFLOW.
 "));
 
       end dp_laminar_IN_con;
@@ -5238,8 +5238,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_laminar_DP and
- dp_laminar_MFLOW.
+ dp_laminar_DP and
+ dp_laminar_MFLOW.
 "));
 
       end dp_laminar_IN_var;
@@ -5316,7 +5316,7 @@ Calculation of pressure loss in a straight pipe for overall flo
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_overall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_overall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
 
                
 "));
       end dp_overall_DP;
@@ -5418,7 +5418,7 @@ Calculation of pressure loss in a straight pipe for overall flo
 
                
 
 
                
-Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_overall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.   See more information.
+Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_overall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated.   See more information.
 
                
 "));
       end dp_overall_MFLOW;
@@ -5431,8 +5431,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_overall_DP and
- dp_overall_MFLOW.
+ dp_overall_DP and
+ dp_overall_MFLOW.
 "));
 
       end dp_overall_IN_con;
@@ -5446,8 +5446,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_overall_DP and
- dp_overall_MFLOW.
+ dp_overall_DP and
+ dp_overall_MFLOW.
 "));
 
       end dp_overall_IN_var;
@@ -5542,7 +5542,7 @@ Calculation of pressure loss in a straight pipe for turbulent f
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_turbulent_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_turbulent_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated.   See more information.
 
                
 "));
       end dp_turbulent_DP;
@@ -5639,7 +5639,7 @@ Calculation of pressure loss in a straight pipe for turbulent f
 
                
 
 
                
-Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_turbulent_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.   See more information.
+Generally this function is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_turbulent_DP is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated.   See more information.
 
                
 "));
       end dp_turbulent_MFLOW;
@@ -5658,8 +5658,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_turbulent_DP and
- dp_turbulent_MFLOW.
+ dp_turbulent_DP and
+ dp_turbulent_MFLOW.
 "));
       end dp_turbulent_IN_con;
 
@@ -5671,8 +5671,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_turbulent_DP and
- dp_turbulent_MFLOW.
+ dp_turbulent_DP and
+ dp_turbulent_MFLOW.
 "));
       end dp_turbulent_IN_var;
 
@@ -5781,7 +5781,7 @@ Generally the pressure loss for two phase flow in a horizontal or a vertical str
 
                
 
 
                
-\"twoPhaseFlowRegimes_horizontal\"/
+\"twoPhaseFlowRegimes_horizontal\"/
 
                
 
 
                
@@ -5789,11 +5789,11 @@ Generally the pressure loss for two phase flow in a horizontal or a vertical str
 
                
 
 
                
-\"twoPhaseFlowRegimes_vertical\"/
+\"twoPhaseFlowRegimes_vertical\"/
 
                
 
 
                
- See more information.
+ See more information.
 
                
 "));
       end dp_twoPhaseOverall_DP;
@@ -5824,7 +5824,7 @@ Generally the pressure loss for two phase flow in a horizontal or a vertical str
           annotation (Dialog(group="Geometry"));
 
         annotation (Documentation(info="
-This record is used as input record for the pressure loss function  dp_twoPhaseOverall_DP.
+This record is used as input record for the pressure loss function  dp_twoPhaseOverall_DP.
 "));
 
       end dp_twoPhaseOverall_IN_con;
@@ -5841,7 +5841,7 @@ This record is used as input record for the pressure loss funct
             x_flow=(x_flow_end + x_flow_sta)/2);
 
         annotation (Documentation(info="
-This record is used as input record for the pressure loss function  dp_twoPhaseOverall_DP.
+This record is used as input record for the pressure loss function  dp_twoPhaseOverall_DP.
 "));
 
       end dp_twoPhaseOverall_IN_var;
@@ -5850,25 +5850,25 @@ This record is used as input record for the pressure loss funct
 
                Laminar flow
                
 
                
 Calculation of pressure loss in a straight pipe for laminar flow regime of single-phase fluid flow only.
-See more information.
+See more information.
 
                
 
 
                Turbulent flow
                
 
                
 Calculation of pressure loss in a straight pipe for turbulent flow regime of single-phase fluid flow only considering surface roughness.
-See more information.
+See more information.
 
                
 
 
                Overall flow
                
 
                
 Calculation of pressure loss in a straight pipe for laminar or turbulent flow regime of single-phase fluid flow only considering surface roughness.
-See more information.
+See more information.
 
                
 
 
                Two phase overall flow
                
 
                
 Calculation of pressure loss for two phase flow in a horizontal or vertical straight pipe for an overall flow regime considering frictional, momentum and geodetic pressure loss.
- See more information.
+ See more information.
 
                
 "));
     end StraightPipe;
@@ -5981,7 +5981,7 @@ Calculation of pressure loss for a valve with different geometries at overall fl
 
                
 
 
                
-Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_severalGeometryOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
+Generally this function is numerically best used for the incompressible case, where the mass flow rate (m_flow) is known (as state variable) in the used model and the corresponding pressure loss (DP) has to be calculated. On the other hand the function dp_severalGeometryOverall_MFLOW is numerically best used for the compressible case if the pressure loss (dp) is known (out of pressures as state variable) and the mass flow rate (M_FLOW) has to be calculated. See more information.
 
                
 "));
       end dp_severalGeometryOverall_DP;
@@ -6086,7 +6086,7 @@ Calculation of pressure loss for a valve with different geometries at overall fl
 
                
 
 
                
-Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_severalGeometryOverall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated. See more information.
+Generally this function is numerically best used for the compressible case, where the pressure loss (dp) is known (out of pressures as state variable) in the used model and the corresponding mass flow rate (M_FLOW) has to be calculated. On the other hand the function dp_severalGeometryOverall_DP is numerically best used for the incompressible case if the mass flow rate (m_flow) is known (as state variable) and the pressure loss (DP) has to be calculated. See more information.
 
                
 "));
       end dp_severalGeometryOverall_MFLOW;
@@ -6133,8 +6133,8 @@ Generally this function is numerically best used for the compressible ca
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_severalGeometryOverall_DP and
- dp_severalGeometryOverall_MFLOW.
+ dp_severalGeometryOverall_DP and
+ dp_severalGeometryOverall_MFLOW.
 "));
       end dp_severalGeometryOverall_IN_con;
 
@@ -6155,8 +6155,8 @@ This record is used as input record for the pressure loss funct
 
         annotation (Documentation(info="
 This record is used as input record for the pressure loss function
- dp_severalGeometryOverall_DP and
- dp_severalGeometryOverall_MFLOW.
+ dp_severalGeometryOverall_DP and
+ dp_severalGeometryOverall_MFLOW.
 "));
       end dp_severalGeometryOverall_IN_var;
       annotation (preferredView="info", Documentation(info="
@@ -6164,7 +6164,7 @@ This record is used as input record for the pressure loss funct
 
                Several geometries
                
 
                
 Calculation of pressure loss for a valve with different geometries at overall flow regime for incompressible and single-phase fluid flow in dependence of its opening.
-See more information.
+See more information.
 
                
 
 "));
@@ -6225,7 +6225,7 @@ You can perform an inverse calculation from kc_evenGapLaminar_KCGeometry
 
                
-\"gap\"/
+\"gap\"/
 
                
 
 
                Calculation
                
@@ -6311,7 +6311,7 @@ the chosen fluid flow and heat transfer situations (targets) is shown in the fig
 
                
 
 
                
-\"kc_evenGapLaminar\"/
+\"kc_evenGapLaminar\"/
 
                
 
 
                References
                
@@ -6372,7 +6372,7 @@ You can perform an inverse calculation from kc_evenGapOverall_KCGeometry and Calculation 
 
 
                This heat transfer function enables a calculation of heat transfer coefficient for laminar and turbulent flow regime. The geometry, constant and fluid parameters of the function are the same as for
-kc_evenGapLaminar  and kc_evenGapTurbulent.
+kc_evenGapLaminar  and kc_evenGapTurbulent.
 
                
 
                
 The calculation conditions for laminar and turbulent flow is equal to the calculation in kc_evenGapLaminar
@@ -6395,7 +6395,7 @@ The verification for all targets is shown in the following figure w.r.t. the ref
 
                
 
 
                
-\"kc_evenGapOverall\"/
+\"kc_evenGapOverall\"/
 
                
 
 
                References
                
@@ -6444,7 +6444,7 @@ You can perform an inverse calculation from kc_evenGapTurbulent_KCGeometry
 
                
-\"gap\"/
+\"gap\"/
 
                
 
 
                Calculation
                
@@ -6504,7 +6504,7 @@ the chosen fluid flow and heat transfer situations (targets) is shown in the fig
 
 
 
                
-\"kc_evenGapTurbulent\"/
+\"kc_evenGapTurbulent\"/
 
                
 
 
                References
                
@@ -6606,7 +6606,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_approxForcedConvection_T1\"/
+\"kc_approxForcedConvection_T1\"/
 
                
 
 
                
@@ -6614,7 +6614,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_approxForcedConvection_T2\"/
+\"kc_approxForcedConvection_T2\"/
 
                
 
 
                
@@ -6622,7 +6622,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_approxForcedConvection_T3\"/
+\"kc_approxForcedConvection_T3\"/
 
                
 
 
                
@@ -6672,7 +6672,7 @@ You can perform an inverse calculation from kc_flatTube_KC, whe
 
                Geometry 
                
 
 
                
-\"flatTube\"/
+\"flatTube\"/
 
                
 
 
                Calculation
                
@@ -6721,7 +6721,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_flatTube\"/
+\"kc_flatTube\"/
 
                
 
 
                References
                
@@ -6768,7 +6768,7 @@ You can perform an inverse calculation from kc_roundTube_KC, wh
 
 
                Geometry 
                
 
                
-\"roundTube\"/
+\"roundTube\"/
 
                
 
 
                Calculation
                
@@ -6807,7 +6807,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_roundTube\"/
+\"kc_roundTube\"/
 
                
 
 
                References
                
@@ -6871,7 +6871,7 @@ centrifugal forces.
 
                Geometry 
                
 
 
                
-\"helicalPipe\"/
+\"helicalPipe\"/
 
                
 
 
                Calculation
                
@@ -6970,7 +6970,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_laminar\"/
+\"kc_laminar\"/
 
                
 
 
                The convective heat transfer of a helical pipe is enhanced compared
@@ -7014,7 +7014,7 @@ You can perform an inverse calculation from kc_overall_KC, wher
 
                Geometry and Calculation 
                
 
 
                This heat transfer function enables a calculation of heat transfer coefficient for laminar and turbulent flow regime. The geometry, constant and fluid parameters of the function are the same as for
-kc_laminar  and kc_turbulent.
+kc_laminar  and kc_turbulent.
 
                
 
                
 The calculation conditions for laminar and turbulent flow is equal to the calculation in kc_laminar
@@ -7026,7 +7026,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_overall\"/
+\"kc_overall\"/
 
                
 
 
                
@@ -7075,7 +7075,7 @@ The critical Reynolds number Re_crit in a helical pipe depends
 
                Geometry 
                
 
 
                
-\"helicalPipe\"/
+\"helicalPipe\"/
 
                
 
 
                Calculation
                
@@ -7125,7 +7125,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_turbulent\"/
+\"kc_turbulent\"/
 
                
 
 
                
@@ -7183,7 +7183,7 @@ You can perform an inverse calculation from kc_laminar_KC, wher
 
                Geometry 
                
 
 
                
-\"plate\"/
+\"plate\"/
 
                
 
 
                Calculation
                
@@ -7223,12 +7223,12 @@ The mean Nusselt number Nu in the laminar regime representing t
 
                
 
 
                
-\"kc_laminar\"/
+\"kc_laminar\"/
 
                
 
 
                
 Note that this function is best used in the laminar regime up to a Reynolds number Re smaller than 2300. There is a deviation w.r.t. literature due to the neglect of the turbulence influence in the transition regime even though this function is used inside its cited restrictions for a higher Reynolds number. The function
-kc_overall is recommended for the simulation of a Reynolds number higher than 2300.
+kc_overall is recommended for the simulation of a Reynolds number higher than 2300.
 
                
 
                References
                
 
                
@@ -7270,7 +7270,7 @@ You can perform an inverse calculation from kc_overall_KC, wher
 
 
                Geometry and Calculation 
                
 
                This heat transfer function enables a calculation of heat transfer coefficient for laminar and turbulent flow regime. The geometry, constant and fluid parameters of the function are the same as for
-kc_laminar  and kc_turbulent.
+kc_laminar  and kc_turbulent.
 
                
 
                
 The calculation conditions for laminar and turbulent flow is equal to the calculation in kc_laminar
@@ -7282,7 +7282,7 @@ The mean Nusselt number Nu = sqrt(Nu_lam^2 + Nu_turb^2) represe
 
                
 
 
                
-\"kc_overall\"/
+\"kc_overall\"/
 
                
 
 
                References
                
@@ -7326,7 +7326,7 @@ You can perform an inverse calculation from kc_turbulent_KC, wh
 
                Geometry 
                
 
 
                
-\"plate\"/
+\"plate\"/
 
                
 
 
                Calculation
                
@@ -7368,7 +7368,7 @@ The mean Nusselt number in turbulent regime Nu representing the
 
                
 
 
                
-\"kc_turbulent\"/
+\"kc_turbulent\"/
 
                
 
 
                References
                
@@ -7419,7 +7419,7 @@ You can perform an inverse calculation from kc_laminar_KC, wher
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -7487,7 +7487,7 @@ This verification has been done with the fluid properties of Water (Prandtl numb
 
                
 
 
                
-\"kc_laminar\"/
+\"kc_laminar\"/
 
                
 
 
                References
                
@@ -7536,7 +7536,7 @@ You can perform an inverse calculation from kc_overall_KC, wher
 
                Geometry and Calculation 
                
 
 
                This heat transfer function enables a calculation of heat transfer coefficient for laminar and turbulent flow regime. The geometry, constant and fluid parameters of the function are the same as for
-kc_laminar  and kc_turbulent.
+kc_laminar  and kc_turbulent.
 
                
 
                
 The calculation conditions for laminar and turbulent flow is equal to the calculation in kc_laminar
@@ -7552,7 +7552,7 @@ The following verification considers pressure loss influence (roughness =2).
 
                
 
 
                
-\"kc_overall\"/
+\"kc_overall\"/
 
                
 
 
                References
                
@@ -7602,7 +7602,7 @@ You can perform an inverse calculation from kc_turbulent_KC, wh
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -7671,7 +7671,7 @@ The mean Nusselt number Nu representing the mean convective hea
 
                
 
 
                
-\"kc_turbulent\"/
+\"kc_turbulent\"/
 
                
 
 
                
@@ -7709,7 +7709,7 @@ Calculation of local two phase heat transfer coefficient Geometry 
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -7795,7 +7795,7 @@ Here the validation of the two phase heat transfer coefficient is shown for boil
 
                
 
 
                
-\"kc_twoPhaseOverall_KC_4\"/
+\"kc_twoPhaseOverall_KC_4\"/
 
                
 
 
                The two phase heat transfer coefficient (kc_2ph) w.r.t. Gungor/Winterton is shown in dependence of the mass flow rate quality (x_flow) for different mass flow rate densities (mdot_A). The validation has been done with measurement results from Kattan/Thome for R134a as medium.
                
@@ -7809,7 +7809,7 @@ Here the validation of the two phase heat transfer coefficient is shown for cond
 
                
 
 
                
-\"kc_twoPhaseOverall_KC_2\"/
+\"kc_twoPhaseOverall_KC_2\"/
 
                
 
 
                The two phase heat transfer coefficient (kc_2ph) w.r.t. Shah is shown in dependence of the mass flow rate quality (x_flow) for different mass flow rate densities (mdot_A). The validation has been done with measurement results from Dobson/Chato for R134a as medium.
                
@@ -7858,7 +7858,7 @@ This function shall be used inside of the restricted limits according to the ref
 
 
                Geometry
                
 
                
-\"circularBend\"/
+\"circularBend\"/
 
                
 
 
                Calculation
                
@@ -8002,20 +8002,20 @@ Re_lam_leave = 754*exp(if k ≤ 0.007 then 0.0065/0.007 else 0.0065/k)
 
                The pressure loss coefficient zeta_TOT of a curved bend in dependence of the Reynolds number Re for different relative curvature radii R_0/d_hyd and different angles of turning delta is shown in the figures below.
                
 
 
                
-\"dp_curvedOverall_1\"/
+\"dp_curvedOverall_1\"/
 
                
 
 
                There are deviations of the pressure loss coefficient zeta_TOT comparing different references. Usually these deviations in the transition regime have to be accepted due to an uncertainty for the determination of comparable boundary conditions in the different references. Nevertheless these calculations cover the usual range of pressure loss coefficients for a curved bend. The pressure loss coefficient zeta_TOT for the same geometry can be adjusted via varying the average height of surface asperities K for calibration.
                
 
                The pressure loss in dependence of the mass flow rate of water is shown for different relative curvature radii:
                
 
 
                
-\"dp_curvedOverall_2\"/
+\"dp_curvedOverall_2\"/
 
                
 
 
                The pressure loss in dependence of the mass flow rate of water is shown for different angles of turning:
                
 
 
                
-\"dp_curvedOverall_3\"/
+\"dp_curvedOverall_3\"/
 
                
 
 
                Note that there is a small deviation between the compressible and incompressible calculation due to the lack of a direct analytical invertibility.
                
@@ -8062,7 +8062,7 @@ This function shall be used inside of the restricted limits according to the ref
 
                Geometry
                
 
 
                
-\"edgedBend\"/
+\"edgedBend\"/
 
                
 
 
                Calculation
                
@@ -8190,7 +8190,7 @@ The pressure loss coefficient zeta_TOT of a edged bend in depen
 
                
 
 
                
-\"dp_edgedOverall_1\"/
+\"dp_edgedOverall_1\"/
 
                
 
 
                
@@ -8219,7 +8219,7 @@ The pressure loss in dependence of the mass flow rate of water is shown for diff
 
                
 
 
                
-\"dp_edgedOverall_2\"/
+\"dp_edgedOverall_2\"/
 
                
 
 
                
@@ -8230,7 +8230,7 @@ The mass flow rate in dependence of the pressure loss of water is shown for diff
 
                
 
 
                
-\"dp_edgedOverall_3\"/
+\"dp_edgedOverall_3\"/
 
                
 
 
                References
                
@@ -8277,7 +8277,7 @@ This function shall be used inside of the restricted limits according to the ref
 
                Geometry
                
 
 
                
-\"pLchannel\"/
+\"pLchannel\"/
 
                
 
 
                Calculation
                
@@ -8317,7 +8317,7 @@ zeta_TOT = CF_lam/Re * (L/d_hyd)
         
                The turbulent regime can be calculated with the pressure loss correlations for a straight pipe with the hydraulic diameter of
            the chosen geometry instead of the internal diameter of a straight pipe according to [VDI 2002, p. Lab 4, sec. 2.1] .
            The documentation of turbulent fluid flow for a straight pipe is shown in
-           dp_turbulent.
                
+           dp_turbulent.
                
 
 
 
                
@@ -8341,7 +8341,7 @@ The Darcy friction factor (lambda_FRI) of a channel with differ
 
                
 
 
                
-\"dp_internalFlowOverall\"/
+\"dp_internalFlowOverall\"/
 
                
 
 
                
@@ -8486,11 +8486,11 @@ The mass flow rate m_flow for different coefficients Km
 
                
 
 
                
-\"dp_idealGas\"/
+\"dp_idealGas\"/
 
                
 
 
                
-Note that the verification for dp_idealGas is also valid for this inverse calculation due to using the same functions.
+Note that the verification for dp_idealGas is also valid for this inverse calculation due to using the same functions.
 
                
 
                References
                
 
                
@@ -8586,7 +8586,7 @@ The generic pressure loss DP in dependence of the mass flow rat
 
                
 
 
                
-\"dp_nominalDensityViscosity_i\"/
+\"dp_nominalDensityViscosity_i\"/
 
                
 
 
                
@@ -8597,7 +8597,7 @@ The generic mass flow rate M_FLOW in dependence of the pressure
 
                
 
 
                
-\"dp_nominalDensityViscosity_c\"/
+\"dp_nominalDensityViscosity_c\"/
 
                
 
 
                References
                
@@ -8735,11 +8735,11 @@ The generic mass flow rate M_FLOW in dependence of the pressure
 
                
 
 
                
-\"dp_nominalPressureLossLawDensity\"/
+\"dp_nominalPressureLossLawDensity\"/
 
                
 
 
                
-Note that the verification for dp_nominalPressureLossLawDensity is also valid for this inverse calculation due to using the same functions.
+Note that the verification for dp_nominalPressureLossLawDensity is also valid for this inverse calculation due to using the same functions.
 
                
 
 
                References
                
@@ -8792,11 +8792,11 @@ The mass flow rate M_FLOW in dependence of the pressure loss 
 
 
                
-\"dp_pressureLossCoefficient\"/
+\"dp_pressureLossCoefficient\"/
 
                
 
 
                
-Note that the verification for dp_pressureLossCoefficient is also valid for this inverse calculation due to using the same functions.
+Note that the verification for dp_pressureLossCoefficient is also valid for this inverse calculation due to using the same functions.
 
                
 
 
                References
                
@@ -8852,11 +8852,11 @@ The generic pressure loss dp for different coefficients 
 
 
                
-\"dp_volumeFlowRate\"/
+\"dp_volumeFlowRate\"/
 
                
 
 
                
-Note that the verification for dp_volumeFlowRate is also valid for this inverse calculation due to using the same functions.
+Note that the verification for dp_volumeFlowRate is also valid for this inverse calculation due to using the same functions.
 
                
 
 
                References
                
@@ -8899,7 +8899,7 @@ This function shall be used within the restricted limits according to the refere
 
                Geometry 
                
 
 
                
-\"suddenChangeSection\"/
+\"suddenChangeSection\"/
 
                
 
 
                Calculation
                
@@ -8952,7 +8952,7 @@ The local resistance coefficient zeta_LOC of a sudden expansion
 
                
 
 
                
-\"suddenChangeExpansion\"/
+\"suddenChangeExpansion\"/
 
                
 
 
                
@@ -8960,7 +8960,7 @@ The local resistance coefficient zeta_LOC of a sudden contracti
 
                
 
 
                
-\"suddenChangeContraction\"/
+\"suddenChangeContraction\"/
 
                
 
 
                References
                
@@ -8995,7 +8995,7 @@ This function shall be used within the restricted limits according to the refere
 
                Geometry
                
 
 
                
-\"thickEdged\"/
+\"thickEdged\"/
 
                
 
 
                Calculation
                
@@ -9054,7 +9054,7 @@ The pressure loss coefficient zeta_TOT of a thick edged orifice
 
                
 
 
                
-\"thickEdgedOverall_1\"/
+\"thickEdgedOverall_1\"/
 
                
 
 
                
@@ -9065,7 +9065,7 @@ The pressure loss DP of an thick edged orifice in dependence of
 
                
 
 
                
-\"thickEdgedOverall_2\"/
+\"thickEdgedOverall_2\"/
 
                
 
 
                
@@ -9073,7 +9073,7 @@ The pressure loss DP of an thick edged orifice in dependence of
 
                
 
 
                
-\"thickEdgedOverall_3\"/
+\"thickEdgedOverall_3\"/
 
                
 
 
                References
                
@@ -9113,7 +9113,7 @@ This function shall be used inside of the restricted limits according to the ref
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -9168,7 +9168,7 @@ The Darcy friction factor lambda_FRI in dependence of Reynolds
 
                
 
 
                
-\"laminar\"/
+\"laminar\"/
 
                
 
 
                
@@ -9176,7 +9176,7 @@ The pressure loss dp for the laminar regime in dependence of th
 
                
 
 
                
-\"dp_laminar\"/
+\"dp_laminar\"/
 
                
 
 
                
@@ -9184,7 +9184,7 @@ Note that this pressure loss function shall not be used for the modelling outsid
 
                
 
                
 If the whole flow
-regime shall be modelled, the pressure loss function dp_overall can be used.
+regime shall be modelled, the pressure loss function dp_overall can be used.
 
                
 
 
                References
                
@@ -9221,7 +9221,7 @@ This function shall be used within the restricted limits according to the refere
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -9318,7 +9318,7 @@ The Darcy friction factor lambda_FRI in dependence of Reynolds
 
                
 
 
                
-\"dp_overall_1\"/
+\"dp_overall_1\"/
 
                
 
 
                
@@ -9326,7 +9326,7 @@ The pressure loss dp for the turbulent regime in dependence of
 
                
 
 
                
-\"dp_overall_2\"/
+\"dp_overall_2\"/
 
                
 
 
                
@@ -9334,7 +9334,7 @@ And the mass flow rate m_flow for the turbulent regime in depen
 
                
 
 
                
-\"dp_overall_3\"/
+\"dp_overall_3\"/
 
                
 
 
                References
                
@@ -9376,7 +9376,7 @@ This function shall be used within the restricted limits according to the refere
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -9451,7 +9451,7 @@ The Darcy friction factor lambda_FRI in dependence of Reynolds
 
                
 
 
                
-\"turbulent\"/
+\"turbulent\"/
 
                
 
 
                
@@ -9459,7 +9459,7 @@ Note that this pressure loss function shall not be used for the modelling outsid
 
                
 
 
                
-If the overall flow regime shall be modelled, the pressure loss function dp_overall can be used.
+If the overall flow regime shall be modelled, the pressure loss function dp_overall can be used.
 
                
 
 
                References
                
@@ -9496,7 +9496,7 @@ This function shall be used within the restricted limits according to the refere
 
                Geometry 
                
 
 
                
-\"straightPipe\"/
+\"straightPipe\"/
 
                
 
 
                Calculation
                
@@ -9680,7 +9680,7 @@ The two phase pressure loss for a horizontal pipe calculated by the correlation
 
                
 
 
                
-\"dp_twoPhaseOverall_1\"/
+\"dp_twoPhaseOverall_1\"/
 
                
 
 
                
@@ -9688,7 +9688,7 @@ The two phase pressure loss for a horizontal pipe calculated by the correlation
 
                
 
 
                
-\"dp_twoPhaseOverall_4\"/
+\"dp_twoPhaseOverall_4\"/
 
                
 
 
                References
                
@@ -9804,7 +9804,7 @@ The pressure loss coefficient (zeta_TOT) of a valve with differ
 
                
 
 
                
-\"dp_severalGeometryOverall_z\"
+\"dp_severalGeometryOverall_z\"
 
                
 
 
                
@@ -9817,7 +9817,7 @@ The mass flow rate of different valves at a constant opening of 50% in dependenc
 
                
 
 
                
-\"dp_severalGeometryOverall\"/
+\"dp_severalGeometryOverall\"/
 
                
 
 
                References
                
@@ -10417,7 +10417,7 @@ The gaseous and the liquid part of a fluid in a two phase flow are often discont
 
                
 
 
                
-A mean density assuming a continuous distribution out of a discontinuous two phase fluid flow situation can be calculated with a homogeneous or a heterogeneous approach (see dp_twoPhaseOverall_DP).
                
+A mean density assuming a continuous distribution out of a discontinuous two phase fluid flow situation can be calculated with a homogeneous or a heterogeneous approach (see dp_twoPhaseOverall_DP).
                
 
                
 The following modelling approaches can be used to calculate the mean density of two phase flow:
 
                
@@ -10823,7 +10823,7 @@ Re = CubicInterpolation_Re(0, Re1, Re2, Delta, lambda2);
 
                
 Function CubicInterpolation_Re(..) approximates the Reynolds number
 Re in the transition regime between laminar and turbulent flow
-of the Moody diagram by an inverse formulation of a cubic Hermite spline interpolation. See 
+of the Moody diagram by an inverse formulation of a cubic Hermite spline interpolation. See 
 Modelica.Fluid.UsersGuide.ComponentDefinition.WallFriction (especially Region 2)
 for a detailed explanation.
 
                
@@ -10880,7 +10880,7 @@ lambda2 = CubicInterpolation_lambda(Re, Re1, Re2, Delta);
 Function CubicInterpolation_lambda(..) approximates the modified friction coefficient
 lambda2=lambda*Re^2 in the transition regime between laminar and turbulent flow
 of the Moody diagram by a (direct) cubic Hermite spline interpolation.
-See 
+See 
 Modelica.Fluid.UsersGuide.ComponentDefinition.WallFriction (especially Region 2)
 for a detailed explanation.
 
                
@@ -10925,7 +10925,7 @@ within ∞ > y > -1/e.  The relative deviation of this approximation for Lam
 
                
 
 
                
-\"LambertW_deviation\"/
+\"LambertW_deviation\"/
 
                
 
 
                
@@ -11081,7 +11081,7 @@ For |x| > 1 both functions return identical results.
 
                
 
 
                
-\"SmoothPower\"/
+\"SmoothPower\"/
 
                
 
 
                References
                
@@ -11167,7 +11167,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
 
 
 
                
-\"Stepsmoother\"/
+\"Stepsmoother\"/
 
                
 
 
                References
                
@@ -11623,7 +11623,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/channel/icon_channel.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/channel/icon_channel.png")}));
         end Channel_i;
 
         partial model General_i "Icon for general heat transfer component"
@@ -11632,7 +11632,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/general/icon_general.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/general/icon_general.png")}));
         end General_i;
 
         partial model HeatExchanger_i
@@ -11642,7 +11642,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/heatExchanger/icon_heatExchanger.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/heatExchanger/icon_heatExchanger.png")}));
         end HeatExchanger_i;
 
         partial model HelicalPipe_i "Icon for heat transfer in a helical pipe"
@@ -11651,7 +11651,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/helicalPipe/icon_helicalPipe.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/helicalPipe/icon_helicalPipe.png")}));
         end HelicalPipe_i;
 
         partial model Plate_i "Icon for heat transfer of a plate"
@@ -11659,7 +11659,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
-                    fileName="modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/plate/icon_plate.png")}));
+                    fileName="modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/plate/icon_plate.png")}));
         end Plate_i;
 
         partial model StraightPipe_i
@@ -11669,7 +11669,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/straightPipe/icon_straightPipe.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/straightPipe/icon_straightPipe.png")}));
 
         end StraightPipe_i;
       end HeatTransfer;
@@ -12358,7 +12358,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
-                    fileName="modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/bend/icon_bend.png")}));
+                    fileName="modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/bend/icon_bend.png")}));
         end Bend_i;
 
         partial model Channel_i "Icon for channel"
@@ -12367,7 +12367,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/channel/icon_channel.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/channel/icon_channel.png")}));
         end Channel_i;
 
         partial model General_i "Icon for general pressure drop"
@@ -12376,7 +12376,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/general/icon_general.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/general/icon_general.png")}));
         end General_i;
 
         partial model HeatExchanger_i
@@ -12384,7 +12384,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
                     {100,100}}), graphics={Bitmap(extent={{-100,-100},{100,100}},
                   fileName=
-                  "modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/heatExchanger/icon_heatExchanger.png")}));
+                  "modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/heatExchanger/icon_heatExchanger.png")}));
         end HeatExchanger_i;
 
         partial model Orifice_i "Icon for orifice"
@@ -12393,7 +12393,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/orifice/icon_orifice.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/orifice/icon_orifice.png")}));
         end Orifice_i;
 
         partial model StraightPipe_i "Icon for straight pipe"
@@ -12402,7 +12402,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
                     fileName=
-                      "modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/StraightPipe/icon_straightPipe.png")}));
+                      "modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/StraightPipe/icon_straightPipe.png")}));
         end StraightPipe_i;
 
         partial model Valve_i "Icon for valve"
@@ -12410,7 +12410,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
                     -100},{100,100}}), graphics={Bitmap(extent={{-100,-100},{
                       100,100}},
-                    fileName="modelica://Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/valve/icon_valve.png")}));
+                    fileName="modelica:/Modelica/Resources/Images/Fluid/Dissipation/PressureLoss/valve/icon_valve.png")}));
         end Valve_i;
       end PressureLoss;
 
diff --git a/Modelica/Fluid/Examples/AST_BatchPlant.mo b/Modelica/Fluid/Examples/AST_BatchPlant.mo
index 47a4b73ead..bf0b9d4244 100644
--- a/Modelica/Fluid/Examples/AST_BatchPlant.mo
+++ b/Modelica/Fluid/Examples/AST_BatchPlant.mo
@@ -576,14 +576,14 @@ package AST_BatchPlant
         points={{-8,99},{-8,20},{-8,20}}, color={0,127,255}));
     annotation (experiment(StopTime=3600,Interval=1),
       __Dymola_Commands(file=
-            "modelica://Modelica/Resources/Scripts/Dymola/Fluid/AST_BatchPlant_StandardWater/plot level.mos"
+            "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/AST_BatchPlant_StandardWater/plot level.mos"
           "plot level"),
       Documentation(info="
 
                
-Documentation for this example can be found on the enclosing package.
+Documentation for this example can be found on the enclosing package.
 
                
 
                
-\"BatchPlant_StandardWater.png\"
 
                
 "),
@@ -2235,7 +2235,7 @@ below.
 
                
 
 
                
-\"AST_BatchPlant1.jpg\"
 
                
 
@@ -2244,7 +2244,7 @@ The flow sheet diagram is shown in the next figure.
 
                
 
 
                
-\"AST_BatchPlant2.png\"
 
                
 
diff --git a/Modelica/Fluid/Examples/BranchingDynamicPipes.mo b/Modelica/Fluid/Examples/BranchingDynamicPipes.mo
index 106aeb4690..2a18f41b17 100644
--- a/Modelica/Fluid/Examples/BranchingDynamicPipes.mo
+++ b/Modelica/Fluid/Examples/BranchingDynamicPipes.mo
@@ -151,10 +151,10 @@ In such cases one might consider changing the modelStructure.
 In the BranchingDynamicPipes example, {pipe1,pipe3,pipe4}.modelStructure are configured to a_v_b, while pipe2.modelStructure remains av_vb.
 This avoids a high-index DAE and overdetermined initial conditions.
 
                
-\"BranchingDynamicPipes.png\"
 "), experiment(StopTime=10),
     __Dymola_Commands(file(ensureSimulated=true)=
-        "modelica://Modelica/Resources/Scripts/Dymola/Fluid/BranchingDynamicPipes/plotResults.mos"
+        "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/BranchingDynamicPipes/plotResults.mos"
         "plotResults"));
 end BranchingDynamicPipes;
diff --git a/Modelica/Fluid/Examples/ControlledTankSystem.mo b/Modelica/Fluid/Examples/ControlledTankSystem.mo
index dd866646d6..6f9eebcffa 100644
--- a/Modelica/Fluid/Examples/ControlledTankSystem.mo
+++ b/Modelica/Fluid/Examples/ControlledTankSystem.mo
@@ -196,11 +196,11 @@ This example is based on
      Lund, Sweden, March 30, 2004
                 
 
                
 
-\"ControlledTanks.png\"
 "),
       __Dymola_Commands(file=
-            "modelica://Modelica/Resources/Scripts/Dymola/Fluid/ControlledTanks/plot level and ports.m_flow.mos"
+            "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/ControlledTanks/plot level and ports.m_flow.mos"
           "plot level and ports.m_flow"));
   end ControlledTanks;
 
diff --git a/Modelica/Fluid/Examples/DrumBoiler.mo b/Modelica/Fluid/Examples/DrumBoiler.mo
index e10f16cb0a..0f7906896d 100644
--- a/Modelica/Fluid/Examples/DrumBoiler.mo
+++ b/Modelica/Fluid/Examples/DrumBoiler.mo
@@ -162,7 +162,7 @@ package DrumBoiler
       experiment(StopTime=5400),
       Documentation(info="
 
-\"DrumBoiler.png\"
 "));
   end DrumBoiler;
diff --git a/Modelica/Fluid/Examples/Explanatory.mo b/Modelica/Fluid/Examples/Explanatory.mo
index 1ac9297547..08f7e3e9ed 100644
--- a/Modelica/Fluid/Examples/Explanatory.mo
+++ b/Modelica/Fluid/Examples/Explanatory.mo
@@ -142,7 +142,7 @@ how the temperature is measured:
 
                
 
 
                
-\"MeasuringTemperature1.png\"
 
                
 
@@ -173,7 +173,7 @@ present as for T_twoPort.T.
 
                
 
 
                
-\"MeasuringTemperature2.png\"
 
                
 
@@ -250,7 +250,7 @@ present as for T_twoPort.T.
 This example shows the use of a sudden expansion / contraction model, which is connected to two boundary conditions prescribing static pressure. Notice that the prescribed static pressure on the right boundary is higher than on the left one. Still, the fluid flows from left to right.
 
                
 
                
-The reason for this is that the boundary conditions model infinite reservoirs with an infinite diameter and thus zero flow velocity. The sudden expansion model does however have two ends with finite diameters, and, as explained in the Overview of the Users' Guide, the momentum balance is not fulfilled exactly for this type of connections. Using a simple connect()-statement, the difference of the kinetic terms is neglected, which is not reasonable in the present model: At the left boundary condition it is zero, and on the left side of the sudden expansion it has a non-zero value. It is not reasonable to neglect it in the shown model, because there is little friction and therefore these kinetic effects dominate. Consequently, only modelling these effects explicitly leads to the correct results.
+The reason for this is that the boundary conditions model infinite reservoirs with an infinite diameter and thus zero flow velocity. The sudden expansion model does however have two ends with finite diameters, and, as explained in the Overview of the Users' Guide, the momentum balance is not fulfilled exactly for this type of connections. Using a simple connect()-statement, the difference of the kinetic terms is neglected, which is not reasonable in the present model: At the left boundary condition it is zero, and on the left side of the sudden expansion it has a non-zero value. It is not reasonable to neglect it in the shown model, because there is little friction and therefore these kinetic effects dominate. Consequently, only modelling these effects explicitly leads to the correct results.
 
                
 
                
 To do so, two additional sudden expansions / contractions are included in the model. The diameter is set to a large value (1e60) close to the boundaries and the proper values close to the original model. These additional components now introduce exact momentum balances and the results are as expected.
@@ -259,11 +259,11 @@ To do so, two additional sudden expansions / contractions are included in the mo
 The total pressures offer an additional perspective on the model. After setting the parameter show_totalPressures on the Advanced tab of the AbruptAdaptors to true, the total pressures are included in said models and may be plotted. This allows to confirm that the total pressure always reduces along the flow direction, even in the upper model.
 
                
 
-\"MomentumBalanceFittings.png\"
 "),
       __Dymola_Commands(file=
-            "modelica://Modelica/Resources/Scripts/Dymola/Fluid/MomentumBalanceFittings/Plot the model results.mos"
+            "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/MomentumBalanceFittings/Plot the model results.mos"
           "Plot the model results"),
       experiment(StopTime=1.1));
   end MomentumBalanceFittings;
diff --git a/Modelica/Fluid/Examples/HeatExchanger.mo b/Modelica/Fluid/Examples/HeatExchanger.mo
index 3b9eba7720..afae7dbfaf 100644
--- a/Modelica/Fluid/Examples/HeatExchanger.mo
+++ b/Modelica/Fluid/Examples/HeatExchanger.mo
@@ -91,7 +91,7 @@ package HeatExchanger "Demo of a heat exchanger model"
             1e-005),
       Documentation(info="
 
                The simulation start in steady state with counterflow operation. At time t = 50, the mass flow rate on the secondary circuit is changed to a negative value in 5 seconds. After a transient, the heat exchanger operates in co-current flow.
                
-
                \"HeatExchanger.png\"/
                
+
                \"HeatExchanger.png\"/
                
 "));
   end HeatExchangerSimulation;
 
diff --git a/Modelica/Fluid/Examples/HeatingSystem.mo b/Modelica/Fluid/Examples/HeatingSystem.mo
index b739462e8f..0e74cd289d 100644
--- a/Modelica/Fluid/Examples/HeatingSystem.mo
+++ b/Modelica/Fluid/Examples/HeatingSystem.mo
@@ -209,10 +209,10 @@ is treated as high-index DAE, as opposed to a nonlinear equation system for conn
 could be additionally introduced to model the fitting between the heater and the pipe, e.g., to adapt different diameters.
 
                
 
-\"HeatingSystem.png\"
 "), experiment(StopTime=6000),
     __Dymola_Commands(file(ensureSimulated=true)=
-        "modelica://Modelica/Resources/Scripts/Dymola/Fluid/HeatingSystem/plotResults.mos"
+        "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/HeatingSystem/plotResults.mos"
         "plotResults"));
 end HeatingSystem;
diff --git a/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo b/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo
index dfe042337b..cce9777832 100644
--- a/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo
+++ b/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo
@@ -246,7 +246,7 @@ When configuring pipeModelStructure=a_v_b, the flow models at t
 A common work-around is to introduce \"mixing volumes\" in critical connections.
 
                
 Here the problem is treated alternatively with the default pipeModelStructure=av_vb of the
-DynamicPipe model.
+DynamicPipe model.
 Each pipe exposes the states of the outer fluid segments to the respective fluid ports.
 Consequently the pressures of all connected pipe segments get lumped together into one mass balance spanning the whole connection set.
 Overall this treatment as high-index DAE results in the reduction to 9 pressure states, preventing algebraic loops in connections.
@@ -272,12 +272,12 @@ from each other, despite of pressures being lumped together. The following simul
 
                
 The fluid temperatures in the pipes of interest are exposed through heatPorts.
 
                
-\"IncompressibleFluidNetwork.png\"
 "),
     experiment(StopTime=200),
     __Dymola_Commands(file=
-          "modelica://Modelica/Resources/Scripts/Dymola/Fluid/IncompressibleFluidNetwork/plotResults.mos"
+          "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/IncompressibleFluidNetwork/plotResults.mos"
         "plotResults"),
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{120,
             100}})),
diff --git a/Modelica/Fluid/Examples/InverseParameterization.mo b/Modelica/Fluid/Examples/InverseParameterization.mo
index 42ba017254..62432c8f84 100644
--- a/Modelica/Fluid/Examples/InverseParameterization.mo
+++ b/Modelica/Fluid/Examples/InverseParameterization.mo
@@ -97,7 +97,7 @@ equation
   connect(pump.port_b, pipe2.port_a) annotation (Line(
       points={{-20,20},{0,20},{0,-60},{20,-60}}, color={0,127,255}));
   annotation (
-    __Dymola_Commands(file(ensureSimulated=true)="modelica://Modelica/Resources/Scripts/Dymola/Fluid/InverseParameterization/plotResults.mos"
+    __Dymola_Commands(file(ensureSimulated=true)="modelica:/Modelica/Resources/Scripts/Dymola/Fluid/InverseParameterization/plotResults.mos"
         "plotResults"),
     experiment(StopTime=10, Interval=0.001),
     Documentation(info="
@@ -130,7 +130,7 @@ can be used to change the flow through pipe1 from fully turbulent (eps_m_flow_tu
 Invoke plotResults and see pipe1.port_a.m_flow. Relating the actual flow to pipe1.flowModel.m_flows_turbulent[1],
 it can be seen that eps_m_flow_turbulent=0.1 is an appropriate choice for the given pipe diameter.
 
                
-\"InverseParametrization.png\"
 "));
 end InverseParameterization;
diff --git a/Modelica/Fluid/Examples/NonCircularPipes.mo b/Modelica/Fluid/Examples/NonCircularPipes.mo
index f77b25be48..11ebb1f2a5 100644
--- a/Modelica/Fluid/Examples/NonCircularPipes.mo
+++ b/Modelica/Fluid/Examples/NonCircularPipes.mo
@@ -55,7 +55,7 @@ Although the hydraulic diameter of both pipes are the same, the different cross
 velocities and by this different outlet pressures (7.324 bar for the circular pipe versus 9.231 bar for the
 circular ring pipe).
 
                
-
                \"NonCircularPipes.png\"
                
 ", revisions="
 
                  
diff --git a/Modelica/Fluid/Examples/PumpingSystem.mo b/Modelica/Fluid/Examples/PumpingSystem.mo
index eeeec4627d..7c1cfeca7c 100644
--- a/Modelica/Fluid/Examples/PumpingSystem.mo
+++ b/Modelica/Fluid/Examples/PumpingSystem.mo
@@ -139,7 +139,7 @@ The water controller is a simple on-off controller, regulating on the gauge pres
 Simulate for 2000 s. When the valve is opened at time t=200, the pump starts turning on and off to keep the reservoir level around 2 meters, which roughly corresponds to a gauge pressure of 200 mbar.
 
                  
 
-\"PumpingSystem.png\"
 ", revisions="
 
                    
diff --git a/Modelica/Fluid/Examples/Tanks.mo b/Modelica/Fluid/Examples/Tanks.mo
index 18c5487b43..76483788a7 100644
--- a/Modelica/Fluid/Examples/Tanks.mo
+++ b/Modelica/Fluid/Examples/Tanks.mo
@@ -90,11 +90,11 @@ package Tanks "Library demonstrating the usage of the tank model"
 
     annotation (experiment(StopTime=200),
       __Dymola_Commands(file=
-            "modelica://Modelica/Resources/Scripts/Dymola/Fluid/ThreeTanks/plot level and port.m_flow.mos"
+            "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/ThreeTanks/plot level and port.m_flow.mos"
           "plot level and port.m_flow"),
       Documentation(info="
 
-\"ThreeTanks.png\"
 "));
   end ThreeTanks;
@@ -195,7 +195,7 @@ package Tanks "Library demonstrating the usage of the tank model"
 
     annotation (experiment(StopTime=25000, Interval=5.0),
       __Dymola_Commands(file=
-            "modelica://Modelica/Resources/Scripts/Dymola/Fluid/TanksWithOverflow/plot level and port.m_flow.mos"
+            "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/TanksWithOverflow/plot level and port.m_flow.mos"
           "plot level and port.m_flow"),
       Documentation(info="
 
                    The mass flow rate to the upper tank is controlled by the static pressure at its bottom.
@@ -211,7 +211,7 @@ Otherwise the simulation may fail due to too large steps subject to events. Alte
 simulation accuracy could be increased in order to avoid errors.
 
                    
 
-\"TanksWithOverflow.png\"
 "),
       Diagram(coordinateSystem(extent={{-160,-120},{100,100}})));
@@ -262,10 +262,10 @@ simulation accuracy could be increased in order to avoid errors.
 
     annotation (
       experiment(StopTime=50),
-      __Dymola_Commands(file="modelica://Modelica/Resources/Scripts/Dymola/Fluid/EmptyTanks/plot level and port.p.mos"
+      __Dymola_Commands(file="modelica:/Modelica/Resources/Scripts/Dymola/Fluid/EmptyTanks/plot level and port.p.mos"
           "plot level and port.p"),
       Documentation(info="
-\"EmptyTanks.png\"
 "));
   end EmptyTanks;
diff --git a/Modelica/Fluid/Examples/TraceSubstances.mo b/Modelica/Fluid/Examples/TraceSubstances.mo
index db39fa405d..c814d71210 100644
--- a/Modelica/Fluid/Examples/TraceSubstances.mo
+++ b/Modelica/Fluid/Examples/TraceSubstances.mo
@@ -71,12 +71,12 @@ This scales the residual equations that are used by the solver to the right orde
 of magnitude.
 
                    
 
                    
-\"RoomCO2.png\"
 
                    
 "),
       __Dymola_Commands(file(ensureSimulated=true)=
-          "modelica://Modelica/Resources/Scripts/Dymola/Fluid/RoomCO2/plotConcentrations.mos"
+          "modelica:/Modelica/Resources/Scripts/Dymola/Fluid/RoomCO2/plotConcentrations.mos"
           "plot concentrations"));
   end RoomCO2;
 
@@ -207,7 +207,7 @@ of magnitude.
         points={{-10,0},{-10,-30},{-18,-30}}, color={0,127,255}));
     annotation (
       experiment(StopTime=86400, Tolerance=1e-006),
-      __Dymola_Commands(file(ensureSimulated=true)="modelica://Modelica/Resources/Scripts/Dymola/Fluid/RoomCO2WithControls/plotStatesWithControl.mos"
+      __Dymola_Commands(file(ensureSimulated=true)="modelica:/Modelica/Resources/Scripts/Dymola/Fluid/RoomCO2WithControls/plotStatesWithControl.mos"
           "plot states and controls"),
       Documentation(info="
 
                    
@@ -244,7 +244,7 @@ This scales the residual equations that are used by the solver to the right orde
 of magnitude.
 
                    
 
                    
-\"RoomCO2WithControls.png\"
 
                    
 "));
diff --git a/Modelica/Fluid/Fittings.mo b/Modelica/Fluid/Fittings.mo
index 8243430734..6101454ccf 100644
--- a/Modelica/Fluid/Fittings.mo
+++ b/Modelica/Fluid/Fittings.mo
@@ -41,7 +41,7 @@ might use this inverse function instead, in order to avoid the solution of a non
 
 
                    
 The details of the model are described in the
-documentation of the underlying function.
+documentation of the underlying function.
 
                    
 "));
     end CurvedBend;
@@ -90,7 +90,7 @@ might use this inverse function instead, in order to avoid the solution of a non
 
 
                    
 The details of the model are described in the
-documentation of the underlying function.
+documentation of the underlying function.
 
                    
 
 "));
@@ -154,7 +154,7 @@ might use this inverse function instead, in order to avoid the solution of a non
 
 
                    
 The details of the model are described in the
-documentation of the underlying function.
+documentation of the underlying function.
 
                    
 
 "));
@@ -255,7 +255,7 @@ might use this inverse function instead, in order to avoid the solution of a non
 
 
                    
 The details of the model are described in the
-documentation of the underlying function.
+documentation of the underlying function.
 
                    
 
 "));
@@ -2128,7 +2128,7 @@ where
 
                    
 This function returns the mass flow rate m_flow as function of pressure loss dp for a curved bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2174,7 +2174,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This function returns the pressure loss dp as function of mass flow rate m_flow for a curved bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2202,7 +2202,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This record is used to define the geometric (constant) data of a curved bend.
 The details of the record are described
-here.
+here.
 
                    
 "));
         end Geometry;
@@ -2255,7 +2255,7 @@ for the CurvedBend fitting component.
 
                    
 This function returns the mass flow rate m_flow as function of pressure loss dp for an edged bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2304,7 +2304,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This function returns the pressure loss dp as function of mass flow rate m_flow for an edged bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2331,7 +2331,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This record is used to define the geometric (constant) data of an edged bend.
 The details of the record are described
-here.
+here.
 
                    
 "));
         end Geometry;
@@ -2390,7 +2390,7 @@ for the EdgedBend fitting component.
 
                    
 This function returns the mass flow rate m_flow as function of pressure loss dp for a thick edged orifice.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2442,7 +2442,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This function returns the pressure loss dp as function of mass flow rate m_flow for a thick edged orifice.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2475,7 +2475,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This record is used to define the geometric (constant) data of a thick edged orifice.
 The details of the record are described
-here.
+here.
 
                    
 "));
         end Geometry;
@@ -2646,7 +2646,7 @@ for the ThickEdgedOrifice fitting component.
 
                    
 This function returns the mass flow rate m_flow as function of pressure loss dp for an edged bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
@@ -2693,7 +2693,7 @@ fluid flows from port_a to port_b (d_a, eta_a) and if fluid flows from port_b to
 
                    
 This function returns the pressure loss dp as function of mass flow rate m_flow for an edged bend.
 The details of the function are described
-here.
+here.
 
                    
 
 
                    
diff --git a/Modelica/Fluid/Pipes.mo b/Modelica/Fluid/Pipes.mo
index 8f88e05545..d025cc3655 100644
--- a/Modelica/Fluid/Pipes.mo
+++ b/Modelica/Fluid/Pipes.mo
@@ -59,12 +59,12 @@ package Pipes "Devices for conveying fluid"
   Documentation(info="
 
                    Model of a straight pipe with constant cross section and with steady-state mass, momentum and energy balances, i.e., the model does not store mass or energy.
 There exist two thermodynamic states, one at each fluid port. The momentum balance is formulated for the two states, taking into account
-momentum flows, friction and gravity. The same result can be obtained by using DynamicPipe with
+momentum flows, friction and gravity. The same result can be obtained by using DynamicPipe with
 steady-state dynamic settings. The intended use is to provide simple connections of vessels or other devices with storage, as it is done in:
 
                    
 
 
                    Numerical Issues
                    
 
                    
@@ -149,17 +149,17 @@ or other flow models without storage, are directly connected.
       annotation (Line(points={{0,55},{0,54},{-34,54},{-34,38.7}}, color={191,0,0}));
     annotation (defaultComponentName="pipe",
   Documentation(info="
-
                    Model of a straight pipe with distributed mass, energy and momentum balances. It provides the complete balance equations for one-dimensional fluid flow as formulated in UsersGuide.ComponentDefinition.BalanceEquations.
                    
+
                    Model of a straight pipe with distributed mass, energy and momentum balances. It provides the complete balance equations for one-dimensional fluid flow as formulated in UsersGuide.ComponentDefinition.BalanceEquations.
                    
 
                    This generic model offers a large number of combinations of possible parameter settings. In order to reduce model complexity, consider defining and/or using a tailored model for the application at hand, such as
-HeatExchanger.
                    
+HeatExchanger.
                    
 
                    DynamicPipe treats the partial differential equations with the finite volume method and a staggered grid scheme for momentum balances. The pipe is split into nNodes equally spaced segments along the flow path. The default value is nNodes=2. This results in two lumped mass and energy balances and one lumped momentum balance across the dynamic pipe.
                    
 
                    Note that this generally leads to high-index DAEs for pressure states if dynamic pipes are directly connected to each other, or generally to models with storage exposing a thermodynamic state through the port. This may not be valid if the dynamic pipe is connected to a model with non-differentiable pressure, like a Sources.Boundary_pT with prescribed jumping pressure. The modelStructure can be configured as appropriate in such situations, in order to place a momentum balance between a pressure state of the pipe and a non-differentiable boundary condition.
                    
-
                    The default modelStructure is av_vb (see Advanced tab). The simplest possible alternative symmetric configuration, avoiding potential high-index DAEs at the cost of the potential introduction of nonlinear equation systems, is obtained with the setting nNodes=1, modelStructure=a_v_b. Depending on the configured model structure, the first and the last pipe segment, or the flow path length of the first and the last momentum balance, are of half size. See the documentation of the base class Pipes.BaseClasses.PartialTwoPortFlow, also covering asymmetric configurations.
                    
-
                    The HeatTransfer component specifies the source term Qb_flows of the energy balance. The default component uses a constant coefficient for the heat transfer between the bulk flow and the segment boundaries exposed through the heatPorts. The HeatTransfer model is replaceable and can be exchanged with any model extended from BaseClasses.HeatTransfer.PartialFlowHeatTransfer.
                    
+
                    The default modelStructure is av_vb (see Advanced tab). The simplest possible alternative symmetric configuration, avoiding potential high-index DAEs at the cost of the potential introduction of nonlinear equation systems, is obtained with the setting nNodes=1, modelStructure=a_v_b. Depending on the configured model structure, the first and the last pipe segment, or the flow path length of the first and the last momentum balance, are of half size. See the documentation of the base class Pipes.BaseClasses.PartialTwoPortFlow, also covering asymmetric configurations.
                    
+
                    The HeatTransfer component specifies the source term Qb_flows of the energy balance. The default component uses a constant coefficient for the heat transfer between the bulk flow and the segment boundaries exposed through the heatPorts. The HeatTransfer model is replaceable and can be exchanged with any model extended from BaseClasses.HeatTransfer.PartialFlowHeatTransfer.
                    
 
                    The intended use is for complex networks of pipes and other flow devices, like valves. See, e.g.,
                    
 
 "),
   Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,100}}), graphics={
@@ -600,7 +600,7 @@ The default value is nNodes=2.
 
                    
 
                    Mass and Energy balances
                    
 
                    
-The mass and energy balances are inherited from Interfaces.PartialDistributedVolume.
+The mass and energy balances are inherited from Interfaces.PartialDistributedVolume.
 One total mass and one energy balance is formed across each segment according to the finite volume approach.
 Substance mass balances are added if the medium contains more than one component.
 
                    
@@ -616,8 +616,8 @@ Moreover it needs to define two vectors of source terms for the distributed ener
 
                    Momentum balance
                    
 
                    
 The momentum balance is determined by the FlowModel component, which can be replaced with any model extended from
-BaseClasses.FlowModels.PartialStaggeredFlowModel.
-The default setting is DetailedPipeFlow.
+BaseClasses.FlowModels.PartialStaggeredFlowModel.
+The default setting is DetailedPipeFlow.
 
                    
 
                    
 This considers
@@ -1054,7 +1054,7 @@ The geometry is specified with the pathLengths[n-1] between the dev
 with the crossAreas[n] and the roughnesses[n] of the device segments.
 Moreover the fluid flow is characterized for different types of devices by the characteristic dimensions[n]
 and the average velocities vs[n] of fluid flow in the device segments.
-See Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber
+See Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber
 for example definitions.
 
                    
 
                    
@@ -1270,7 +1270,7 @@ and due to gravity.
 Correlations of different complexity and validity can be
 selected via the replaceable package WallFriction (see parameter menu below).
 The details of the pipe wall friction model are described in the
-UsersGuide.
+UsersGuide.
 Basically, different variants of the equation
 
                    
 
@@ -1375,7 +1375,7 @@ specified dp_nominal and m_flow_nominal.
 It takes into account the fluid density of each flow segment and
 obtains appropriate pathLengths_nominal values
 for an inverse parameterization of the
-
+
           TurbulentPipeFlow
 model. Per default the upstream and downstream densities are averaged with the setting useUpstreamScheme = false,
 in order to avoid discontinuous pathLengths_nominal values in the case of flow reversal.
@@ -1471,7 +1471,7 @@ The turbulent pressure loss correlation might be useful to optimize models that
 
                    
 This component defines the complete regime of wall friction.
 The details are described in the
-UsersGuide.
+UsersGuide.
 The functional relationship of the friction loss factor λ is
 displayed in the next figure. Function massFlowRate_dp() defines the \"red curve\"
 (\"Swamee and Jain\"), where as function pressureLoss_m_flow() defines the
@@ -1482,7 +1482,7 @@ solving a non-linear equation.
 
                    
 
 
                    
-\"PipeFriction1.png\"
 
                    
 
@@ -1493,7 +1493,7 @@ shown next, the change of elevation with the path from a to b has the opposite
 sign of the change of density.
                    
 
 
                    
-\"PipeFrictionStaticHead_case-a.png\"
 
                    
 
@@ -1502,7 +1502,7 @@ In the case illustrated second, the change of elevation with the path from a to
 b has the same sign of the change of density.
                    
 
 
                    
-\"PipeFrictionStaticHead_case-b.png\"
 
                    
 "), Diagram(coordinateSystem(
@@ -1556,7 +1556,7 @@ The geometry is specified in the interface with the surfaceAreas[n]
 and the lengths[n] along the flow path.
 Moreover the fluid flow is characterized for different types of devices by the characteristic dimensions[n+1]
 and the average velocities vs[n+1] of fluid flow.
-See Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber
+See Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber
 for example definitions.
 
                    
 "),Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},
@@ -1730,7 +1730,7 @@ The following table gives examples for the characteristic dimension D and the ve
 with
   m_flow = v*ρ*A
 
-See also 
+See also 
           Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber.
 "));
       end ReynoldsNumber_m_flow;
@@ -2140,7 +2140,7 @@ systems of equations can still further be reduced.
 
                    
 
 
                    
-In UsersGuide the complete friction regime is illustrated.
+In UsersGuide the complete friction regime is illustrated.
 This component describes only the Hagen-Poiseuille equation.
 
                    
 
                    
@@ -2378,7 +2378,7 @@ This relationship is only valid for large Reynolds numbers.
 
                    
 
 
                    
-In UsersGuide the complete friction regime is illustrated.
+In UsersGuide the complete friction regime is illustrated.
 This component describes only the asymptotic behaviour for large
 Reynolds numbers, i.e., the values at the right ordinate where
 λ is constant.
@@ -3310,7 +3310,7 @@ identical to laminar wall friction.
 
                    
 This component defines the complete regime of wall friction.
 The details are described in the
-UsersGuide.
+UsersGuide.
 The functional relationship of the friction loss factor λ is
 displayed in the next figure. Function massFlowRate_dp() defines the \"red curve\"
 (\"Swamee and Jain\"), where as function pressureLoss_m_flow() defines the
@@ -3321,7 +3321,7 @@ solving a non-linear equation.
 
                    
 
 
                    
-\"PipeFriction1.png\"
 
                    
 
@@ -3332,7 +3332,7 @@ shown next, the change of elevation with the path from a to b has the opposite
 sign of the change of density.
                    
 
 
                    
-\"PipeFrictionStaticHead_case-a.png\"
 
                    
 
@@ -3341,7 +3341,7 @@ In the case illustrated second, the change of elevation with the path from a to
 b has the same sign of the change of density.
                    
 
 
                    
-\"PipeFrictionStaticHead_case-b.png\"
 
                    
 
@@ -3354,7 +3354,7 @@ pressure losses due to wall friction in a pipe.
 Every correlation is defined by a package that is derived
 by inheritance from the package WallFriction.PartialWallFriction.
 The details of the underlying pipe wall friction model are described in the
-UsersGuide.
+UsersGuide.
 Basically, different variants of the equation
 
                    
 
@@ -3368,7 +3368,7 @@ in the next figure:
 
                    
 
 
                    
-\"PipeFriction1.png\"
 
                    
 
diff --git a/Modelica/Fluid/Sensors.mo b/Modelica/Fluid/Sensors.mo
index 41251392ee..b415cc8566 100644
--- a/Modelica/Fluid/Sensors.mo
+++ b/Modelica/Fluid/Sensors.mo
@@ -869,7 +869,7 @@ Moreover the obtained result is restricted to the value flowing into port_a if a
 
                  
 
 
                  
-Modelica.Fluid.Examples.Explanatory.MeasuringTemperature
+Modelica.Fluid.Examples.Explanatory.MeasuringTemperature
 demonstrates the differences between one- and two-port sensor at hand of a
 simple example.
 
                  
diff --git a/Modelica/Fluid/Types.mo b/Modelica/Fluid/Types.mo
index ef89ca4fee..b34c93c8de 100644
--- a/Modelica/Fluid/Types.mo
+++ b/Modelica/Fluid/Types.mo
@@ -219,7 +219,7 @@ Enumeration to define the choice of valve flow coefficient
 
 
                  
 The details of the coefficients are explained in the
-
+
    User's Guide .
 
                  
 
diff --git a/Modelica/Fluid/Utilities.mo b/Modelica/Fluid/Utilities.mo
index 88e8cbd2fc..6573f8df71 100644
--- a/Modelica/Fluid/Utilities.mo
+++ b/Modelica/Fluid/Utilities.mo
@@ -314,14 +314,14 @@ Typical screenshots for two different configurations
 are shown below. The first one with k1=k2=1:
 
                  
 
                  
-\"regRoot2_a.png\"
 
                  
 
                  
 and the second one with k1=1 and k2=3:
 
                  
 
                  
-\"regRoot2_b.png\"
 
                  
 
@@ -329,7 +329,7 @@ and the second one with k1=1 and k2=3:
 The (smooth) derivative of the function with
 k1=1, k2=3 is shown in the next figure:
                  
 
                  
-\"regRoot2_c.png\"
 
                  
 
@@ -463,7 +463,7 @@ such that
 A typical screenshot for k1=1, k2=3 is shown in the next figure:
 
                  
 
                  
-\"regSquare2_b.png\"
 
                  
 
@@ -473,7 +473,7 @@ k1=1, k2=3 is shown in the next figure:
 
                  
 
 
                  
-\"regSquare2_b.png\"
 
                  
 
@@ -765,14 +765,14 @@ Typical screenshots for two different configurations
 are shown below. The first one illustrates five different settings of xi and yid:
 
                  
 
                  
-\"regFun3_a.png\"
 
                  
 
                  
 The second graph shows the continuous derivative of this regularization function:
 
                  
 
                  
-\"regFun3_a.png\"
 
                  
 
diff --git a/Modelica/Fluid/Valves.mo b/Modelica/Fluid/Valves.mo
index ee401c22c5..092ebeee77 100644
--- a/Modelica/Fluid/Valves.mo
+++ b/Modelica/Fluid/Valves.mo
@@ -62,7 +62,7 @@ Valve model according to the IEC 534/ISA S.75 standards for valve sizing, incomp
 
 
                  
 The parameters of this model are explained in detail in
-PartialValve
+PartialValve
 (the base model for valves).
 
                  
 
@@ -77,7 +77,7 @@ If checkValve is false, the valve supports reverse flow, with a sym
 
                  
 The treatment of parameters Kv and Cv is
 explained in detail in the
-User's Guide.
+User's Guide.
 
                  
 
 ",
@@ -162,7 +162,7 @@ explained in detail in the
 
 
                  
 The parameters of this model are explained in detail in
-PartialValve
+PartialValve
 (the base model for valves).
 
                  
 
@@ -174,7 +174,7 @@ The parameters of this model are explained in detail in
 
                  
 The treatment of parameters Kv and Cv is
 explained in detail in the
-User's Guide.
+User's Guide.
 
                  
 
 ",
@@ -271,7 +271,7 @@ explained in detail in the
 
 
                  
 The parameters of this model are explained in detail in
-PartialValve
+PartialValve
 (the base model for valves).
 
                  
 
@@ -283,7 +283,7 @@ The parameters of this model are explained in detail in
 
                  
 The treatment of parameters Kv and Cv is
 explained in detail in the
-User's Guide.
+User's Guide.
 
                  
 
 ",
@@ -464,7 +464,7 @@ it is open.
             fillPattern=FillPattern.Solid)}),
     Documentation(info="
 
                  
-This model is similar to ValveDiscrete,
+This model is similar to ValveDiscrete,
 except that the valve opens gradually with an opening time Topen and closes gradually with
 a closing time Tclose instead of doing so abruptly. This can help to avoid unrealistic phenomena such
 as reversing flows when accurate fluid models with small compressiblity are employed.
@@ -714,16 +714,16 @@ from inlet to outlet are neglected in the energy balance.
                  
 
                  
 
 
                  
-\"ValveCharacteristics1a.png\"
                  
-\"Components/ValveCharacteristics1b.png\"
 
                  
 
 
                  
 The treatment of parameters Kv and Cv is
 explained in detail in the
-User's Guide.
+User's Guide.
 
                  
 
 
                  
@@ -739,7 +739,7 @@ a step input of opening. The icon of a valve changes in the following way
 
                  
 
 
                  
-\"FilteredValveIcon.png\"
 
                  
 
@@ -758,7 +758,7 @@ filteredOpening = true, riseTime = 1 s, and leakageOpening = 0.
 
                  
 
 
                  
-\"ValveFilteredOpening.png\"
 
                  
 
diff --git a/Modelica/Fluid/Vessels.mo b/Modelica/Fluid/Vessels.mo
index eeaeb173dc..a78f09dd4a 100644
--- a/Modelica/Fluid/Vessels.mo
+++ b/Modelica/Fluid/Vessels.mo
@@ -39,7 +39,7 @@ Ideal heat transfer is assumed per default; the thermal port temperature is equa
 
                  
 If use_portsData=true, the port pressures represent the pressures just after the outlet (or just before the inlet) in the attached pipe.
 The hydraulic resistances portsData.zeta_in and portsData.zeta_out determine the dissipative pressure drop between volume and port depending on
-the direction of mass flow. See VesselPortsData and [Idelchik, Handbook of Hydraulic Resistance, 2004].
+the direction of mass flow. See VesselPortsData and [Idelchik, Handbook of Hydraulic Resistance, 2004].
 
                  
 "));
     end ClosedVolume;
@@ -151,7 +151,7 @@ The following assumptions are made:
 
                  
 The port pressures represent the pressures just after the outlet (or just before the inlet) in the attached pipe.
 The hydraulic resistances portsData.zeta_in and portsData.zeta_out determine the dissipative pressure drop between tank and port depending on
-the direction of mass flow. See VesselPortsData and [Idelchik, Handbook of Hydraulic Resistance, 2004].
+the direction of mass flow. See VesselPortsData and [Idelchik, Handbook of Hydraulic Resistance, 2004].
 
                  
 
                  
 With the setting use_portsData=false, the port pressure represents the static head
diff --git a/Modelica/Fluid/package.mo b/Modelica/Fluid/package.mo
index 11f9358cbf..9898c7d9e2 100644
--- a/Modelica/Fluid/package.mo
+++ b/Modelica/Fluid/package.mo
@@ -73,7 +73,7 @@ This library has the following main features:
      or junction should be used if these are important for the specific problem at hand.
      In all circuits where friction dominates, or components such as pumps determine the flow rate,
      kinetic pressure is typically irrelevant. You can consider the
-     Modelica.Fluid.Examples.Explanatory.MomentumBalanceFittings model (and its documentation)
+     Modelica.Fluid.Examples.Explanatory.MomentumBalanceFittings model (and its documentation)
      to see one case where the momentum balance essentially depends on kinetic pressure,
      so it is necessary to use explicit fittings in order to obtain correct results.
      
                   
@@ -94,7 +94,7 @@ This library has the following main features:
 
 
                  
 Please explore the
-Examples,
+Examples,
 which provide simple models for a broad variety of applications.
 
                  
 "));
@@ -124,7 +124,7 @@ one point as shown in the next figure:
 
                  
 
 
                  
-\"MixingConnections.png\"
 
                  
 
@@ -202,7 +202,7 @@ In the simpler case of a one-to-one connections between port_a and port_b,
 inStream(port_a.h_outflow) just returns port_b.h_outflow. For multiple-way connections,
 mixing equations are generated, and special care is taken in order to avoid discontinuities
 around zero flow rates. For more details, see this
-presentation
+presentation
 which illustrates the stream concept rationale and the underlying technicalities.
 
                  
 
@@ -378,19 +378,19 @@ equations hold
 
                  
 
                
   
                
     
-      \"power_capacitor.png\"
     
   
                
 
 
 
 
 
 
 
 
   
 
 
 
 
 
 
 
 
     
     
 
 
 
 
 
                
 
                [Johnson1991]
                B. Johnson, T. Quarles, A. R. Newton, D. O. Pederson, A. Sangiovanni-Vincentelli, SPICE3 Version 3f User's Manual, University of Berkeley, Department of Electrical Engineering and Computer Sciences, USA, 1991, SPICE3 user's manual (© Regents of the University of California).
                B. Johnson, T. Quarles, A. R. Newton, D. O. Pederson, A. Sangiovanni-Vincentelli, SPICE3 Version 3f User's Manual, University of Berkeley, Department of Electrical Engineering and Computer Sciences, USA, 1991, SPICE3 user's manual (© Regents of the University of California).
                		
 
                
 
                
 
                [Kielkowski1994]
                		
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
                
-      
-      
-      
-      
@@ -416,7 +416,7 @@ the \"energy balance 2\":
 
                
 
                
   
                 Mass balance  \"massBalance.png\"
   
                
   
                 Momentum balance  \"momentumBalance.png\"
   
                
   
                 Energy balance 1  \"energyBalance1.png\"
   
                
   
                 Pipe friction  \"pipeFriction.png\"
   
                
   
                
-      
                
   
                 Energy balance 2  \"energyBalance2.png\"
   
                
 
                
@@ -575,7 +575,7 @@ A plot of this characteristic is shown in the next figure:
 
                
 
 
                
-\"sqrt.png\"
 
                
 
@@ -641,7 +641,7 @@ mass flow rate varies only slowly). In this section it is explained how this cas
 handled in the Modelica.Fluid library for pipes with
 nonuniform roughness, including the smooth pipe
 as a special case (see
-Pipes.BaseClasses.WallFriction).
+Pipes.BaseClasses.WallFriction).
 The treatment is non-standard in order to get a
 numerically well-posed description.
 
                
@@ -691,7 +691,7 @@ see \"blue\" curve in the next figure:
 
                
 
 
                
-\"PipeFriction1\"
+\"PipeFriction1\"
 
                
 
 
                
@@ -706,7 +706,7 @@ used in Modelica.Fluid:
 
                
 
 
                
-\"PipeFriction2\"
+\"PipeFriction2\"
 
                
 
 
                
@@ -892,7 +892,7 @@ It is valid for incompressible and compressible flow up to a Mach number of 0.6.
     annotation (Documentation(info="
 
                
 The control valves in
-Modelica.Fluid.Valves
+Modelica.Fluid.Valves
 have the parameters Kv and Cv. They are defined
 as unit-less variables, but in the description text a unit
 is given. The reason for this definition is the following:
@@ -1124,32 +1124,32 @@ Modelica_Fluid was refactored and finalized for the release:
 
 
              •  Complete implementation of one-dimensional fluid flow
                
      The balance equations as documented in
-     UsersGuide.ComponentDefinition.BalanceEquations
+     UsersGuide.ComponentDefinition.BalanceEquations
      are now completely implemented. The implementations with generic boundary flow and source terms find in:
      
      Specific models combine the balances and define the boundary flow and source terms as appropriate.
      For instance
      
      All non-trivial mass and energy balances of Vessels, Machines and Fittings have been replaced with PartialLumpedVolume.
      The mass and energy balances of Pipes are based on PartialDistributedVolume.
                
-     See Examples.BranchingDynamicPipes
+     See Examples.BranchingDynamicPipes
      for an example utilizing the complete balance equations.
                • 
 
 
              •  New approach for the connection of distributed flow models
                
@@ -1165,11 +1165,11 @@ Modelica_Fluid was refactored and finalized for the release:
 
 
              •  Clarification of modeling assumptions
                
      The documentation has been extended to better explain the modeling assumptions made. In particular the section
-     UsersGuide.ComponentDefinition.FluidConnectors
+     UsersGuide.ComponentDefinition.FluidConnectors
      now makes clear that the ports represent the thermodynamic enthalpy, as opposed to stagnation enthalpy,
      and thermodynamic or static pressure, as opposed to total pressure. An new package Explanatory has been added to the
      examples to show the difference between static pressure and total pressure and possible implications. See
-     Examples.Explanatory.MomentumBalanceFittings.
                • 
+     Examples.Explanatory.MomentumBalanceFittings.
 
 
              •  System (former Ambient)
                
      The use of the global System object has been extended towards common default values for
@@ -1178,12 +1178,12 @@ Modelica_Fluid was refactored and finalized for the release:
      In particular steady-state initialization and complete steady-state simulation can now be specified system-wide.
      A new Types.Init.Dynamics has been introduced, combining steady-state and initial conditions.
      The former Types.Init has become obsolete.
-     
                See Examples.HeatingSystem
                • 
+     
                See Examples.HeatingSystem
 
 
              •  Extension of pumps for better consideration of zero flow and heat transfer with environment
                
      The simplified mass and energy balances have been replaced with a rigorous formulation.
      Moreover an optional heat transfer model can be configured for heat exchanged with the environment or the housing.
                
-     See Machines.BaseClasses.PartialPump
                • 
+     See Machines.BaseClasses.PartialPump
 
 
              •  Refinement of valves for flow reversal
                
      All valves now use upstream discretization for reversing flow conditions.
                • 
@@ -1191,7 +1191,7 @@ Modelica_Fluid was refactored and finalized for the release:
 
              •  Finalization of trace substances
                
      Modelica.Fluid now provides a sound implementation for trace substances,
      which can easily be added to existing Media models, in order to study their evolution in a fluid system.
                
-     See Examples.TraceSubstances.RoomCO2WithControls
                • 
+     See Examples.TraceSubstances.RoomCO2WithControls
 
 
              •  Vectorized ports for volumes
                
      The ports of models that typically have large volumes, like Vessels and Sources,
@@ -1199,7 +1199,7 @@ Modelica_Fluid was refactored and finalized for the release:
      of such volume models resulted in unintended mixing equations for stream variables
      in connection sets outside the volumes. The mixing takes place inside the volumes
      when using multiple ports. Moreover a
-     Fittings.MultiPort
+     Fittings.MultiPort
      has been introduced. It can be attached to components like pipes,
      which do not have vectorized ports on their own.
                • 
 
@@ -1210,14 +1210,14 @@ Modelica_Fluid was refactored and finalized for the release:
      are of secondary interest. As these models use the same interfaces, base classes and naming conventions,
      they can easily be replaced with more detailed models
      as more information shall be taken into account later on.
                
-     See Examples.InverseParameterization
+     See Examples.InverseParameterization
 
 
              •  Replaceable HeatTransfer models
                
      The Vessels and the Machines now have replaceable HeatTransfer models,
      besides the Pipes. All HeatTransfer models are optional.
      The heat transfer models are parameterized with the Medium and the ThermodynamicState
      of involved flow segments.
                
-     See Interfaces.PartialHeatTransfer.
                • 
+     See Interfaces.PartialHeatTransfer.
 
 
              •  All examples are working now (using Dymola 7.1).
                
      The number of examples has been extended with the former critical test cases
@@ -1726,7 +1726,7 @@ a simple heating system with a closed flow cycle. By just changing one configura
 
                
 
 
                
-\"HeatingSystem.png\"
 
                
 
@@ -1735,7 +1735,7 @@ With respect to previous versions, the design
 of the connectors has been changed in a non-backward compatible way,
 using the recently developed concept
 of stream connectors that results in much more reliable simulations
-(see also Stream-Connectors-Overview-Rationale.pdf).
+(see also Stream-Connectors-Overview-Rationale.pdf).
 This extension was included in Modelica 3.1.
 
                
 
@@ -1743,10 +1743,10 @@ This extension was included in Modelica 3.1.
 The following parts are useful, when newly starting with this library:
 
                
 
 
                
diff --git a/Modelica/Magnetic/FluxTubes/BaseClasses/FixedShape.mo b/Modelica/Magnetic/FluxTubes/BaseClasses/FixedShape.mo
index 3ae8378627..c54d63fbca 100644
--- a/Modelica/Magnetic/FluxTubes/BaseClasses/FixedShape.mo
+++ b/Modelica/Magnetic/FluxTubes/BaseClasses/FixedShape.mo
@@ -39,7 +39,7 @@ equation
 
   annotation (Documentation(info="
 
                
-Please refer to the description of  the sub-package Shapes.FixedShape for utilisation of this partial model.
+Please refer to the description of  the sub-package Shapes.FixedShape for utilisation of this partial model.
 
                
 "));
 end FixedShape;
diff --git a/Modelica/Magnetic/FluxTubes/BaseClasses/Force.mo b/Modelica/Magnetic/FluxTubes/BaseClasses/Force.mo
index d373115ac7..f7ebb5dc86 100644
--- a/Modelica/Magnetic/FluxTubes/BaseClasses/Force.mo
+++ b/Modelica/Magnetic/FluxTubes/BaseClasses/Force.mo
@@ -70,7 +70,7 @@ equation
         fillColor={0,127,0},
         fillPattern=FillPattern.Solid)}), Documentation(info="
 
                
-Please refer to the description of  the sub-package Shapes.Force for utilisation of this partial model.
+Please refer to the description of  the sub-package Shapes.Force for utilisation of this partial model.
 
                
 "));
 end Force;
diff --git a/Modelica/Magnetic/FluxTubes/BaseClasses/Generic.mo b/Modelica/Magnetic/FluxTubes/BaseClasses/Generic.mo
index 8166d21c6e..2f46ad30fa 100644
--- a/Modelica/Magnetic/FluxTubes/BaseClasses/Generic.mo
+++ b/Modelica/Magnetic/FluxTubes/BaseClasses/Generic.mo
@@ -5,10 +5,10 @@ partial model Generic "Partial Tellinen hysteresis model"
 
   // Group Fixed Geometry (Cuboid)
   parameter SI.Length l=0.1 "Length in direction of flux" annotation (Dialog(group="Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Interfaces/GenericParallelFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Interfaces/GenericParallelFlux.png"));
 
   parameter SI.Area A=1e-4 "Area of cross section" annotation (Dialog(group="Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/GenericParallelFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/GenericParallelFlux.png"));
   final parameter SI.Volume V = A * l "Volume of FluxTube";
   annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
             -100},{100,100}}), graphics={
diff --git a/Modelica/Magnetic/FluxTubes/BaseClasses/GenericHysteresisTellinen.mo b/Modelica/Magnetic/FluxTubes/BaseClasses/GenericHysteresisTellinen.mo
index 78f204a1ec..b4440f74a5 100644
--- a/Modelica/Magnetic/FluxTubes/BaseClasses/GenericHysteresisTellinen.mo
+++ b/Modelica/Magnetic/FluxTubes/BaseClasses/GenericHysteresisTellinen.mo
@@ -57,7 +57,7 @@ der(b) = dhR/diffHyst * der(hystR);
 der(b) = dhF/diffHyst * der(hystF);
 
                • 
 
-
+
                		
 
                
 
                
 Fig. 1: Description of the Tellinen hysteresis model.
diff --git a/Modelica/Magnetic/FluxTubes/BaseClasses/Leakage.mo b/Modelica/Magnetic/FluxTubes/BaseClasses/Leakage.mo
index ddff8f64ad..3889aed40a 100644
--- a/Modelica/Magnetic/FluxTubes/BaseClasses/Leakage.mo
+++ b/Modelica/Magnetic/FluxTubes/BaseClasses/Leakage.mo
@@ -19,7 +19,7 @@ equation
         textString="%name",
         textColor={0,0,255})}), Documentation(info="
 
                
-Please refer to the description of  the sub-package Shapes.Leakage for utilisation of this partial model.
+Please refer to the description of  the sub-package Shapes.Leakage for utilisation of this partial model.
 
                
 "));
 end Leakage;
diff --git a/Modelica/Magnetic/FluxTubes/Basic/Crossing.mo b/Modelica/Magnetic/FluxTubes/Basic/Crossing.mo
index 376119e33d..b791927ac9 100644
--- a/Modelica/Magnetic/FluxTubes/Basic/Crossing.mo
+++ b/Modelica/Magnetic/FluxTubes/Basic/Crossing.mo
@@ -37,8 +37,8 @@ This is a simple crossing of two branches. The ports port_p1 and See also
 
                
-Idle,
-Short
+Idle,
+Short
 
                
 
 ",
diff --git a/Modelica/Magnetic/FluxTubes/Basic/EddyCurrent.mo b/Modelica/Magnetic/FluxTubes/Basic/EddyCurrent.mo
index 6d69f31ba0..dd917d26f0 100644
--- a/Modelica/Magnetic/FluxTubes/Basic/EddyCurrent.mo
+++ b/Modelica/Magnetic/FluxTubes/Basic/EddyCurrent.mo
@@ -52,7 +52,7 @@ Eddy currents are induced in a conductive magnetic flux tube when the flux chang
 
                
 
 
                
-Partitioning of a solid conductive cylinder or prism into several hollow cylinders or separate nested prisms and modelling of each of these flux tubes connected in parallel with a series connection of a reluctance element and an eddy current component can model the delayed buildup of the magnetic field in the complete flux tube from the outer to the inner sections. Please refer to [Ka08] for an illustration.
+Partitioning of a solid conductive cylinder or prism into several hollow cylinders or separate nested prisms and modelling of each of these flux tubes connected in parallel with a series connection of a reluctance element and an eddy current component can model the delayed buildup of the magnetic field in the complete flux tube from the outer to the inner sections. Please refer to [Ka08] for an illustration.
 
                
 ", revisions="
 
                Version 3.2.2, 2014-01-15 (Christian Kral)
                
diff --git a/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverter.mo b/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverter.mo
index fe74f5290b..bafce7f7b0 100644
--- a/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverter.mo
+++ b/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverter.mo
@@ -136,7 +136,7 @@ N * dΦ/dt = -v
 
              
 
 
              
-\"converter
+\"converter
 
              
 
 
              
diff --git a/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverterWithLeakageInductance.mo b/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverterWithLeakageInductance.mo
index 16da6552af..738b7f6037 100644
--- a/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverterWithLeakageInductance.mo
+++ b/Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverterWithLeakageInductance.mo
@@ -158,7 +158,7 @@ equation
         Line(points={{-30,-100},{-30,-60}}, color={28,108,200})}),
     Documentation(info="
 
              
-Same as ElectroMagneticConverter with an additional leakage path on the magnetic side (leakage inductance, leakage flux). This model may improve stability especially when the magnetic circuit contains more than one electromagnetic converter.
+Same as ElectroMagneticConverter with an additional leakage path on the magnetic side (leakage inductance, leakage flux). This model may improve stability especially when the magnetic circuit contains more than one electromagnetic converter.
 
              
 "));
 end ElectroMagneticConverterWithLeakageInductance;
diff --git a/Modelica/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.mo b/Modelica/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.mo
index b9ab6c7c58..f83baccdcb 100644
--- a/Modelica/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.mo
+++ b/Modelica/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.mo
@@ -6,7 +6,7 @@ model LeakageWithCoefficient
   parameter SI.CouplingCoefficient c_usefulFlux(final min=eps, final max=1-eps, start=0.7)
     "Ratio useful flux/(leakage flux + useful flux) = useful flux/total flux"
     annotation (Dialog(groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.png"));
   Blocks.Interfaces.RealInput R_mUsefulTot(quantity="Reluctance", unit="H-1")
     annotation (Placement(transformation(
         extent={{-20,-20},{20,20}},
@@ -17,17 +17,17 @@ equation
   // Generalized Kirchhoff's current law
   annotation (defaultComponentName="leakage", Documentation(info="
 
              
-Differently from the flux tube elements of package Shapes.Leakage
+Differently from the flux tube elements of package Shapes.Leakage
 that are calculated from their geometry, this leakage reluctance is calculated with reference to the total reluctance of a useful flux path. Please refer to the Parameters section for an illustration of the resulting magnetic network. Exploiting Kirchhoff's generalized current law, the leakage reluctance is calculated by means of a coupling coefficient c_usefulFlux.
 
              
 
              
-\"Leakage
+\"Leakage
 
              
 
 
              Attention
              
 
 
              
-This element must not be used for dynamic simulation of electro-magneto-mechanical actuators, where the shape of at least one flux tube element with reluctance force generation in the useful flux path changes with armature motion (e.g., air gap). This change results in a non-zero derivative dG_m/dx of those elements permeance G_m with respect to armature position x, which in turn will lead to a non-zero derivative of the leakage permeance with respect to armature position. This would generate a reluctance force in the leakage element that is not accounted for properly. Shapes.Force.LeakageAroundPoles provides a simple leakage reluctance with force generation.
+This element must not be used for dynamic simulation of electro-magneto-mechanical actuators, where the shape of at least one flux tube element with reluctance force generation in the useful flux path changes with armature motion (e.g., air gap). This change results in a non-zero derivative dG_m/dx of those elements permeance G_m with respect to armature position x, which in turn will lead to a non-zero derivative of the leakage permeance with respect to armature position. This would generate a reluctance force in the leakage element that is not accounted for properly. Shapes.Force.LeakageAroundPoles provides a simple leakage reluctance with force generation.
 
              
 "));
 end LeakageWithCoefficient;
diff --git a/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo b/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo
index a1ce7a7ddc..8fae5b18ce 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo
@@ -130,7 +130,7 @@ equation
 Educational example of a magnetic circuit containing an iron core and an airgap:
 
              
 
              
-\"Magnetic
+\"Magnetic
 
              
 
              
 A current ramp is applied in positive electric direction through the exciting coil, causing a rising magnetomotive force (mmf) in positive magnetic direction of the electromagnetic converter.
diff --git a/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/SaturatedInductor.mo b/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/SaturatedInductor.mo
index 9baca1998a..b908889bbc 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/SaturatedInductor.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/BasicExamples/SaturatedInductor.mo
@@ -81,7 +81,7 @@ r_mFe.B vs. r_mFe.H       // magnetisation curve B(H); hysteresis neglected
 
 
 
              
-The magnetisation characteristics of the flux tube element representing the ferromagnetic core can easily be changed from simplified linear behaviour (nonLinearPermeability set to false and R_mFe.mu_rConst set to a positive value, preferably mu_rConst >> 1) to non-linear behaviour (e.g., selection of one of the electric sheets in Material.SoftMagnetic with nonLinearPermeability set to true). This enables for convenient initial design of magnetic circuits with linear material characteristics prior to simulation with non-linear behaviour.
+The magnetisation characteristics of the flux tube element representing the ferromagnetic core can easily be changed from simplified linear behaviour (nonLinearPermeability set to false and R_mFe.mu_rConst set to a positive value, preferably mu_rConst >> 1) to non-linear behaviour (e.g., selection of one of the electric sheets in Material.SoftMagnetic with nonLinearPermeability set to true). This enables for convenient initial design of magnetic circuits with linear material characteristics prior to simulation with non-linear behaviour.
 
              
 
 
              Note
              
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo
index a36f6fa8a8..196a627279 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis.mo
@@ -41,7 +41,7 @@ model Transformer1PhaseWithHysteresis
     "Temperature coefficient of secondary turns" annotation(Dialog(tab="Electrical", group="Secondary winding"));
 
   parameter SI.Length l1(displayUnit="mm") = 40e-3
-    "Mean Length l1 of core" annotation (Dialog(tab="Core", group="Geometry", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis/Core_SinglePhase.png"));
+    "Mean Length l1 of core" annotation (Dialog(tab="Core", group="Geometry", groupImage="modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer1PhaseWithHysteresis/Core_SinglePhase.png"));
   parameter SI.Length l2(displayUnit="mm") = 60e-3
     "Mean Length l2 of core" annotation (Dialog(tab="Core", group="Geometry"));
   parameter SI.Length a(displayUnit="mm") = 15e-3 "Height of core" annotation (Dialog(tab="Core", group="Geometry"));
@@ -223,14 +223,14 @@ equation
         Line(points={{100,90},{100,20},{60,20}}, color={0,0,255})}),
     Documentation(info="
 
              
-Simple model of a single-phase transformer with a primary and a secondary winding and a magnetic core. The core is modeled with GenericHystTellinenEverett flux tube elements. Thus, this element considers static and dynamic hysteresis.
+Simple model of a single-phase transformer with a primary and a secondary winding and a magnetic core. The core is modeled with GenericHystTellinenEverett flux tube elements. Thus, this element considers static and dynamic hysteresis.
 
              
 
 
              
   Fig. 1: Sketch of the modelled transformer with magnetic core, primary and secondary winding
   
              
     
-      
+      
    
   
              
 
              
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo
index 2c66db83c8..c8cd366bf5 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo
@@ -37,7 +37,7 @@ model Transformer3PhaseYyWithHysteresis
     "Temperature coefficient of secondary turns" annotation(Dialog(tab="Electrical", group="Secondary winding"));
 
   parameter SI.Length l1(displayUnit="mm") = 40e-3
-    "Mean length l1 of core" annotation (Dialog(tab="Core", group="Geometry", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis/Core_ThreePhase1.png"));
+    "Mean length l1 of core" annotation (Dialog(tab="Core", group="Geometry", groupImage="modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis/Core_ThreePhase1.png"));
   parameter SI.Length l2(displayUnit="mm") = 60e-3
     "Mean length l2 of core" annotation (Dialog(tab="Core", group="Geometry"));
   parameter SI.Length a(displayUnit="mm") = 15e-3 "Height of core" annotation (Dialog(tab="Core", group="Geometry"));
@@ -421,14 +421,14 @@ equation
           pattern=LinePattern.None)}),
     Documentation(info="
 
              
-Simple model of a three-phase transformer with primary and a secondary windings and a magnetic E-I shaped core. The core is modeled with GenericHystTellinenEverett flux tube elements. Thus, this model considers static and dynamic hysteresis as well as initial flux.
+Simple model of a three-phase transformer with primary and a secondary windings and a magnetic E-I shaped core. The core is modeled with GenericHystTellinenEverett flux tube elements. Thus, this model considers static and dynamic hysteresis as well as initial flux.
 
              
 
 
              
   Fig. 1: Sketch of the modelled transformer with magnetic core, primary and secondary winding
   
              
     
-      
+      
    
   
              
 
              
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/HysteresisModelComparison.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/HysteresisModelComparison.mo
index ff9dc22f6f..b579a66b41 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/HysteresisModelComparison.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/HysteresisModelComparison.mo
@@ -114,14 +114,14 @@ This example compares the behavior of three different hysteresis models due to t
   
            • Model=GenericHystPreisachEverett,Preisach hysteresis model, the hysteresis shape is defined by the Everett function (Fig1. e)
              • 
 
 
              
-Compared to the complex Preisach hysteresis model the Tellinen model is very simple and thus computationally more effective and stable. It is sufficient for many applications. But the Tellinen model has inherently a problem with small periodic input field variations at locations where the outer hysteresis loop has large slopes. In such a case, the simulated minor loops settle to the center of the hysteresis envelope curve, whereas the minor loops of the Preisach model stay constant ('property of equal vertical chords', [Ma03]). The input signal of the example (Fig. 1 a) corresponds to that case and Fig. 1 b-e shows the behavior of the different models.
+Compared to the complex Preisach hysteresis model the Tellinen model is very simple and thus computationally more effective and stable. It is sufficient for many applications. But the Tellinen model has inherently a problem with small periodic input field variations at locations where the outer hysteresis loop has large slopes. In such a case, the simulated minor loops settle to the center of the hysteresis envelope curve, whereas the minor loops of the Preisach model stay constant ('property of equal vertical chords', [Ma03]). The input signal of the example (Fig. 1 a) corresponds to that case and Fig. 1 b-e shows the behavior of the different models.
 
              
 
 
              
   Fig. 1: Simulated magnetic flux densities B of different hysteresis models (b) due to an applied magnetic field strength shown in (a). Corresponding B(H) loops of the hysteresis models GenericHystTellinenSoft (c), GenericHystTellinenTable (d) and GenericHystPreisachEverett (e).
   
              
     
-      
+      
     
   
              
 
              
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/InductorWithHysteresis.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/InductorWithHysteresis.mo
index f1881f829e..17ecd71760 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/InductorWithHysteresis.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/InductorWithHysteresis.mo
@@ -42,7 +42,7 @@ This is a simple model of an inductor with a ferromagnetic core. The used Generi
   
        Fig. 1: Results Core.B(t) and Core.B(H) of the magnetic Core.
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis1.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis1.mo
index b32123eca1..1552f537e8 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis1.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis1.mo
@@ -56,7 +56,7 @@ Then plot the flux density of the Core Core.B over the magnetic field strength C
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -64,7 +64,7 @@ Then plot the flux density of the Core Core.B over the magnetic field strength C
 
        
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis2.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis2.mo
index ff1d7df132..71f85b84f5 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis2.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/SinglePhaseTransformerWithHysteresis2.mo
@@ -30,7 +30,7 @@ equation
   connect(transformer.n2, el_ground2.p) annotation (Line(points={{10,10},{10,12},{20,12},{20,0},{40,0}}, color={0,0,255}));
   annotation (experiment(StartTime=0, StopTime=0.1, Interval=2e-5, Tolerance=1e-004), Documentation(info="
 
        
-A simple model of an single-phase transformer (similar to SinglePhaseTransformerWithHysteresis1 but with separate transformer model: Transformer1PhaseWithHysteresis). Use the simulation settings:
+A simple model of an single-phase transformer (similar to SinglePhaseTransformerWithHysteresis1 but with separate transformer model: Transformer1PhaseWithHysteresis). Use the simulation settings:
 
        
 
          
   
        • Stop time: 0.1 s
          • 
@@ -43,7 +43,7 @@ The figure shows the magnetic hysteresis in the transformer core. In (a) the con
 
          
   
          
     
-      
+      
     
   
          
 
          
diff --git a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/ThreePhaseTransformerWithRectifier.mo b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/ThreePhaseTransformerWithRectifier.mo
index ba3800d5a8..051637634e 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/ThreePhaseTransformerWithRectifier.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/Hysteresis/ThreePhaseTransformerWithRectifier.mo
@@ -148,7 +148,7 @@ equation
         extent={{-150,-100},{150,100}},
         grid={1,1})), Documentation(info="
 
          
-This is a model of a three-phase transformer and rectifier unit using the Transformer3PhaseYyWithHysteresis model. Use the following simulation settings:
+This is a model of a three-phase transformer and rectifier unit using the Transformer3PhaseYyWithHysteresis model. Use the following simulation settings:
 
          
 
 
            
@@ -165,7 +165,7 @@ An example simulation shows the transformer inrush currents due to an initially
 
        Fig. 1: Transformer inrush currents due to initial magnetization of the magnetic core; (a) transformer primary currents; (b)  transformer secondary currents; (c) flux densities of the transformer legs; (d) B(H) hysteresis loops of transformer leg one.; (e) instantaneous static hysteresis, eddy current and copper losses of the transformer; (f) approximated average static hysteresis, eddy current and copper losses of the transformer
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ArmatureStroke.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ArmatureStroke.mo
index 93a1229884..771ee3b7b0 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ArmatureStroke.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ArmatureStroke.mo
@@ -70,7 +70,7 @@ equation
     experiment(StopTime=0.05, Tolerance=1e-007),
     Documentation(info="
 
        
-Have a look at ConstantActuator and at PermeanceActuator
+Have a look at ConstantActuator and at PermeanceActuator
 for an explanation of both actuator models.
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/ConstantActuator.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/ConstantActuator.mo
index 5961fce8b3..17abbdd1fb 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/ConstantActuator.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/ConstantActuator.mo
@@ -97,7 +97,7 @@ c = B * l.
 
 
 
        
-The converter constant c as well as coil resistance R and inductance L are assumed to be known, e.g., from measurements or catalogue data. Hence this model is well-suited for system simulation together with neighbouring subsystems, but not for actuator design, where the motor constant is to be found on base of the magnetic circuit's geometry, material properties and winding data. See PermeanceActuator for a more accurate model of this actuator that is based on a magnetic network. Due to identical connectors, both models can be used in system simulation, e.g. to simulate a stroke as demonstrated in ArmatureStroke.
+The converter constant c as well as coil resistance R and inductance L are assumed to be known, e.g., from measurements or catalogue data. Hence this model is well-suited for system simulation together with neighbouring subsystems, but not for actuator design, where the motor constant is to be found on base of the magnetic circuit's geometry, material properties and winding data. See PermeanceActuator for a more accurate model of this actuator that is based on a magnetic network. Due to identical connectors, both models can be used in system simulation, e.g. to simulate a stroke as demonstrated in ArmatureStroke.
 
        
 "));
 end ConstantActuator;
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/PermeanceActuator.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/PermeanceActuator.mo
index f761ccf875..ef23b67485 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/PermeanceActuator.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/Components/PermeanceActuator.mo
@@ -4,7 +4,7 @@ model PermeanceActuator
 
   parameter Real N=140 "Number of turns" annotation (Dialog(group=
           "Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Examples/MovingCoilActuator/MovingCoilActuator_dimensions.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Examples/MovingCoilActuator/MovingCoilActuator_dimensions.png"));
   parameter SI.Resistance R=2.86 "Coil resistance";
 
   parameter SI.Radius r_core=12.5e-3
@@ -160,7 +160,7 @@ equation
       points={{40,-18},{40,-10},{30,-10}}, color={255,127,0}));
   annotation (Documentation(info="
 
        
-In the ConstantActuator model the force F is strictly proportional to the current i as indicated by the converter constant c. However, there is an additional non-linear force component in such an actuator that is due to the dependency of the coil inductance L on the armature position x. The inductance increases as the armature moves into the stator. The total force is
+In the ConstantActuator model the force F is strictly proportional to the current i as indicated by the converter constant c. However, there is an additional non-linear force component in such an actuator that is due to the dependency of the coil inductance L on the armature position x. The inductance increases as the armature moves into the stator. The total force is
 
        
 
 
        @@ -174,7 +174,7 @@ Both force components are properly considered with a simple permeance model as s
 
        
 
 
        
-\"Structure,
+\"Structure,
 
        
 "),
    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour.mo
index a1e109000a..d651061445 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceCurrentBehaviour.mo
@@ -80,10 +80,10 @@ equation
     experiment(StopTime=6, Tolerance=1e-007),
     Documentation(info="
 
        
-Have a look at ConstantActuator and at PermeanceActuator for an explanation of both converter models.
        
+Have a look at ConstantActuator and at PermeanceActuator for an explanation of both converter models.
        
 
        
 
        
-Simulation of the force-current characteristics of both converter models with the armature blocked at mid-position x=0 reveals the difference between the two models. In the ConstantActuator, force is proportional to current. In the simple PermeanceActuator there is an additional non-linear force component that is due to the dependency of the inductance on the armature position. Comparison with FEA results validates the higher accuracy of the PermeanceActuator. In the FEA model, the relative permeability of the stator iron was set to mu_rFe=const.=1000 in order to avoid additional non-linear force components due to saturation. Simulate for 6 s and plot vs. current (e.g., iSensor.i)
        
+Simulation of the force-current characteristics of both converter models with the armature blocked at mid-position x=0 reveals the difference between the two models. In the ConstantActuator, force is proportional to current. In the simple PermeanceActuator there is an additional non-linear force component that is due to the dependency of the inductance on the armature position. Comparison with FEA results validates the higher accuracy of the PermeanceActuator. In the FEA model, the relative permeability of the stator iron was set to mu_rFe=const.=1000 in order to avoid additional non-linear force components due to saturation. Simulate for 6 s and plot vs. current (e.g., iSensor.i)
        
 
         pmFixedPos.flange_b.f       // force of permeance model
 cFixedPos.flange_b.f        // force of converter constant model
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceStrokeBehaviour.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceStrokeBehaviour.mo
index 75e5be001f..04e840291d 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceStrokeBehaviour.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/ForceStrokeBehaviour.mo
@@ -53,10 +53,10 @@ equation
       StopTime=4,
       Tolerance=1e-007), Documentation(info="
 
        
-Have a look at ConstantActuator and at PermeanceActuator for an explanation of both converter models.
        
+Have a look at ConstantActuator and at PermeanceActuator for an explanation of both converter models.
        
 
        
 
        
-Simulation of the force-stroke characteristic of the PermeanceActuator with a constant current I=3A and a forced armature movement (similar to measurements in reality) shows the dependency of both force-generating permeances G_ma and G_mb as well as inductance L on armature position x. Simulate for 8 s and plot vs. armature position feedX.flange_b.s (same physical quantities together in a common diagram for comparison):
        
+Simulation of the force-stroke characteristic of the PermeanceActuator with a constant current I=3A and a forced armature movement (similar to measurements in reality) shows the dependency of both force-generating permeances G_ma and G_mb as well as inductance L on armature position x. Simulate for 8 s and plot vs. armature position feedX.flange_b.s (same physical quantities together in a common diagram for comparison):
        
 
         feedX.flange_b.f            // force of permeance model (permeance of stator iron neglected in this model)
 comparisonWithFEA.y[1]      // force of FEA model with non-linear stator iron 1.0718
diff --git a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/package.mo b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/package.mo
index 474b28889e..974c7db719 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/MovingCoilActuator/package.mo
@@ -4,7 +4,7 @@ package MovingCoilActuator "Two translatory electrodynamic actuator models of di
 
   annotation (Documentation(info="
 
        
-Moving coil actuators are often called electrodynamic actuators and a proportional behaviour between force and current is expressed by a converter constant (see ConstantActuator). However, in a simple moving coil actuator as presented in this example there is an additional non-linear force component that is due to the increase of the inductance when the armature coil moves into the ferromagnetic stator. A simple PermeanceActuator can be used to describe this non-linear force component.
+Moving coil actuators are often called electrodynamic actuators and a proportional behaviour between force and current is expressed by a converter constant (see ConstantActuator). However, in a simple moving coil actuator as presented in this example there is an additional non-linear force component that is due to the increase of the inductance when the armature coil moves into the ferromagnetic stator. A simple PermeanceActuator can be used to describe this non-linear force component.
 
        
 "));
 end MovingCoilActuator;
diff --git a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonPullInStroke.mo b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonPullInStroke.mo
index cc0a6992cc..0d43c118fc 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonPullInStroke.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonPullInStroke.mo
@@ -410,7 +410,7 @@ equation
   annotation (experiment(StopTime=0.05, Tolerance=1e-007), Documentation(
         info="
 
        
-Have a look at SolenoidActuator for general comments and at SimpleSolenoid and AdvancedSolenoid for a detailed description of both magnetic network models.
+Have a look at SolenoidActuator for general comments and at SimpleSolenoid and AdvancedSolenoid for a detailed description of both magnetic network models.
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonQuasiStatic.mo b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonQuasiStatic.mo
index 688ab5cd81..0e1b24e515 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonQuasiStatic.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/ComparisonQuasiStatic.mo
@@ -83,7 +83,7 @@ equation
   annotation (experiment(StopTime=10, Tolerance=1e-007), Documentation(
         info="
 
        
-Have a look at SolenoidActuator for general comments and at SimpleSolenoid and AdvancedSolenoid for a detailed description of both magnetic network models.
+Have a look at SolenoidActuator for general comments and at SimpleSolenoid and AdvancedSolenoid for a detailed description of both magnetic network models.
 
        
 
 
        
@@ -119,7 +119,7 @@ comparisonWithFEA.y[3]                 // static inductance obtained with FEA as
 
        
 
 
        
-As mentioned in the description of both magnetic network models, one can tell the higher armature flux and inductance of the advanced solenoid model at large air gaps compared to that of the simple model. The effect of this difference on dynamic model behaviour can be analysed in ComparisonPullInStroke.
+As mentioned in the description of both magnetic network models, one can tell the higher armature flux and inductance of the advanced solenoid model at large air gaps compared to that of the simple model. The effect of this difference on dynamic model behaviour can be analysed in ComparisonPullInStroke.
 
        
 "));
 end ComparisonQuasiStatic;
diff --git a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/AdvancedSolenoid.mo b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/AdvancedSolenoid.mo
index d23aced75d..29d331a9cb 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/AdvancedSolenoid.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/AdvancedSolenoid.mo
@@ -4,7 +4,7 @@ model AdvancedSolenoid
 
   parameter Real N=957 "Number of turns" annotation (Dialog(group=
           "Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Examples/SolenoidActuator/Solenoid_dimensions.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Examples/SolenoidActuator/Solenoid_dimensions.png"));
   parameter SI.Resistance R=5 "Coil resistance";
   parameter SI.Resistance R_par=1e5
     "Resistance parallel to the coil, in series to C_par";
@@ -381,11 +381,11 @@ equation
         textColor={0,0,255},
         textString="%name")}), Documentation(info="
 
        
-Please have a look at SimpleSolenoid for a general description of this actuator. Unlike in that simple magnetic network model, the coil is split into two lumped elements here. This enables for more realistic modelling of the radial leakage flux between armature and yoke (leakage permeance G_mLeakRad). Especially for large air gaps, the influence of this leakage flux on the actuator's inductance and its electromagnetic force is rather strong. Please have a look at ComparisonQuasiStatic for a comparison of both models with FEA-based results included as reference.
+Please have a look at SimpleSolenoid for a general description of this actuator. Unlike in that simple magnetic network model, the coil is split into two lumped elements here. This enables for more realistic modelling of the radial leakage flux between armature and yoke (leakage permeance G_mLeakRad). Especially for large air gaps, the influence of this leakage flux on the actuator's inductance and its electromagnetic force is rather strong. Please have a look at ComparisonQuasiStatic for a comparison of both models with FEA-based results included as reference.
 
        
 
 
        
-\"Assigned
+\"Assigned
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/SimpleSolenoid.mo b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/SimpleSolenoid.mo
index e86df33236..982d444ebd 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/SimpleSolenoid.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/Components/SimpleSolenoid.mo
@@ -8,7 +8,7 @@ model SimpleSolenoid
   //yoke
   parameter SI.Radius r_yokeOut=15e-3 "Outer yoke radius" annotation (
       Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Examples/SolenoidActuator/Solenoid_dimensions.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Examples/SolenoidActuator/Solenoid_dimensions.png"));
   parameter SI.Radius r_yokeIn=13.5e-3 "Inner yoke radius";
   parameter SI.Length l_yoke=35e-3 "Axial yoke length";
   parameter SI.Length t_yokeBot=3.5e-3 "Axial thickness of yoke bottom";
@@ -292,7 +292,7 @@ In the half-section below, the flux tube elements of the actuator's magnetic cir
 
        
 
 
        
-\"Field
+\"Field
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/package.mo b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/package.mo
index bd9dac5b56..3330a57ba3 100644
--- a/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Examples/SolenoidActuator/package.mo
@@ -4,15 +4,15 @@ package SolenoidActuator "Two models of a reluctance actuator of different model
 
   annotation (Documentation(info="
 
        
-In electromagnetic or reluctance actuators, a thrust or reluctance force is generated due to a non-zero gradient of the relative magnetic permeability mu_r at surfaces between regions of different permeability (non-saturated ferromagnetic material: mu_r>>1, adjacent air: mu_r=1). In lumped magnetic network models, this force can be calculated as shortly outlined in Reluctance Forces of the User's Guide.
+In electromagnetic or reluctance actuators, a thrust or reluctance force is generated due to a non-zero gradient of the relative magnetic permeability mu_r at surfaces between regions of different permeability (non-saturated ferromagnetic material: mu_r>>1, adjacent air: mu_r=1). In lumped magnetic network models, this force can be calculated as shortly outlined in Reluctance Forces of the User's Guide.
 
        
 
 
        
-As an example of a reluctance actuator, a simple axis-symmetric lifting magnet with planar end planes of armature and pole is shown. Often, a SimpleSolenoid model is sufficient for initial rough design of such an actuator's magnetic subsystem. Higher accuracy can be gained from an AdvancedSolenoid model where the coil-imposed magnetomotive force is split and the leakage flux between armature and yoke is accounted for more precisely.
+As an example of a reluctance actuator, a simple axis-symmetric lifting magnet with planar end planes of armature and pole is shown. Often, a SimpleSolenoid model is sufficient for initial rough design of such an actuator's magnetic subsystem. Higher accuracy can be gained from an AdvancedSolenoid model where the coil-imposed magnetomotive force is split and the leakage flux between armature and yoke is accounted for more precisely.
 
        
 
 
        
-The differences between these two models in static behaviour can be analysed and compared to results obtained with a more accurate finite element analysis (FEA) in ComparisonQuasiStatic. The resulting differences in dynamic behaviour can be analysed and compared to FEA results with simulation of a pull-in stroke in ComparisonPullInStroke.
+The differences between these two models in static behaviour can be analysed and compared to results obtained with a more accurate finite element analysis (FEA) in ComparisonQuasiStatic. The resulting differences in dynamic behaviour can be analysed and compared to FEA results with simulation of a pull-in stroke in ComparisonPullInStroke.
 
        
 "));
 end SolenoidActuator;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/BaseData.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/BaseData.mo
index 657f64a920..4036e9ac06 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/BaseData.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/BaseData.mo
@@ -21,7 +21,7 @@ record BaseData "Record for permanent magnetic material data"
 
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end BaseData;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/HardFerrite.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/HardFerrite.mo
index f5c731f749..f236448aad 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/HardFerrite.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/HardFerrite.mo
@@ -7,7 +7,7 @@ record HardFerrite "Hard ferrite sintered, exemplary values"
     alpha_Br=-0.002);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end HardFerrite;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/NdFeB.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/NdFeB.mo
index 0edfb6c26b..8bf9ab5786 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/NdFeB.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/NdFeB.mo
@@ -7,7 +7,7 @@ record NdFeB "NdFeB sintered; exemplary values"
     alpha_Br=-0.001);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end NdFeB;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticHardFerrite.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticHardFerrite.mo
index 45f4eff424..87394a12aa 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticHardFerrite.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticHardFerrite.mo
@@ -7,7 +7,7 @@ record PlasticHardFerrite "Plastic-bonded hard ferrite, exemplary values"
     alpha_Br=-0.002);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end PlasticHardFerrite;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticNdFeB.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticNdFeB.mo
index 641648b2e1..bf3322265c 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticNdFeB.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticNdFeB.mo
@@ -7,7 +7,7 @@ record PlasticNdFeB "Plastic-bonded NdFeB, exemplary values"
     alpha_Br=-0.001);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end PlasticNdFeB;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticSmCo.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticSmCo.mo
index 8ed115aaa4..3a550b7286 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticSmCo.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/PlasticSmCo.mo
@@ -7,7 +7,7 @@ record PlasticSmCo "Plastic-bonded Sm-Co, exemplary values"
     alpha_Br=-0.0004);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end PlasticSmCo;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/Sm2Co17.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/Sm2Co17.mo
index c9d0520a98..8804d36730 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/Sm2Co17.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/Sm2Co17.mo
@@ -7,7 +7,7 @@ record Sm2Co17 "Sm2Co17 sintered, exemplary values"
     alpha_Br=-0.0003);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end Sm2Co17;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/SmCo5.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/SmCo5.mo
index 207d559217..eb6e5dda8b 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/SmCo5.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/SmCo5.mo
@@ -7,7 +7,7 @@ record SmCo5 "SmCo5 sintered, exemplary values"
     alpha_Br=-0.0004);
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package HardMagnetic for a description of all permanent magnetic material characteristics of this package.
 
        
 "));
 end SmCo5;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/package.mo b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/package.mo
index 7ddbca1c46..8bb011d18a 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HardMagnetic/package.mo
@@ -7,7 +7,7 @@ package HardMagnetic "Characteristics of common permanent magnetic materials (te
 Typical values for remanence, coercivity and the temperature coefficient of remanence are provided for the common permanent magnetic materials illustrated below.
        
 
        
 
        
-\"Demagnetization
+\"Demagnetization
 
        
 
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/BaseData.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/BaseData.mo
index 7306573d45..8a0537be48 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/BaseData.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/BaseData.mo
@@ -21,7 +21,7 @@ record BaseData "Base Data Record"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M270_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M270_50A.mo
index 10586a9a80..e880d48e21 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M270_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M270_50A.mo
@@ -14,7 +14,7 @@ record M270_50A "M270-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M330_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M330_50A.mo
index 944911e249..7877332595 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M330_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M330_50A.mo
@@ -14,7 +14,7 @@ record M330_50A "M330-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50A.mo
index 3b82c05ea8..8d5226c719 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50A.mo
@@ -14,7 +14,7 @@ record M400_50A "M400-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50AP.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50AP.mo
index 6f7202a2ad..af97303788 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50AP.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M400_50AP.mo
@@ -14,7 +14,7 @@ record M400_50AP "M400-50AP"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M800_65A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M800_65A.mo
index 885ecd12fb..813b1773b1 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M800_65A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/M800_65A.mo
@@ -14,7 +14,7 @@ record M800_65A "M800-65A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacodur50.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacodur50.mo
index 4695c83b60..dc386c0c17 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacodur50.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacodur50.mo
@@ -14,7 +14,7 @@ record Vacodur50 "Vacodur50"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacoflux17.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacoflux17.mo
index 7b130d594e..838ed83339 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacoflux17.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/Vacoflux17.mo
@@ -14,7 +14,7 @@ record Vacoflux17 "Vacoflux17"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/package.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/package.mo
index 6f282930a9..38777fd1f8 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisEverettParameter/package.mo
@@ -3,6 +3,6 @@ package HysteresisEverettParameter "Parameter sets for an analytical description
   extends Modelica.Icons.MaterialPropertiesPackage;
 
   annotation (Documentation(info="
-
        These parameter records contain the parameters which adapt the analytical Everett function to a specific hysteresis shape (see [YUY89] for a detailed description of that function). The Everett function is used to define the shape of the ferromagnetic hysteresis of the GenericHystTellinenEverett and the GenericHystPreisachEverett flux tube elements.
        
+
        These parameter records contain the parameters which adapt the analytical Everett function to a specific hysteresis shape (see [YUY89] for a detailed description of that function). The Everett function is used to define the shape of the ferromagnetic hysteresis of the GenericHystTellinenEverett and the GenericHystPreisachEverett flux tube elements.
        
 "));
 end HysteresisEverettParameter;
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/BaseData.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/BaseData.mo
index d5e9686358..121564a571 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/BaseData.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/BaseData.mo
@@ -105,7 +105,7 @@ record BaseData "Hysteresis table data"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M270_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M270_50A.mo
index 1f7755a31b..bb20dff648 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M270_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M270_50A.mo
@@ -74,7 +74,7 @@ record M270_50A "M270-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M330_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M330_50A.mo
index c51daa23d4..8436e62bbd 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M330_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M330_50A.mo
@@ -74,7 +74,7 @@ record M330_50A "M330-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50A.mo
index 3ccbc1b33f..3891d74e5f 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50A.mo
@@ -74,7 +74,7 @@ record M400_50A "M400-50A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50AP.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50AP.mo
index 647fa054c2..2e29e75301 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50AP.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M400_50AP.mo
@@ -74,7 +74,7 @@ record M400_50AP "M400-50AP"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M800_65A.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M800_65A.mo
index 6f2107179c..5ab879039e 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M800_65A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/M800_65A.mo
@@ -74,7 +74,7 @@ record M800_65A "M800-65A"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacodur50.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacodur50.mo
index 511fd57597..01d9780edf 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacodur50.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacodur50.mo
@@ -22,7 +22,7 @@ record Vacodur50 "Vacodur50"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux17.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux17.mo
index 500b9dbf59..3d6751b2d3 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux17.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux17.mo
@@ -19,7 +19,7 @@ record Vacoflux17 "Vacoflux17"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux48.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux48.mo
index 204a1617f0..d31f7e6c5f 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux48.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/Vacoflux48.mo
@@ -25,7 +25,7 @@ record Vacoflux48 "Vacoflux48"
 
        
   
        
     
-      
+      
    
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/package.mo b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/package.mo
index c920767b5d..aa53b4f4b8 100644
--- a/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/HysteresisTableData/package.mo
@@ -4,7 +4,7 @@ package HysteresisTableData
 
   annotation (Documentation(info="
 
        
-Material table data for the GenericHystTellinenTable flux tube element. The records contain two data tables tabris and tabfal describing the rising and the falling branch of the hysteresis envelope curve of the corresponding material. The first column is the magnetic field strength H and has to be strictly monotonically increasing. The second column contains the corresponding values of the magnetic fluxdensity B. Both curves may not intersect each other.
+Material table data for the GenericHystTellinenTable flux tube element. The records contain two data tables tabris and tabfal describing the rising and the falling branch of the hysteresis envelope curve of the corresponding material. The first column is the magnetic field strength H and has to be strictly monotonically increasing. The second column contains the corresponding values of the magnetic fluxdensity B. Both curves may not intersect each other.
 
        
 
 
        
@@ -15,7 +15,7 @@ Fig. 1 and Fig. 2 show library entries based on own measurements of several stee
 
        Fig. 1: Static hysteresis envelope curves of several steel sheets
   
        
     
-      
+      
     
   
        
 
        
@@ -24,20 +24,20 @@ Fig. 1 and Fig. 2 show library entries based on own measurements of several stee
 
        Fig. 2: Static hysteresis envelope curves of several steel sheets
   
        
     
-      
+      
     
   
        
 
        
 
 
        
-Fig. 3 shows the static hysteresis loop library entries for soft magnetic cobalt-iron-alloys which were extracted from [Va01].
+Fig. 3 shows the static hysteresis loop library entries for soft magnetic cobalt-iron-alloys which were extracted from [Va01].
 
        
 
 
-
+
        Fig. 3: Soft magnetic cobalt iron library entries [Va01]Fig. 3: Soft magnetic cobalt iron library entries [Va01]
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/BaseData.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/BaseData.mo
index 755b739bc5..82721311e0 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/BaseData.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/BaseData.mo
@@ -15,7 +15,7 @@ record BaseData
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-The parameters needed for approximation of the magnetisation characteristics of included soft magnetic materials are declared in this record.
+The parameters needed for approximation of the magnetisation characteristics of included soft magnetic materials are declared in this record.
 
        
 "), Icon(graphics={Text(
           extent={{-100,-10},{100,-40}},
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/CobaltIron/Vacoflux50.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/CobaltIron/Vacoflux50.mo
index 3cfa651ba4..884cbeba5b 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/CobaltIron/Vacoflux50.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/CobaltIron/Vacoflux50.mo
@@ -10,7 +10,7 @@ record Vacoflux50 "VACOFLUX 50 (50% CoFe)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Source of B(H) characteristics: VACUUMSCHMELZE GmbH & Co. KG, Germany
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M330_50A.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M330_50A.mo
index 5a19230011..8d07434b36 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M330_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M330_50A.mo
@@ -10,7 +10,7 @@ record M330_50A "M330-50A (1.0809) @ 50Hz"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Sample: complete core after machining and packet assembling
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M350_50A.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M350_50A.mo
index 218297a3d3..31c6a0823f 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M350_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M350_50A.mo
@@ -10,7 +10,7 @@ record M350_50A "M350-50A (1.0810) @ 50Hz"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Sample: sheet strip
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M530_50A.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M530_50A.mo
index 93331f7b46..ce03cd7fc0 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M530_50A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M530_50A.mo
@@ -10,7 +10,7 @@ record M530_50A "M530-50A (1.0813) @ 50Hz"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Sample: sheet strip
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M700_100A.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M700_100A.mo
index 16d48e4081..5390c9e026 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M700_100A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M700_100A.mo
@@ -10,7 +10,7 @@ record M700_100A "M700-100A (1.0826) @ 50Hz"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Sample: sheet strip
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M940_100A.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M940_100A.mo
index dffb829951..f5ab4df49a 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M940_100A.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/M940_100A.mo
@@ -10,7 +10,7 @@ record M940_100A "M940-100A @ 50Hz"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Sample: sheet strip
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/package.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/package.mo
index 1e468ed68d..9b4d8ce011 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/ElectricSheet/package.mo
@@ -4,7 +4,7 @@ package ElectricSheet "Various electric sheets"
 
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end ElectricSheet;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/MuMetall.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/MuMetall.mo
index 7d11b6722f..0186122c14 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/MuMetall.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/MuMetall.mo
@@ -10,7 +10,7 @@ record MuMetall "Mu-metal (77% NiFe)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Source of B(H) characteristics:
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/Permenorm3601K3.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/Permenorm3601K3.mo
index c52a6c69d9..6979e877f2 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/Permenorm3601K3.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/Permenorm3601K3.mo
@@ -10,7 +10,7 @@ record Permenorm3601K3 "PERMENORM 3601 K3 (36% NiFe)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Source of B(H) characteristics:
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/RFe80.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/RFe80.mo
index 6b9fd1defc..476d76f7a6 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/RFe80.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/RFe80.mo
@@ -10,7 +10,7 @@ record RFe80 "Hyperm 0 (RFe80)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 Source of B(H) characteristics: Product catalogue Magnequench, 2000
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/VacoferS2.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/VacoferS2.mo
index 6d3301619e..4d70b27111 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/VacoferS2.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/VacoferS2.mo
@@ -10,7 +10,7 @@ record VacoferS2 "VACOFER S2 (99.95% Fe)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 
        
 
        Source of B(H) characteristics:
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_1008.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_1008.mo
index d522e1817d..bfc68f7220 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_1008.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_1008.mo
@@ -10,7 +10,7 @@ record AISI_1008 "AISI 1008 (1.0204)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end AISI_1008;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_12L14.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_12L14.mo
index 7b7fbb0929..4cce78c2e1 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_12L14.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/AISI_12L14.mo
@@ -10,7 +10,7 @@ record AISI_12L14 "AISI 12L14 (1.0718)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end AISI_12L14;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC01.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC01.mo
index d8b1869bcc..69ccf4dbc6 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC01.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC01.mo
@@ -10,7 +10,7 @@ record DC01 "DC01 (1.0330, previously St2)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end DC01;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC03.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC03.mo
index e82322d43d..46d2abf9e9 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC03.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/DC03.mo
@@ -10,7 +10,7 @@ record DC03 "DC03 (1.0347, previously St3)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end DC03;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMn28K.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMn28K.mo
index 2fb4edd45f..dde375a5b8 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMn28K.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMn28K.mo
@@ -10,7 +10,7 @@ record Steel_9SMn28K "9SMn28K (1.0715)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end Steel_9SMn28K;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMnPb28.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMnPb28.mo
index ef076f2850..8d44d8b3ff 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMnPb28.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMnPb28.mo
@@ -10,7 +10,7 @@ record Steel_9SMnPb28 "9SMnPb28 (1.0718)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end Steel_9SMnPb28;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/X6Cr17.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/X6Cr17.mo
index 12402b8ff8..0af6dbac1d 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/X6Cr17.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/X6Cr17.mo
@@ -10,7 +10,7 @@ record X6Cr17 "X6Cr17 (1.4016)"
   annotation (defaultComponentPrefixes="parameter",
     Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end X6Cr17;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/package.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/package.mo
index bae493df47..4217b39cd1 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/package.mo
@@ -4,7 +4,7 @@ package Steel "Various ferromagnetic steels"
 
   annotation (Documentation(info="
 
        
-Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
+Please refer to the description of  the enclosing package SoftMagnetic for a description of all soft magnetic material characteristics of this package.
 
        
 "));
 end Steel;
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/mu_rApprox.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/mu_rApprox.mo
index a225e9c33b..1bade1506a 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/mu_rApprox.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/mu_rApprox.mo
@@ -28,11 +28,11 @@ algorithm
 
   annotation (Documentation(info="
 
        
-The relative permeability mu_r as a function of flux density B for all soft magnetic materials currently included in this library is approximated with the following function [Ro00]:
+The relative permeability mu_r as a function of flux density B for all soft magnetic materials currently included in this library is approximated with the following function [Ro00]:
 
        
 
 
        
-\"Equation
+\"Equation
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/package.mo b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/package.mo
index ae15aec2ba..34463d131d 100644
--- a/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/package.mo
@@ -4,13 +4,13 @@ package SoftMagnetic "Characteristics mu_r(B) of common soft magnetic materials;
 
   annotation (Documentation(info="
 
        
-The magnetisation characteristics mu_r(B) of all soft magnetic materials currently included in this library are approximated with a function. Each material is characterised by the five parameters of this function. The approximated characteristics mu_r(B) for most of the ferromagnetic materials currently included are shown in the plots below (solid lines) together with the original data points compiled from measurements and literature.
+The magnetisation characteristics mu_r(B) of all soft magnetic materials currently included in this library are approximated with a function. Each material is characterised by the five parameters of this function. The approximated characteristics mu_r(B) for most of the ferromagnetic materials currently included are shown in the plots below (solid lines) together with the original data points compiled from measurements and literature.
 
        
 
 
        
-\"Approximated
        
-\"Approximated
        
-\"Approximated
        
+\"Approximated
        
+\"Approximated
        
+\"Approximated
        
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Cuboid.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Cuboid.mo
index ecceabbac4..6f0961f539 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Cuboid.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Cuboid.mo
@@ -7,7 +7,7 @@ model Cuboid
 
   parameter SI.Length l=0.01 "Length in direction of flux" annotation (
       Dialog(group="Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidParallelFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidParallelFlux.png"));
   parameter SI.Length a=0.01 "Width of rectangular cross-section"
     annotation (Dialog(group="Fixed geometry"));
   parameter SI.Length b=0.01 "Height of rectangular cross-section"
@@ -19,7 +19,7 @@ equation
 
   annotation (Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "), Icon(graphics={
         Text(
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo
index 64966d2eeb..894abdb823 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo
@@ -7,7 +7,7 @@ model GenericFluxTube
 
   parameter SI.Length l=0.01 "Length in direction of flux"
     annotation(Dialog(group="Fixed geometry", groupImage=
-      "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/GenericFluxTube.png"));
+      "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/GenericFluxTube.png"));
   parameter SI.CrossSection area=0.0001 "Area of cross section"
     annotation (Dialog(group="Fixed geometry"));
 equation
@@ -16,7 +16,7 @@ equation
 
   annotation (defaultComponentName="generic", Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 ",
     revisions="
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo
index fa6388c329..62ae44aebd 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo
@@ -7,7 +7,7 @@ model HollowCylinderAxialFlux
 
   parameter SI.Length l=0.01 "Axial length (in direction of flux)"
     annotation (Dialog(group="Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderAxialFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderAxialFlux.png"));
   parameter SI.Radius r_i=0
     "Inner radius of hollow cylinder (zero for cylinder)"
     annotation (Dialog(group="Fixed geometry"));
@@ -21,7 +21,7 @@ equation
 
   annotation (defaultComponentName="cylinder", Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
index 6e5127830c..137d21043b 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
@@ -8,7 +8,7 @@ model HollowCylinderCircumferentialFlux
   parameter SI.Length l=0.02 "Width (orthogonal to flux direction)"
     annotation (Dialog(group=
           "Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Circumferential.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Circumferential.png"));
   parameter SI.Radius r_i=0.01 "Inner radius of hollow cylinder"
     annotation (Dialog(group="Fixed geometry"));
   parameter SI.Radius r_o=0.02 "Outer radius of hollow cylinder"
@@ -21,7 +21,7 @@ equation
 
   annotation (defaultComponentName="cylinder", Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo
index 2334f537eb..dbbcb998ff 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo
@@ -8,7 +8,7 @@ model HollowCylinderRadialFlux
   parameter SI.Length l=0.01 "Width (orthogonal to flux direction)"
                                            annotation (Dialog(group=
           "Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderRadialFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderRadialFlux.png"));
   parameter SI.Radius r_i=0.01 "Inner radius of hollow cylinder"
     annotation (Dialog(group="Fixed geometry"));
   parameter SI.Radius r_o=0.02 "Outer radius of hollow cylinder"
@@ -22,7 +22,7 @@ equation
 
   annotation (defaultComponentName="cylinder", Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Toroid.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Toroid.mo
index 8a26a00be3..92361b1064 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Toroid.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/Toroid.mo
@@ -7,7 +7,7 @@ model Toroid
   import Modelica.Constants.pi;
   parameter SI.Radius r=0.1 "Radius of toroid (middle)"
     annotation (Dialog(group="Fixed geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.png"));
   parameter SI.Radius d=0.01 "Diameter of cylindrical core"
     annotation (Dialog(group="Fixed geometry"));
   parameter SI.Angle alpha=pi/2 "Angle of toroid section"
@@ -18,7 +18,7 @@ equation
 
   annotation (defaultComponentName="cylinder", Documentation(info="
 
        
-Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/package.mo b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/package.mo
index 2fb1169416..46992ded95 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/FixedShape/package.mo
@@ -4,14 +4,14 @@ package FixedShape "Flux tubes with fixed shape during simulation and linear or
 
   annotation (Documentation(info="
 
        
-Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
+Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
 
        
 
 
        
-Due to the restrictions on reluctance force calculation outlined there, flux tube elements with a possibly non-linear material characteristic mu_r(B) must have a fixed shape during simulation of converter motion. Hence, the dimensions of these flux tubes are defined as parameters in the model components that extend the base class BaseClasses.FixedShape.
        
+Due to the restrictions on reluctance force calculation outlined there, flux tube elements with a possibly non-linear material characteristic mu_r(B) must have a fixed shape during simulation of converter motion. Hence, the dimensions of these flux tubes are defined as parameters in the model components that extend the base class BaseClasses.FixedShape.
        
 
 
        
-For initial design of magnetic circuits, the relative permeability of possibly non-linear flux tube elements can easily be set to a constant value mu_rConst (non-linearPermeability set to false). In some cases, this can simplify the rough geometric design of a device's magnetic circuit. Once an initial geometry is found, the magnetic subsystem can be simulated and fine-tuned with more realistic non-linear characteristics of ferromagnetic materials. Doing so requires setting of the parameter non-linearPermeability to true and selection of one of the soft magnetic materials of Material.SoftMagnetic.
+For initial design of magnetic circuits, the relative permeability of possibly non-linear flux tube elements can easily be set to a constant value mu_rConst (non-linearPermeability set to false). In some cases, this can simplify the rough geometric design of a device's magnetic circuit. Once an initial geometry is found, the magnetic subsystem can be simulated and fine-tuned with more realistic non-linear characteristics of ferromagnetic materials. Doing so requires setting of the parameter non-linearPermeability to true and selection of one of the soft magnetic materials of Material.SoftMagnetic.
 
        
 "));
 end FixedShape;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidOrthogonalFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidOrthogonalFlux.mo
index 82fb07fb84..b496f82de9 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidOrthogonalFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidOrthogonalFlux.mo
@@ -6,7 +6,7 @@ model CuboidOrthogonalFlux
 
   SI.Length l=s "Length in direction of motion (orthogonal to flux)"
     annotation (Dialog(group="Variable geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidOrthogonalFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidOrthogonalFlux.png"));
   parameter SI.Length a=0.01 "Width of rectangular cross-section";
   parameter SI.Length b=0.01
     "Height of rectangular cross-section (in flux direction)";
@@ -26,7 +26,7 @@ equation
 
   annotation (defaultComponentName="force", Documentation(info="
 
        
-Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end CuboidOrthogonalFlux;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidParallelFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidParallelFlux.mo
index 3968d3b740..bd3a11391c 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidParallelFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/CuboidParallelFlux.mo
@@ -6,7 +6,7 @@ model CuboidParallelFlux
 
   SI.Length l=s "Axial length (in direction of flux)" annotation (Dialog(
         group="Variable geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidParallelFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/CuboidParallelFlux.png"));
   parameter SI.Length a=0.01 "Width of rectangular cross-section";
   parameter SI.Length b=0.01 "Height of rectangular cross-section";
 
@@ -25,7 +25,7 @@ equation
 
   annotation (defaultComponentName="force", Documentation(info="
 
        
-Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end CuboidParallelFlux;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderAxialFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderAxialFlux.mo
index 0c62faf464..34b93aa5b2 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderAxialFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderAxialFlux.mo
@@ -6,7 +6,7 @@ model HollowCylinderAxialFlux
 
   SI.Length l=s "Axial length (in direction of flux)" annotation (Dialog(
         group="Variable geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderAxialFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderAxialFlux.png"));
   parameter SI.Radius r_i=0 "Inner radius of (hollow) cylinder";
   parameter SI.Radius r_o=0.01 "Outer radius of (hollow) cylinder";
 
@@ -25,7 +25,7 @@ equation
 
   annotation (defaultComponentName="force", Documentation(info="
 
        
-Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end HollowCylinderAxialFlux;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderRadialFlux.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderRadialFlux.mo
index a6e803bc58..786de5b3e0 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderRadialFlux.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/HollowCylinderRadialFlux.mo
@@ -6,7 +6,7 @@ model HollowCylinderRadialFlux
 
   SI.Length l=s "Axial length (orthogonal to direction of flux)"
     annotation (Dialog(group="Variable geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderRadialFlux.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinderRadialFlux.png"));
   parameter SI.Radius r_i=0.01 "Inner radius of hollow cylinder";
   parameter SI.Radius r_o=0.015 "Outer radius of hollow cylinder";
 
@@ -27,7 +27,7 @@ equation
 
   annotation (defaultComponentName="force", Documentation(info="
 
        
-Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Force for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end HollowCylinderRadialFlux;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/LeakageAroundPoles.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/LeakageAroundPoles.mo
index 8d50286b42..dc89c70df8 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/LeakageAroundPoles.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/LeakageAroundPoles.mo
@@ -5,7 +5,7 @@ model LeakageAroundPoles
   extends BaseClasses.Force;
   SI.Length l=s "Axial length (in direction of flux)" annotation (Dialog(
         group="Variable geometry", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/LeakageAroundPoles.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/LeakageAroundPoles.png"));
   parameter SI.Length w=0.1
     "Width orthogonal to flux; mean circumference of flux tube in case of cylindrical poles";
   parameter SI.Radius r=0.01 "Radius of leakage field";
@@ -22,7 +22,7 @@ equation
 
   annotation (defaultComponentName="force", Documentation(info="
 
        
-Please refer to the description of  the enclosing sub-package Force for a description of all elements of this package.
+Please refer to the description of  the enclosing sub-package Force for a description of all elements of this package.
 
        
 
 
        
@@ -30,7 +30,7 @@ Leakage flux around a prismatic or cylindric air gap between to poles can be des
 
        
 
 
        
-Note that in [Ka08] the equation for G_m is accidentally swapped with that of a similar element.
+Note that in [Ka08] the equation for G_m is accidentally swapped with that of a similar element.
 
        
 "));
 end LeakageAroundPoles;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Force/package.mo b/Modelica/Magnetic/FluxTubes/Shapes/Force/package.mo
index caeb602b95..0c3cd56a0f 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Force/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Force/package.mo
@@ -4,7 +4,7 @@ package Force "Flux tubes with reluctance force generation; constant permeabilit
 
   annotation (Documentation(info="
 
        
-Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
+Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
 
        
 
        
 Flux tube elements with generation of a reluctance force are intended for modelling of position-dependent air gap sections and permanent magnet sections respectively of translatory actuators. By default, the position coordinate of the mechanical connector flange.s is identical with the dimension l of the package's flux tube elements. l is the dimension changes with armature motion. If needed, the identity l=flange.s can be replaced by an actuator-specific equation, for example, when a flux tube length increases with decreasing armature position. The position coordinate of an element's translatory connector flange.s in turn will be identical with the armature position x in most cases, as the examples illustrate.
        
@@ -21,7 +21,7 @@ dG_m   dG_m   dl
 The parameter dlBydx must be set in each flux tube element to +1 or -1 according to the definition of the armature coordinate and the position of the element in a device's magnetic circuit. Proper match between armature motion and resulting variation of the flux tube length assures that the element's reluctance force acts in the right direction.
 
        
 
        
-The shapes of the flux tubes defined in this package are rather simple. Only one dimension varies with armature motion. Flux tubes with more complex variations of dimensions with armature motion can be defined by extending the base class BaseClasses.Force, if needed. Determination of the analytic derivative dGmBydl could become more complex for those flux tubes.
+The shapes of the flux tubes defined in this package are rather simple. Only one dimension varies with armature motion. Flux tubes with more complex variations of dimensions with armature motion can be defined by extending the base class BaseClasses.Force, if needed. Determination of the analytic derivative dGmBydl could become more complex for those flux tubes.
 
        
 "));
 end Force;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystPreisachEverett.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystPreisachEverett.mo
index 6dbe6e2721..6cd934da55 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystPreisachEverett.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystPreisachEverett.mo
@@ -186,11 +186,11 @@ equation
     Documentation(info="
 
        
 Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the
-Preisach hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
+Preisach hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
 
        
 
 
        
-An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenEverett.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenEverett.mo
index 7a8657badb..b143519147 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenEverett.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenEverett.mo
@@ -42,11 +42,11 @@ equation
     Documentation(info="
 
 
        
-Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function, which is also used to parameterize the GenericHystPreisachEverett model. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
+Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function, which is also used to parameterize the GenericHystPreisachEverett model. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
 
        
 
 
        
-An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard.mo
index 813054b0b9..3b9898412b 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard.mo
@@ -5,7 +5,7 @@ model GenericHystTellinenHard
   extends BaseClasses.GenericHysteresisTellinen(      mu0=K*mu_0);
 
   //Hysteresis parameter
-  parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
+  parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
   parameter SI.MagneticFieldStrength Hc=5e5 "Coercitivity" annotation (Dialog(group="Hysteresis"));
   parameter Real M(final unit="m/A") = 10/Hc "Slope of tanh()-function" annotation (Dialog(group="Hysteresis"));
   parameter Real K=1 "Slope of hysteresis in the saturation region (K*mu_0)" annotation (Dialog(group="Hysteresis"));
@@ -58,20 +58,20 @@ equation
           textColor={255,128,0},
           textString="TH")}), Documentation(info="
 
        
-  Flux tube element for modeling the ferromagnetic (static) hysteresis of hard magnetic materials. The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters.
+  Flux tube element for modeling the ferromagnetic (static) hysteresis of hard magnetic materials. The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters.
 
        
 
 
        
   Fig. 1: Hyperbolic tangent functions define the shape of the ferromagnetic (static) hysteresis
   
        
     
-      
+      
    
   
        
 
        
 
 
        
-An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 "));
 end GenericHystTellinenHard;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
index c35808a815..f6bd210619 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenPermanentMagnet.mo
@@ -5,7 +5,7 @@ model GenericHystTellinenPermanentMagnet
   extends BaseClasses.GenericHysteresisTellinen(                mu0=K*
         Modelica.Constants.mu_0, MagRel(start=-1, fixed=true));
 
-  parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
+  parameter SI.MagneticFluxDensity Br=1.2 "Remanence" annotation (Dialog(group="Hysteresis", groupImage="modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenHard/HardMagneticHysteresis.png"));
   parameter SI.MagneticFieldStrength Hc=5e5 "Coercitivity" annotation (Dialog(group="Hysteresis"));
   parameter Real M(final unit="m/A") = 10/Hc
     "Slope of tanh()-function" annotation (Dialog(group="Hysteresis"));
@@ -72,11 +72,11 @@ equation
           textString="TH")}), Documentation(info="
 
 
        
-Flux tube element for modeling the hard magnetic hysteresis of permanent magnets. The model is similar to GenericHystTellinenHard but has an initial magnetization preset of -100% and an adapted icon for better readability of the diagram.
+Flux tube element for modeling the hard magnetic hysteresis of permanent magnets. The model is similar to GenericHystTellinenHard but has an initial magnetization preset of -100% and an adapted icon for better readability of the diagram.
 
        
 
 
        
-An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft.mo
index 8089d87f4d..98e9ca8e13 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft.mo
@@ -2,7 +2,7 @@ within Modelica.Magnetic.FluxTubes.Shapes.HysteresisAndMagnets;
 model GenericHystTellinenSoft
   "Generic flux tube with soft magnetic hysteresis based on the Tellinen model and simple tanh()-functions"
   // Dialog Group Hysteresis
-  parameter SI.MagneticFluxDensity Js = 1.8 "Saturation polarization" annotation (Dialog(group="Hysteresis", groupImage="modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft/SoftMagneticHysteresis2.png"));
+  parameter SI.MagneticFluxDensity Js = 1.8 "Saturation polarization" annotation (Dialog(group="Hysteresis", groupImage="modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenSoft/SoftMagneticHysteresis2.png"));
   parameter SI.MagneticFluxDensity Br=0.9 "Remanence" annotation (Dialog(group="Hysteresis"));
   parameter SI.MagneticFieldStrength Hc=120 "Coercitivity" annotation (Dialog(group="Hysteresis"));
   parameter Real K=1 "Slope of hysteresis in the saturation region (K*mu_0)" annotation (Dialog(group="Hysteresis"));
@@ -21,10 +21,10 @@ equation
   hystF = Js*tanh(M*Hstat + H0) + mu0*Hstat + eps/2;
 
   annotation (defaultComponentName="core", Documentation(info="
-
        Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop (see Fig. 1) is described by simple hyperbolic tangent functions with 4 parameters. Therefore, the hysteresis shape variety is limited but the parameterization of the model is very simple and the model is relatively fast and robust. The rising (hystR) and falling (hystF) branches of the limiting hysteresis loop are defined by the following equations.
        
+
        Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop (see Fig. 1) is described by simple hyperbolic tangent functions with 4 parameters. Therefore, the hysteresis shape variety is limited but the parameterization of the model is very simple and the model is relatively fast and robust. The rising (hystR) and falling (hystF) branches of the limiting hysteresis loop are defined by the following equations.
        
 
-

        Fig. 1: Hyperbolic tangent functions define the shape of the ferromagnetic (static) hysteresis
        
-

        An overview over of available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
        
+

        Fig. 1: Hyperbolic tangent functions define the shape of the ferromagnetic (static) hysteresis
        
+

        An overview over of available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
        
         		
 
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenTable.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenTable.mo
index 45c1dc5b5a..16648b12db 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenTable.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericHystTellinenTable.mo
@@ -36,10 +36,10 @@ equation
     Documentation(info="
 
 
        
-Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The rising and falling branch of the limiting ferromagnetic hysteresis loop are specified by table data. Therefore, almost any hysteresis shapes are possible. A library with predefined tables can be found at FluxTubes.Material.HysteresisTableData.
+Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The rising and falling branch of the limiting ferromagnetic hysteresis loop are specified by table data. Therefore, almost any hysteresis shapes are possible. A library with predefined tables can be found at FluxTubes.Material.HysteresisTableData.
 
        
 
        
-An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview of all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericLinearPermanentMagnet.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericLinearPermanentMagnet.mo
index d26c32c294..384d590beb 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericLinearPermanentMagnet.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/GenericLinearPermanentMagnet.mo
@@ -49,11 +49,11 @@ equation
           textString="S")}),
     Documentation(info="
 
        
-Simple model of a linear permanent Magnet. Typical characteristics of common permanent magnetic materials can be found at FluxTubes.Material.HardMagnetic.
+Simple model of a linear permanent Magnet. Typical characteristics of common permanent magnetic materials can be found at FluxTubes.Material.HardMagnetic.
 
        
 
 
        
-An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
+An overview over all available hysteresis and permanent magnet elements of the package HysteresisAndMagnets can be found in UsersGuide.Hysteresis.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/package.mo b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/package.mo
index 131fdc2032..720a4cf897 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/HysteresisAndMagnets/package.mo
@@ -5,7 +5,7 @@ package HysteresisAndMagnets "Flux tube elements for modelling ferromagnetic hys
   annotation (Documentation(info="
 
 
        
-Please have a look at UsersGuide.Hysteresis for an explanation of the Content of the package.
+Please have a look at UsersGuide.Hysteresis for an explanation of the Content of the package.
 
        
 
 "));
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo
index 372a95df2a..4640e8970e 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo
@@ -6,7 +6,7 @@ model CoaxCylindersEndFaces
 
   parameter SI.Radius r_0=10e-3 "Radius of inner solid cylinder"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.png"));
   parameter SI.Radius r_1=17e-3 "Inner radius of outer hollow cylinder";
   parameter SI.Radius r_2=20e-3 "Outer radius of outer hollow cylinder";
 
@@ -22,7 +22,7 @@ equation
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end CoaxCylindersEndFaces;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo
index 5cc5bdc103..fa21816386 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo
@@ -6,14 +6,14 @@ model EighthOfHollowSphere
 
   parameter SI.Length t(start=0.01) "Thickness of spherical shell"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.png"));
 
 equation
   G_m = mu_0*0.5*t;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end EighthOfHollowSphere;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo
index bc6325ba74..2d01085c4d 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo
@@ -6,14 +6,14 @@ model EighthOfSphere
 
   parameter SI.Radius r=0.01 "Radius of eighth of sphere"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.png"));
 
 equation
   G_m = mu_0*0.308*r;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end EighthOfSphere;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.mo
index 3220675e63..8197311b00 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.mo
@@ -6,14 +6,14 @@ model HalfCylinder "Leakage flux through the edges of a half cylinder"
   parameter SI.Length l=0.1
     "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>distance between edges)"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.png"));
 
 equation
   G_m = mu_0*0.26*l;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end HalfCylinder;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo
index 77e7877adc..18cea4a158 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo
@@ -7,7 +7,7 @@ model HalfHollowCylinder
   parameter SI.Length l=0.1
     "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>r_i)"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.png"));
   parameter Real ratio(start=1) "Constant ratio t/r_i";
 
 equation
@@ -15,7 +15,7 @@ equation
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end HalfHollowCylinder;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo
index c7bc5d8267..650823ad8f 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo
@@ -7,13 +7,13 @@ model QuarterCylinder
   parameter SI.Length l=0.1
     "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>distance between edge and plane)"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.png"));
 equation
   G_m = mu_0*0.52*l;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end QuarterCylinder;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo
index b697ed6943..0020e50bd1 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo
@@ -7,7 +7,7 @@ model QuarterHollowCylinder
   parameter SI.Length l=0.1
     "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>r_i)"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.png"));
   parameter Real ratio(start=1) "Constant ratio t/r_i";
 
 equation
@@ -15,7 +15,7 @@ equation
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end QuarterHollowCylinder;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo
index db60c79491..cfc1a4ce0f 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo
@@ -6,14 +6,14 @@ model QuarterHollowSphere
 
   parameter SI.Length t(start=0.01) "Thickness of spherical shell"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.png"));
 
 equation
   G_m = mu_0*0.25*t;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end QuarterHollowSphere;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.mo
index ef231be6f7..38ae37e47a 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.mo
@@ -6,14 +6,14 @@ model QuarterSphere
 
   parameter SI.Radius r=0.005 "Radius of quarter sphere"
     annotation (Dialog(group="Parameters", groupImage=
-          "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.png"));
+          "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.png"));
 
 equation
   G_m = mu_0*0.077*2*r;
 
   annotation (defaultComponentName="leakage", Documentation(info="
 
        
-Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
+Please refer to the enclosing sub-package Leakage for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.
 
        
 "));
 end QuarterSphere;
diff --git a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/package.mo b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/package.mo
index cf292fe7e1..786714ee27 100644
--- a/Modelica/Magnetic/FluxTubes/Shapes/Leakage/package.mo
+++ b/Modelica/Magnetic/FluxTubes/Shapes/Leakage/package.mo
@@ -4,15 +4,15 @@ package Leakage "Leakage flux tubes with position-independent permeance and henc
 
   annotation (Documentation(info="
 
        
-Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
+Please have a look at UsersGuide.ReluctanceForceCalculation for an explanation of the different flux tube categories and resulting sub-packages.
 
        
 
 
        
-The permeances of all elements of this package are calculated from their geometry. These flux tube elements are intended for modelling of leakage fields through vacuum, air and other media with a relative permeability mu_r=1. Basic.LeakageWithCoefficient accounts for leakage not by the geometry of flux tubes, but by a coupling coefficient c_usefulFlux.
+The permeances of all elements of this package are calculated from their geometry. These flux tube elements are intended for modelling of leakage fields through vacuum, air and other media with a relative permeability mu_r=1. Basic.LeakageWithCoefficient accounts for leakage not by the geometry of flux tubes, but by a coupling coefficient c_usefulFlux.
 
        
 
 
        
-All dimensions are defined as parameters. As a result, the shape of these elements will remain constant during dynamic simulation of actuators and reluctance forces will not be generated in these flux tube elements. A simple leakage flux tube with reluctance force generation is provided with the element Force.LeakageAroundPoles. In cases where the accuracy of that element is not sufficient, the leakage elements of this package can be adapted and extended so that they are able to change their shape with armature motion and to generate reluctance forces. This requires an extension of the partial model BaseClasses.Force, a higher variability of the variables representing the flux tube's dimensions, definition of a relationship between armature position and these dimensions and determination of the analytic derivative dG_m/dx of the flux tube's permeance G_m with respect to armature position x.
+All dimensions are defined as parameters. As a result, the shape of these elements will remain constant during dynamic simulation of actuators and reluctance forces will not be generated in these flux tube elements. A simple leakage flux tube with reluctance force generation is provided with the element Force.LeakageAroundPoles. In cases where the accuracy of that element is not sufficient, the leakage elements of this package can be adapted and extended so that they are able to change their shape with armature motion and to generate reluctance forces. This requires an extension of the partial model BaseClasses.Force, a higher variability of the variables representing the flux tube's dimensions, definition of a relationship between armature position and these dimensions and determination of the analytic derivative dG_m/dx of the flux tube's permeance G_m with respect to armature position x.
 
        
 "));
 end Leakage;
diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/FluxTubeConcept.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/FluxTubeConcept.mo
index 98230d0c44..86a58119b1 100644
--- a/Modelica/Magnetic/FluxTubes/UsersGuide/FluxTubeConcept.mo
+++ b/Modelica/Magnetic/FluxTubes/UsersGuide/FluxTubeConcept.mo
@@ -9,14 +9,14 @@ Following below, the concept of magnetic flux tubes is outlined in short. For a
 
        
 
 
        
-\"Magnetic
+\"Magnetic
 
        
 
 
        
 For a region with an approximately homogeneous distribution of the magnetic field strength H and the magnetic flux density B through cross sectional area A at each length coordinate s  (A perpendicular to the direction of the magnetic field lines), a magnetic reluctance Rm can be defined:
        
 
 
        
-\"Transition
+\"Transition
 
        
 
 
        
@@ -24,20 +24,20 @@ With the definition of the magnetic potential difference Vm
 
        
 
 
        
-\"Maxwell's
+\"Maxwell's
 
        
 
 
        the general formula for the calculation of a magnetic reluctance Rm from its geometric and material properties is:
        
 
 
        
-\"General
+\"General
 
        
 
 
        
 For a prismatic or cylindrical volume of length l and cross sectional area A with the magnetic flux entering and leaving the region through its end planes, the above equation simplifies to:
        
 
 
        
-\"Magnetic
+\"Magnetic
 
        
 
 
        
@@ -45,7 +45,7 @@ Similar equations can be derived for other geometries. In cases where a direct i
 
        
 
 
        
-\"Reluctance
+\"Reluctance
 
        
 
 
        
diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/DynamicHysteresis.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/DynamicHysteresis.mo
index 3af82d202a..8d071bd09a 100644
--- a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/DynamicHysteresis.mo
+++ b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/DynamicHysteresis.mo
@@ -6,25 +6,25 @@ class DynamicHysteresis "Dynamic Hysteresis (Eddy Currents)"
 
        Dynamic Hysteresis (Eddy Currents)
        
 
 
        
-Some of the hysteresis flux tubes elements of the package HysteresisAndMagnets are capable of simulating eddy currents (dynamic hysteresis) additional to the static hysteresis behavior of the core material. The computation of eddy currents can be activated via the switch includeEddyCurrents in the \"LossesAndHeat\" tab of the corresponding elements parameter dialog. The total magnetic field strength H of the element is the sum of the ferromagnetic portion Hstat and the eddy current portion Heddy:
+Some of the hysteresis flux tubes elements of the package HysteresisAndMagnets are capable of simulating eddy currents (dynamic hysteresis) additional to the static hysteresis behavior of the core material. The computation of eddy currents can be activated via the switch includeEddyCurrents in the \"LossesAndHeat\" tab of the corresponding elements parameter dialog. The total magnetic field strength H of the element is the sum of the ferromagnetic portion Hstat and the eddy current portion Heddy:
 
        
 
 
        
   
        
     
-      
+      
     
   
        
 
        
 
 
        
-The eddy current portion of the magnetic field strength is the product of the classical eddy current factor (σcl) [BE01,Te98] and the time derivative of the magnetic flux density B(t):
+The eddy current portion of the magnetic field strength is the product of the classical eddy current factor (σcl) [BE01,Te98] and the time derivative of the magnetic flux density B(t):
 
        
 
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -37,20 +37,20 @@ Where σ is the electrical conductivity and d the
 
        Fig. 1: Static and dynamic portion of the hysteresis B(H)
   
        
     
-      
+      
     
   
        
 
        
 
 
        
-The following two figures show a comparison between measured and simulated dynamic hysteresis at several frequencies. The measurements were performed with a 25 cm Epstein frame  according to DIN EN 60404-2. The magnetic core was made up of four layers of M330-50A steel sheet. The primary Winding of the used Epstein frame had 720 turns. The primary voltage was adjusted so that the magnetic excitation was about Hmax = 400 A/m, but 72 V in maximum. The simulation results (see Fig. 3) were generated with a simple model of this setup using the GenericHystTellinenTable hysteresis flux tube element for modeling the magnetic core.
+The following two figures show a comparison between measured and simulated dynamic hysteresis at several frequencies. The measurements were performed with a 25 cm Epstein frame  according to DIN EN 60404-2. The magnetic core was made up of four layers of M330-50A steel sheet. The primary Winding of the used Epstein frame had 720 turns. The primary voltage was adjusted so that the magnetic excitation was about Hmax = 400 A/m, but 72 V in maximum. The simulation results (see Fig. 3) were generated with a simple model of this setup using the GenericHystTellinenTable hysteresis flux tube element for modeling the magnetic core.
 
        
 
 
        
 Fig. 2: Dynamic hysteresis measurements with an 25 cm Epstein frame according to DIN EN 60404-2 (Material: M330-50A, 4 Sheets)
   
        
     
-      
+      
     
   
        
 
        
@@ -59,7 +59,7 @@ The following two figures show a comparison between measured and simulated dynam
 
        Fig. 3: Simulation results of a 25 cm Epstein frame model according to the measurement setup of Fig. 1
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/HysteresisLosses.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/HysteresisLosses.mo
index 9ff27c25a3..aa069e679c 100644
--- a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/HysteresisLosses.mo
+++ b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/HysteresisLosses.mo
@@ -8,7 +8,7 @@ class HysteresisLosses "Hysteresis losses"
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -20,7 +20,7 @@ The two components LossPowerStat and LossPowerEddy can
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -28,20 +28,20 @@ The two components LossPowerStat and LossPowerEddy can
 
        
   
        
     
-      
+      
     
   
        
 
        
 
 
        
-Where σcl is the classical eddy current factor (see UsersGuide.Hysteresis.DynamicHysteresis) and V the volume of the core material. The equations show that LossPowerStat acts as power sink and power source (magnetic energy storage) whereas LossPowerEddy is always positive (Power sink). By means of an simple example the following figures show the time course of the magnetic flux density,  the magnetic field strength and the hysteresis losses. The pulsating course of the power loss (see Fig. 3c) makes it difficult to estimate an average loss. For this reason, the hysteresis flux tube elements are capable of directly computing the moving average of the power losses. Therefore, t_avg of the \"LossesAndHeat\" tab of the elements parameter dialog may be adjusted to set an adequate time interval (see Fig. 3d).
+Where σcl is the classical eddy current factor (see UsersGuide.Hysteresis.DynamicHysteresis) and V the volume of the core material. The equations show that LossPowerStat acts as power sink and power source (magnetic energy storage) whereas LossPowerEddy is always positive (Power sink). By means of an simple example the following figures show the time course of the magnetic flux density,  the magnetic field strength and the hysteresis losses. The pulsating course of the power loss (see Fig. 3c) makes it difficult to estimate an average loss. For this reason, the hysteresis flux tube elements are capable of directly computing the moving average of the power losses. Therefore, t_avg of the \"LossesAndHeat\" tab of the elements parameter dialog may be adjusted to set an adequate time interval (see Fig. 3d).
 
        
 
 
-  
+  
        Fig. 1: Diagram of a simple transformer with ferromagnetic core (model available at Examples.Hysteresis.SinglePhaseTransformerWithHysteresis1)Fig. 1: Diagram of a simple transformer with ferromagnetic core (model available at Examples.Hysteresis.SinglePhaseTransformerWithHysteresis1)
   
        
     
-      
+      
     
   
        
 
        
@@ -50,7 +50,7 @@ Where σcl is the classical eddy current factor (se
   
        Fig. 2: Simulated total dynamic hysteresis loop with its static and eddy current fractions
   
        
     
-      
+      
     
   
        
 
        
@@ -59,7 +59,7 @@ Where σcl is the classical eddy current factor (se
   
        Fig. 3: Simulated outputs of the Core component of Fig. 1
   
        
     
-      
+      
     
   
        
 
        
diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Preisach.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Preisach.mo
index 6a2501f2d3..45df236703 100644
--- a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Preisach.mo
+++ b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Preisach.mo
@@ -6,14 +6,14 @@ class Preisach "Preisach Hysteresis Model"
 
        The Preisach hysteresis model
        
 
 
        
-This section gives an very brief overview of the Preisach hysteresis model, which is explained in more detail in [Pr35, Ma03, Zi12]. The classical Preisach hysteresis model describes the course of magnetic flux density B(t) of a ferromagnetic core material as a function of the course of the magnetic field strength H(t) and its history. The model assumes an infinite set of elementary hysteresis operators γαβ. The simple rectangular pattern of the output γαβH(t) of such an operator with its upper and lower switching limits α and β is shown Fig. 1.
+This section gives an very brief overview of the Preisach hysteresis model, which is explained in more detail in [Pr35, Ma03, Zi12]. The classical Preisach hysteresis model describes the course of magnetic flux density B(t) of a ferromagnetic core material as a function of the course of the magnetic field strength H(t) and its history. The model assumes an infinite set of elementary hysteresis operators γαβ. The simple rectangular pattern of the output γαβH(t) of such an operator with its upper and lower switching limits α and β is shown Fig. 1.
 
        
 
 
        
   Fig. 1: Characteristics of an elementary hysteresis operator.
   
        
     
-      
+      
     
   
        
 
        
@@ -26,7 +26,7 @@ Due to α≥β, the switching limits α and β span a right t
   
        Fig. 2: Preisach Plane (a) and exemplary plot of the Preisach distribution function P(α,β) (b)
   
        
     
-      
+      
     
   
        
 
        
@@ -38,7 +38,7 @@ Additionally, the Preisach distribution function P(α,β) is defined ov
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -46,13 +46,13 @@ Additionally, the Preisach distribution function P(α,β) is defined ov
 
        Hysteresis shape and computing of the double integral
        
 
 
        
-The equation above shows, that the double integral of P(α,β) have to be computed in every time step to compute B(t) according to the Preisach hysteresis model. Typically, the Preisach distribution function is not analytically integrable twice. A numerical double integration in every time step would be very computationally intensive. Therefore, an analytical description of the Everett function [YUY89] is used to define the hysteresis shape.
+The equation above shows, that the double integral of P(α,β) have to be computed in every time step to compute B(t) according to the Preisach hysteresis model. Typically, the Preisach distribution function is not analytically integrable twice. A numerical double integration in every time step would be very computationally intensive. Therefore, an analytical description of the Everett function [YUY89] is used to define the hysteresis shape.
 
        
 
 
        
   
        
     
-      
+      
     
   
        
 
        
@@ -65,13 +65,13 @@ The Everett function returns the change in magnetization which results when all
    Fig. 3: Preisach plane and region R over which P(α,β) is integrated to obtain E(H1,H2)
    - +

    -According to [YUY89] the used analytical form of the Everett function is parameterized by 8 parameters. Several parameter sets were identified to fit measured or published static hysteresis behavior of different materials. These predefined parameter sets are stored in FluxTubes.Material.HysteresisEverettParameter library and can be used with the GenericHystPreisachEverett flux tube element. Additionally, also the GenericHystTellinenEverett element can use this library. +According to [YUY89] the used analytical form of the Everett function is parameterized by 8 parameters. Several parameter sets were identified to fit measured or published static hysteresis behavior of different materials. These predefined parameter sets are stored in FluxTubes.Material.HysteresisEverettParameter library and can be used with the GenericHystPreisachEverett flux tube element. Additionally, also the GenericHystTellinenEverett element can use this library.

    ")); diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Tellinen.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Tellinen.mo index ab0f30ff69..903676df3d 100644 --- a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Tellinen.mo +++ b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/StaticHysteresis/Tellinen.mo @@ -6,11 +6,11 @@ class Tellinen "Tellinen Hysteresis Model"

    The Tellinen hysteresis model

    -The Tellinen hysteresis model is described in more detail in [Te98, ZB12]. It is a simple model to describe the static magnetic hysteresis behavior of ferromagnetic materials. It only requires the Upper BU(H) and lower BL(H) branches of the limiting hysteresis loop for the adaption to a material specific hysteresis shape. Coming from negative magnetic saturation with increasing magnetic field strength H(t) the flux density B(T) travels along the BL(H). Coming from positive saturation with a decreasing H(t), B(t) travels along BU(H). The Tellinen model is defined by the following equation, which gives a calculation rule for time derivative of the magnetic flux density B(t) with respect to the current value of B(t), H(t) and its slope dH(t)/dt. +The Tellinen hysteresis model is described in more detail in [Te98, ZB12]. It is a simple model to describe the static magnetic hysteresis behavior of ferromagnetic materials. It only requires the Upper BU(H) and lower BL(H) branches of the limiting hysteresis loop for the adaption to a material specific hysteresis shape. Coming from negative magnetic saturation with increasing magnetic field strength H(t) the flux density B(T) travels along the BL(H). Coming from positive saturation with a decreasing H(t), B(t) travels along BU(H). The Tellinen model is defined by the following equation, which gives a calculation rule for time derivative of the magnetic flux density B(t) with respect to the current value of B(t), H(t) and its slope dH(t)/dt.

    - +
    @@ -21,7 +21,7 @@ Therein, SU(H) and SL(H) are the derivatives of limiting b Fig. 1: Upper BU(H) and lower BL(H) branches of the hysteresis envelope curve, their corresponding slope functions SUH(H) and SLH(H) and the actual operating point H(t), B(t).

    - +
    ")); diff --git a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/package.mo b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/package.mo index 8df13e2dc6..02c5df485e 100644 --- a/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/package.mo +++ b/Modelica/Magnetic/FluxTubes/UsersGuide/Hysteresis/package.mo @@ -11,16 +11,16 @@ The elements provided in the package Shapes.HysteresisAndMagnets allow for consi

    - +
    Fig. 1: Inductor with ferromagnetic core and hysteresis effects; (a) diagram of the network model; (b) simulated hysteresis characteristics of the core for different excitation frequencies of 0, 10 and 100 Hz (the example model can be found at: Examples.Hysteresis.InductorWithHysteresis)Fig. 1: Inductor with ferromagnetic core and hysteresis effects; (a) diagram of the network model; (b) simulated hysteresis characteristics of the core for different excitation frequencies of 0, 10 and 100 Hz (the example model can be found at: Examples.Hysteresis.InductorWithHysteresis)
    - +

    -Several models to describe the static hysteresis behavior of ferromagnetic materials are known. In this library two of them are implemented. The simple but fast Tellinen hysteresis model and the more accurate but complex Preisach hysteresis model. Click the links for a short description of both models. +Several models to describe the static hysteresis behavior of ferromagnetic materials are known. In this library two of them are implemented. The simple but fast Tellinen hysteresis model and the more accurate but complex Preisach hysteresis model. Click the links for a short description of both models.

    Flux tube elements of the Package HysteresisAndMagnets

    @@ -31,59 +31,59 @@ Several models to describe the static hysteresis behavior of ferromagnetic mater
    GenericHystTellinenSoft
    +     		GenericHystTellinenSoft
    		 - Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters. Therefore, the hysteresis shape variety is limited but the parameterization of the model is very simple and the model is relatively fast and robust. + Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters. Therefore, the hysteresis shape variety is limited but the parameterization of the model is very simple and the model is relatively fast and robust.
    GenericHystTellinenHard
    +     		GenericHystTellinenHard
    		 - Flux tube element for modeling the ferromagnetic (static) hysteresis of hard magnetic materials. The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters. + Flux tube element for modeling the ferromagnetic (static) hysteresis of hard magnetic materials. The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The shape of the limiting hysteresis loop is described by simple hyperbolic tangent functions with 4 parameters.
    GenericHystTellinenEverett
    +     		GenericHystTellinenEverett
    		 - Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function, which is also used to parameterize the GenericHystPreisachEverett model. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter. + Flux tube element for modeling soft magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function, which is also used to parameterize the GenericHystPreisachEverett model. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
    GenericHystTellinenTable
    +     		GenericHystTellinenTable
    		 - Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The rising and falling branch of the limiting ferromagnetic hysteresis loop are specified by table data. Therefore, almost any hysteresis shapes are possible. A library with predefined tables can be found at FluxTubes.Material.HysteresisTableData. + Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the Tellinen hysteresis model. The rising and falling branch of the limiting ferromagnetic hysteresis loop are specified by table data. Therefore, almost any hysteresis shapes are possible. A library with predefined tables can be found at FluxTubes.Material.HysteresisTableData.
    GenericHystPreisachEverett
    +     		GenericHystPreisachEverett
    		 Flux tube element for modeling magnetic materials with ferromagnetic and dynamic hysteresis (eddy currents). The ferromagnetic hysteresis behavior is defined by the -Preisach hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter. +Preisach hysteresis model. The Shape of the limiting ferromagnetic hysteresis loop is specified by an analytical description of the Everett function. A library of predefined parameter sets can be found in FluxTubes.Material.HysteresisEverettParameter.
    GenericHystTellinenPermanentMagnet
    +     		GenericHystTellinenPermanentMagnet
    		 - Flux tube element for modeling the hard magnetic hysteresis of permanent magnets. The model is similar to GenericHystTellinenHard but has an initial magnetization preset of -100% and an adapted icon for better readability of the diagram. + Flux tube element for modeling the hard magnetic hysteresis of permanent magnets. The model is similar to GenericHystTellinenHard but has an initial magnetization preset of -100% and an adapted icon for better readability of the diagram.
    GenericLinearPermanentMagnet
    +     		GenericLinearPermanentMagnet
    		 - Simple model of a linear permanent Magnet. Typical characteristics of common permanent magnetic materials can be found at FluxTubes.Material.HardMagnetic. + Simple model of a linear permanent Magnet. Typical characteristics of common permanent magnetic materials can be found at FluxTubes.Material.HardMagnetic.
    Fig: Magnetic equivalent circuit of the air gap model
    - +

    See also

    -SinglePhaseWinding, -SymmetricPolyphaseWinding, -SymmetricPolyphaseCageWinding -SaliencyCageWinding +SinglePhaseWinding, +SymmetricPolyphaseWinding, +SymmetricPolyphaseCageWinding +SaliencyCageWinding

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo index 587faabd16..0a2f842da9 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo @@ -125,15 +125,15 @@ equation Documentation(info="

    -The salient cage model is a two axis model with two phases. The electromagnetic coupling therefore is also two phase coupling model. The angles of the two orientations are 0 and . This way an asymmetrical rotor cage with different resistances and stray inductances in d- and q-axis can be modeled. +The salient cage model is a two axis model with two phases. The electromagnetic coupling therefore is also two phase coupling model. The angles of the two orientations are 0 and . This way an asymmetrical rotor cage with different resistances and stray inductances in d- and q-axis can be modeled.

    See also

    -SinglePhaseWinding, -SymmetricPolyphaseWinding, -SymmetricPolyphaseCageWinding -RotorSaliencyAirGap +SinglePhaseWinding, +SymmetricPolyphaseWinding, +SymmetricPolyphaseCageWinding +RotorSaliencyAirGap

    ")); end SaliencyCageWinding; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SinglePhaseWinding.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SinglePhaseWinding.mo index 41ce486576..f316930276 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SinglePhaseWinding.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SinglePhaseWinding.mo @@ -113,16 +113,16 @@ equation textString="%name")}), Documentation(info="

    The single-phase winding consists of a winding -resistor, a -single-phase electromagnetic coupling and a stray reluctance. +resistor, a +single-phase electromagnetic coupling and a stray reluctance.

    See also

    -SymmetricPolyphaseWinding, -SymmetricPolyphaseCageWinding, -SaliencyCageWinding -RotorSaliencyAirGap +SymmetricPolyphaseWinding, +SymmetricPolyphaseCageWinding, +SaliencyCageWinding +RotorSaliencyAirGap

    ")); end SinglePhaseWinding; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo index aca3ed4ca5..8069a67b59 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo @@ -128,19 +128,19 @@ equation textString="%name")}), Documentation(info="
    - +

    The symmetric rotor cage model of this library does not consist of rotor bars and end rings. Instead the symmetric cage is modeled by an equivalent symmetrical winding. The rotor cage model consists of - phases. If the cage is modeled by equivalent stator winding parameters, the number of effective turns, , has to be chosen equivalent to the effective number of stator turns. + phases. If the cage is modeled by equivalent stator winding parameters, the number of effective turns, , has to be chosen equivalent to the effective number of stator turns.

    See also

    -SinglePhaseWinding, -SymmetricPolyphaseWinding, -SaliencyCageWinding, -RotorSaliencyAirGap +SinglePhaseWinding, +SymmetricPolyphaseWinding, +SaliencyCageWinding, +RotorSaliencyAirGap

    ")); end SymmetricPolyphaseCageWinding; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo index 381084ed0a..380d73eabf 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo @@ -159,20 +159,20 @@ equation Documentation(info="

    The symmetrical polyphase winding consists of a symmetrical winding -resistor, a -zero inductor as well as a symmetrical -polyphase electromagnetic coupling and a -stray reluctance and a -core loss model including -heat port. +resistor, a +zero inductor as well as a symmetrical +polyphase electromagnetic coupling and a +stray reluctance and a +core loss model including +heat port.

    See also

    -SinglePhaseWinding, -SymmetricPolyphaseCageWinding, -SaliencyCageWinding -RotorSaliencyAirGap +SinglePhaseWinding, +SymmetricPolyphaseCageWinding, +SaliencyCageWinding +RotorSaliencyAirGap

    ")); end SymmetricPolyphaseWinding; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo index d26be26c1d..fd4f747e55 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo @@ -34,7 +34,7 @@ model IM_SlipRing "Induction machine with slip ring rotor" parameter SI.Inductance Lm(start=3*ZsRef*sqrt(1 - 0.0667)/(2*pi *fsNominal)) "Stator main field inductance" annotation (Dialog( tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/IMS.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/IMS.png")); parameter SI.Inductance Lrsigma(start=3*ZsRef*(1 - sqrt(1 - 0.0667))/(2*pi*fsNominal)) "Rotor leakage inductance w.r.t. rotor side" @@ -151,7 +151,7 @@ Resistances and stray inductances of the machine always refer to either stator o

    See also

    -IM_SquirrelCage, +IM_SquirrelCage,

    ")); end IM_SlipRing; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo index 82e6f0ad77..bbef8a9ff8 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo @@ -23,7 +23,7 @@ model IM_SquirrelCage parameter SI.Inductance Lm(start=3*ZsRef*sqrt(1 - 0.0667)/(2*pi *fsNominal)) "Stator main field inductance" annotation (Dialog( tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/IMC.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/IMC.png")); parameter SI.Inductance Lrsigma(start=3*ZsRef*(1 - sqrt(1 - 0.0667))/(2*pi*fsNominal)) "Rotor leakage inductance of equivalent m phase winding w.r.t. stator side" @@ -80,7 +80,7 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    -IM_SlipRing, +IM_SlipRing,

    ")); end IM_SquirrelCage; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/package.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/package.mo index 76c137b14b..5442bcb93c 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/package.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/InductionMachines/package.mo @@ -8,7 +8,7 @@ package InductionMachines "Induction machines"

    See also

    -SynchronousMachines +SynchronousMachines

    ")); end InductionMachines; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo index df45c091f2..253f6a72c3 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo @@ -31,7 +31,7 @@ model SM_ElectricalExcited parameter SI.Inductance Lmd(start=1.5*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, d-axis" annotation (Dialog(tab= "Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMEE.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMEE.png")); parameter SI.Inductance Lmq(start=1.5*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -233,8 +233,8 @@ The symmetry of the stator is assumed. For rotor asymmetries can be taken into a

    See also

    -SM_PermanentMagnet, -SM_ReluctanceRotor, +SM_PermanentMagnet, +SM_ReluctanceRotor,

    ")); end SM_ElectricalExcited; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo index 8ec772d492..fd40647030 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo @@ -29,7 +29,7 @@ model SM_PermanentMagnet parameter SI.Inductance Lmd(start=0.3*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, d-axis" annotation (Dialog(tab= "Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMPM.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMPM.png")); parameter SI.Inductance Lmq(start=0.3*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -188,8 +188,8 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    -SM_ElectricalExcited, -SM_ReluctanceRotor, +SM_ElectricalExcited, +SM_ReluctanceRotor,

    ")); end SM_PermanentMagnet; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo index 58c36b93fc..5da8d97dc5 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo @@ -28,7 +28,7 @@ model SM_ReluctanceRotor "Reluctance machine with optional damper cage" parameter SI.Inductance Lmd(start=2.9*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, d-axis" annotation (Dialog(tab= "Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMR.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMR.png")); parameter SI.Inductance Lmq(start=0.9*ZsRef/(2*pi*fsNominal)) "Stator main field inductance, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -141,8 +141,8 @@ The symmetry of the stator is assumed. For rotor asymmetries can be taken into a

    See also

    -SM_ElectricalExcited, -SM_PermanentMagnet, +SM_ElectricalExcited, +SM_PermanentMagnet,

    ")); end SM_ReluctanceRotor; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/package.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/package.mo index c42a78f56a..0846ee61a1 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/package.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/SynchronousMachines/package.mo @@ -8,7 +8,7 @@ package SynchronousMachines "Synchronous machines"

    See also

    -InductionMachines +InductionMachines

    ")); end SynchronousMachines; diff --git a/Modelica/Magnetic/FundamentalWave/BasicMachines/package.mo b/Modelica/Magnetic/FundamentalWave/BasicMachines/package.mo index b798872e87..3f5eecff73 100644 --- a/Modelica/Magnetic/FundamentalWave/BasicMachines/package.mo +++ b/Modelica/Magnetic/FundamentalWave/BasicMachines/package.mo @@ -5,7 +5,7 @@ package BasicMachines "Basic machine components and models" annotation (Documentation(info="

    This package contains electric machine models and -components +components for electric machines.

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Components/Crossing.mo b/Modelica/Magnetic/FundamentalWave/Components/Crossing.mo index ba1b9a624e..9fcd25c921 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/Crossing.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/Crossing.mo @@ -35,8 +35,8 @@ This is a simple crossing of two branches. The ports port_p1 and See also

    -Idle, -Short +Idle, +Short

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Components/EddyCurrent.mo b/Modelica/Magnetic/FundamentalWave/Components/EddyCurrent.mo index fbe0553ae6..149c3451d8 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/EddyCurrent.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/EddyCurrent.mo @@ -33,11 +33,11 @@ equation textString="%name")}),Documentation(info="

    The eddy current loss model with respect to fundamental wave effects is designed in accordance to -FluxTubes.Basic.EddyCurrent. +FluxTubes.Basic.EddyCurrent.

    -\"eddycurrent.png\"
    @@ -45,7 +45,7 @@ The eddy current loss model with respect to fundamental wave effects is designed
    Fig. 1: equivalent models of eddy current losses
    - \"eddycurrent_electric.png\"
    Fig: Orientation of winding and location of complex magnetic flux
    - +
    @@ -136,7 +136,7 @@ The converter model optionally (if useStrayPermeance = true) consid

    See also

    -SinglePhaseElectroMagneticConverter +SinglePhaseElectroMagneticConverter

    ")); end PolyphaseElectroMagneticConverter; diff --git a/Modelica/Magnetic/FundamentalWave/Components/Reluctance.mo b/Modelica/Magnetic/FundamentalWave/Components/Reluctance.mo index bfa8c45411..c3a86e48a2 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/Reluctance.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/Reluctance.mo @@ -20,18 +20,18 @@ equation textString="%name")}), Documentation(info="

    The salient reluctance models the relationship between the complex magnetic potential difference -\"V_m.png\" and the complex magnetic flux , +\"V_m.png\" and the complex magnetic flux ,

    -\"reluctance.png\"

    which can also be expressed in terms complex phasors:

    -\"reluctance_alt.png\"
    diff --git a/Modelica/Magnetic/FundamentalWave/Components/Short.mo b/Modelica/Magnetic/FundamentalWave/Components/Short.mo index 56160eb520..67ece4fb21 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/Short.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/Short.mo @@ -17,8 +17,8 @@ This is a simple short cut branch.

    See also

    -Idle, -Crossing +Idle, +Crossing

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Components/SinglePhaseElectroMagneticConverter.mo b/Modelica/Magnetic/FundamentalWave/Components/SinglePhaseElectroMagneticConverter.mo index 9d24c5af06..7a0b99d367 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/SinglePhaseElectroMagneticConverter.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/SinglePhaseElectroMagneticConverter.mo @@ -91,7 +91,7 @@ equation textString="%name")}), Documentation(info="

    -The single-phase winding has an effective number of turns, and a respective orientation of the winding, . The current in winding is . +The single-phase winding has an effective number of turns, and a respective orientation of the winding, . The current in winding is .

    @@ -99,7 +99,7 @@ The total complex magnetic potential difference of the single-phase winding is d

    -   +  

    @@ -107,19 +107,19 @@ In this equation the magnetomotive force is aligned with the orientation of the

    -The voltage induced in the winding depends on the cosine between the orientation of the winding and the angle of the complex magnetic flux. Additionally, the magnitudes of the induced voltages are proportional to the respective number of turns. This relationship can be modeled by means of

    +The voltage induced in the winding depends on the cosine between the orientation of the winding and the angle of the complex magnetic flux. Additionally, the magnitudes of the induced voltages are proportional to the respective number of turns. This relationship can be modeled by means of

    -   +  

    The single-phase electromagnetic converter is a special case of the -PolyphaseElectroMagneticConverter +PolyphaseElectroMagneticConverter

    See also

    -PolyphaseElectroMagneticConverter +PolyphaseElectroMagneticConverter

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Components/package.mo b/Modelica/Magnetic/FundamentalWave/Components/package.mo index 1ee92be4f4..6eda0af23d 100644 --- a/Modelica/Magnetic/FundamentalWave/Components/package.mo +++ b/Modelica/Magnetic/FundamentalWave/Components/package.mo @@ -4,6 +4,6 @@ package Components "Basic fundamental wave components" annotation (Documentation(info="

    Basic components of the FundamentalWave library for modeling magnetic circuits. Machine specific components are -located at Machines.Components.

    +located at Machines.Components.

    ")); end Components; diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo index 3f9a69972b..b3f414613a 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_CommonLeakage.mo @@ -261,7 +261,7 @@ equation Documentation(info="

    At start time tStart voltages are supplied to the -polyphase induction machines with squirrel cage. +polyphase induction machines with squirrel cage. The machines starts from standstill, accelerating inertias against load torque quadratic dependent on speed, finally reaching nominal speed. Three equivalent machines with different parameter ratioCommonLeakage are compared. Note that due to the mode of operation, the behaviour of all three machines is identical. diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo index 7c269b5fa7..befd2f48eb 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMC_DOL_Polyphase.mo @@ -238,7 +238,7 @@ equation Documentation(info="

    At start time tStart voltages are supplied to the -polyphase induction machines with squirrel cage. +polyphase induction machines with squirrel cage. The machines starts from standstill, accelerating inertias against load torque quadratic dependent on speed, finally reaching nominal speed. Two equivalent machines with different numbers of phases are compared and their equal behavior is demonstrated.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo index fe8d00a5a6..7442bd74e1 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/ComparisonPolyphase/IMS_Start_Polyphase.mo @@ -269,7 +269,7 @@ equation Documentation(info="

    At start time tOn voltages are supplied to the -induction machines with sliprings. +induction machines with sliprings. The two machine start from standstill, accelerating inertias against load torque quadratic dependent on speed, using a starting resistance. At time tRheostat external rotor resistance is shortened, finally reaching nominal speed. Two equivalent machines with different numbers of phases are compared and their equal behavior is demonstrated.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo index 733e367f68..2dd1274cd3 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_DOL.mo @@ -183,7 +183,7 @@ equation Tolerance=1e-06), Documentation(info="

    At start time tStart three-phase voltage is supplied to the -induction machine with squirrel cage. +induction machine with squirrel cage. The machine starts from standstill, accelerating inertias against load torque quadratic dependent on speed, finally reaching nominal speed.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Start.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Start.mo index 43ac9c2a7d..e3c0fdb94e 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Start.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMS_Start.mo @@ -208,7 +208,7 @@ equation Tolerance=1e-06), Documentation(info="

    At start time tOn three-phase voltage is supplied to the -induction machine with sliprings. +induction machine with sliprings. The machine starts from standstill, accelerating inertias against load torque quadratic dependent on speed, using a starting resistance. At time tRheostat external rotor resistance is shortened, finally reaching nominal speed.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo index 7c7df35591..a3fbbcce9f 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMEE_Generator_Polyphase.mo @@ -333,7 +333,7 @@ equation

    Electrical excited synchronous machine as generator

    Two -electrically excited synchronous generators are connected to grids and driven with constant speed. +electrically excited synchronous generators are connected to grids and driven with constant speed. Since speed is slightly smaller than synchronous speed corresponding to mains frequency, rotor angle is very slowly increased. Two equivalent machines with different numbers of phases are compared and their equal behavior is demonstrated.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo index 8a9dae3289..926c29ffe0 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMPM_Inverter_Polyphase.mo @@ -273,10 +273,10 @@ equation

    An ideal frequency inverter is modeled by using -VfControllers -and SignalVoltagess. +VfControllers +and SignalVoltagess. Frequency is raised by a ramp, causing the -permanent magnet synchronous machines to start, +permanent magnet synchronous machines to start, and accelerate the inertias. Two equivalent machines with different numbers of phases are compared and their equal behavior is demonstrated.

    At time tStep a load step is applied. Simulate for 1.5 seconds and plot (versus time):

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo index e5cfbfe053..91b9b9f9af 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/ComparisonPolyphase/SMR_Inverter_Polyphase.mo @@ -250,10 +250,10 @@ equation

    Synchronous machine with reluctance rotor fed by an ideal inverter

    Ideal frequency inverters are modeled by using a -VfController -and phase SignalVoltages. +VfController +and phase SignalVoltages. Frequency is raised by a ramp, causing the -reluctance machine to start, +reluctance machine to start, and accelerating inertias. At time tStep a load step is applied. Two equivalent machines with different numbers of phases are compared and their equal behavior is demonstrated.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo index 4a650c7dba..a584591a47 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_Generator.mo @@ -285,7 +285,7 @@ equation

    Electrical excited synchronous machine as generator

    An -electrically excited synchronous generator is connected to the grid and driven with constant speed. +electrically excited synchronous generator is connected to the grid and driven with constant speed. Since speed is slightly smaller than synchronous speed corresponding to mains frequency, rotor angle is very slowly increased. This allows to see several characteristics dependent on rotor angle.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Inverter.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Inverter.mo index 56b95a2414..42f8b8c92f 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Inverter.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_Inverter.mo @@ -206,10 +206,10 @@ equation

    An ideal frequency inverter is modeled by using a -VfController -and a three-phase SignalVoltage. +VfController +and a three-phase SignalVoltage. Frequency is raised by a ramp, causing the -permanent magnet synchronous machine to start, +permanent magnet synchronous machine to start, and accelerate the inertias.

    At time tStep a load step is applied. Simulate for 1.5 seconds and plot (versus time):

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_Inverter.mo b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_Inverter.mo index aae9d2acd2..8455e31167 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_Inverter.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMR_Inverter.mo @@ -198,10 +198,10 @@ equation

    Synchronous machine with reluctance rotor fed by an ideal inverter

    An ideal frequency inverter is modeled by using a -VfController -and a three-phase SignalVoltage. +VfController +and a three-phase SignalVoltage. Frequency is raised by a ramp, causing the -reluctance machine to start, +reluctance machine to start, and accelerating inertias. At time tStep a load step is applied.

    diff --git a/Modelica/Magnetic/FundamentalWave/Examples/package.mo b/Modelica/Magnetic/FundamentalWave/Examples/package.mo index 65c371bf70..6f4a19cf57 100644 --- a/Modelica/Magnetic/FundamentalWave/Examples/package.mo +++ b/Modelica/Magnetic/FundamentalWave/Examples/package.mo @@ -4,8 +4,8 @@ package Examples "Examples of electric machines based on the FundamentalWave con annotation (Documentation(info="

    Examples comparing the models of -Electrical.Machines.BasicMachines with -Magnetic.FundamentalWave.BasicMachines. +Electrical.Machines.BasicMachines with +Magnetic.FundamentalWave.BasicMachines.

    ")); end Examples; diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/MagneticPort.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/MagneticPort.mo index 0fa0daa88d..9bc5e57faa 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/MagneticPort.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/MagneticPort.mo @@ -6,13 +6,13 @@ connector MagneticPort "Magnetic port of fundamental wave machines" "Complex magnetic flux into the port"; annotation (Documentation(info="

    -The potential quantity of the magnetic port is the complex magnetic potential difference . The corresponding flow quantity is the magnetic flux . +The potential quantity of the magnetic port is the complex magnetic potential difference . The corresponding flow quantity is the magnetic flux .

    See also

    -PositiveMagneticPort, -NegativeMagneticPort +PositiveMagneticPort, +NegativeMagneticPort

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/NegativeMagneticPort.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/NegativeMagneticPort.mo index 72f055d311..81390083cf 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/NegativeMagneticPort.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/NegativeMagneticPort.mo @@ -20,13 +20,13 @@ connector NegativeMagneticPort "Negative magnetic port of fundamental wave machi fillPattern=FillPattern.Solid)}), Documentation(info="

    -Negative magnetic port. +Negative magnetic port.

    See also

    -MagneticPort, -PositiveMagneticPort +MagneticPort, +PositiveMagneticPort

    ")); end NegativeMagneticPort; diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/PositiveMagneticPort.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/PositiveMagneticPort.mo index 8271da2324..2cb7541931 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/PositiveMagneticPort.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/PositiveMagneticPort.mo @@ -20,13 +20,13 @@ connector PositiveMagneticPort "Positive magnetic port of fundamental wave machi fillPattern=FillPattern.Solid)}), Documentation(info="

    -Positive magnetic port. +Positive magnetic port.

    See also

    -MagneticPort, -NegativeMagneticPort +MagneticPort, +NegativeMagneticPort

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPort.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPort.mo index cd4e3c343e..57ea72931e 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPort.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPort.mo @@ -7,17 +7,17 @@ equation annotation (Documentation(info="

    This magnetic two port element only consists of a -positive and a -negative magnetic port. +positive and a +negative magnetic port. This model is mainly used to extend from in order build more complex - equation based - models.

    See also

    -PositiveMagneticPort, -NegativeMagneticPort, -TwoPortElementary, -TwoPortExtended +PositiveMagneticPort, +NegativeMagneticPort, +TwoPortElementary, +TwoPortExtended

    ")); end TwoPort; diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortElementary.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortElementary.mo index 02ce511012..33869a94e8 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortElementary.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortElementary.mo @@ -7,16 +7,16 @@ partial model TwoPortElementary "Two magnetic ports for graphical modeling" annotation (Documentation(info="

    This magnetic two port element consists of a -positive and a -negative magnetic port and +positive and a +negative magnetic port and considers the flux balance of the two ports. Additionally the magnetic potential difference (of the positive and the negative port) and the magnetic flux (into the positive magnetic port) are defined. This model is mainly to used to extend from in order build more complex - graphical - models.

    See also

    -PositiveMagneticPort, -NegativeMagneticPort, -TwoPortExtended -TwoPort +PositiveMagneticPort, +NegativeMagneticPort, +TwoPortExtended +TwoPort

    ")); end TwoPortElementary; diff --git a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortExtended.mo b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortExtended.mo index dae3bc6f50..87b799a8f6 100644 --- a/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortExtended.mo +++ b/Modelica/Magnetic/FundamentalWave/Interfaces/TwoPortExtended.mo @@ -15,11 +15,11 @@ partial model TwoPortExtended "Two magnetic ports for graphical modeling with ad "Argument of complex magnetic flux"; annotation (Documentation(info=" -

    This magnetic two port element consists of a positive and a negative magnetic port and some additionally variables, but no physical balance equations.

    +

    This magnetic two port element consists of a positive and a negative magnetic port and some additionally variables, but no physical balance equations.

    See also

    -

    PositiveMagneticPort, -NegativeMagneticPort, -TwoPort, -TwoPortElementary

    +

    PositiveMagneticPort, +NegativeMagneticPort, +TwoPort, +TwoPortElementary

    ")); end TwoPortExtended; diff --git a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticFluxSensor.mo b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticFluxSensor.mo index 48dca290bf..6502eb2849 100644 --- a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticFluxSensor.mo +++ b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticFluxSensor.mo @@ -37,7 +37,7 @@ equation

    See also

    -MagneticPotentialDifferenceSensor +MagneticPotentialDifferenceSensor

    ")); end MagneticFluxSensor; diff --git a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo index df2601922e..345f6a1b59 100644 --- a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo +++ b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo @@ -37,6 +37,6 @@ equation

    See also

    -MagneticFluxSensor +MagneticFluxSensor

    ")); end MagneticPotentialDifferenceSensor; diff --git a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialSensor.mo b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialSensor.mo index fdf1ca7640..71fb84aaba 100644 --- a/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialSensor.mo +++ b/Modelica/Magnetic/FundamentalWave/Sensors/MagneticPotentialSensor.mo @@ -30,6 +30,6 @@ equation

    See also

    -MagneticFluxSensor +MagneticFluxSensor

    ")); end MagneticPotentialSensor; diff --git a/Modelica/Magnetic/FundamentalWave/Sources/ConstantFlux.mo b/Modelica/Magnetic/FundamentalWave/Sources/ConstantFlux.mo index 377a974642..4620c2b443 100644 --- a/Modelica/Magnetic/FundamentalWave/Sources/ConstantFlux.mo +++ b/Modelica/Magnetic/FundamentalWave/Sources/ConstantFlux.mo @@ -44,11 +44,11 @@ Source of constant magnetic flux.

    See also

    - + ConstantMagneticPotentialDifference, - + SignalMagneticPotentialDifference, -SignalFlux +SignalFlux

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo b/Modelica/Magnetic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo index 82d4693e7f..2508f38e4b 100644 --- a/Modelica/Magnetic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo +++ b/Modelica/Magnetic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo @@ -45,9 +45,9 @@ Source of constant magnetomotive force.

    See also

    -SignalMagneticPotentialDifference, -ConstantFlux, -SignalFlux +SignalMagneticPotentialDifference, +ConstantFlux, +SignalFlux

    ")); end ConstantMagneticPotentialDifference; diff --git a/Modelica/Magnetic/FundamentalWave/Sources/SignalFlux.mo b/Modelica/Magnetic/FundamentalWave/Sources/SignalFlux.mo index ea26fbe27e..7623720af7 100644 --- a/Modelica/Magnetic/FundamentalWave/Sources/SignalFlux.mo +++ b/Modelica/Magnetic/FundamentalWave/Sources/SignalFlux.mo @@ -50,11 +50,11 @@ Source of magnetic flux with complex signal input.

    See also

    - + ConstantMagneticPotentialDifference, - + SignalMagneticPotentialDifference, -ConstantFlux, +ConstantFlux,

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo b/Modelica/Magnetic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo index 63cac70d03..295cfc8868 100644 --- a/Modelica/Magnetic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo +++ b/Modelica/Magnetic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo @@ -50,9 +50,9 @@ Source of magnetomotive force with complex signal input.

    See also

    -ConstantMagneticPotentialDifference, -ConstantFlux, -SignalFlux +ConstantMagneticPotentialDifference, +ConstantFlux, +SignalFlux

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/Salient.mo b/Modelica/Magnetic/FundamentalWave/Types/Salient.mo index a0c47ddd96..f0e20f9ad4 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/Salient.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/Salient.mo @@ -10,11 +10,11 @@ Definition of saliency with respect to the orthogonal d- and q-axis. Saliency, h

    See also

    -SalientCurrent, -SalientVoltage, -SalientInductance, -SalientReluctance, -SalientResistance +SalientCurrent, +SalientVoltage, +SalientInductance, +SalientReluctance, +SalientResistance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientCurrent.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientCurrent.mo index 1016e64ca5..b7341ffcd0 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientCurrent.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientCurrent.mo @@ -6,12 +6,12 @@ record SalientCurrent = Salient (redeclare SI.Current d,

    See also

    -Salient, -SalientVoltage, -SalientResistance, -SalientInductance, -SalientReluctance, -SalientPermeance +Salient, +SalientVoltage, +SalientResistance, +SalientInductance, +SalientReluctance, +SalientPermeance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientInductance.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientInductance.mo index ddb6b9a81e..7328123b39 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientInductance.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientInductance.mo @@ -6,12 +6,12 @@ record SalientInductance = Salient (redeclare SI.Inductance d,

    See also

    -Salient, -SalientCurrent, -SalientVoltage, -SalientResistance, -SalientReluctance, -SalientPermeance +Salient, +SalientCurrent, +SalientVoltage, +SalientResistance, +SalientReluctance, +SalientPermeance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientPermeance.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientPermeance.mo index 540abdf23c..16f4765923 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientPermeance.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientPermeance.mo @@ -6,12 +6,12 @@ record SalientPermeance = Salient (redeclare SI.Permeance d,

    See also

    -Salient, -SalientCurrent, -SalientVoltage, -SalientResistance, -SalientInductance, -SalientReluctance +Salient, +SalientCurrent, +SalientVoltage, +SalientResistance, +SalientInductance, +SalientReluctance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientReluctance.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientReluctance.mo index f12c48285c..cd33d66531 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientReluctance.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientReluctance.mo @@ -6,12 +6,12 @@ record SalientReluctance = Salient (redeclare SI.Reluctance d,

    See also

    -Salient, -SalientCurrent, -SalientVoltage, -SalientResistance, -SalientInductance, -SalientPermeance +Salient, +SalientCurrent, +SalientVoltage, +SalientResistance, +SalientInductance, +SalientPermeance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientResistance.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientResistance.mo index 2a9aeb397c..da5b881aad 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientResistance.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientResistance.mo @@ -6,12 +6,12 @@ record SalientResistance = Salient (redeclare SI.Resistance d,

    See also

    -Salient, -SalientCurrent, -SalientVoltage, -SalientInductance, -SalientReluctance, -SalientPermeance +Salient, +SalientCurrent, +SalientVoltage, +SalientInductance, +SalientReluctance, +SalientPermeance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/Types/SalientVoltage.mo b/Modelica/Magnetic/FundamentalWave/Types/SalientVoltage.mo index 82b4191fe2..a1b2d165b2 100644 --- a/Modelica/Magnetic/FundamentalWave/Types/SalientVoltage.mo +++ b/Modelica/Magnetic/FundamentalWave/Types/SalientVoltage.mo @@ -6,12 +6,12 @@ record SalientVoltage = Salient (redeclare SI.Voltage d,

    See also

    -Salient, -SalientCurrent, -SalientResistance, -SalientInductance, -SalientReluctance, -SalientPermeance +Salient, +SalientCurrent, +SalientResistance, +SalientInductance, +SalientReluctance, +SalientPermeance

    ")); diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/Concept.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/Concept.mo index 7108860f08..2913f3e4bb 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/Concept.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/Concept.mo @@ -6,14 +6,14 @@ class Concept "Fundamental wave concept"

    Overview of the concept of fundamental waves

    -The exact magnetic field in the air gap of an electric machine is usually determined by an electromagnetic finite element analysis. The waveform of the magnetic field, e.g., the magnetic potential difference , consists of a spatial fundamental wave - with respect to an equivalent two pole machine - and additional harmonic waves of different order. The fundamental wave is however dominant in the air gap of an electric machine. +The exact magnetic field in the air gap of an electric machine is usually determined by an electromagnetic finite element analysis. The waveform of the magnetic field, e.g., the magnetic potential difference , consists of a spatial fundamental wave - with respect to an equivalent two pole machine - and additional harmonic waves of different order. The fundamental wave is however dominant in the air gap of an electric machine.

    Fig. 1: Field lines of a four pole induction machine
    - +
    @@ -22,20 +22,20 @@ The exact magnetic field in the air gap of an electric machine is usually determ In the fundamental wave theory only a pure sinusoidal distribution of magnetic quantities is assumed. It is thus assumed that all other harmonic wave effects are not taken into account.

    - +
    Fig. 2: Magnetic potential difference of a four pole machine, where is the angle of the spatial domain with respect to one pole pairFig. 2: Magnetic potential difference of a four pole machine, where is the angle of the spatial domain with respect to one pole pair
    - +

    -The waveforms of the magnetic field quantities, e.g., the magnetic potential difference , can be represented by complex phasor, e.g., according to: +The waveforms of the magnetic field quantities, e.g., the magnetic potential difference , can be represented by complex phasor, e.g., according to:

    -   +  

    It is important to note that the magnetic potential used in this library always refers to an equivalent two pole machine.

    @@ -44,23 +44,23 @@ The waveforms of the magnetic field quantities, e.g., the magnetic potential dif
    Fig. 3: Spatial distribution of the magnetic potential difference (red shade = positive sine wave, blue shade = negative sine wave) including complex phasor representing this spatial distribution
    - +

    -The potential and flow quantities of this library are the complex magnetic potential difference and the complex magnetic flux as defined in the basic magnetic port. Due to the sinusoidal distribution of magnetic potential and flux, such a complex phasor representation can be used. This way, the FundamentalWave library can be seen as a spatial extension of the FluxTubes library. +The potential and flow quantities of this library are the complex magnetic potential difference and the complex magnetic flux as defined in the basic magnetic port. Due to the sinusoidal distribution of magnetic potential and flux, such a complex phasor representation can be used. This way, the FundamentalWave library can be seen as a spatial extension of the FluxTubes library.

    -The specific arrangement of windings in electric machines with pole pairs give rise to sinusoidal dominant magnetic potential wave. The spatial period of this wave is determined by one pole pair -[Mueller70, - Spaeth73]. +The specific arrangement of windings in electric machines with pole pairs give rise to sinusoidal dominant magnetic potential wave. The spatial period of this wave is determined by one pole pair +[Mueller70, + Spaeth73].

    -The main components of an electric machine model based on the FundamentalWave library are polyphase and single-phase windings, air gap as well as symmetric or salient cage models. +The main components of an electric machine model based on the FundamentalWave library are polyphase and single-phase windings, air gap as well as symmetric or salient cage models. The electric machine models provided in this library are based on symmetrical windings in the stator and equivalent two-phase or three-phase windings in squirrel cage rotors. Slip ring induction machines may have different phase numbers in the stator and rotor.

    @@ -72,15 +72,15 @@ The machine models of the FundamentalWave library are currently based on the fol
    • The number of stator phases is greater or equal to three - [Eckhardt82] + [Eckhardt82]
    • The phase windings are assumed to be symmetrical; an extension to this approach can be considered
    • Only fundamental wave effects are taken into account
    • The magnetic potential difference refers to an equivalent two pole machine
    • There are no restrictions on the waveforms of voltages and currents
    • All resistances and inductances are modeled as constant quantities; saturation effects, cross coupling effects - [Li07], temperature dependency of resistances and deep bar effects could be considered in an extension to this library
      • -
    • Hysteresis losses are currently not considered [Haumer09]
      • + [Li07], temperature dependency of resistances and deep bar effects could be considered in an extension to this library +
    • Hysteresis losses are currently not considered [Haumer09]
    • The losses dissipated in the electric machine models are
      • ohmic heat losses,
        • diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/Contact.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/Contact.mo index 04254c8932..eaeefb417f 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/Contact.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/Contact.mo @@ -22,7 +22,7 @@ email: a.haumer@haumer.at

        Based on an original idea of Michael Beuschel this library was developed -[Beuschel00]. +[Beuschel00]. The authors of the FundamentalWave library would like to thank Michael Beuschel for contributing his source code to this library.

        diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/Parameters.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/Parameters.mo index 83062e38be..346413d2e5 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/Parameters.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/Parameters.mo @@ -7,69 +7,69 @@ class Parameters "Parameters of equivalent machines models"

        The stator main inductance - + of an - + phase induction machine is related with the self inductance of on stator phase, -, +, by:

        - +

        Parameters of equivalent polyphase induction machines models

        Assume a set parameters, -, -, -, -, +, +, +, +, of a three-phase induction machine and a set of parameters, -, -, -, -, +, +, +, +, of an - + phase induction machine. It is also assumed that

        • the nominal phase voltages
        • the nominal stator frequencies

        of the three and - + phase induction machine are equal. In this case the two parameter sets are related by:

        -
        -
        -
        -
        +
        +
        +
        +

        This way the same torque is generated and the machine currents are related by:

        - +

        The same applies for the rotor parameters of a - + slip ring induction machine, where the phase number - + is simply replaced by - + for transforming equivalent three-phase to - + phase winding parameters -- at the same nominal rotor voltage and frequency.

        See also

        -IMC_DOL_Polyphase, -IMS_Start_Polyphase, -SMPM_Inverter_Polyphase, -SMEE_Generator_Polyphase, -SMR_Inverter_Polyphase +IMC_DOL_Polyphase, +IMS_Start_Polyphase, +SMPM_Inverter_Polyphase, +SMEE_Generator_Polyphase, +SMR_Inverter_Polyphase

        ")); diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/Polyphase.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/Polyphase.mo index 60963b58ae..6d3866538a 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/Polyphase.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/Polyphase.mo @@ -7,27 +7,27 @@ class Polyphase "Polyphase windings"

        Symmetrical three-phases systems of currents (or voltages) consists of three sinusoidal sine waves with an angular displacement of -. +.

        -, +,

        Electrical three-phase machines have (usually) symmetrical three-phase windings which excite spatial magnetic potential with a spatial displacement of - + - with respect to the fundamental wave, -see [Laughton02]. +see [Laughton02]. Such a symmetrical three-phase system of currents (or voltages) can be represented by phasors, as depicted in Fig. 1(a). The associated three-phase winding is depicted in Fig. 2(a). The winding axis are displaced by -: +:

        - +

        @@ -39,7 +39,7 @@ spatial domain which also applies to polyphase systems.

    Fig. 1: Symmetrical (a) three-phase and (b) five-phase current system
    - \"phase35.png\"
    Fig. 2: Symmetrical (a) three-phase and (b) five-phase winding
    - \"winding35.png\"
    @@ -108,7 +108,7 @@ A function for calculating the Fig. 4: Symmetrical (a) six and (b) ten phase winding diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/ReleaseNotes.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/ReleaseNotes.mo index f51a8aefe1..74803aa0c6 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/ReleaseNotes.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/ReleaseNotes.mo @@ -15,21 +15,21 @@ class ReleaseNotes "Release Notes"
  • Unified simulation tolerances, see #2278
  • Added more examples from - Machines.Examples, see + Machines.Examples, see #2276
  • Replace wrong permeance image in documentation according to #2208
  • Added obsolete annotation to SymmetricMultiPhaseCageWinding_obsolete and SaliencyCageWinding_obsolete, see #1536
  • Updated documentation of - Short, - Idle and - PermanentMagnet + Short, + Idle and + PermanentMagnet
  • Added new components:
  • Removed parameter text from icon layer for reluctance and permeance model
  • Restructured cage models with reluctance instead of inductance model according to ticket @@ -53,7 +53,7 @@ this also includes the removal of the rotor cage heat sensor which previously ha
  • Fixed missing default parameter TpmOperational in ambient of PM synchronous machine, see ticket #1216#1216
  • Added voltages, currents, complex flux and magnetic potential difference as global variables in -polyphase converter
    • +polyphase converter
  • Added two more component examples, showing the equivalent nature of electrical and magnetic domain
    • @@ -76,7 +76,7 @@ this also includes the removal of the rotor cage heat sensor which previously ha @@ -84,13 +84,13 @@ the wrong calculation G=(m/2)*GcRef/effectiveTurns^2 is now replace @@ -26,7 +26,7 @@ i.e., induced voltages caused by the derivative of the sum of all phase currents

    Electromagnetic coupling

    -The PolyphaseElectroMagneticConverter +The PolyphaseElectroMagneticConverter calculates the magnetic voltages (MMF) caused by the currents of the m phases according to the spatial orientation of the phases. To complete the coupling, the induced voltages caused by the derivative of magentic flux are calculated, again according to the spatial orientation of the phases.

    @@ -34,7 +34,7 @@ To complete the coupling, the induced voltages caused by the derivative of magen

    Magnetic circuit

    The magnetic circuit models individual and common stray (leakage) flux as well as -core loss. +core loss. Note that up to now only the eddy current loss is taken into account, since the hysteresis loss require the detection of the re-magnetization frequency.

    @@ -60,7 +60,7 @@ For a model with ratioCommonLeakage < 1 - eps (including individ typically more states have to be initialized than for a model with ratioCommonLeakage = 1 (without individual stray inductances). See: initial equation section of example -IMC_DOL_CommonLeakage, +IMC_DOL_CommonLeakage, which compares the behaviour of three identical machines except ratioCommonLeakage={0, 0.5, 1}.

    diff --git a/Modelica/Magnetic/FundamentalWave/UsersGuide/package.mo b/Modelica/Magnetic/FundamentalWave/UsersGuide/package.mo index 519d0a2012..de66dfd274 100644 --- a/Modelica/Magnetic/FundamentalWave/UsersGuide/package.mo +++ b/Modelica/Magnetic/FundamentalWave/UsersGuide/package.mo @@ -6,10 +6,10 @@ package UsersGuide "User's Guide"

    This library contains components for modelling of electromagnetic fundamental wave models for the application in polyphase -electric machines. +electric machines. The number of phases is not restricted to three. DC machines are (currently) not included in this library. The FundamentalWave library is an alternative approach to the -Modelica.Electrical.Machines library. +Modelica.Electrical.Machines library. A great advantage of this library is the strict object orientation of the electrical and magnetic components that the electric machines models are composed of. From a didactic point of view this library is very beneficial for students in the @@ -17,7 +17,7 @@ field of electrical engineering.

    -For more details see the concept. +For more details see the concept.

    Note
    diff --git a/Modelica/Magnetic/FundamentalWave/package.mo b/Modelica/Magnetic/FundamentalWave/package.mo index 622dd1b235..532062ac9e 100644 --- a/Modelica/Magnetic/FundamentalWave/package.mo +++ b/Modelica/Magnetic/FundamentalWave/package.mo @@ -3,10 +3,10 @@ package FundamentalWave "Library for magnetic fundamental wave effects in electr extends Modelica.Icons.Package; annotation (preferredView="info", Documentation(revisions=" -

    A detailed list of changes is summarized in the release notes.

    +

    A detailed list of changes is summarized in the release notes.

    ", info=" -

    For a discrimination of various machine models, see discrimination.

    +

    For a discrimination of various machine models, see discrimination.

    Copyright © 2009-2020, Modelica Association and contributors

    diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/FixedShape.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/FixedShape.mo index 041ac67088..964ad88cb9 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/FixedShape.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/FixedShape.mo @@ -33,7 +33,7 @@ equation annotation (Documentation(info="

    Please refer to the description of the subpackage -Shapes.FixedShape +Shapes.FixedShape for utilisation of this partial model.

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/Leakage.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/Leakage.mo index e4e1d9deda..25d51fdd7c 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/Leakage.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/BaseClasses/Leakage.mo @@ -20,7 +20,7 @@ equation textColor={0,0,255})}), Documentation(info="

    Please refer to the description of the subpackage -Shapes.Leakage +Shapes.Leakage for utilisation of this partial model.

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/EddyCurrent.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/EddyCurrent.mo index d99aa54382..4cfe846cca 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/EddyCurrent.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/EddyCurrent.mo @@ -57,7 +57,7 @@ Eddy currents are induced in a conductive magnetic flux tube when the flux chang

    -Partitioning of a solid conductive cylinder or prism into several hollow cylinders or separate nested prisms and modelling of each of these flux tubes connected in parallel with a series connection of a reluctance element and an eddy current component can model the delayed buildup of the magnetic field in the complete flux tube from the outer to the inner sections. Please refer to [Ka08] for an illustration. +Partitioning of a solid conductive cylinder or prism into several hollow cylinders or separate nested prisms and modelling of each of these flux tubes connected in parallel with a series connection of a reluctance element and an eddy current component can model the delayed buildup of the magnetic field in the complete flux tube from the outer to the inner sections. Please refer to [Ka08] for an illustration.

    ", revisions="")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo index 7a76aae9f6..c5382e98c6 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/ElectroMagneticConverter.mo @@ -112,7 +112,7 @@ The electromagnetic energy conversion is given by Ampere's law and
    -\"converter +\"converter

    diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/LeakageWithCoefficient.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/LeakageWithCoefficient.mo index d8c42d2007..129fb02979 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/LeakageWithCoefficient.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Basic/LeakageWithCoefficient.mo @@ -7,7 +7,7 @@ model LeakageWithCoefficient parameter SI.CouplingCoefficient c_usefulFlux(final min=eps, final max=1-eps, start=0.7) "Ratio useful flux/(leakage flux + useful flux) = useful flux/total flux" annotation (Dialog(groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Basic/LeakageWithCoefficient.png")); Blocks.Interfaces.RealInput R_mUsefulTot(quantity="Reluctance", unit="H-1") annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=270,origin={0,120}))); @@ -17,7 +17,7 @@ equation annotation (Documentation(info="

    -Differently from the flux tube elements of package Shapes.Leakage +Differently from the flux tube elements of package Shapes.Leakage that are calculated from their geometry, this leakage reluctance is calculated with reference to the total reluctance of a useful flux path. Parameter c_usefulFlux is the ratio of the useful flux over the total flux.

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo index b27ca41ada..81c66a9ade 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/BasicExamples/QuadraticCoreAirgap.mo @@ -124,7 +124,7 @@ equation Educational example of a magnetic circuit containing an iron core and an airgap:

    -\"Magnetic +\"Magnetic

    A current ramp is applied in positive electric direction through the exciting coil, causing a rising magnetomotive force (mmf) in positive magnetic direction of the electromagnetic converter. diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo index c4ce8cc998..248f5a5b1c 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/AbsoluteSensor.mo @@ -14,7 +14,7 @@ equation textString="%name")}), Documentation(info="

    The absolute sensor partial model provides a single -PositiveMagneticPort +PositiveMagneticPort to measure the complex magnetic potential. Additionally this model contains a base icon and a definition of the angular frequency.

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/MagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/MagneticPort.mo index aaae0fee20..813b96e108 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/MagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/MagneticPort.mo @@ -12,9 +12,9 @@ is the complex magnetic flux Phi.

    See also

    -PositiveMagneticPort, -NegativeMagneticPort, -Magnetic.FluxTubes.Interfaces.MagneticPort +PositiveMagneticPort, +NegativeMagneticPort, +Magnetic.FluxTubes.Interfaces.MagneticPort

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo index c9eee8fc96..28eaf5c57d 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/NegativeMagneticPort.mo @@ -24,19 +24,19 @@ connector NegativeMagneticPort "Negative quasi-static magnetic port" Documentation(info="

    The negative magnetic port is based on the -MagneticPort. +MagneticPort. Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular frequency of the quasi-static magnetic potential and flux. The symbol is also designed such way to look different than the -PositiveMagneticPort. +PositiveMagneticPort.

    See also

    -MagneticPort, -PositiveMagneticPort, -Magnetic.FluxTubes.Interfaces.NegativeMagneticPort +MagneticPort, +PositiveMagneticPort, +Magnetic.FluxTubes.Interfaces.NegativeMagneticPort

    ")); end NegativeMagneticPort; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo index 7031109450..838e659c7a 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/PositiveMagneticPort.mo @@ -24,19 +24,19 @@ connector PositiveMagneticPort "Positive quasi-static magnetic port" Documentation(info="

    The positive magnetic port is based on the -MagneticPort. +MagneticPort. Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular frequency of the quasi-static magnetic potential and flux. The symbol is also designed such way to look different than the -NegativeMagneticPort. +NegativeMagneticPort.

    See also

    -MagneticPort, -NegativeMagneticPort, -Magnetic.FluxTubes.Interfaces.PositiveMagneticPort +MagneticPort, +NegativeMagneticPort, +Magnetic.FluxTubes.Interfaces.PositiveMagneticPort

    ")); end PositiveMagneticPort; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo index 0356999432..d93c3a3e74 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Interfaces/RelativeSensor.mo @@ -21,7 +21,7 @@ partial model RelativeSensor "Partial magnetic voltage or flux sensor" Documentation(info="

    The relative sensor partial model relies on the -TwoPort +TwoPort to measure the complex magnetic voltage, flux or power. Additionally this model contains a base icon and a definition of the angular frequency.

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/FundamentalWavePermabilitySensor.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/FundamentalWavePermabilitySensor.mo index 7f59044c0a..c10f8ecac9 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/FundamentalWavePermabilitySensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/FundamentalWavePermabilitySensor.mo @@ -115,6 +115,6 @@ equation This sensor is used to determined the effective fundamental wave permeability of a saturated lumped circuit reluctance. For this purpose the sensor is placed such way that the magnetic flux and the magnetic potential difference of the investigated reluctance are sensed. The area of cross section and the effective length of the investigated magnetic path have to be provided as parameters.

    See example -NonLinearInductor.

    +NonLinearInductor.

    ")); end FundamentalWavePermabilitySensor; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo index 214134a76f..f262e68540 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Sensors/Transient/Permeability.mo @@ -43,21 +43,21 @@ equation

    This model determines the absolute and relative permeability from two real inputs:

    • RMS magnetic potential difference, -\"V_m\"
      • +\"V_m\"
    • RMS magnetic flux, -\"Phi\"
      • +\"Phi\"

    In order to calculate the permeabilities, the area of cross section, -\"l\", +\"l\", and the geometric length, -\"l\", +\"l\", of the flux path have to be take into account

    -\"Permeabilities\" +\"Permeabilities\"

    In case that the magnetic potential difference is close to zero, permeabilities yield:

    -\"Permeabilities=0\" +\"Permeabilities=0\"
    ")); end Permeability; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Cuboid.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Cuboid.mo index 4217a08ea9..c34c6f4232 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Cuboid.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Cuboid.mo @@ -7,7 +7,7 @@ model Cuboid parameter SI.Length l=0.01 "Length in direction of flux" annotation ( Dialog(group="Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/CuboidParallelFlux_qs.png")); + "modelica:/Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/CuboidParallelFlux_qs.png")); parameter SI.Length a=0.01 "Width of rectangular cross-section" annotation (Dialog(group="Fixed geometry")); parameter SI.Length b=0.01 "Height of rectangular cross-section" @@ -22,15 +22,15 @@ equation The cuboid models the reluctance with rectangular dimensions a and b, and length, l the magnetic reluctance by:

    - +

    The area of cross section is determined by:

    - +
    - +
    ")); end Cuboid; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo index e8ae5f8be2..b75531c901 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/GenericFluxTube.mo @@ -7,7 +7,7 @@ model GenericFluxTube parameter SI.Length l=0.01 "Length in direction of flux" annotation(Dialog(group="Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/GenericFluxTube_qs.png")); + "modelica:/Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/GenericFluxTube_qs.png")); parameter SI.CrossSection area=0.0001 "Area of cross section" annotation (Dialog(group="Fixed geometry")); equation @@ -20,11 +20,11 @@ The generic flux tube models the reluctance with constant area of cross section, and length, l the magnetic reluctance by:

    -, +,
    - +
    ", revisions="
    Version 3.2.2, 2014-01-15 (Christian Kral)
    diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo index a7b2c56ad2..7af91b201e 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderAxialFlux.mo @@ -7,7 +7,7 @@ model HollowCylinderAxialFlux parameter SI.Length l=0.01 "Axial length (in direction of flux)" annotation (Dialog(group="Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/HollowCylinderAxialFlux_qs.png")); + "modelica:/Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/HollowCylinderAxialFlux_qs.png")); parameter SI.Radius r_i=0 "Inner radius of hollow cylinder (zero for cylinder)" annotation (Dialog(group="Fixed geometry")); @@ -20,12 +20,12 @@ equation G_m = mu_0*mu_r*A/l; annotation (Documentation(info=" -

    The axial cylinder models is characterized by the outer diameter, , the inner diameter, , length, . The magnetic reluctance is determined by:

    -
    +

    The axial cylinder models is characterized by the outer diameter, , the inner diameter, , length, . The magnetic reluctance is determined by:

    +

    The area of cross section yields:

    -
    -
    -

    A hollow cylinder is depicted in the above figure left for . A solid cylindric flux tube an be considered by setting the inner radius, , equal to zero.

    -

    A circular sector of the area of cross section with central angle is depicted in the above figure right.

    +
    +
    +

    A hollow cylinder is depicted in the above figure left for . A solid cylindric flux tube an be considered by setting the inner radius, , equal to zero.

    +

    A circular sector of the area of cross section with central angle is depicted in the above figure right.

    ")); end HollowCylinderAxialFlux; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo index 68bd27035d..11667e4254 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo @@ -7,7 +7,7 @@ model HollowCylinderCircumferentialFlux "Hollow cylinder with circumferential fl parameter SI.Length l=0.02 "Width (orthogonal to flux direction)" annotation (Dialog(group= "Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Circumferential.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Circumferential.png")); parameter SI.Radius r_i=0.01 "Inner radius of hollow cylinder" annotation (Dialog(group="Fixed geometry")); parameter SI.Radius r_o=0.02 "Outer radius of hollow cylinder" @@ -20,7 +20,7 @@ equation annotation (defaultComponentName="cylinder", Documentation(info="

    -Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m. +Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.

    diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo index 0b01f40ead..84090d5ab7 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo @@ -8,7 +8,7 @@ model HollowCylinderRadialFlux parameter SI.Length l=0.01 "Width (orthogonal to flux direction)" annotation (Dialog(group= "Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/HollowCylinderRadialFlux_qs.png")); + "modelica:/Modelica/Resources/Images/Magnetic/QuasiStatic/FluxTubes/HollowCylinderRadialFlux_qs.png")); parameter SI.Radius r_i=0.01 "Inner radius of hollow cylinder" annotation (Dialog(group="Fixed geometry")); parameter SI.Radius r_o=0.02 "Outer radius of hollow cylinder" @@ -21,10 +21,10 @@ equation annotation (Dialog(group="Fixed geometry"), Documentation(info=" -

    The radial cylinder model is characterized by the outer diameter, , the inner diameter, , length, , and the angle . The magnetic reluctance is determined by:

    -
    +

    The radial cylinder model is characterized by the outer diameter, , the inner diameter, , length, , and the angle . The magnetic reluctance is determined by:

    +

    In this model the magnetic flux and the magnetic potential difference, respectively, are radially oriented.

    -
    -

    The above figure left shows a radial flux cylinder with . The figure on the right indicates the central angle in case a cylinder section shall be considered.

    +
    +

    The above figure left shows a radial flux cylinder with . The figure on the right indicates the central angle in case a cylinder section shall be considered.

    ")); end HollowCylinderRadialFlux; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Toroid.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Toroid.mo index 299c7e2c1f..13df7616d6 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Toroid.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/Toroid.mo @@ -6,7 +6,7 @@ model Toroid "Toroid with circular cross section; fixed shape" import Modelica.Constants.pi; parameter SI.Radius r=0.1 "Radius of toroid (middle)" annotation (Dialog(group="Fixed geometry", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.png")); parameter SI.Radius d=0.01 "Diameter of cylindrical core" annotation (Dialog(group="Fixed geometry")); parameter SI.Angle alpha=pi/2 "Angle of toroid section" @@ -17,7 +17,7 @@ equation annotation (defaultComponentName="cylinder", Documentation(info="

    -Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m. +Please refer to the enclosing sub-package FixedShape for a description of all elements of this package and to [Ro41] for derivation and/or coefficients of the equation for permeance G_m.

    diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo index 2f9364cade..dce0e4c391 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.mo @@ -6,7 +6,7 @@ model CoaxCylindersEndFaces parameter SI.Radius r_0=10e-3 "Radius of inner solid cylinder" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/CoaxCylindersEndFaces.png")); parameter SI.Radius r_1=17e-3 "Inner radius of outer hollow cylinder"; parameter SI.Radius r_2=20e-3 "Outer radius of outer hollow cylinder"; @@ -23,10 +23,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end CoaxCylindersEndFaces; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo index b97233cfa7..1a62c20a1d 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.mo @@ -6,7 +6,7 @@ model EighthOfHollowSphere parameter SI.Length t(start=0.01) "Thickness of spherical shell" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfHollowSphere.png")); equation G_m = mu_0*0.5*t; @@ -14,10 +14,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end EighthOfHollowSphere; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo index 10e52380a9..be19fc0e4c 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/EighthOfSphere.mo @@ -6,7 +6,7 @@ model EighthOfSphere parameter SI.Radius r=0.01 "Radius of eighth of sphere" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/EighthOfSphere.png")); equation G_m = mu_0*0.308*r; @@ -14,10 +14,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end EighthOfSphere; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfCylinder.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfCylinder.mo index edfc5eff4c..18a9e91f8b 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfCylinder.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfCylinder.mo @@ -6,7 +6,7 @@ model HalfCylinder "Leakage flux through the edges of a half cylinder" parameter SI.Length l=0.1 "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>distance between edges)" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfCylinder.png")); equation G_m = mu_0*0.26*l; @@ -14,10 +14,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end HalfCylinder; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo index f3073edd44..078eef34d7 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.mo @@ -7,7 +7,7 @@ model HalfHollowCylinder parameter SI.Length l=0.1 "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>r_i)" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/HalfHollowCylinder.png")); parameter Real ratio(start=1) "Constant ratio t/r_i"; equation @@ -16,10 +16,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end HalfHollowCylinder; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo index 0463cc8382..2d7f7a3359 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterCylinder.mo @@ -7,17 +7,17 @@ model QuarterCylinder parameter SI.Length l=0.1 "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>distance between edge and plane)" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterCylinder.png")); equation G_m = mu_0*0.52*l; annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end QuarterCylinder; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo index 875d520a26..3f438212b7 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.mo @@ -7,7 +7,7 @@ model QuarterHollowCylinder parameter SI.Length l=0.1 "Axial length orthogonal to flux (=2*pi*r for cylindrical pole and r>>r_i)" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowCylinder.png")); parameter Real ratio(start=1) "Constant ratio t/r_i"; equation @@ -16,10 +16,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end QuarterHollowCylinder; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo index 7134ddef3b..d99c75a9f7 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.mo @@ -6,7 +6,7 @@ model QuarterHollowSphere parameter SI.Length t(start=0.01) "Thickness of spherical shell" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterHollowSphere.png")); equation G_m = mu_0*0.25*t; @@ -14,10 +14,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end QuarterHollowSphere; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterSphere.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterSphere.mo index 67159e20eb..fa6421b9fc 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterSphere.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/QuarterSphere.mo @@ -6,7 +6,7 @@ model QuarterSphere parameter SI.Radius r=0.005 "Radius of quarter sphere" annotation (Dialog(group="Parameters", groupImage= - "modelica://Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.png")); + "modelica:/Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Leakage/QuarterSphere.png")); equation G_m = mu_0*0.077*2*r; @@ -14,10 +14,10 @@ equation annotation (Documentation(info="

    In -[Ro41] +[Ro41] the equations for determining the reluctance - + are summarized. As an alternative to the geometry based data a -generic leakage model is provided in this library. +generic leakage model is provided in this library.

    ")); end QuarterSphere; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/package.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/package.mo index 5ab877e5ce..1ef1b075be 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/Leakage/package.mo @@ -3,8 +3,8 @@ package Leakage "Leakage flux tubes with position-independent permeance and henc extends Modelica.Icons.VariantsPackage; annotation (Documentation(info="

    -The permeances of all elements of this package are calculated from their geometry [Ro41]. These flux tube elements are intended for modelling of leakage fields through vacuum, air and other media with a relative permeability -. -Basic.LeakageWithCoefficient accounts for leakage not by the geometry of flux tubes, but by a coupling coefficient c_usefulFlux. +The permeances of all elements of this package are calculated from their geometry [Ro41]. These flux tube elements are intended for modelling of leakage fields through vacuum, air and other media with a relative permeability +. +Basic.LeakageWithCoefficient accounts for leakage not by the geometry of flux tubes, but by a coupling coefficient c_usefulFlux.

    ")); end Leakage; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/FluxTubeConcept.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/FluxTubeConcept.mo index 6706535012..4f904cf8fc 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/FluxTubeConcept.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/FluxTubeConcept.mo @@ -12,13 +12,13 @@ Following below, the concept of magnetic flux tubes is outlined in short. For a
    • Normal component of magnetic flux density, -
      • +
    • Normal component of magnetic field strength, -
      • +
    • Magnetic flux, -
      • +
    • Magnetic potential difference, -
      • +

    The figure below and the following equations illustrate the relationships between

    @@ -29,19 +29,19 @@ Following below, the concept of magnetic flux tubes is outlined in short. For a
    -\"Magnetic +\"Magnetic

    A flux tube confines the magnetic flux. Flied lines, and flux tubes, respectively are always closed. So there is no flux entering or leaving a flux tube. The total flux of a configuration can be represented by parallel flux tubes, representing different flux paths. This is considered by connecting the elements of a lumped circuit model, such that the sum of all fluxes of a connection is equivalent to zero.

    For a section of a flux tube with length - + the magnetic potential difference is determined by the length integral over the magnetic field strength:

    - +
    @@ -49,24 +49,24 @@ the magnetic potential difference is determined by the length integral over the The magnetic flux entering, and leaving a flux tube, respectively, is determined by the surface integral of the normal component of the magnetic field strength:

    - +

    The magnetic potential difference and the magnetic flux have the same angle, so the reluctance a real (non complex) quantity:

    - +

    For a -generic flux tube reluctance with constant +generic flux tube reluctance with constant area of cross section, -, +, and length, -, +, the magnetic reluctance is:

    - +

    Assumptions

    @@ -75,17 +75,17 @@ the magnetic reluctance is:

  • Force interaction is not considered
  • Reluctance models are linear; so non-linearities can only be taken into account by adapting the constant relative permeability; see example -NonLinearInductor
    • +NonLinearInductor

    Notes

    The parameter and variable names are chosen as close as possible to the transient -FluxTubes library, to avoid additional effort when converting transient into quasi-static flux tubes models.

    +FluxTubes library, to avoid additional effort when converting transient into quasi-static flux tubes models.

    Reference Note

    A similar approach on quasi-static flux tube models is published in -[Raabe2012].

    +[Raabe2012].

    ")); end FluxTubeConcept; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/Literature.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/Literature.mo index aa634f984c..45af99c4b6 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/Literature.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/Literature.mo @@ -19,7 +19,7 @@ class Literature "Literature"

    Additional References

    Additional reference on magnetic flux tubes are listed in -Modelica.Magnetic.FluxTubes. +Modelica.Magnetic.FluxTubes.

    ")); end Literature; diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/package.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/package.mo index b62a51155b..a5df4f7820 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/UsersGuide/package.mo @@ -3,19 +3,19 @@ package UsersGuide "User's Guide" extends Modelica.Icons.Information; annotation (DocumentationClass=true, Documentation(info="

    The quasi-static flux tubes library is based on the transient library -Magnetic.FluxTubes. The main principles of confined flux and flux tubes apply, too. The quasi-static flux tubes library contains components for modelling of electromagnetic devices with lumped magnetic networks based on quasi-static theory. Models based on this library are suited for quasi-static simulation of transformers at component and system level.

    +Magnetic.FluxTubes. The main principles of confined flux and flux tubes apply, too. The quasi-static flux tubes library contains components for modelling of electromagnetic devices with lumped magnetic networks based on quasi-static theory. Models based on this library are suited for quasi-static simulation of transformers at component and system level.

    The quasi-static components of this library do not consider saturation since linearity is strictly assumed. In case that the permeability of a saturated circuit needs to be considered, a -transient permeability estimation sensor is provided do determine the effective permeability from a transient simulation. +transient permeability estimation sensor is provided do determine the effective permeability from a transient simulation.

    A general introduction into quasi-static phasor can be found in -Modelica.Electrical.QuasiStatic. +Modelica.Electrical.QuasiStatic.

    This user's guide gives a short introduction to the underlying -concept of quasi-static magnetic flux tubes, summarizes basic relationships and equations. +concept of quasi-static magnetic flux tubes, summarizes basic relationships and equations.

    ")); end UsersGuide; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo index 39144fe723..00d463a6b7 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/PermanentMagnet.mo @@ -35,7 +35,7 @@ equation annotation (defaultComponentName="magnet", Documentation(info="

    Permanent magnet model with magnetic, mechanical and thermal connector including losses. The PM model is source of constant magnetic potential difference. The PM loss is calculated by -PermanentMagnetLosses. +PermanentMagnetLosses.

    "), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/QuasiStaticAnalogWinding.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/QuasiStaticAnalogWinding.mo index 8d0c124820..4dc87c8dd4 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/QuasiStaticAnalogWinding.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/QuasiStaticAnalogWinding.mo @@ -99,17 +99,17 @@ equation Documentation(info="

    The single-phase winding consists of a -resistor, and a -single-phase electromagnetic coupling. +resistor, and a +single-phase electromagnetic coupling.

    See also

    - + SymmetricPolyphaseWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SinglePhaseWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseWinding

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo index 0146c69241..79607d94e8 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/RotorSaliencyAirGap.mo @@ -112,22 +112,22 @@ This salient air gap model can be used for machines with uniform air gaps and fo

    For the mechanical interaction of the air gap model with the stator and the rotor is equipped with two -rotational connectors. The torques acting on both connectors have the same absolute values but different signs. The stator and the rotor reference angles, - and - are related by - +rotational connectors. The torques acting on both connectors have the same absolute values but different signs. The stator and the rotor reference angles, + and + are related by + where - + is the electrical angle between stator and rotor.

    The air gap model has two magnetic stator and two magnetic rotor -ports. The magnetic potential difference and the magnetic flux of the stator and rotor are equal complex quantities, respectively, but the reference angles are different; see Concept. The d and q axis components with respect to the rotor fixed reference frame (superscript r) are determined from the stator (superscript s) and rotor (superscript r) reference quantities, by +ports. The magnetic potential difference and the magnetic flux of the stator and rotor are equal complex quantities, respectively, but the reference angles are different; see Concept. The d and q axis components with respect to the rotor fixed reference frame (superscript r) are determined from the stator (superscript s) and rotor (superscript r) reference quantities, by

    -  . +  .

    @@ -135,12 +135,12 @@ The d and q axis magnetic potential difference components and flux components ar

    -   +  

    See also

    - + Magnetic.FundamentalWave.BasicMachines.Components.RotorSaliencyAirGap

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo index d42fc73e5b..6a07ed6eb6 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SaliencyCageWinding.mo @@ -123,16 +123,16 @@ equation Documentation(info="

    -The salient cage model is a two axis model with two phases. The electromagnetic coupling therefore is also two phase coupling model. The angles of the two orientations are 0 and . This way an asymmetrical rotor cage with different resistances and stray inductances in d- and q-axis can be modeled. +The salient cage model is a two axis model with two phases. The electromagnetic coupling therefore is also two phase coupling model. The angles of the two orientations are 0 and . This way an asymmetrical rotor cage with different resistances and stray inductances in d- and q-axis can be modeled.

    See also

    - + SymmetricPolyphaseWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseCageWinding - + Magnetic.FundamentalWave.BasicMachines.Components.RotorSaliencyAirGap

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo index e2d1c5c0a5..92fc30bbba 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseCageWinding.mo @@ -121,22 +121,22 @@ equation textString="%name")}), Documentation(info="
    - +

    The symmetric rotor cage model of this library does not consist of rotor bars and end rings. Instead the symmetric cage is modeled by an equivalent symmetrical winding. The rotor cage model consists of - phases. If the cage is modeled by equivalent stator winding parameters, the number of effective turns, -, has to be chosen equivalent to the effective number of stator turns. + phases. If the cage is modeled by equivalent stator winding parameters, the number of effective turns, +, has to be chosen equivalent to the effective number of stator turns.

    See also

    - + SaliencyCageWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseCageWinding - + Magnetic.FundamentalWave.BasicMachines.Components.RotorSaliencyAirGap

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo index 03d37cac69..616f89ba5c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/Components/SymmetricPolyphaseWinding.mo @@ -154,20 +154,20 @@ equation Documentation(info="

    The symmetrical polyphase winding consists of a symmetrical winding -resistor, a -stray reluctance, a symmetrical -polyphase electromagnetic coupling and a -core loss model including -heat port. +resistor, a +stray reluctance, a symmetrical +polyphase electromagnetic coupling and a +core loss model including +heat port.

    See also

    - + QuasiStaticAnalogWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SinglePhaseWinding, - + Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseWinding

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo index 24cf0233f1..a47fc1988c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SlipRing.mo @@ -33,7 +33,7 @@ model IM_SlipRing "Induction machine with slip ring rotor" parameter SI.Inductance Lm(start=3*ZsRef*sqrt(1 - 0.0667)/(2*pi *fsNominal)) "Stator main field inductance per phase" annotation ( Dialog(tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/IMS.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/IMS.png")); parameter SI.Inductance Lrsigma(start=3*ZsRef*(1 - sqrt(1 - 0.0667))/(2*pi*fsNominal)) "Rotor leakage inductance per phase w.r.t. rotor side" @@ -159,11 +159,11 @@ Resistances and stray inductances of the machine always refer to either stator o

    See also

    - + IM_SquirrelCage, - + Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing, - + Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage,

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo index 6310ac21f6..5971895c8c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/InductionMachines/IM_SquirrelCage.mo @@ -22,7 +22,7 @@ model IM_SquirrelCage "Induction machine with squirrel cage" parameter SI.Inductance Lm(start=3*ZsRef*sqrt(1 - 0.0667)/(2*pi *fsNominal)) "Stator main field inductance per phase" annotation ( Dialog(tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/IMC.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/IMC.png")); parameter SI.Inductance Lrsigma(start=3*ZsRef*(1 - sqrt(1 - 0.0667))/(2*pi*fsNominal)) "Rotor leakage inductance of equivalent m phase winding w.r.t. stator side" @@ -84,11 +84,11 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    - + IM_SlipRing, - + Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing, - + Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage,

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo index ee45004007..a9ecf5ab78 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ElectricalExcited.mo @@ -30,7 +30,7 @@ model SM_ElectricalExcited parameter SI.Inductance Lmd(start=1.5*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, d-axis" annotation (Dialog( tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMEE.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMEE.png")); parameter SI.Inductance Lmq(start=1.5*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -217,15 +217,15 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    - + SM_PermanentMagnet, - + SM_ReluctanceRotor, - + Magnetic.FundamentalWave.BasicMachines.SM_PermanentMagnet, - + Magnetic.FundamentalWave.BasicMachines.SM_ElectricalExcited, - + Magnetic.FundamentalWave.BasicMachines.SM_ReluctanceRotor,

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo index 91ed231ff6..bc8ef5cd64 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_PermanentMagnet.mo @@ -28,7 +28,7 @@ model SM_PermanentMagnet parameter SI.Inductance Lmd(start=0.3*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, d-axis" annotation (Dialog( tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMPM.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMPM.png")); parameter SI.Inductance Lmq(start=0.3*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -186,15 +186,15 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    - + SM_ElectricalExcited, - + SM_ReluctanceRotor, - + Magnetic.FundamentalWave.BasicMachines.SM_PermanentMagnet, - + Magnetic.FundamentalWave.BasicMachines.SM_ElectricalExcited, - + Magnetic.FundamentalWave.BasicMachines.SM_ReluctanceRotor,

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo index b823247b06..fbac8f9a8b 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/BasicMachines/SynchronousMachines/SM_ReluctanceRotor.mo @@ -24,7 +24,7 @@ model SM_ReluctanceRotor parameter SI.Inductance Lmd(start=2.9*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, d-axis" annotation (Dialog( tab="Nominal resistances and inductances", groupImage= - "modelica://Modelica/Resources/Images/Electrical/Machines/SMR.png")); + "modelica:/Modelica/Resources/Images/Electrical/Machines/SMR.png")); parameter SI.Inductance Lmq(start=0.9*ZsRef/(2*pi*fsNominal)) "Stator main field inductance per phase, q-axis" annotation (Dialog(tab="Nominal resistances and inductances")); @@ -139,15 +139,15 @@ Resistances and stray inductances of the machine refer to an m-phas

    See also

    - + SM_PermanentMagnet, - + SM_ElectricalExcited, - + Magnetic.FundamentalWave.BasicMachines.SM_PermanentMagnet, - + Magnetic.FundamentalWave.BasicMachines.SM_ElectricalExcited, - + Magnetic.FundamentalWave.BasicMachines.SM_ReluctanceRotor,

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Crossing.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Crossing.mo index 31af7e0d0b..b96637c8f5 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Crossing.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Crossing.mo @@ -31,11 +31,11 @@ This is a simple short cut branch.

    See also

    -Idle -Short -Magnetic.FundamentalWave.Components.Idle, -Magnetic.FundamentalWave.Components.Short, -Magnetic.FundamentalWave.Components.Crossing +Idle +Short +Magnetic.FundamentalWave.Components.Idle, +Magnetic.FundamentalWave.Components.Short, +Magnetic.FundamentalWave.Components.Crossing

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/EddyCurrent.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/EddyCurrent.mo index 5583c1a36a..3aeeeea5ea 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/EddyCurrent.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/EddyCurrent.mo @@ -39,51 +39,51 @@ equation Documentation(info="

    The eddy current loss model with respect to fundamental wave effects is designed in accordance to -FluxTubes.Basic.EddyCurrent and -FundamentalWave.Components.EddyCurrent. +FluxTubes.Basic.EddyCurrent and +FundamentalWave.Components.EddyCurrent.

    -  . +  .

    Fig. 3: Symmetrical (a) six and (b) ten phase current system
    - \"phase610.png\"
    - \"winding610.png\"
    Fig. 1: Symmetric polyphase winding
    - \"SymmetricPolyphaseWinding.png\"
    Fig. 1: equivalent models of eddy current losses
    - +

    Due to the nature of eddy current losses, which can be represented by symmetric conductors in an equivalent electric circuit (Fig. 1), the respective -number of phases has to be taken into account. -Assume that the conductances -of the equivalent circuit are , +number of phases has to be taken into account. +Assume that the conductances +of the equivalent circuit are , the conductance for the eddy current loss model is determined by

    -   +  

    -where is the number of turns of the symmetric electromagnetic coupling. +where is the number of turns of the symmetric electromagnetic coupling.

    -

    For such an phase system +

    For such an phase system the relationship between the voltage and current space phasors and the magnetic flux and magnetic potential difference phasor is

    -  ,
    -  , +  ,
    +  ,

    -where -and +where +and are the phase voltages and currents, respectively.

    @@ -91,7 +91,7 @@ are the phase voltages and currents, respectively. The dissipated loss power

    -   +  

    can be determined for the space phasor @@ -99,6 +99,6 @@ relationship of the voltage and current space phasor.

    See also

    -

    FluxTubes.Basic.EddyCurrent

    +

    FluxTubes.Basic.EddyCurrent

    ")); end EddyCurrent; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Idle.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Idle.mo index 5e03626a6d..dabb11715a 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Idle.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Idle.mo @@ -19,11 +19,11 @@ This is a simple idle running branch.

    See also

    -Short -Crossing, -Magnetic.FundamentalWave.Components.Idle, -Magnetic.FundamentalWave.Components.Short, -Magnetic.FundamentalWave.Components.Crossing +Short +Crossing, +Magnetic.FundamentalWave.Components.Idle, +Magnetic.FundamentalWave.Components.Short, +Magnetic.FundamentalWave.Components.Crossing

    "), diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Permeance.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Permeance.mo index f18f355b52..66c2fd4e81 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Permeance.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Permeance.mo @@ -23,11 +23,11 @@ equation Documentation(info="

    The salient permeance models the relationship between the complex magnetic potential difference -\"V_m.png\" and the complex magnetic flux : +\"V_m.png\" and the complex magnetic flux :

    -\"reluctance.png\"
    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo index 256d8dae0f..4ac0a9aafd 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/PolyphaseElectroMagneticConverter.mo @@ -153,7 +153,7 @@ equation textString="%name")}), Documentation(info="

    -Each phase of an phase winding has an effective number of turns, and an respective winging angle and a phase current . +Each phase of an phase winding has an effective number of turns, and an respective winging angle and a phase current .

    @@ -161,31 +161,31 @@ The total complex magnetic potential difference of the polyphase winding is dete

    -   +  

    In this equation - + is the positive symmetrical component of the currents.

    The positive sequence of the voltages - + induced in each winding is directly proportional to the complex magnetic flux and the number of turns. This relationship can be modeled by means of

    -  . +  .

    See also

    - + Modelica.Magnetic.FundamentalWave.Components.SinglePhaseElectroMagneticConverter, - + Modelica.Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter, - + QuasiStaticAnalogElectroMagneticConverter

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/QuasiStaticAnalogElectroMagneticConverter.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/QuasiStaticAnalogElectroMagneticConverter.mo index bff7f36563..067d65e3c5 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/QuasiStaticAnalogElectroMagneticConverter.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/QuasiStaticAnalogElectroMagneticConverter.mo @@ -90,7 +90,7 @@ equation textString="%name")}), Documentation(info="

    -The analog single-phase winding has an effective number of turns, and a respective orientation of the winding, . The current in the winding is . +The analog single-phase winding has an effective number of turns, and a respective orientation of the winding, . The current in the winding is .

    @@ -98,22 +98,22 @@ The total complex magnetic potential difference of the single-phase winding is d

    -   +  

    where - -is the reference angle of the electrical and magnetic system, respectively. The induced voltage is identical to zero. + +is the reference angle of the electrical and magnetic system, respectively. The induced voltage is identical to zero.

    See also

    - + Modelica.Magnetic.FundamentalWave.Components.SinglePhaseElectroMagneticConverter, - + Modelica.Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter, - + PolyphaseElectroMagneticConverter

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Reluctance.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Reluctance.mo index e78c7b02e6..9116f57444 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Reluctance.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Reluctance.mo @@ -20,17 +20,17 @@ equation textString="%name")}), Documentation(info="

    The salient reluctance models the relationship between the complex magnetic potential difference - and the complex magnetic flux , + and the complex magnetic flux ,

    -   +  

    which can also be expressed in terms complex phasors:

    -   +  

    ")); end Reluctance; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Short.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Short.mo index 23e18098c8..4c95d5f219 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Short.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/Short.mo @@ -17,11 +17,11 @@ This is a simple short cut branch.

    See also

    -Idle -Crossing, -Magnetic.FundamentalWave.Components.Idle, -Magnetic.FundamentalWave.Components.Short, -Magnetic.FundamentalWave.Components.Crossing +Idle +Crossing, +Magnetic.FundamentalWave.Components.Idle, +Magnetic.FundamentalWave.Components.Short, +Magnetic.FundamentalWave.Components.Crossing

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/package.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/package.mo index b6bab63d46..c2ff868629 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Components/package.mo @@ -4,6 +4,6 @@ package Components "Basic fundamental wave components" annotation (Documentation(info="

    Basic components of the FundamentalWave library for modeling magnetic circuits. Machine specific components are -located at Machines.Components.

    +located at Machines.Components.

    ")); end Components; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter.mo index e3fa7142db..1016d9741b 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/InductionMachines/IMC_Inverter.mo @@ -133,8 +133,8 @@ and accelerate inertias. At time tStep a load step is applied.

    Compare with transient models -IMC_Inverter (Electrical.Machines) and -IMC_Inverter (FundamentalWave). +IMC_Inverter (Electrical.Machines) and +IMC_Inverter (FundamentalWave). Note that electrical transients are neglected, but mechanical transients are taken into account.

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/MagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/MagneticPort.mo index 0618b3bb17..f16448c57c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/MagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/MagneticPort.mo @@ -11,8 +11,8 @@ connector MagneticPort "Quasi-static magnetic port of fundamental wave machines"

    See also

    -PositiveMagneticPort, -NegativeMagneticPort +PositiveMagneticPort, +NegativeMagneticPort

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/NegativeMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/NegativeMagneticPort.mo index 25f82c2e44..211482a09f 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/NegativeMagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/NegativeMagneticPort.mo @@ -20,15 +20,15 @@ connector NegativeMagneticPort "Negative quasi-static magnetic port of fundament Documentation(info="

    -The negative pin is based on Pin. -Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the positive pin. +The negative pin is based on Pin. +Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the positive pin.

    See also

    -MagneticPort, -PositiveMagneticPort +MagneticPort, +PositiveMagneticPort

    ")); end NegativeMagneticPort; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/PositiveMagneticPort.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/PositiveMagneticPort.mo index 97d5576631..1b1f68b823 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/PositiveMagneticPort.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/PositiveMagneticPort.mo @@ -21,16 +21,16 @@ connector PositiveMagneticPort "Positive quasi-static magnetic port of fundament

    The positive port is based on -MagneticPort. +MagneticPort. Additionally the reference angle is specified in the connector. The time derivative of the reference angle is the actual angular velocity of the quasi-static voltage and current. The symbol is also designed such way to look different than the -NegativeMagneticPort. +NegativeMagneticPort.

    See also

    -MagneticPort, -NegativeMagneticPort +MagneticPort, +NegativeMagneticPort

    ")); end PositiveMagneticPort; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/TwoPortExtended.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/TwoPortExtended.mo index 8f8c99634f..beaf973e3a 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/TwoPortExtended.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Interfaces/TwoPortExtended.mo @@ -22,7 +22,7 @@ The partial two port model consists of a positive and a negative magnetic port.

    This interface model contains an extended set of (output) variables compared to -TwoPortElementary. +TwoPortElementary.

    ")); end TwoPortExtended; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo index 0614f29de8..2f5a5a1f11 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/PermanentMagnetLosses.mo @@ -45,7 +45,7 @@ The dependency of the permanent magnet loss torque on the angular velocity is mo

    See also

    -Permanent magnet loss parameters +Permanent magnet loss parameters

    If it is desired to neglect permanent magnet losses, set strayLoadParameters.PRef = 0 (this is the default). diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/StrayLoad.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/StrayLoad.mo index 35a0991292..7a0377e4d6 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/StrayLoad.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Losses/StrayLoad.mo @@ -35,7 +35,7 @@ but without scaling them to zero at no-load current.

    For an estimation of dependency on varying angular velocity see: -[Lang1984] +[Lang1984]

    The stray load losses are modeled such way that they do not cause a voltage drop in the electric circuit. @@ -53,7 +53,7 @@ The dependency of the stray load torque on the angular velocity is modeled by th

    See also

    -StrayLoad parameters +StrayLoad parameters

    If it is desired to neglect stray load losses, set strayLoadParameters.PRef = 0 (this is the default). diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticFluxSensor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticFluxSensor.mo index 8efb1f85c6..40a5cc5a9c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticFluxSensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticFluxSensor.mo @@ -44,7 +44,7 @@ equation

    See also

    -MagneticPotentialDifferenceSensor +MagneticPotentialDifferenceSensor

    ")); end MagneticFluxSensor; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo index e37eaafe00..7139b3b4a2 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialDifferenceSensor.mo @@ -43,6 +43,6 @@ equation

    See also

    -MagneticFluxSensor +MagneticFluxSensor

    ")); end MagneticPotentialDifferenceSensor; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialSensor.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialSensor.mo index 42c9de5a99..326d1ca663 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialSensor.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sensors/MagneticPotentialSensor.mo @@ -38,6 +38,6 @@ equation

    See also

    -MagneticFluxSensor +MagneticFluxSensor

    ")); end MagneticPotentialSensor; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantFlux.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantFlux.mo index 9af0eec113..c09b1e4d15 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantFlux.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantFlux.mo @@ -48,11 +48,11 @@ Source of constant magnetic flux.

    See also

    - + ConstantMagneticPotentialDifference, - + SignalMagneticPotentialDifference, - + SignalFlux

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo index f9115b8066..940269ee75 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/ConstantMagneticPotentialDifference.mo @@ -49,11 +49,11 @@ Source of constant magnetomotive force.

    See also

    - + SignalMagneticPotentialDifference, - + ConstantFlux, - + SignalFlux

    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalFlux.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalFlux.mo index f729d4e96f..a546ee9632 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalFlux.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalFlux.mo @@ -50,11 +50,11 @@ Source of magnetic flux with complex signal input.

    See also

    - + ConstantMagneticPotentialDifference, - + SignalMagneticPotentialDifference, - + ConstantFlux

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo index 944f9502e3..82d6d7e33c 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Sources/SignalMagneticPotentialDifference.mo @@ -50,11 +50,11 @@ Source of magnetomotive force with complex signal input.

    See also

    - + ConstantMagneticPotentialDifference, - + ConstantFlux, - + SignalFlux

    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/Concept.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/Concept.mo index 2e004a9665..843537cfe2 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/Concept.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/Concept.mo @@ -11,28 +11,28 @@ Let us assume that the air gap model contains stator and rotor magnetic ports wh

    -, +,

    where - + is the connector reference angle of the stator ports, - + is the connector reference angle of the rotor ports, and - + is the difference of the mechanical angles of the flange and the support, respectively, multiplied by the number of pole pairs, -. +. The stator and rotor reference angles are directly related with the electrical frequencies of the electric circuits of the stator, -, +, and rotor, -, +, respectively, by means of:

    - +

    @@ -42,7 +42,7 @@ This is a strict consequence of the electromagnetic coupling between the quasi-s

    Fig. 1: Reference frames of the quasi-static fundamental wave library
    - +
    @@ -52,28 +52,28 @@ The complex magnetic flux with respect a stator and rotor magnetic port are equa

    -, +,

    but the reference phase angles are different according to the relationship explained above. The stator and rotor reference angles refer to quasi-static magnetic connectors. The complex magnetic flux of the (stator) port with respect to the stator fixed reference frame is then calculated by

    -. +.

    The complex magnetic flux of the (rotor) magnetic port with respect to the rotor fixed reference frame is then calculated by

    -. +.

    The two stator and rotor fixed complex fluxes are related by

    -. +.
    ")); diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/ReleaseNotes.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/ReleaseNotes.mo index 1c12adf1c7..90386aba74 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/ReleaseNotes.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/ReleaseNotes.mo @@ -14,10 +14,10 @@ class ReleaseNotes "Release Notes"
  • Fixed wrong initial conditions of #2277
  • Added more examples from - Machines.Examples, see + Machines.Examples, see #2276
  • Added -RotorDisplacementAngle, see +RotorDisplacementAngle, see #2050
    • @@ -28,7 +28,7 @@ class ReleaseNotes "Release Notes"
  • Update and improvement of documentation
  • Added new component:
  • Removed parameter text from icon layer for reluctance and permeance model
  • Fixed issues of ticket @@ -41,7 +41,7 @@ class ReleaseNotes "Release Notes"
  • Added active, reactive and apparent power and power factor in interface and machine models, see #1405
  • Added new interface model - TwoPortExtended + TwoPortExtended to simplify consistent inclusion of variables, see #1405
  • Changed icon and location of terminal box according to @@ -108,7 +108,7 @@ class ReleaseNotes "Release Notes"
    Version 0.1.0, 2013-08-27
      -
    • Documentation of phasor concept
      • +
    • Documentation of phasor concept
    • Connections.branch between electric and magnetic quasi-static connectors to handle open circuit and motor operation of machines
    • Saliency effects are properly considered
    • Electromagnetic coupling with Analog domain is implemented fully quasi-static with v = 0 at the electric connectors -- this may have to be changed in the future
      • diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/package.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/package.mo index f83423d32a..1f90127059 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/UsersGuide/package.mo @@ -4,7 +4,7 @@ package UsersGuide "User's Guide" annotation (DocumentationClass=true, Documentation(info="

      This is the library of quasi-static fundamental wave models for polyphase electric machines. This is complementary library with the transient machine models of -FundamentalWave. +FundamentalWave.

      ")); end UsersGuide; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/MultiTerminalBox.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/MultiTerminalBox.mo index 3fbbc3c34d..8448649ad9 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/MultiTerminalBox.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/MultiTerminalBox.mo @@ -64,7 +64,7 @@ The parameter terminalConnection is used to switch between star This connector is a plug with mSystem = Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m) phases, representing the star points of each base system; see -Modelica.Magnetic.FundamentalWave.UsersGuide.Polyphase. +Modelica.Magnetic.FundamentalWave.UsersGuide.Polyphase.

      ")); end MultiTerminalBox; diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/VfController.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/VfController.mo index 141a8736f4..0a68023ea2 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/VfController.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Utilities/VfController.mo @@ -63,7 +63,7 @@ The output voltages may serve as inputs for complex voltage sources with phase i
    • Fig. 1: Voltage vs. frequency of voltage frequency controller
    - +
    diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo index 0d52932efa..27a53a95ba 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/package.mo @@ -2,7 +2,7 @@ within Modelica.Magnetic.QuasiStatic; package FundamentalWave "Quasi-static fundamental wave electric machines" extends Modelica.Icons.Package; annotation (preferredView="info", Documentation(info=" -

    For a discrimination of various machine models, see discrimination.

    +

    For a discrimination of various machine models, see discrimination.

    Copyright © 2013-2020, Modelica Association and contributors

    diff --git a/Modelica/Math/BooleanVectors.mo b/Modelica/Math/BooleanVectors.mo index e6a92dbca6..46a6d43240 100644 --- a/Modelica/Math/BooleanVectors.mo +++ b/Modelica/Math/BooleanVectors.mo @@ -21,7 +21,7 @@ algorithm

    Returns true if all elements of the Boolean input vector b are true. Otherwise the function returns false. If b is an empty vector, -i.e., size(b,1)=0, the function returns false (as opposed to andTrue returning true). +i.e., size(b,1)=0, the function returns false (as opposed to andTrue returning true).

    Example

    @@ -36,13 +36,13 @@ i.e., size(b,1)=0, the function returns false (as opposed to See also

    -andTrue, -anyTrue, -countTrue, -enumerate, -firstTrueIndex, -index, and -oneTrue. +andTrue, +anyTrue, +countTrue, +enumerate, +firstTrueIndex, +index, and +oneTrue.

    ")); @@ -68,7 +68,7 @@ algorithm

    Returns true if all elements of the Boolean input vector b are true. Otherwise the function returns false. If b is an empty vector, -i.e., size(b,1)=0, the function returns true (as opposed to allTrue returning false). +i.e., size(b,1)=0, the function returns true (as opposed to allTrue returning false).

    Example

    @@ -83,13 +83,13 @@ i.e., size(b,1)=0, the function returns true (as opposed to See also

    -allTrue, -anyTrue, -countTrue, -enumerate, -firstTrueIndex, -index, and -oneTrue. +allTrue, +anyTrue, +countTrue, +enumerate, +firstTrueIndex, +index, and +oneTrue.

    ")); @@ -131,13 +131,13 @@ i.e., size(b,1)=0, the function returns false.

    See also

    -allTrue, -andTrue, -countTrue, -enumerate, -firstTrueIndex, -index, and -oneTrue. +allTrue, +andTrue, +countTrue, +enumerate, +firstTrueIndex, +index, and +oneTrue.

    ")); end anyTrue; @@ -166,13 +166,13 @@ This function returns the number of true elements in a Boolean

    See also

    -allTrue, -andTrue, -anyTrue, -enumerate, -firstTrueIndex, -index, and -oneTrue. +allTrue, +andTrue, +anyTrue, +enumerate, +firstTrueIndex, +index, and +oneTrue.

    ")); end countTrue; @@ -217,13 +217,13 @@ indicated by 0.

    See also

    -allTrue, -andTrue, -anyTrue, -countTrue, -firstTrueIndex, -index, and -oneTrue. +allTrue, +andTrue, +anyTrue, +countTrue, +firstTrueIndex, +index, and +oneTrue.

    ")); end enumerate; @@ -268,13 +268,13 @@ function returns 0.

    See also

    -allTrue, -andTrue, -anyTrue, -countTrue, -enumerate, -index, and -oneTrue. +allTrue, +andTrue, +anyTrue, +countTrue, +enumerate, +index, and +oneTrue.

    ")); end firstTrueIndex; @@ -315,13 +315,13 @@ the integer vector is the number of true elements in b.

    See also

    -allTrue, -andTrue, -anyTrue, -countTrue, -enumerate, -firstTrueIndex, and -oneTrue. +allTrue, +andTrue, +anyTrue, +countTrue, +enumerate, +firstTrueIndex, and +oneTrue.

    ")); end index; @@ -363,13 +363,13 @@ i.e., size(b,1)=0, the function returns false.

    See also

    -allTrue, -andTrue, -anyTrue, -countTrue, -enumerate, -firstTrueIndex, and -index. +allTrue, +andTrue, +anyTrue, +countTrue, +enumerate, +firstTrueIndex, and +index.

    ")); end oneTrue; diff --git a/Modelica/Math/Distributions.mo b/Modelica/Math/Distributions.mo index aca4643239..7fc273d76d 100644 --- a/Modelica/Math/Distributions.mo +++ b/Modelica/Math/Distributions.mo @@ -25,7 +25,7 @@ Plot of the function:

    - +

    @@ -41,8 +41,8 @@ density(0,-1,1) // = 0.5

    See also

    -Uniform.cumulative, -Uniform.quantile. +Uniform.cumulative, +Uniform.quantile.

    ", revisions=" @@ -53,7 +53,7 @@ density(0,-1,1) // = 0.5
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -96,7 +96,7 @@ Plot of the function:

    - +

    @@ -112,8 +112,8 @@ cumulative(0,-1,1) // = 0.5

    See also

    -Uniform.density, -Uniform.quantile. +Uniform.density, +Uniform.quantile.

    ", revisions=" @@ -124,7 +124,7 @@ cumulative(0,-1,1) // = 0.5
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -175,7 +175,7 @@ Plot of the function:

    - +

    @@ -191,8 +191,8 @@ quantile(0.5,-1,1) // = 0

    See also

    -Uniform.density, -Uniform.cumulative. +Uniform.density, +Uniform.cumulative.

    ", revisions=" @@ -203,7 +203,7 @@ quantile(0.5,-1,1) // = 0
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -230,15 +230,15 @@ of the uniform distribution. Examples:

    - +
    - +
    - +

    @@ -254,7 +254,7 @@ For more details of this distribution see
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -290,7 +290,7 @@ Plot of the function:

    - +

    @@ -306,8 +306,8 @@ density(3,1,0.5) // = 0.00026766045152977074

    See also

    -Normal.cumulative, -Normal.quantile. +Normal.cumulative, +Normal.quantile.

    ", revisions=" @@ -318,7 +318,7 @@ density(3,1,0.5) // = 0.00026766045152977074
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -361,7 +361,7 @@ Plot of the function:

    - +

    @@ -377,8 +377,8 @@ cumulative(0,1,0.5) // = 0.15865525393145707

    See also

    -Normal.density, -Normal.quantile. +Normal.density, +Normal.quantile.

    ", revisions=" @@ -389,7 +389,7 @@ cumulative(0,1,0.5) // = 0.15865525393145707
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -445,7 +445,7 @@ Plot of the function:

    - +

    @@ -461,8 +461,8 @@ quantile(0.5,1,0.5) // = 1

    See also

    -Normal.density, -Normal.cumulative. +Normal.density, +Normal.cumulative.

    ", revisions=" @@ -473,7 +473,7 @@ quantile(0.5,1,0.5) // = 1
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -510,15 +510,15 @@ of the normal distribution. Examples:

    - +
    - +
    - +

    @@ -534,7 +534,7 @@ For more details of this distribution see
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -586,7 +586,7 @@ Plot of the function:

    - +

    @@ -605,8 +605,8 @@ density(0.5,-1.5,1.5,1,0.9) // = 0.5365495585520803

    See also

    -TruncatedNormal.cumulative, -TruncatedNormal.quantile. +TruncatedNormal.cumulative, +TruncatedNormal.quantile.

    ", revisions=" @@ -617,7 +617,7 @@ density(0.5,-1.5,1.5,1,0.9) // = 0.5365495585520803
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -678,7 +678,7 @@ Plot of the function:

    - +

    @@ -697,8 +697,8 @@ cumulative(0.5,-1.5,1.5,1,0.9) // = 0.4046868865634537

    See also

    -TruncatedNormal.density, -TruncatedNormal.quantile. +TruncatedNormal.density, +TruncatedNormal.quantile.

    ", revisions=" @@ -709,7 +709,7 @@ cumulative(0.5,-1.5,1.5,1,0.9) // = 0.4046868865634537
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -778,7 +778,7 @@ Plot of the function:

    - +

    @@ -797,8 +797,8 @@ quantile(0.5,0,1,0.5,0.9) // = 0.5

    See also

    -TruncatedNormal.density, -TruncatedNormal.cumulative. +TruncatedNormal.density, +TruncatedNormal.cumulative.

    ", revisions=" @@ -809,7 +809,7 @@ quantile(0.5,0,1,0.5,0.9) // = 0.5
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -854,15 +854,15 @@ of the truncated normal distribution. Examples:

    - +
    - +
    - +

    @@ -881,7 +881,7 @@ of truncated distributions, see
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -926,7 +926,7 @@ Plot of the function:

    - +

    @@ -942,8 +942,8 @@ density(1,0.5,2) // = 0.14652511110987343

    See also

    -Weibull.cumulative, -Weibull.quantile. +Weibull.cumulative, +Weibull.quantile.

    ", revisions=" @@ -954,7 +954,7 @@ density(1,0.5,2) // = 0.14652511110987343
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1006,7 +1006,7 @@ Plot of the function:

    - +

    @@ -1022,8 +1022,8 @@ cumulative(0.5,0.5,1) // = 0.6321205588285577

    See also

    -Weibull.density, -Weibull.quantile. +Weibull.density, +Weibull.quantile.

    ", revisions=" @@ -1034,7 +1034,7 @@ cumulative(0.5,0.5,1) // = 0.6321205588285577
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1085,7 +1085,7 @@ Plot of the function:

    - +

    @@ -1101,8 +1101,8 @@ quantile(0.5,1,0.5) // = 0.41627730557884884

    See also

    -Weibull.density, -Weibull.cumulative. +Weibull.density, +Weibull.cumulative.

    ", revisions=" @@ -1113,7 +1113,7 @@ quantile(0.5,1,0.5) // = 0.41627730557884884
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1145,15 +1145,15 @@ of the Weibull distribution. Examples:

    - +
    - +
    - +

    @@ -1169,7 +1169,7 @@ For more details of this distribution see
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1221,7 +1221,7 @@ Plot of the function:

    - +

    @@ -1240,8 +1240,8 @@ density(0.5,0,0.8,0.5,2) // = 1.5948036466479143

    See also

    -TruncatedWeibull.cumulative, -TruncatedWeibull.quantile. +TruncatedWeibull.cumulative, +TruncatedWeibull.quantile.

    ", revisions=" @@ -1252,7 +1252,7 @@ density(0.5,0,0.8,0.5,2) // = 1.5948036466479143
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1312,7 +1312,7 @@ Plot of the function:

    - +

    @@ -1331,8 +1331,8 @@ cumulative(0.5,0,0.8,0.5,2) // = 0.6850805314988328

    See also

    -TruncatedWeibull.density, -TruncatedWeibull.quantile. +TruncatedWeibull.density, +TruncatedWeibull.quantile.

    ", revisions=" @@ -1343,7 +1343,7 @@ cumulative(0.5,0,0.8,0.5,2) // = 0.6850805314988328
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1413,7 +1413,7 @@ Plot of the function:

    - +

    @@ -1432,8 +1432,8 @@ quantile(0.5,0,1,0.5,0.9) // = 0.256951787882498

    See also

    -TruncatedWeibull.density, -TruncatedWeibull.cumulative. +TruncatedWeibull.density, +TruncatedWeibull.cumulative.

    ", revisions=" @@ -1444,7 +1444,7 @@ quantile(0.5,0,1,0.5,0.9) // = 0.256951787882498
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1486,15 +1486,15 @@ of the truncated Weibull distribution. Examples:

    - +
    - +
    - +

    @@ -1513,7 +1513,7 @@ of truncated distributions, see
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1547,7 +1547,7 @@ arguments of the probability density functions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1578,7 +1578,7 @@ arguments of the cumulative distribution functions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1610,7 +1610,7 @@ arguments of the quantile functions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1641,7 +1641,7 @@ arguments of the probability density functions of truncated distributions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1672,7 +1672,7 @@ arguments of the cumulative distribution functions for a truncated distribution.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1703,7 +1703,7 @@ arguments of the quantile functions for truncated distributions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1729,7 +1729,7 @@ truncated distribution functions.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -1789,7 +1789,7 @@ and the result is then limited to ± 0.1 Volt, or (b) the normal distribut so that it is within the band of ± 0.1 Volt. Approach (a) is a brute force method that changes the statistical properties of the signal in an unknown way. Approach (b) is a \"clean\" mathematical description. The blocks in package -Blocks.Noise +Blocks.Noise give the user the freedom to choose: Either compute a normal (unlimited) noise, or a truncated normal noise (truncated distribution).

    @@ -1859,7 +1859,7 @@ compared with its truncated distribution:

    - +
    ", revisions=" @@ -1870,7 +1870,7 @@ compared with its truncated distribution:
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    diff --git a/Modelica/Math/FastFourierTransform.mo b/Modelica/Math/FastFourierTransform.mo index c2e3199bd7..09d538f40b 100644 --- a/Modelica/Math/FastFourierTransform.mo +++ b/Modelica/Math/FastFourierTransform.mo @@ -101,7 +101,7 @@ A plot of the resulting FFT is shown in the next image:

    - +

    @@ -179,7 +179,7 @@ Furthermore, note that the FFT phases are with respect to a cos(..) signal. ", info="

    -This is the same example as Examples.RealFFT1 +This is the same example as Examples.RealFFT1 with the only difference that just the amplitudes of the FFT are stored on file (but not the phases).

    ")); @@ -282,9 +282,9 @@ results in the following output:

    See also

    -realFFTsamplePoints, -realFFT, -realFFTwriteToFile +realFFTsamplePoints, +realFFT, +realFFTwriteToFile

    ")); end realFFTinfo; @@ -400,9 +400,9 @@ ns = 5760

    See also

    -realFFTinfo, -realFFT, -realFFTwriteToFile +realFFTinfo, +realFFT, +realFFTwriteToFile

    ")); end realFFTsamplePoints; @@ -468,7 +468,7 @@ ns = 5760 The input argument of this function is a Real vector u. size(u,1) must be even. An efficient computation is performed, if size(u,1) = 2^a*3^b*5^c (a,b,c Integer ≥ 0). An appropriate length of vector u can be computed with function -realFFTsamplePoints. +realFFTsamplePoints. Function realFFT computes a real FFT (Fast Fourier Transform) of u and returns the result in form of the outputs amplitudes and phases. Argument info provides additional information:

    @@ -522,15 +522,15 @@ amplitudes[i] is the amplitude of a sine-function at the i-th frequency.

    -See also Examples.RealFFT1 +See also Examples.RealFFT1 which is a complete example where an FFT is computed during simulation and stored on file.

    See also

    -realFFTinfo, -realFFTsamplePoints, -realFFTwriteToFile +realFFTinfo, +realFFTsamplePoints, +realFFTwriteToFile

    ")); end realFFT; @@ -597,7 +597,7 @@ no phases will be stored on file. Otherwise, phases must have the same dimension vector. The frequency vector f is constructed within the function from the dimension of the amplitudes vector and the information that amplitudes[end] is at frequency f_max. The format argument defines the file format (for details see -writeRealMatrix). +writeRealMatrix). Argument t_computed is the actual time instant when the FFT was computed. It is used in the print message after the result was stored on file.

    @@ -616,14 +616,14 @@ The matrix on file has the following structure:

    See detailed example model: -Examples.RealFFT1. +Examples.RealFFT1.

    See also

    -realFFTinfo, -realFFTsamplePoints, -realFFT +realFFTinfo, +realFFTsamplePoints, +realFFT

    ")); end realFFTwriteToFile; @@ -642,7 +642,7 @@ See detailed example model: protected Real work[3*size(u,1) + 2*(div(size(u,1),2)+1)]; external "C" info = ModelicaFFT_kiss_fftr(u, size(u,1), work, size(work,1), amplitudes, phases) - annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaFFT.h\"", Library="ModelicaExternalC"); + annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaFFT.h\"", Library="ModelicaExternalC"); annotation (Documentation(revisions=" @@ -794,7 +794,7 @@ annotation (Documentation(info=" This package provides functions to compute the Fast Fourier Transform (FFT).

    -For an example see Examples.RealFFT1 +For an example see Examples.RealFFT1 where the following signal is computed during simulation

    @@ -808,7 +808,7 @@ resulting in:

    - +

    References

    diff --git a/Modelica/Math/Nonlinear.mo b/Modelica/Math/Nonlinear.mo index 09e275da3f..9708897db2 100644 --- a/Modelica/Math/Nonlinear.mo +++ b/Modelica/Math/Nonlinear.mo @@ -68,7 +68,7 @@ package Nonlinear "Library of functions operating on nonlinear equations" annotation (Documentation(info="

    This example integrates the following integrands with function -quadratureLobatto +quadratureLobatto and compares the result with an analytical solution. The examples also demonstrate how additional input arguments to the integrand function can be passed as additional arguments. @@ -141,7 +141,7 @@ The following integrals are computed: annotation (Documentation(info="

    This example solves the following integrands with function -quadratureLobatto. +quadratureLobatto. The user can set the parameters, like \"w\" or \"k\", and can experiment with different integration intervals. The following integrals are computed: @@ -216,7 +216,7 @@ The following integrals are computed: annotation (Documentation(info="

    This example solves the following nonlinear equations with function -solveOneNonlinearEquation +solveOneNonlinearEquation and compares the result with the available analytical solution. The examples also demonstrate how additional input arguments to the nonlinear equation function can be passes as additional arguments. @@ -297,7 +297,7 @@ The following nonlinear equations are solved: annotation (Documentation(info="

    This example solves the following nonlinear equations with function -solveOneNonlinearEquation. +solveOneNonlinearEquation. The user can set the parameters, like \"w\" or \"m\", and can experiment with different start intervals. The following nonlinear equations are solved: @@ -335,7 +335,7 @@ to a function in a model.

    From a modeling point of view, the example demonstrates in very simplified way the basic approach to model distributed systems with the Ritz method. -The displacement field u(c,t) of a particle (where c is the undeformed position and t is time) is hereby approximated by space-dependent mode shapes Φ(c) and time-dependent modal amplitudes q(t), that is u = Φ(c)*q(t). When inserting this decomposition in the equations of motion and then integrating over all particles, terms such as ∫(Φ(c) dc)*q(t) appear, where the time-invariant integral term can be computed beforehand once with the Lobatto method. By this approach the partial differential equations are transformed to a system of ordinary differential equations. +The displacement field u(c,t) of a particle (where c is the undeformed position and t is time) is hereby approximated by space-dependent mode shapes Φ(c) and time-dependent modal amplitudes q(t), that is u = Φ(c)*q(t). When inserting this decomposition in the equations of motion and then integrating over all particles, terms such as ∫(Φ(c) dc)*q(t) appear, where the time-invariant integral term can be computed beforehand once with the Lobatto method. By this approach the partial differential equations are transformed to a system of ordinary differential equations.

    "), experiment(StopTime=5)); @@ -415,11 +415,11 @@ arguments to the example functions.

    This partial function defines the interface of a function with one input and one output Real signal. The scalar functions -of Modelica.Math.Nonlinear +of Modelica.Math.Nonlinear are derived from this base type by inheritance. This allows to use these functions directly as function arguments to a function, see, .e.g., -Math.Nonlinear.Examples. +Math.Nonlinear.Examples.

    ")); @@ -429,7 +429,7 @@ to a function, see, .e.g., Interface definitions of functions. The main purpose is to use functions derived from these interface definitions as function arguments to a function, see, .e.g., -Math.Nonlinear.Examples. +Math.Nonlinear.Examples.

    ")); end Interfaces; @@ -619,7 +619,7 @@ using the adaptive Lobatto rule according to:

    Example

    -See the examples in Modelica.Math.Nonlinear.Examples. +See the examples in Modelica.Math.Nonlinear.Examples.

    ")); @@ -794,7 +794,7 @@ function. The solver function is a direct mapping of the Algol 60 procedure

    Example

    -See the examples in Modelica.Math.Nonlinear.Examples. +See the examples in Modelica.Math.Nonlinear.Examples.

    ")); end solveOneNonlinearEquation; @@ -811,7 +811,7 @@ functions.

    For details about how to define and to use functions as input arguments to functions, see -ModelicaReference.Classes.'function' +ModelicaReference.Classes.'function' or Section 12.4.2 (Functional Input Arguments to Functions) of the Modelica 3.4 specification.

    diff --git a/Modelica/Math/Polynomials.mo b/Modelica/Math/Polynomials.mo index a6af06b4be..d1eff464bd 100644 --- a/Modelica/Math/Polynomials.mo +++ b/Modelica/Math/Polynomials.mo @@ -296,7 +296,7 @@ To compute the roots, the eigenvalues of the corresponding companion matrix are calculated. These are the roots of the polynomial.
    Since the companion matrix has already Hessenberg form, the transformation to Hessenberg form has not to be performed. -Function eigenvaluesHessenberg
    +Function eigenvaluesHessenberg
    provides efficient eigenvalue computation for those matrices.

    Example

    diff --git a/Modelica/Math/Random.mo b/Modelica/Math/Random.mo index 3ce4ef9896..409b0153b2 100644 --- a/Modelica/Math/Random.mo +++ b/Modelica/Math/Random.mo @@ -61,13 +61,13 @@ package Random "Library of functions for generating random numbers" annotation (experiment(StopTime=2), Documentation(info="

    This example demonstrates how to utilize the random number generators -of package Math.Random.Generators in a Modelica model. +of package Math.Random.Generators in a Modelica model. The example calculates random numbers in the range 0 .. 1 of the available random number generators periodically with a sample period of 0.05 s. Simulations results are shown in the figure below:

    - +
    ", revisions="
    Date Description
    @@ -78,7 +78,7 @@ with a sample period of 0.05 s. Simulations results are shown in the figure belo
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -103,7 +103,7 @@ This package contains examples demonstrating the usage of the functions in packa
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -189,7 +189,7 @@ and the returned state is the one from the last iteration.

    See also

    -Random.Generators.Xorshift64star.random. +Random.Generators.Xorshift64star.random.

    ", revisions=" @@ -200,7 +200,7 @@ and the returned state is the one from the last iteration.
    - \"DLR + \"DLR Initial version implemented by A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    @@ -222,7 +222,7 @@ and the returned state is the one from the last iteration. output Integer stateOut[nState] "The new internal states of the random number generator"; external "C" ModelicaRandom_xorshift64star(stateIn, stateOut, result) - annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC"); + annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC"); annotation(Documentation(info="

    Syntax

    @@ -254,7 +254,7 @@ same random number r is returned.
 
 
    See also
    
 
    
-Random.Generators.Xorshift64star.initialState.
+Random.Generators.Xorshift64star.initialState.
 
    
 ",     revisions="
 
@@ -265,7 +265,7 @@ same random number r is returned.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -281,7 +281,7 @@ same random number r is returned.
 Random number generator xorshift64*. This generator has a period of 2^64
 (the period defines the number of random numbers generated before the sequence begins to repeat itself).
 For an overview, comparison with other random number generators, and links to articles, see
-Math.Random.Generators.
+Math.Random.Generators.
 
    
 ",     revisions="
 
@@ -292,7 +292,7 @@ For an overview, comparison with other random number generators, and links to ar
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -347,7 +347,7 @@ a reasonable initial state vector with the following strategy:
 
    
 
 
    
-The Xorshift64star
+The Xorshift64star
 random number generator is used to fill the internal state vector with 64 bit random numbers.
 
    
 
@@ -362,7 +362,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
 
 
    See also
    
 
    
-Random.Generators.Xorshift128plus.random.
+Random.Generators.Xorshift128plus.random.
 
    
 ",     revisions="
 
@@ -373,7 +373,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -395,7 +395,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
         output Integer stateOut[nState]
           "The new internal states of the random number generator";
         external "C" ModelicaRandom_xorshift128plus(stateIn, stateOut, result)
-          annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
+          annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
         annotation (Documentation(info="
 
    Syntax
    
 
    @@ -427,7 +427,7 @@ same random number r is returned.
 
 
    See also
    
 
    
-Random.Generators.Xorshift128plus.initialState.
+Random.Generators.Xorshift128plus.initialState.
 
    
 ",     revisions="
 
@@ -438,7 +438,7 @@ same random number r is returned.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -455,7 +455,7 @@ Random number generator xorshift128+. This generator has a peri
 (the period defines the number of random numbers generated before the sequence begins to repeat itself).
 For an overview, comparison with
 other random number generators, and links to articles, see
-Math.Random.Generators.
+Math.Random.Generators.
 
    
 ",     revisions="
 
@@ -466,7 +466,7 @@ other random number generators, and links to articles, see
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -524,7 +524,7 @@ a reasonable initial state vector with the following strategy:
 
    
 
 
    
-The Xorshift64star
+The Xorshift64star
 random number generator is used to fill the internal state vector with 64 bit random numbers.
 
    
 
@@ -539,7 +539,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
 
 
    See also
    
 
    
-Random.Generators.Xorshift1024star.random.
+Random.Generators.Xorshift1024star.random.
 
    
 ",     revisions="
 
@@ -550,7 +550,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -572,7 +572,7 @@ random number generator is used to fill the internal state vector with 64 bit ra
         output Integer stateOut[nState]
           "The new internal states of the random number generator";
         external "C" ModelicaRandom_xorshift1024star(stateIn, stateOut, result)
-          annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
+          annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
         annotation (Documentation(info="
 
    Syntax
    
 
    @@ -604,7 +604,7 @@ same random number r is returned.
 
 
    See also
    
 
    
-Random.Generators.Xorshift1024star.initialState.
+Random.Generators.Xorshift1024star.initialState.
 
    
 ",     revisions="
 
@@ -615,7 +615,7 @@ same random number r is returned.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -631,7 +631,7 @@ same random number r is returned.
 Random number generator xorshift1024*. This generator has a period of 2^1024
 (the period defines the number of random numbers generated before the sequence begins to repeat itself).
 For an overview, comparison with other random number generators, and links to articles, see
-Math.Random.Generators.
+Math.Random.Generators.
 
    
 ",     revisions="
 
@@ -642,7 +642,7 @@ For an overview, comparison with other random number generators, and links to ar
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -796,7 +796,7 @@ Further explanations of the properties above:
 
 
    
 The xorshift random number generators are used in the following way in the
-Blocks.Noise package:
+Blocks.Noise package:
 
    
 
      
 
    1.  Xorshift64star (xorshift64*) is used to generate the initial internal state vectors of the
@@ -804,16 +804,16 @@ The xorshift random number generators are used in the following way in the
      to the very good startup properties.
      2. 
 
 
    2.  Xorshift128plus (xorshift128+) is the random number generator
-     used by the blocks in Blocks.Noise.
+     used by the blocks in Blocks.Noise.
      Since these blocks hold the internal state vector for every block instance, and the
      internal state vector is copied whenever a new random number is drawn, it is important
      that the internal state vector is short (and still has good statistical properties
      as shown in the table above).
      3. 
 
 
    3.  Xorshift1024star (xorshift1024*) is the basis of the impure function
-     Math.Random.Utilities.impureRandom
+     Math.Random.Utilities.impureRandom
      which in turn is used with
-     Blocks.Noise.GlobalSeed.
+     Blocks.Noise.GlobalSeed.
      The internal state vector is not exposed. It is updated internally, whenever a new random number
      is drawn.
      4. 
 
    
@@ -831,7 +831,7 @@ These numbers are mapped to the 52 bit mantissa of double numbers in the range 0
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -894,7 +894,7 @@ These numbers are mapped to the 52 bit mantissa of double numbers in the range 0
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -912,7 +912,7 @@ state = Utilities.initialStateWithXorshift6star(localSeed, glob
 
    Description
    
 
 
    
-The Xorshift64star
+The Xorshift64star
 random number generator is used to fill a state vector of length nState (nState ≥ 1) with random numbers and return
 this vector. Arguments localSeed and globalSeed are any Integer numbers (including zero or negative number)
 that characterize the initial state.
@@ -935,7 +935,7 @@ If the same localSeed, globalSeed, nState is given, the same state vector is ret
       extends Modelica.Icons.Function;
       output Integer seed "Automatically generated seed";
 
-      external "C" seed = ModelicaRandom_automaticGlobalSeed(0.0) annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
+      external "C" seed = ModelicaRandom_automaticGlobalSeed(0.0) annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
      annotation (Documentation(info="
 
    Syntax
    
 
    @@ -968,7 +968,7 @@ This function should be only called once during initialization.
 
 
    See also
    
 
    
-automaticLocalSeed.
+automaticLocalSeed.
 
    
 
    Note
    
 
    This function is impure!
    
@@ -981,7 +981,7 @@ This function should be only called once during initialization.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1014,7 +1014,7 @@ seed = Utilities.automaticLocalSeed(path);
 Returns an automatically computed seed (Integer) from the hash value of
 the full path name of an instance (has to be inquired in the model or block
 where this function is called by the Modelica built-in operator getInstanceName()).
-Contrary to automaticGlobalSeed(),
+Contrary to automaticGlobalSeed(),
 this is a pure function, that is, the same seed is returned, if an identical
 path is provided.
 
    
@@ -1031,7 +1031,7 @@ path is provided.
 
 
    See also
    
 
    
-automaticGlobalSeed, hashString and getInstanceName.
+automaticGlobalSeed, hashString and getInstanceName.
 
    
 ",     revisions="
 
@@ -1042,7 +1042,7 @@ path is provided.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1073,7 +1073,7 @@ path is provided.
         input Integer[33] rngState "The initial state";
         input Integer id;
         external "C" ModelicaRandom_setInternalState_xorshift1024star(rngState, size(rngState,1), id)
-          annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
+          annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
       end setInternalState;
 
     algorithm
@@ -1093,15 +1093,15 @@ id = initializeImpureRandom(seed;
 
 
    
 Generates a hidden initial state vector for the
-Xorshift1024star
+Xorshift1024star
 random number generator (= xorshift1024* algorithm), from Integer input argument seed. Argument seed
 can be given any value (including zero or negative number). The function returns the
 dummy Integer number id. This number needs to be passed as input to function
-impureRandom,
+impureRandom,
 in order that the sorting order is correct (so that impureRandom is always called
 after initializeImpureRandom). The function stores a reasonable initial state vector
 in a C-static memory by using the
-Xorshift64star
+Xorshift64star
 random number generator to fill the internal state vector with 64 bit random numbers.
 
    
 
@@ -1121,8 +1121,8 @@ random number generator to fill the internal state vector with 64 bit random num
 
 
    See also
    
 
    
-Utilities.impureRandom,
-Random.Generators
+Utilities.impureRandom,
+Random.Generators
 
    
 ",     revisions="
 
@@ -1133,7 +1133,7 @@ random number generator to fill the internal state vector with 64 bit random num
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1153,7 +1153,7 @@ random number generator to fill the internal state vector with 64 bit random num
       output Real y
         "A random number with a uniform distribution on the interval (0,1]";
       external "C" y = ModelicaRandom_impureRandom_xorshift1024star(id)
-        annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
+        annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaRandom.h\"", Library="ModelicaExternalC");
       annotation(Documentation(info="
 
    Syntax
    
 
    @@ -1164,7 +1164,7 @@ r = impureRandom(id);
 
    
 Returns a uniform random number in the range 0 < random ≤ 1 with the xorshift1024* algorithm.
 The dummy input Integer argument id must be the output argument of a call to function
-initializeImpureRandom,
+initializeImpureRandom,
 in order that the sorting order is correct (so that impureRandom is always called
 after initializeImpureRandom). For every call of impureRandom(id), a different random number
 is returned, so the function is impure.
@@ -1191,8 +1191,8 @@ is returned, so the function is impure.
 
 
    See also
    
 
    
-initializeImpureRandom,
-Random.Generators
+initializeImpureRandom,
+Random.Generators
 
    
 
    Note
    
 
    This function is impure!
    
@@ -1205,7 +1205,7 @@ is returned, so the function is impure.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1243,7 +1243,7 @@ Returns an Integer random number in the range imin ≤ random ≤ imax with th
 (the random number in the range 0 ... 1 returned by the xorshift1024* algorithm is mapped to
 an Integer number in the range imin ... imax).
 The dummy input Integer argument id must be the output argument of a call to function
-initializeImpureRandom,
+initializeImpureRandom,
 in order that the sorting order is correct (so that impureRandomInteger is always called
 after initializeImpureRandom). For every call of impureRandomInteger(id), a different random number
 is returned, so the function is impure.
@@ -1251,8 +1251,8 @@ is returned, so the function is impure.
 
 
    See also
    
 
    
-initializeImpureRandom,
-Random.Generators
+initializeImpureRandom,
+Random.Generators
 
    
 
    Note
    
 
    This function is impure!
    
@@ -1265,7 +1265,7 @@ is returned, so the function is impure.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1280,7 +1280,7 @@ is returned, so the function is impure.
 
    
 This package contains utility functions for the random number generators,
 that are usually of no interest for the user
-(they are, for example, used in package Blocks.Noise).
+(they are, for example, used in package Blocks.Noise).
 
    
 ",   revisions="
 
@@ -1291,7 +1291,7 @@ that are usually of no interest for the user
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1327,15 +1327,15 @@ as building blocks of higher level functionality.
 
    
 
 
    
-Package Math.Random.Generators
+Package Math.Random.Generators
 contains various pseudo random number generators. These generators are used in the blocks
-of package Blocks.Noise to generate
+of package Blocks.Noise to generate
 reproducible noise signals.
-Package Math.Random.Utilities
+Package Math.Random.Utilities
 contains utility functions for the random number generators,
 that are usually of no interest for the user
 (they are, for example, used to implement the blocks in
-package Blocks.Noise).
+package Blocks.Noise).
 
    
 ", revisions="
 
@@ -1346,7 +1346,7 @@ package Blocks.Noise).
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
diff --git a/Modelica/Math/Special.mo b/Modelica/Math/Special.mo
index 7988a2ef71..a5ee0798d3 100644
--- a/Modelica/Math/Special.mo
+++ b/Modelica/Math/Special.mo
@@ -70,7 +70,7 @@ of the function:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -86,9 +86,9 @@ erf(0.5)  // = 0.520499877813047
 
 
    See also
    
 
    
-erfc,
-erfInv,
-erfcInv.
+erfc,
+erfInv,
+erfcInv.
 
    
 ",   revisions="
 
@@ -99,7 +99,7 @@ erf(0.5)  // = 0.520499877813047
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -152,7 +152,7 @@ of the function:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -170,9 +170,9 @@ erfc(0.5)  // = 0.4795001221869534
 
 
    See also
    
 
    
-erf,
-erfInv,
-erfcInv.
+erf,
+erfInv,
+erfcInv.
 
    
 ",   revisions="
 
@@ -183,7 +183,7 @@ erfc(0.5)  // = 0.4795001221869534
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -239,7 +239,7 @@ Plot of the function:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -256,9 +256,9 @@ erfInv(0.9999999999) // = 4.572824958544925
 
 
    See also
    
 
    
-erf,
-erfc,
-erfcInv.
+erf,
+erfc,
+erfcInv.
 
    
 ",   revisions="
 
@@ -269,7 +269,7 @@ erfInv(0.9999999999) // = 4.572824958544925
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -331,7 +331,7 @@ Plot of the function:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -347,9 +347,9 @@ erfInv(1.999999)   // = -3.4589107372909473
 
 
    See also
    
 
    
-erf,
-erfc,
-erfInv.
+erf,
+erfc,
+erfInv.
 
    
 ",   revisions="
 
@@ -360,7 +360,7 @@ erfInv(1.999999)   // = -3.4589107372909473
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -389,7 +389,7 @@ erfInv(1.999999)   // = -3.4589107372909473
 
 
-
+
diff --git a/Modelica/StateGraph.mo b/Modelica/StateGraph.mo
index a6d5d3f9ec..d8886e27ba 100644
--- a/Modelica/StateGraph.mo
+++ b/Modelica/StateGraph.mo
@@ -31,7 +31,7 @@ The basic elements of StateGraphs are steps and transit
 
    
 
 
    
-
+
 
    
 
 
    
@@ -59,7 +59,7 @@ the above figure, results in the following menu:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -99,7 +99,7 @@ figure:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -128,7 +128,7 @@ form, as shown in the next figure:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -267,7 +267,7 @@ An example for both components is given in the next figure.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -298,7 +298,7 @@ corresponding parameter menu. E.g. in a \"Parallel\" component:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -308,7 +308,7 @@ the vector index to which the component shall be connected:
 
    
 
 
    
-
+
 
    
 
 
    CompositeSteps, Suspend and Resume Port
    
@@ -319,7 +319,7 @@ An example is given in the next figure (from Examples.ControlledTanks):
 
    
 
 
    
-
+
 
    
 
 
    
@@ -371,7 +371,7 @@ In this section a more realistic, still simple, application example
 is given, to demonstrate various features of the StateGraph library.
 This example shows the control of a two tank system from the master thesis
 of Isolde Dressler
-(see literature).
+(see literature).
 
    
 
    
 In the following figure the top level of the model is shown.
@@ -379,7 +379,7 @@ This model is available as StateGraph.Examples.ControlledTanks.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -435,7 +435,7 @@ the next figure:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -731,7 +731,7 @@ email: Martin.Otter@dlr.de
 
      
 
    •  The development of this library was strongly motivated by the
      master thesis of Isolde Dressler
-     (see literature),
+     (see literature),
      in which
      a compiler from JGrafchart to Modelica was designed and
      implemented. This project was supervised by Karl-Erik Årzén
@@ -747,7 +747,7 @@ email: Martin.Otter@dlr.de
      finite state machines with equations is based on
      (Elmqvist, Mattsson and Otter, 2001),
      which in turn uses ideas from (Mosterman, Otter and Elmqvist, 1998),
-     see literature
      • 
+     see literature
 
    
 "));
 
@@ -762,22 +762,22 @@ way. This package contains the User's Guide for
 the library and has the following content:
 
    
 
      
-
    1. Overview of library
+
    2. Overview of library
      gives an overview of the library.
      3. 
-
    3.  A first example
+
    4.  A first example
      demonstrates at hand of a first example how to use this library.
      5. 
-
    5.  An
+
    6.  An
      application example demonstrates varies features at hand of the
      control of a two tank system.
      7. 
-
    7.  Comparison
+
    8.  Comparison
      with StateGraph2 compares Modelica.StateGraph with the much improved version
      Modelica_StateGraph2.
      9. 
-
    9. Release Notes
+
    10. Release Notes
     summarizes the differences between different versions of this library.
      11. 
-
    11. Literature
+
    12. Literature
     provides references that have been used to design and implement this
     library.
      13. 
-
    13. Contact
+
    14. Contact
     provides information about the authors of the library as well as
     acknowledgments.
      15. 
 
    
@@ -1213,7 +1213,7 @@ according to their setting before leaving the \"compositeStep\" via its
 
    
 With this example the controller of a tank filling/emptying system
 is demonstrated. This example is from Dressler (2004),
-see Literature.
+see Literature.
 The basic operation is to fill and empty the two tanks:
 
    
 
      
@@ -2733,7 +2733,7 @@ Note, there is a much improved version of this library called
 Modelica tool, you can download it from
 https://github.com/modelica/Modelica_StateGraph2.
 In the
-Users Guide
+Users Guide
 a detailed comparison is given. It is highly recommended to use Modelica_StateGraph2 instead
 of Modelica.StateGraph.
 
      
@@ -2754,9 +2754,9 @@ some deficiencies of StateCharts.
 For an introduction, have especially a look at:
 
      
 
 
      
@@ -2767,9 +2767,9 @@ top-level part of the tank controller as a StateGraph is shown:
 
      
 
 
      
-
+
 
-
+
 
      
 
 
      
diff --git a/Modelica/Thermal/FluidHeatFlow/BaseClasses/SimpleFriction.mo b/Modelica/Thermal/FluidHeatFlow/BaseClasses/SimpleFriction.mo
index c7c32d8bd4..b4262d8a2f 100644
--- a/Modelica/Thermal/FluidHeatFlow/BaseClasses/SimpleFriction.mo
+++ b/Modelica/Thermal/FluidHeatFlow/BaseClasses/SimpleFriction.mo
@@ -45,7 +45,7 @@ Definition of relationship between pressure drop and volume flow rate:
 
    1. -V_flowLaminar > VolumeFlow or VolumeFlow < +V_flowLaminar: turbulent, i.e., quadratic dependency of pressure drop on volume flow.
      2. 
 
 
      
-\"SimpleFriction.png\"
 
      
 
      
diff --git a/Modelica/Thermal/FluidHeatFlow/Components/OneWayValve.mo b/Modelica/Thermal/FluidHeatFlow/Components/OneWayValve.mo
index 22d3b187bd..801b96dc1d 100644
--- a/Modelica/Thermal/FluidHeatFlow/Components/OneWayValve.mo
+++ b/Modelica/Thermal/FluidHeatFlow/Components/OneWayValve.mo
@@ -22,7 +22,7 @@ equation
   V_flow = (s*unitPressureDrop)  *(if backward then V_flowBackward/dpNominal else 1);
   Q_flow = frictionLoss*V_flow*dp;
 annotation (Documentation(info="
-
      Simple one-way valve, comparable to the electrical ideal diode model.
      
+
      Simple one-way valve, comparable to the electrical ideal diode model.
      
 
        
 
      • from flowPort_a to flowPort_b: small pressure drop, linearly dependent on volumeFlow
        • 
 
      • from flowPort_b to flowPort_a: small leakage flow, linearly dependent on pressure drop
        • 
diff --git a/Modelica/Thermal/FluidHeatFlow/Examples/package.mo b/Modelica/Thermal/FluidHeatFlow/Examples/package.mo
index 563068979b..f66a625de8 100644
--- a/Modelica/Thermal/FluidHeatFlow/Examples/package.mo
+++ b/Modelica/Thermal/FluidHeatFlow/Examples/package.mo
@@ -14,9 +14,9 @@ package Examples "Examples that demonstrate the usage of the FluidHeatFlow compo
 
      • OneMass: Cooling of a mass (thermal capacity) by a coolant flow
        • 
 
      • TwoMass: Cooling of two masses (thermal capacities) by two parallel coolant flows
        • 
 
      • WaterPump: Water pumping station
        • 
-
      • TestOpenTank: Test the OpenTank model
        • 
+
      • TestOpenTank: Test the OpenTank model
        • 
 
      • TwoTanks: Two connected open tanks
        • 
-
      • TestCylinder: Test the Cylinder model
        • 
+
      • TestCylinder: Test the Cylinder model
        • 
 
    
 
 "));
diff --git a/Modelica/Thermal/FluidHeatFlow/Sensors/RelPressureSensor.mo b/Modelica/Thermal/FluidHeatFlow/Sensors/RelPressureSensor.mo
index 2c842ece9a..e9b3acdc8a 100644
--- a/Modelica/Thermal/FluidHeatFlow/Sensors/RelPressureSensor.mo
+++ b/Modelica/Thermal/FluidHeatFlow/Sensors/RelPressureSensor.mo
@@ -13,7 +13,7 @@ equation
 annotation (
     Documentation(info="
 
    The RelPressureSensor measures the pressure drop between flowPort_a and flowPort_b.
    
-
    Thermodynamic equations are defined by Interfaces.RelativeSensorBase.
    
+
    Thermodynamic equations are defined by Interfaces.RelativeSensorBase.
    
 "),
   Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
         Text(
diff --git a/Modelica/Thermal/FluidHeatFlow/Sensors/RelTemperatureSensor.mo b/Modelica/Thermal/FluidHeatFlow/Sensors/RelTemperatureSensor.mo
index 590ce346fb..2d5c432d5f 100644
--- a/Modelica/Thermal/FluidHeatFlow/Sensors/RelTemperatureSensor.mo
+++ b/Modelica/Thermal/FluidHeatFlow/Sensors/RelTemperatureSensor.mo
@@ -13,7 +13,7 @@ equation
   annotation (
     Documentation(info="
 
    The RelTemperatureSensor measures the temperature difference between flowPort_a and flowPort_b.
    
-
    Thermodynamic equations are defined by Interfaces.RelativeSensorBase.
    
+
    Thermodynamic equations are defined by Interfaces.RelativeSensorBase.
    
 
    
 Note: Connected flowPorts have the same temperature (mixing temperature)!
 Since mixing my occur, the outlet temperature of a component may be different from the connector's temperature.
diff --git a/Modelica/Thermal/FluidHeatFlow/UsersGuide/ReleaseNotes.mo b/Modelica/Thermal/FluidHeatFlow/UsersGuide/ReleaseNotes.mo
index 7a1ba1a846..7ba0dcc32a 100644
--- a/Modelica/Thermal/FluidHeatFlow/UsersGuide/ReleaseNotes.mo
+++ b/Modelica/Thermal/FluidHeatFlow/UsersGuide/ReleaseNotes.mo
@@ -6,8 +6,8 @@ class ReleaseNotes "Release Notes"
   
    4.0.0, 2020-06-04
    
   
 
diff --git a/Modelica/Thermal/HeatTransfer/Components/Convection.mo b/Modelica/Thermal/HeatTransfer/Components/Convection.mo
index 1316ca4ea7..c4c1a26fe7 100644
--- a/Modelica/Thermal/HeatTransfer/Components/Convection.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/Convection.mo
@@ -59,7 +59,7 @@ equation
     Documentation(info="
 
    
 This is a model of linear heat convection, e.g., the heat transfer between a plate and the surrounding air; see also:
-ConvectiveResistor.
+ConvectiveResistor.
 It may be used for complicated solid geometries and fluid flow over the solid by determining the
 convective thermal conductance Gc by measurements. The basic constitutive equation for convection is
 
    
@@ -85,7 +85,7 @@ from properties of the fluid flowing over the solid. Examples:
 
    
 
    
 Machines cooled by air (empirical, very rough approximation according
-to [Fischer2017, p. 452]:
+to [Fischer2017, p. 452]:
 
    
 
     h = 7.8*v^0.78 [W/(m2.K)] (forced convection)
@@ -96,7 +96,7 @@ where
 
    Laminar flow with constant velocity of a fluid along a
 flat plate where the heat flow rate from the plate
 to the fluid (= solid.Q_flow) is kept constant
-(according to [Holman2010, p.265]):
+(according to [Holman2010, p.265]):
 
    
 
     h  = Nu*k/x;
diff --git a/Modelica/Thermal/HeatTransfer/Components/ConvectiveResistor.mo b/Modelica/Thermal/HeatTransfer/Components/ConvectiveResistor.mo
index 35e09245c9..345959eabe 100644
--- a/Modelica/Thermal/HeatTransfer/Components/ConvectiveResistor.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/ConvectiveResistor.mo
@@ -59,7 +59,7 @@ equation
     Documentation(info="
 
    
 This is a model of linear heat convection, e.g., the heat transfer between a plate and the surrounding air; same as the
-Convection component
+Convection component
 but using the convective resistance instead of the convective conductance as an input.
 This is advantageous for series connections of ConvectiveResistors,
 especially if it shall be allowed that a convective resistance is defined to be zero (i.e. no temperature difference).
diff --git a/Modelica/Thermal/HeatTransfer/Components/GeneralHeatFlowToTemperatureAdaptor.mo b/Modelica/Thermal/HeatTransfer/Components/GeneralHeatFlowToTemperatureAdaptor.mo
index 193da68429..98df701961 100644
--- a/Modelica/Thermal/HeatTransfer/Components/GeneralHeatFlowToTemperatureAdaptor.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/GeneralHeatFlowToTemperatureAdaptor.mo
@@ -30,7 +30,7 @@ This component is used to provide a pure signal interface around a HeatTransfer
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-HeatTransfer.Examples.GenerationOfFMUs.
+HeatTransfer.Examples.GenerationOfFMUs.
 This adaptor has heatflow as input and temperature and derivative of temperature as output signals.
 
    
 "),
diff --git a/Modelica/Thermal/HeatTransfer/Components/GeneralTemperatureToHeatFlowAdaptor.mo b/Modelica/Thermal/HeatTransfer/Components/GeneralTemperatureToHeatFlowAdaptor.mo
index c1589dd4a1..009538428d 100644
--- a/Modelica/Thermal/HeatTransfer/Components/GeneralTemperatureToHeatFlowAdaptor.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/GeneralTemperatureToHeatFlowAdaptor.mo
@@ -31,7 +31,7 @@ This component is used to provide a pure signal interface around a HeatTransfer
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-HeatTransfer.Examples.GenerationOfFMUs.
+HeatTransfer.Examples.GenerationOfFMUs.
 This adaptor has temperature and derivative of temperature as input signals and heatflow as output signal.
 
    
 
    
diff --git a/Modelica/Thermal/HeatTransfer/Components/ThermalConductor.mo b/Modelica/Thermal/HeatTransfer/Components/ThermalConductor.mo
index cf504f1f98..aac922fa7e 100644
--- a/Modelica/Thermal/HeatTransfer/Components/ThermalConductor.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/ThermalConductor.mo
@@ -31,7 +31,7 @@ equation
     Documentation(info="
 
    
 This is a model for transport of heat without storing it; see also:
-ThermalResistor.
+ThermalResistor.
 It may be used for complicated geometries where
 the thermal conductance G (= inverse of thermal resistance)
 is determined by measurements and is assumed to be constant
diff --git a/Modelica/Thermal/HeatTransfer/Components/ThermalResistor.mo b/Modelica/Thermal/HeatTransfer/Components/ThermalResistor.mo
index 668db56d5a..fb2c5af2cf 100644
--- a/Modelica/Thermal/HeatTransfer/Components/ThermalResistor.mo
+++ b/Modelica/Thermal/HeatTransfer/Components/ThermalResistor.mo
@@ -31,7 +31,7 @@ equation
     Documentation(info="
 
    
 This is a model for transport of heat without storing it, same as the
-ThermalConductor
+ThermalConductor
 but using the thermal resistance instead of the thermal conductance as a parameter.
 This is advantageous for series connections of ThermalResistors,
 especially if it shall be allowed that a ThermalResistance is defined to be zero (i.e. no temperature difference).
diff --git a/Modelica/Thermal/HeatTransfer/Examples/Utilities/Conduction.mo b/Modelica/Thermal/HeatTransfer/Examples/Utilities/Conduction.mo
index efe08ff6e5..95c58872e8 100644
--- a/Modelica/Thermal/HeatTransfer/Examples/Utilities/Conduction.mo
+++ b/Modelica/Thermal/HeatTransfer/Examples/Utilities/Conduction.mo
@@ -46,7 +46,7 @@ equation
           textString="T1"),        Text(
                 extent={{-150,-114},{150,-144}},
           textString="G=%G"),      Bitmap(extent={{-88,-36},{92,56}},
-            fileName="modelica://Modelica/Resources/Images/Thermal/HeatTransfer/Conductor.png"),
+            fileName="modelica:/Modelica/Resources/Images/Thermal/HeatTransfer/Conductor.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="T2"),        Text(
diff --git a/Modelica/Thermal/HeatTransfer/Examples/Utilities/DirectCapacity.mo b/Modelica/Thermal/HeatTransfer/Examples/Utilities/DirectCapacity.mo
index e48c29477a..72812e66ea 100644
--- a/Modelica/Thermal/HeatTransfer/Examples/Utilities/DirectCapacity.mo
+++ b/Modelica/Thermal/HeatTransfer/Examples/Utilities/DirectCapacity.mo
@@ -48,7 +48,7 @@ equation
           textString="dT"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="C=%C"),      Bitmap(extent={{-96,-42},{64,54}},
-            fileName="modelica://Modelica/Resources/Images/Thermal/HeatTransfer/DirectCapacity.png"),
+            fileName="modelica:/Modelica/Resources/Images/Thermal/HeatTransfer/DirectCapacity.png"),
           Text( extent={{10,-60},{94,-90}},
                 horizontalAlignment=TextAlignment.Right,
           textString="Q_flow")}));
diff --git a/Modelica/Thermal/HeatTransfer/Examples/Utilities/InverseCapacity.mo b/Modelica/Thermal/HeatTransfer/Examples/Utilities/InverseCapacity.mo
index a87d7e3175..e756a351c8 100644
--- a/Modelica/Thermal/HeatTransfer/Examples/Utilities/InverseCapacity.mo
+++ b/Modelica/Thermal/HeatTransfer/Examples/Utilities/InverseCapacity.mo
@@ -40,7 +40,7 @@ equation
           textString="dT"),     Text(
                 extent={{-150,-110},{150,-140}},
           textString="C=%C"),      Bitmap(extent={{-58,-42},{98,48}},
-            fileName="modelica://Modelica/Resources/Images/Thermal/HeatTransfer/InverseCapacity.png"),
+            fileName="modelica:/Modelica/Resources/Images/Thermal/HeatTransfer/InverseCapacity.png"),
           Text( extent={{-90,-64},{-6,-94}},
                 horizontalAlignment=TextAlignment.Left,
           textString="Q_flow")}));
diff --git a/Modelica/Thermal/HeatTransfer/Interfaces/PartialElementaryConditionalHeatPortWithoutT.mo b/Modelica/Thermal/HeatTransfer/Interfaces/PartialElementaryConditionalHeatPortWithoutT.mo
index e956ef14e1..406bb97d8f 100644
--- a/Modelica/Thermal/HeatTransfer/Interfaces/PartialElementaryConditionalHeatPortWithoutT.mo
+++ b/Modelica/Thermal/HeatTransfer/Interfaces/PartialElementaryConditionalHeatPortWithoutT.mo
@@ -25,7 +25,7 @@ If this model is used, the loss power has to be provided by an equation in the m
 
 
    
 Note, this partial model is used in cases, where heatPort.T (that is the device temperature) is not utilized in the model. If this is desired, inherit instead from partial model
-PartialElementaryConditionalHeatPort.
+PartialElementaryConditionalHeatPort.
 
    
 "));
 end PartialElementaryConditionalHeatPortWithoutT;
diff --git a/Modelica/Thermal/HeatTransfer/Sensors/ConditionalFixedHeatFlowSensor.mo b/Modelica/Thermal/HeatTransfer/Sensors/ConditionalFixedHeatFlowSensor.mo
index d615227e85..a045907299 100644
--- a/Modelica/Thermal/HeatTransfer/Sensors/ConditionalFixedHeatFlowSensor.mo
+++ b/Modelica/Thermal/HeatTransfer/Sensors/ConditionalFixedHeatFlowSensor.mo
@@ -55,7 +55,7 @@ equation
     Documentation(info="
 
    
 If useFixedTemperature = false, this sensor acts just as a normal
-HeatFlowSensor.
+HeatFlowSensor.
 
    
 
    
 If useFixedTemperature = true, it is assumed that the connections to both heatPorts of this sensor are conditionally removed;
diff --git a/Modelica/Thermal/HeatTransfer/UsersGuide/package.mo b/Modelica/Thermal/HeatTransfer/UsersGuide/package.mo
index 051380dcf0..ff7e76c2a5 100644
--- a/Modelica/Thermal/HeatTransfer/UsersGuide/package.mo
+++ b/Modelica/Thermal/HeatTransfer/UsersGuide/package.mo
@@ -28,7 +28,7 @@ of this example:
 
    
 
 
    
-\"driveWithHeatTransfer\"
+\"driveWithHeatTransfer\"
 
    
 
 
    
@@ -67,6 +67,6 @@ the Modelica design group is discussing a general scheme to describe material pr
 
    
 
    
 For technical details in the design of this library, see
-[Tiller2001].
    
+[Tiller2001].
    
 "));
 end UsersGuide;
diff --git a/Modelica/Units.mo b/Modelica/Units.mo
index 2ec746e642..c0bdd250df 100644
--- a/Modelica/Units.mo
+++ b/Modelica/Units.mo
@@ -1152,8 +1152,8 @@ end UsersGuide;
 
    
 Since magnetic material properties like reluctance and permeance often are anisotropic resp. salient,
 a special operator instead of multiplication (compare: tensor vs. vector) is required.
-Modelica.Magnetic.FundamentalWave uses a
-special record Salient
+Modelica.Magnetic.FundamentalWave uses a
+special record Salient
 which is only valid in the rotor-fixed coordinate system.
 
    
 
    
@@ -1196,7 +1196,7 @@ on units.
 
    
 
    
 For an introduction to the conventions used in this package, have a look at:
-Conventions.
+Conventions.
 
    
 "));
   end SI;
@@ -1876,13 +1876,13 @@ part have the SI unit Ampere).
 
    
 Furthermore, conversion functions from non SI-units to SI-units and vice versa
 are provided in subpackage
-Conversions.
+Conversions.
 
    
 
 
    
 For an introduction how units are used in the Modelica Standard Library
 with package Units, have a look at:
-How to use Units.
+How to use Units.
 
    
 
 
    
diff --git a/Modelica/Utilities/Examples.mo b/Modelica/Utilities/Examples.mo
index 0d35585768..97c7f5a5bf 100644
--- a/Modelica/Utilities/Examples.mo
+++ b/Modelica/Utilities/Examples.mo
@@ -383,7 +383,7 @@ readRealParameter(\"test.txt\", \"w_rel0\")
     extends Modelica.Icons.Example;
 
     parameter String file = Modelica.Utilities.Files.loadResource(
-    "modelica://Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt")
+    "modelica:/Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt")
       "File on which data is present"
           annotation(Dialog(loadSelector(filter="Text files (*.txt)",
                         caption="Open text file to read parameters of the form \"name = value\"")));
@@ -428,7 +428,7 @@ from a file.
     annotation (preferredView="text", experiment(StopTime=0.1), Documentation(info="
 
    
 Example model that shows how to write a Real matrix in MATLAB MAT format on file
-using function writeRealMatrix.
+using function writeRealMatrix.
 
    
 "));
   end WriteRealMatrixToFile;
@@ -437,15 +437,15 @@ using function 
 Example model that shows how to read a Real matrix in MATLAB MAT format from file
 using functions
-readMatrixSize and
-readRealMatrix.
+readMatrixSize and
+readRealMatrix.
 
    
 
 
    
@@ -489,27 +489,27 @@ use the functions of package Modelica.Utilities. In particular
 the following examples are present.
 
    
 
      
-
    •  Function calculator
+
    •  Function calculator
      is an interpreter to evaluate
      expressions consisting of +,-,*,/,(),sin(), cos(), tan(), sqrt(), pi.
      For example: calculator(\"1.5*sin(pi/6)\");
       
      • 
-
    •  Function expression
+
    •  Function expression
      is the basic function used in \"calculator\" to evaluate an expression.
      It is useful if the expression interpreter is used in a larger
      scan operation (such as readRealParameter below).
       
      • 
-
    •  Function readRealParameter
+
    •  Function readRealParameter
      reads the value of a parameter
      from file, given the file and the parameter name. The value
      on file is interpreted with the Examples.expression function
      and can therefore be an expression.
       
      • 
-
    •  Model readRealParameterModel
+
    •  Model readRealParameterModel
      is a test model to demonstrate the usage of \"readRealParameter\". The model
-     contains 3 parameters that are read from file Examples_readRealParameters.txt.
       
+     contains 3 parameters that are read from file Examples_readRealParameters.txt.
       
      
      • 
-
    •  Model WriteRealMatrixToFile
+
    •  Model WriteRealMatrixToFile
      demonstrates the usage of function \"Streams.writeReaMatrix\" to store a matrix in various MATLAB MAT formats on file.
       
      
      • 
-
    •  Model ReadRealMatrixFromFile
+
    •  Model ReadRealMatrixFromFile
      demonstrates the usage of functions \"Streams.readMatrixSize\" and \"Streams.readRealMatrix\"
      to read a matrix in various MATLAB MAT formats from file.
      
      • 
diff --git a/Modelica/Utilities/Files.mo b/Modelica/Utilities/Files.mo
index 0d9a310087..82912dd659 100644
--- a/Modelica/Utilities/Files.mo
+++ b/Modelica/Utilities/Files.mo
@@ -569,7 +569,7 @@ impure function fullPathName "Get full path name of file or directory name"
   extends Modelica.Icons.Function;
   input String name "Absolute or relative file or directory name";
   output String fullName "Full path of 'name'";
-external "C" fullName = ModelicaInternal_fullPathName(name) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+external "C" fullName = ModelicaInternal_fullPathName(name) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   annotation (Documentation(info="
 
      Syntax
      
 
      @@ -658,7 +658,7 @@ impure function temporaryFileName
     "Return arbitrary name of a file that does not exist and is in a directory where access rights allow to write to this file (useful for temporary output of files)"
   extends Modelica.Icons.Function;
   output String fileName "Full path name of temporary file";
-  external "C" fileName=ModelicaInternal_temporaryFileName() annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" fileName=ModelicaInternal_temporaryFileName() annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   annotation (Documentation(info="
 
      Syntax
      
 
      @@ -671,7 +671,7 @@ and is in a directory where access rights allow to
 write to this file (useful for temporary output of files).
 
      
 
      
-The created temporary file is not automatically deleted when closed, but needs to be explicitly deleted, e.g. by removeFile(fileName).
+The created temporary file is not automatically deleted when closed, but needs to be explicitly deleted, e.g. by removeFile(fileName).
 
      
 
      
 Warning:
@@ -720,7 +720,7 @@ as well as absolute local file path names are supported.
 
 
      Example
      
 
      -file1 = loadResource(\"modelica://Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt\")
+file1 = loadResource(\"modelica:/Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt\")
         // file1 is the absolute path name of the file
 file2 = loadResource(\"C:\\\\data\\\\readParameters.txt\")
         file2 = \"C:/data/readParameters.txt\"
@@ -749,44 +749,44 @@ In the table below an example call to every function is given:
 
      
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -412,7 +412,7 @@ of the function:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -454,7 +454,7 @@ Evaluate a polynomial using Horner's scheme.
 
 
-
+
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -574,7 +574,7 @@ Utility function in order to compute part of erf(..) and erfc(..).
 
 
-
+
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -829,7 +829,7 @@ Utility function in order to compute erfInv(..) and erfcInv(..).
 
 
-
+
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -855,7 +855,7 @@ by the user.
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -882,7 +882,7 @@ cannot be expressed analytically.
 
 
-  
+  
-  
+  
diff --git a/Modelica/Mechanics/MultiBody/Frames/planarRotation.mo b/Modelica/Mechanics/MultiBody/Frames/planarRotation.mo
index d5c3eb294f..a8a020116b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/planarRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/planarRotation.mo
@@ -29,9 +29,9 @@ return a wrong result, if length(e) is not one.
 
 
    See also
    
-planarRotationAngle,
-TransformationMatrices.planarRotation,
-Quaternions.planarRotation.
+planarRotationAngle,
+TransformationMatrices.planarRotation,
+Quaternions.planarRotation.
 
    "));
 end planarRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/planarRotationAngle.mo b/Modelica/Mechanics/MultiBody/Frames/planarRotationAngle.mo
index 9318f5fc6d..75346ba607 100644
--- a/Modelica/Mechanics/MultiBody/Frames/planarRotationAngle.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/planarRotationAngle.mo
@@ -86,8 +86,8 @@ and/or a division by zero will occur.
 
 
    See also
    
-planarRotation,
-TransformationMatrices.planarRotationAngle.
+planarRotation,
+TransformationMatrices.planarRotationAngle.
 
    "));
 end planarRotationAngle;
diff --git a/Modelica/Mechanics/MultiBody/Frames/relativeRotation.mo b/Modelica/Mechanics/MultiBody/Frames/relativeRotation.mo
index 036950b055..fc0c17cd57 100644
--- a/Modelica/Mechanics/MultiBody/Frames/relativeRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/relativeRotation.mo
@@ -24,8 +24,8 @@ from the orientation object R2 that describes the orientation to rotate from fra
 
 
    See also
    
-TransformationMatrices.relativeRotation,
-Quaternions.relativeRotation.
+TransformationMatrices.relativeRotation,
+Quaternions.relativeRotation.
 
    "));
 end relativeRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/resolve1.mo b/Modelica/Mechanics/MultiBody/Frames/resolve1.mo
index c66b00a07c..2ab72a0765 100644
--- a/Modelica/Mechanics/MultiBody/Frames/resolve1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/resolve1.mo
@@ -24,9 +24,9 @@ orientation object R12 that describes the orientation to rotate frame 1 int
 
 
    See also
    
-resolve2,
-TransformationMatrices.resolve1,
-Quaternions.resolve1.
+resolve2,
+TransformationMatrices.resolve1,
+Quaternions.resolve1.
 
    "));
 end resolve1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/resolve2.mo b/Modelica/Mechanics/MultiBody/Frames/resolve2.mo
index ce7b827417..926f6769b4 100644
--- a/Modelica/Mechanics/MultiBody/Frames/resolve2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/resolve2.mo
@@ -23,9 +23,9 @@ orientation object R12 that describes the orientation  to rotate frame 1 in
 
 
    See also
    
-resolve1,
-TransformationMatrices.resolve2,
-Quaternions.resolve2.
+resolve1,
+TransformationMatrices.resolve2,
+Quaternions.resolve2.
 
    "));
 end resolve2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/resolveDyade1.mo b/Modelica/Mechanics/MultiBody/Frames/resolveDyade1.mo
index fe4ec378ca..a6d29e6505 100644
--- a/Modelica/Mechanics/MultiBody/Frames/resolveDyade1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/resolveDyade1.mo
@@ -22,7 +22,7 @@ orientation object R12 that describes the orientation to rotate frame 1 int
 
 
    See also
    
-TransformationMatrices.resolveDyade1.
+TransformationMatrices.resolveDyade1.
 
    "));
 end resolveDyade1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/resolveDyade2.mo b/Modelica/Mechanics/MultiBody/Frames/resolveDyade2.mo
index 5da88002e9..6369eb760d 100644
--- a/Modelica/Mechanics/MultiBody/Frames/resolveDyade2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/resolveDyade2.mo
@@ -22,7 +22,7 @@ orientation object R12 that describes the orientation to rotate frame 1 int
 
 
    See also
    
-TransformationMatrices.resolveDyade2.
+TransformationMatrices.resolveDyade2.
 
    "));
 end resolveDyade2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/smallRotation.mo b/Modelica/Mechanics/MultiBody/Frames/smallRotation.mo
index 1ee6e48dc8..1d21ecc11b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/smallRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/smallRotation.mo
@@ -35,8 +35,8 @@ Optionally, residues are returned as well if withResidues=true.
 
 
    See also
    
-TransformationMatrices.smallRotation,
-Quaternions.smallRotation.
+TransformationMatrices.smallRotation,
+Quaternions.smallRotation.
 
    "));
 end smallRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/to_Q.mo b/Modelica/Mechanics/MultiBody/Frames/to_Q.mo
index 9da1b1928c..a02d6fd163 100644
--- a/Modelica/Mechanics/MultiBody/Frames/to_Q.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/to_Q.mo
@@ -18,15 +18,15 @@ Q = Frames.to_Q(R, Q_guess);
 
 
    Description
    
-This function returns a quaternion object Q
-computed from an orientation object R
+This function returns a quaternion object Q
+computed from an orientation object R
 and depending on the initial guess Q_guess.
 
    See also
    
-from_Q,
-TransformationMatrices.to_Q.
+from_Q,
+TransformationMatrices.to_Q.
 
    "));
 end to_Q;
diff --git a/Modelica/Mechanics/MultiBody/Frames/to_T.mo b/Modelica/Mechanics/MultiBody/Frames/to_T.mo
index affa29fe67..600f61be59 100644
--- a/Modelica/Mechanics/MultiBody/Frames/to_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/to_T.mo
@@ -15,18 +15,18 @@ T = Frames.to_T(R);
 
    Description
    
 This function returns a real matrix T
-
+
 computed from an
-orientation object R.
+orientation object R.
 The matrix T is considered to be an object transformation matrix.
 
    See also
    
-from_T,
-to_T_inv,
-TransformationMatrices.to_T,
-Quaternions.to_T.
+from_T,
+to_T_inv,
+TransformationMatrices.to_T,
+Quaternions.to_T.
 
    "));
 end to_T;
diff --git a/Modelica/Mechanics/MultiBody/Frames/to_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/to_T_inv.mo
index 8c980b6523..f5c8dd634e 100644
--- a/Modelica/Mechanics/MultiBody/Frames/to_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/to_T_inv.mo
@@ -17,18 +17,18 @@ T_inv = Frames.to_T_inv(R);
 
    Description
    
 This function returns a real matrix T_inv
-
+
 computed from an
-orientation object R.
+orientation object R.
 The matrix T_inv is considered to be an inverse transformation matrix.
 
    See also
    
-from_T_inv,
-to_T,
-TransformationMatrices.to_T_inv,
-Quaternions.to_T_inv.
+from_T_inv,
+to_T,
+TransformationMatrices.to_T_inv,
+Quaternions.to_T_inv.
 
    "));
 end to_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/to_exy.mo b/Modelica/Mechanics/MultiBody/Frames/to_exy.mo
index 65920da879..c754a7da85 100644
--- a/Modelica/Mechanics/MultiBody/Frames/to_exy.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/to_exy.mo
@@ -17,15 +17,15 @@ exy = Frames.to_exy(R);
 
    Description
    
 This function returns unit vectors e_x and e_y which define axes of frame 2 resolved in frame 1,
-provided R is an orientation object
+provided R is an orientation object
 to rotate frame 1 into frame 2.
 
    See also
    
-from_nxy,
-from_nxz,
-TransformationMatrices.to_exy.
+from_nxy,
+from_nxz,
+TransformationMatrices.to_exy.
 
    "));
 end to_exy;
diff --git a/Modelica/Mechanics/MultiBody/Frames/to_vector.mo b/Modelica/Mechanics/MultiBody/Frames/to_vector.mo
index ebadfaf38f..c3a0e02577 100644
--- a/Modelica/Mechanics/MultiBody/Frames/to_vector.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/to_vector.mo
@@ -16,13 +16,13 @@ vec = Frames.to_vector(R);
 
    
 This function returns a vector vec which contains elements of a transformation matrix T
 computed from an
-orientation object R.
+orientation object R.
 
    See also
    
-to_T,
-TransformationMatrices.to_vector.
+to_T,
+TransformationMatrices.to_vector.
 
    "));
 end to_vector;
diff --git a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo
index e1942a750a..3375418739 100644
--- a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo
+++ b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearing.mo
@@ -67,7 +67,7 @@ This hierarchical connector models a 1-dim. rotational flange
 connector and its optional bearing defined by a 3-dim. frame connector.
 If a connection to the subconnectors should be clearly visible,
 connect first an  instance of
-FlangeWithBearingAdaptor
+FlangeWithBearingAdaptor
 to the FlangeWithBearing connector.
 
    "));
diff --git a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearingAdaptor.mo b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearingAdaptor.mo
index 748d63f669..ec30e54788 100644
--- a/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearingAdaptor.mo
+++ b/Modelica/Mechanics/MultiBody/Interfaces/FlangeWithBearingAdaptor.mo
@@ -43,7 +43,7 @@ equation
 
    
 Adaptor object to make a more visible connection to the flange and frame
 subconnectors of a
-FlangeWithBearing
+FlangeWithBearing
 connector.
 
    "));
diff --git a/Modelica/Mechanics/MultiBody/Interfaces/partialColorMap.mo b/Modelica/Mechanics/MultiBody/Interfaces/partialColorMap.mo
index c9f7adef82..534c8a12d4 100644
--- a/Modelica/Mechanics/MultiBody/Interfaces/partialColorMap.mo
+++ b/Modelica/Mechanics/MultiBody/Interfaces/partialColorMap.mo
@@ -8,7 +8,7 @@ partial function partialColorMap
 
    
 This partial function defines the interface of a function that returns
 a color map. Predefined color map functions are defined in package
-Modelica.Mechanics.MultiBody.Visualizers.Colors.ColorMaps.
+Modelica.Mechanics.MultiBody.Visualizers.Colors.ColorMaps.
 
    "));
 end partialColorMap;
diff --git a/Modelica/Mechanics/MultiBody/Interfaces/partialSurfaceCharacteristic.mo b/Modelica/Mechanics/MultiBody/Interfaces/partialSurfaceCharacteristic.mo
index 9a18f7d677..46373bbf47 100644
--- a/Modelica/Mechanics/MultiBody/Interfaces/partialSurfaceCharacteristic.mo
+++ b/Modelica/Mechanics/MultiBody/Interfaces/partialSurfaceCharacteristic.mo
@@ -17,7 +17,7 @@ partial function partialSurfaceCharacteristic "Interface for a function returnin
   annotation (Documentation(info="
    This partial function defines the interface of a function that returns
 surface characteristics for an object visualization, see e.g.
-Visualizers.Advanced.SurfaceCharacteristics.torus.
+Visualizers.Advanced.SurfaceCharacteristics.torus.
 Function which extends from this partial class shall define all outputs
 X, Y, Z and C.
 The last one output C can be set as follows when a multi-colored surface
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRP.mo
index 4a95bc871e..56458509e3 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRP.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRP.mo
@@ -204,7 +204,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRR.mo
index ef6d68e2fe..35d1642d19 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRR.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointRRR.mo
@@ -192,7 +192,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo
index 0084690fd9..75b1079c97 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSP.mo
@@ -216,7 +216,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo
index b8f0e6c92d..9ca23ee37c 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointSSR.mo
@@ -217,7 +217,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo
index b6dfca9a1a..738ecee20e 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUPS.mo
@@ -314,7 +314,7 @@ are not part of the default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo
index 548bb0b117..d7862393a0 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSP.mo
@@ -251,7 +251,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo
index dd0611708c..bc9d81010e 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/JointUSR.mo
@@ -258,7 +258,7 @@ default animation):
 
    
-\"model
+\"model
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Assemblies/package.mo b/Modelica/Mechanics/MultiBody/Joints/Assemblies/package.mo
index d3f9f03bc6..e7f52b15dc 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Assemblies/package.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Assemblies/package.mo
@@ -14,7 +14,7 @@ This requires to solve a non-linear system of equations which
 is performed analytically (i.e., when a mathematical
 solution exists, it is computed efficiently and reliably).
 A detailed description how to use these joints is provided in
-MultiBody.UsersGuide.Tutorial.LoopStructures.AnalyticLoopHandling.
+MultiBody.UsersGuide.Tutorial.LoopStructures.AnalyticLoopHandling.
 
    
 The assembly joints in this package are named JointXYZ where
@@ -36,43 +36,43 @@ of a universal, a spherical and a revolute joint.
 
    Content
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
diff --git a/Modelica/Math/package.mo b/Modelica/Math/package.mo
index c1c0edef54..458d93c343 100644
--- a/Modelica/Math/package.mo
+++ b/Modelica/Math/package.mo
@@ -70,7 +70,7 @@ v = {2.12, -4.34, -2.56, -1.67};
 
 
    See also
    
 
    
-Matrices.toString,
+Matrices.toString,
 
    
 ", revisions="
 
@@ -130,9 +130,9 @@ can be provided as third argument of the function. Default is \"eps = 0\".
 
 
    See also
    
 
    
-Vectors.find,
-Matrices.isEqual,
-Strings.isEqual
+Vectors.find,
+Matrices.isEqual,
+Strings.isEqual
 
    
 "));
   end isEqual;
@@ -173,7 +173,7 @@ With the optional
 second argument \"p\", any other p-norm can be computed:
 
    
 
    
-\"function
+\"function
 
    
 
    
 Besides the Euclidean norm (p=2), also the 1-norm and the
@@ -210,7 +210,7 @@ v = {2, -4, -2, -1};
 
 
    See also
    
 
    
-Matrices.norm
+Matrices.norm
 
    
 "));
   end norm;
@@ -244,7 +244,7 @@ v = {2, -4, -2, -1};
 
 
    See also
    
 
    
-Vectors.norm
+Vectors.norm
 
    
 "));
   end length;
@@ -292,8 +292,8 @@ is usually inlined and symbolic processing is applied.
 
 
    See also
    
 
    
-Vectors.length,
-Vectors.normalizeWithAssert
+Vectors.length,
+Vectors.normalizeWithAssert
 
    
 "));
   end normalize;
@@ -332,8 +332,8 @@ is usually inlined and symbolic processing is applied.
 
 
    See also
    
 
    
-Vectors.length,
-Vectors.normalize
+Vectors.length,
+Vectors.normalize
 
    
 "));
 end normalizeWithAssert;
@@ -489,7 +489,7 @@ can be provided as third argument of the function. Default is \"eps = 0\".
 
 
    See also
    
 
    
-Vectors.isEqual
+Vectors.isEqual
 
    
 "));
   end find;
@@ -619,7 +619,7 @@ at the left and at the right side of the pipe), see next figure:
 
    
 
 
    
-
+
 
    
 
 
    Example
    
@@ -632,7 +632,7 @@ at the left and at the right side of the pipe), see next figure:
 
 
    See also
    
 
    
-MultiBody.Visualizers.PipeWithScalarField
+MultiBody.Visualizers.PipeWithScalarField
 
    
 "));
   end relNodePositions;
@@ -643,41 +643,41 @@ This library provides functions operating on vectors:
 
    
 
 
      
-
    •  toString(v)
+
    •  toString(v)
      - returns the string representation of vector v.
      • 
 
-
    •  isEqual(v1, v2)
+
    •  isEqual(v1, v2)
      - returns true if vectors v1 and v2 have the same size and the same elements.
      • 
 
-
    •  norm(v,p)
+
    •  norm(v,p)
      - returns the p-norm of vector v.
      • 
 
-
    •  length(v)
+
    •  length(v)
      - returns the length of vector v (= norm(v,2), but inlined and therefore usable in
        symbolic manipulations)
      • 
 
-
    •  normalize(v)
+
    •  normalize(v)
      - returns vector in direction of v with length = 1 and prevents
        zero-division for zero vector.
      • 
 
-
    •  reverse(v)
+
    •  reverse(v)
      - reverses the vector elements of v.
      • 
 
-
    •  sort(v)
+
    •  sort(v)
      - sorts the elements of vector v in ascending or descending order.
      • 
 
-
    •  find(e, v)
+
    •  find(e, v)
      - returns the index of the first occurrence of scalar e in vector v.
      • 
 
-
    •  interpolate(x, y, xi)
+
    •  interpolate(x, y, xi)
      - returns the interpolated value in (x,y) that corresponds to xi.
      • 
 
-
    •  relNodePositions(nNodes)
+
    •  relNodePositions(nNodes)
      - returns a vector of relative node positions (0..1).
      • 
 
    
 
 
    See also
    
-Matrices
+Matrices
 "),
     Icon(graphics={Rectangle(
           extent={{-16,66},{14,18}},
@@ -817,7 +817,7 @@ toString(A,\"A\",1);
 
 
    See also
    
 
    
-Vectors.toString
+Vectors.toString
 
    
 
 ", revisions="
@@ -886,8 +886,8 @@ can be provided as third argument of the function. Default is \"eps = 0\".
   result := Matrices.isEqual(M1,M3,0.1); // = true
 
 
    See also
    
-Vectors.isEqual,
-Strings.isEqual
+Vectors.isEqual,
+Strings.isEqual
 "));
   end isEqual;
 
@@ -924,7 +924,7 @@ solution x of the linear system of equations
 
    
 If a unique solution x does not exist (since A is singular),
 an assertion is triggered. If this is not desired, use instead
-Matrices.leastSquares
+Matrices.leastSquares
 and inquire the singularity of the solution with the return argument rank
 (a unique solution is computed if rank = size(A,1)).
 
    
@@ -944,9 +944,9 @@ i.e., by Gaussian elimination with partial pivoting.
   x := Matrices.solve(A,b);  // x = {3,2,1}
 
 
    See also
    
-Matrices.LU,
-Matrices.LU_solve,
-Matrices.leastSquares.
+Matrices.LU,
+Matrices.LU_solve,
+Matrices.leastSquares.
 "));
   end solve;
 
@@ -983,7 +983,7 @@ solution X of the linear system of equations
 
    
 If a unique solution X does not exist (since A is singular),
 an assertion is triggered. If this is not desired, use instead
-Matrices.leastSquares2
+Matrices.leastSquares2
 and inquire the singularity of the solution with the return argument rank
 (a unique solution is computed if rank = size(A,1)).
 
@@ -1009,9 +1009,9 @@ i.e., by Gaussian elimination with partial pivoting.
 
 
    See also
    
 
    
-Matrices.LU,
-Matrices.LU_solve2,
-Matrices.leastSquares2.
+Matrices.LU,
+Matrices.LU_solve2,
+Matrices.leastSquares2.
 
    
 "));
   end solve2;
@@ -1162,9 +1162,9 @@ where Q1 consists of the first \"rank\" columns of Q.
 
    See also
    
 
 
    
-Matrices.leastSquares2
+Matrices.leastSquares2
 (same as leastSquares, but with a right hand side matrix),
    
-Matrices.solve
+Matrices.solve
 (for square, regular matrices A)
 
    
 
@@ -1312,9 +1312,9 @@ where Q1 consists of the first \"rank\" columns of Q.
 
    See also
    
 
 
    
-Matrices.leastSquares
+Matrices.leastSquares
 (same as leastSquares2, but with a right hand side vector),
    
-Matrices.solve2
+Matrices.solve2
 (for square, regular matrices A)
 
    
 
@@ -1428,13 +1428,13 @@ diagonal elements (lower trapezoidal if m > n), and
 Matrices L and U are stored in the returned
 matrix LU (the diagonal of L is not stored).
 With the companion function
-Matrices.LU_solve,
+Matrices.LU_solve,
 this decomposition can be used to solve
 linear systems (P*L*U)*x = b with different right
 hand side vectors b. If a linear system of equations with
 just one right hand side vector b shall be solved, it is
 more convenient to just use the function
-Matrices.solve.
+Matrices.solve.
 
    
 
    
 The optional third (Integer) output argument has the following meaning:
    
@@ -1474,8 +1474,8 @@ matrix A was interchanged with row pivots[i].
 
 
    See also
    
 
    
-Matrices.LU_solve,
-Matrices.solve,
+Matrices.LU_solve,
+Matrices.solve,
 
    
 "));
   end LU;
@@ -1522,7 +1522,7 @@ defined by vector pivots),
 diagonal elements (lower trapezoidal if m > n), and
 U is an upper triangular matrix (upper trapezoidal if m < n).
 The matrices of this decomposition are computed with function
-Matrices.LU that
+Matrices.LU that
 returns arguments LU and pivots
 used as input arguments of Matrices.LU_solve.
 With Matrices.LU and Matrices.LU_solve
@@ -1530,7 +1530,7 @@ it is possible to efficiently solve linear systems
 with different right hand side vectors. If a linear system of equations with
 just one right hand side vector shall be solved, it is
 more convenient to just use the function
-Matrices.solve.
+Matrices.solve.
 
    
 
    
 If a unique solution x does not exist (since the
@@ -1561,8 +1561,8 @@ matrix A was interchanged with row pivots[i].
   x2 := Matrices.LU_solve(LU, pivots, b2);  // x2 = {1,0,2}
 
 
    See also
    
-Matrices.LU,
-Matrices.solve,
+Matrices.LU,
+Matrices.solve,
 "));
   end LU_solve;
 
@@ -1609,7 +1609,7 @@ defined by vector pivots),
 diagonal elements (lower trapezoidal if m > n), and
 U is an upper triangular matrix (upper trapezoidal if m < n).
 The matrices of this decomposition are computed with function
-Matrices.LU that
+Matrices.LU that
 returns arguments LU and pivots
 used as input arguments of Matrices.LU_solve2.
 With Matrices.LU and Matrices.LU_solve2
@@ -1617,7 +1617,7 @@ it is possible to efficiently solve linear systems
 with different right hand side matrices. If a linear system of equations with
 just one right hand side matrix shall be solved, it is
 more convenient to just use the function
-Matrices.solve2.
+Matrices.solve2.
 
    
 
    
 If a unique solution X does not exist (since the
@@ -1656,8 +1656,8 @@ matrix A was interchanged with row pivots[i].
                                                       2, 4] */
 
 
    See also
    
-Matrices.LU,
-Matrices.solve2,
+Matrices.LU,
+Matrices.solve2,
 "));
   end LU_solve2;
 
@@ -1704,7 +1704,7 @@ has an imaginary part, then eigenvalues[i+1,:] is the conjugate complex
 eigenvalue and eigenvectors[:,i] is the real and eigenvectors[:,i+1] is the
 imaginary part of the eigenvector of the i-th eigenvalue.
 With function
-Matrices.eigenValueMatrix,
+Matrices.eigenValueMatrix,
 a real block diagonal matrix is constructed from the eigenvalues
 such that
 
    
@@ -1733,8 +1733,8 @@ i.e., matrix A has the 3 real eigenvalues -0.618, 8, 1.618.
 
    
 
 
    See also
    
-Matrices.eigenValueMatrix,
-Matrices.singularValues
+Matrices.eigenValueMatrix,
+Matrices.singularValues
 "));
   end eigenValues;
 
@@ -1775,7 +1775,7 @@ Matrices.eigenValueMatrix(eigenvalues);
 The function call returns a block diagonal matrix J
 from the two-column matrix eigenvalues
 (computed by function
-Matrices.eigenValues).
+Matrices.eigenValues).
 Matrix eigenvalues must have the real part of the
 eigenvalues in the first column and the imaginary part in the
 second column. If an eigenvalue i has a vanishing imaginary
@@ -1791,7 +1791,7 @@ J[i+1, i]   := eigenvalues[i+1,2];
 J[i+1, i+1] := eigenvalues[i+1,1];
 
 
    See also
    
-Matrices.eigenValues
+Matrices.eigenValues
 "));
   end eigenValueMatrix;
 
@@ -1856,7 +1856,7 @@ i.e.
                0,    0, 2.31, 0]
 
 
    See also
    
-Matrices.eigenValues
+Matrices.eigenValues
 "));
   end singularValues;
 
@@ -1999,7 +1999,7 @@ called as: (,R,p) = QR(A).
 Function hessenberg computes the Hessenberg matrix H of matrix A as well as the orthogonal transformation matrix U that holds H = U'*A*U.
 The Hessenberg form of a matrix is computed by repeated Householder similarity transformation. The elementary reflectors and the corresponding scalar factors are provided
 by function \"Utilities.toUpperHessenberg()\". The transformation matrix U is then computed by
-LAPACK.dorghr.
+LAPACK.dorghr.
 
    
 
 
    Example
    
@@ -2030,7 +2030,7 @@ U*H*transpose(U) = [1.0, 2.0, 3.0;
 
 
    See also
    
 
    
-Matrices.Utilities.toUpperHessenberg
+Matrices.Utilities.toUpperHessenberg
 
    
 
 ", revisions="
@@ -2126,7 +2126,7 @@ The calculation in lapack.dgees is performed stepwise, i.e., using the internal
 
 
 
    See also
    
-Math.Matrices.Utilities.reorderRSF
+Math.Matrices.Utilities.reorderRSF
 
 ", revisions="
 
 
 
    See also
    
-Matrices.rcond.
+Matrices.rcond.
 "));
   end rank;
 
@@ -2739,7 +2739,7 @@ r = 3.0
 
 
    See also
    
 
    
-Matrices.rcond
+Matrices.rcond
 
    
 
 ", revisions="
@@ -2785,7 +2785,7 @@ r = Matrices.rcond(A);
 
    Description
    
 
    
 This function estimates the reciprocal of the condition number (norm(A) * norm(inv(A))) of a general real matrix A, in either the 1-norm or
-the infinity-norm, using the LAPACK function DGECON.
+the infinity-norm, using the LAPACK function DGECON.
 If rcond(A) is near 1.0, A is well conditioned and A is ill conditioned if rcond(A) is near zero.
 
    
 
@@ -2802,7 +2802,7 @@ r = 0.3333
 
 
    See also
    
 
    
-Matrices.conditionNumber
+Matrices.conditionNumber
 
    
 
 ", revisions="
@@ -2880,7 +2880,7 @@ Vectors.norm(A*v,p) ≤ Matrices.norm(A,p)*Ve
 
 
    See also
    
 
    
-Matrices.frobeniusNorm
+Matrices.frobeniusNorm
 
    
 
 "));
@@ -2919,7 +2919,7 @@ r = 3.162;
 
 
    See also
    
 
    
-Matrices.norm
+Matrices.norm
 
    
 
 ", revisions="
@@ -3039,7 +3039,7 @@ nullity = 1
 
 
    See also
    
 
    
-Matrices.singularValues
+Matrices.singularValues
 
    
 ", revisions="
 
      
@@ -3656,8 +3656,8 @@ X = [1.633, -0.761,  0.575, -0.656;
 
 
      See also
      
 
      
-Matrices.continuousSylvester,
-Matrices.discreteLyapunov
+Matrices.continuousSylvester,
+Matrices.discreteLyapunov
 
      
 
 ", revisions="
@@ -3763,7 +3763,7 @@ The Boolean inputs \"AisSchur\" and \"BisSchur\" indicate to omit one or both of
 
      
 
 
      
-The function applies LAPACK-routine DTRSYL. See LAPACK.dtrsyl
+The function applies LAPACK-routine DTRSYL. See LAPACK.dtrsyl
 for more information.
 
      
 
@@ -3805,8 +3805,8 @@ X = [0.0,  0.0,  1.0;
 
 
      See also
      
 
      
-Matrices.discreteSylvester,
-Matrices.continuousLyapunov
+Matrices.discreteSylvester,
+Matrices.continuousLyapunov
 
      
 
 ", revisions="
@@ -3964,7 +3964,7 @@ with dimensions according to S, the solution X
 
 
      
 With optional input refinement=true a subsequent iterative refinement based on Newton's method with exact line search is applied.
-See continuousRiccatiIterative
+See continuousRiccatiIterative
 for more information.
 
      
 
@@ -3998,8 +3998,8 @@ X = [2.0, 1.0;
 
 
      See also
      
 
      
-Matrices.Utilities.continuousRiccatiIterative,
-Matrices.discreteRiccati
+Matrices.Utilities.continuousRiccatiIterative,
+Matrices.discreteRiccati
 
      
 
 ", revisions="
        
@@ -4174,8 +4174,8 @@ X  = [7.5735,   -3.1426,  2.7205, -2.5958;
 
 
        See also
        
 
        
-Matrices.discreteSylvester,
-Matrices.continuousLyapunov
+Matrices.discreteSylvester,
+Matrices.continuousLyapunov
 
        
 
 ", revisions="
@@ -4378,8 +4378,8 @@ X = [2.0,   3.0,   6.0;
 
 
        See also
        
 
        
-Matrices.continuousSylvester,
-Matrices.discreteLyapunov
+Matrices.continuousSylvester,
+Matrices.discreteLyapunov
 
        
 
 ", revisions="
@@ -4598,7 +4598,7 @@ X = [14.5623, 9.7082;
 
 
        See also
        
 
        
-Matrices.continuousRiccati
+Matrices.continuousRiccati
 
        
 ", revisions="
 
          
@@ -4788,7 +4788,7 @@ A_flr = [3, 2,  1;
 
 
          See also
          
 
          
-Matrices.flipUpDown
+Matrices.flipUpDown
 
          
 
 ", revisions="
@@ -4834,7 +4834,7 @@ A_fud  = [-1, 2, -3;
 
 
          See also
          
 
          
-Matrices.flipLeftRight
+Matrices.flipLeftRight
 
          
 
 ", revisions="
@@ -10035,7 +10035,7 @@ LAPACK library
 that provides FORTRAN subroutines to solve linear algebra
 tasks. Usually, these functions are not directly called, but only via
 the much more convenient interface of
-Modelica.Math.Matrices.
+Modelica.Math.Matrices.
 The documentation of the LAPACK functions is a copy of the original
 FORTRAN code. The details of LAPACK are described in:
 
          
@@ -10167,7 +10167,7 @@ maxSteps iteration steps have been performed or the relative change delt
 
          
 With an appropriate initial value X0 a sufficiently accurate solution might be reach within a few iteration steps. Although a Lyapunov equation
 of order n (n is the order of the Riccati equation) is to be solved at each iteration step, the algorithm might be faster
-than a direct method like Matrices.continuousRiccati, since direct methods have to solve the 2*n-order Hamiltonian
+than a direct method like Matrices.continuousRiccati, since direct methods have to solve the 2*n-order Hamiltonian
 system equation.
          
 
 The algorithm is taken from [1] and [2].
@@ -10217,8 +10217,8 @@ X0=identity(4);
 
 
 
          See also
          
-Matrices.Utilities.discreteRiccatiIterative
          
-Matrices.continuousRiccati
+Matrices.Utilities.discreteRiccatiIterative
          
+Matrices.continuousRiccati
 ", revisions="
 
            
 
          • 2010/04/30 
@@ -10331,7 +10331,7 @@ maxSteps iteration steps have been performed or the relative change delt
 
            
 With an appropriate initial value X0 a sufficiently accurate solution might be reach with a few iteration steps. Although a Lyapunov equation of
 order n (n is the order of the Riccati equation) is to be solved at each iteration step, the algorithm might be faster
-than a direct method like Matrices.discreteRiccati, since direct methods have to solve the 2*n-order Hamiltonian
+than a direct method like Matrices.discreteRiccati, since direct methods have to solve the 2*n-order Hamiltonian
 system equation.
 
 The algorithm is taken from [1] and [2].
@@ -10378,8 +10378,8 @@ X0=identity(4);
 
 
 
            See also
            
-Matrices.Utilities.continuousRiccatiIterative
            
-Matrices.discreteRiccati
+Matrices.Utilities.continuousRiccatiIterative
            
+Matrices.discreteRiccati
 ", revisions="
 
              
 
            • 2010/04/30 
@@ -10446,8 +10446,8 @@ X0=identity(4);
 Function toUpperHessenberg computes a upper Hessenberg form H of a matrix A by orthogonal similarity transformation:  Q' * A * Q = H.
 The optional inputs ilo and ihi improve efficiency if the matrix is already partially converted to Hessenberg form; it is assumed
 that matrix A is already upper Hessenberg for rows and columns 1:(ilo-1) and (ihi+1):size(A, 1).
-The function calls LAPACK.dgehrd.
-See Matrices.LAPACK.dgehrd for more information about the additional outputs V, tau, info and inputs ilo, ihi.
+The function calls LAPACK.dgehrd.
+See Matrices.LAPACK.dgehrd for more information about the additional outputs V, tau, info and inputs ilo, ihi.
 
              
 
 
              Example
              
@@ -10466,7 +10466,7 @@ H = [1.0,  -2.466,  2.630;
 
 
 
              See also
              
-Matrices.hessenberg
+Matrices.hessenberg
 ", revisions="
                
 
              • 2010/04/30 
        by Marcus Baur, DLR-RM
                • 
@@ -10512,7 +10512,7 @@ This step can be skipped if the matrix has already Hessenberg form.
 
                
 The function uses the LAPACK-routine dhseqr. Output info is 0 for a successful call of this
 function.
                
-See Matrices.LAPACK.dhseqr for details
+See Matrices.LAPACK.dhseqr for details
 
                
 
 
                Example
                
@@ -10534,8 +10534,8 @@ ev := Matrices.Utilities.eigenvaluesHessenberg(A);
 
 
                See also
                
 
                
-Matrices.eigenValues,
-Matrices.hessenberg
+Matrices.eigenValues,
+Matrices.hessenberg
 
                
 ", revisions="
 
                  
@@ -10604,8 +10604,8 @@ the system are in the 1-by-1 and 2-by-2 diagonal blocks of the block upp
 If the Schur form is referenced to a continuous system the staple eigenvalues are in the left complex half plane.
 The stable eigenvalues of a discrete system are inside the complex unit circle.
                  
 This function is used for example to solve algebraic Riccati equations
-(continuousRiccati,
-discreteRiccati). In this context the Schur form
+(continuousRiccati,
+discreteRiccati). In this context the Schur form
 as well as the corresponding eigenvalues and the transformation matrix Q are known, why the eigenvalues and the transformation matrix are inputs to reorderRSF().
                  
 
 The Schur vector matrix Qo is also reordered according to To. The vectors wr and wi contains the real and imaginary parts of the
@@ -10626,7 +10626,7 @@ To := Matrices.Utilities.reorderRSF(T,identity(4),{-1, 2, -3, 6},{0, 0, 0, 0}, t
 //        0.0,  0.0,   0.0,   6.0]
 
 
                  
-See also Matrices.realSchur
+See also Matrices.realSchur
 
                  
 ", revisions="
 
                    
@@ -10688,8 +10688,8 @@ tk = Matrices.Utilities.findLocal_tk(Rk, Vk);
 
                    Description
                    
 
                    
 Function findLocal_tk() is an auxiliary function called in iterative solver for algebraic Riccati equation based on Newton's method with
-exact line search like continuousRiccatiIterative
                    
-and discreteRiccatiIterative.
                    
+exact line search like continuousRiccatiIterative
                    
+and discreteRiccatiIterative.
                    
 The function computes the local minimum of the function f_k(t_k)
 
                    
 
                    @@ -10708,8 +10708,8 @@ See [1] for more information
 
                    
 
 
                    See also
                    
-Matrices.Utilities.continuousRiccatiIterative
                    
-Matrices.Utilities.discreteRiccatiIterative
                    
+Matrices.Utilities.continuousRiccatiIterative
                    
+Matrices.Utilities.discreteRiccatiIterative
                    
 ", revisions="
 
                      
 
                    • 2010/04/30 
@@ -10731,7 +10731,7 @@ This library provides functions operating on matrices. Below, the
 functions are ordered according to categories and a typical
 call of the respective function is shown.
 Most functions are solely an interface to the external
-LAPACK library.
+LAPACK library.
 
                      
 
 
                      
@@ -10740,120 +10740,120 @@ Note: A' is a short hand notation of transpose(A):
 
 
                      Basic Information
                      
 
                        
-
                      •  toString(A)
+
                      •  toString(A)
      - returns the string representation of matrix A.
                        • 
 
-
                      •  isEqual(M1, M2)
+
                      •  isEqual(M1, M2)
      - returns true if matrices M1 and M2 have the same size and the same elements.
                        • 
 
                      
 
 
                      Linear Equations
                      
 
                        
-
                      •  solve(A,b)
+
                      •  solve(A,b)
      - returns solution x of the linear equation A*x=b (where b is a vector,
        and A is a square matrix that must be regular).
                        • 
 
-
                      •  solve2(A,B)
+
                      •  solve2(A,B)
      - returns solution X of the linear equation A*X=B (where B is a matrix,
        and A is a square matrix that must be regular)
                        • 
 
-
                      •  leastSquares(A,b)
+
                      •  leastSquares(A,b)
      - returns solution x of the linear equation A*x=b in a least squares sense
        (where b is a vector and A may be non-square and may be rank deficient)
                        • 
 
-
                      •  leastSquares2(A,B)
+
                      •  leastSquares2(A,B)
      - returns solution X of the linear equation A*X=B in a least squares sense
        (where B is a matrix and A may be non-square and may be rank deficient)
                        • 
 
-
                      •  equalityLeastSquares(A,a,B,b)
+
                      •  equalityLeastSquares(A,a,B,b)
      - returns solution x of a linear equality constrained least squares problem:
        min|A*x-a|^2 subject to B*x=b
                        • 
 
-
                      •  (LU,p,info) = LU(A)
+
                      •  (LU,p,info) = LU(A)
      - returns the LU decomposition with row pivoting of a rectangular matrix A.
                        • 
 
-
                      •  LU_solve(LU,p,b)
+
                      •  LU_solve(LU,p,b)
      - returns solution x of the linear equation L*U*x[p]=b with a b
        vector and an LU decomposition from \"LU(..)\".
                        • 
 
-
                      •  LU_solve2(LU,p,B)
+
                      •  LU_solve2(LU,p,B)
      - returns solution X of the linear equation L*U*X[p,:]=B with a B
        matrix and an LU decomposition from \"LU(..)\".
                        • 
 
                      
 
 
                      Matrix Factorizations
                      
 
                        
-
                      •  (eval,evec) = eigenValues(A)
+
                      •  (eval,evec) = eigenValues(A)
      - returns eigen values \"eval\" and eigen vectors \"evec\" for a real,
        nonsymmetric matrix A in a Real representation.
                        • 
 
-
                      •  eigenValueMatrix(eval)
+
                      •  eigenValueMatrix(eval)
      - returns real valued block diagonal matrix of the eigenvalues \"eval\" of matrix A.
                        • 
 
-
                      •  (sigma,U,VT) = singularValues(A)
+
                      •  (sigma,U,VT) = singularValues(A)
      - returns singular values \"sigma\" and left and right singular vectors U and VT
        of a rectangular matrix A.
                        • 
 
-
                      •  (Q,R,p) = QR(A)
+
                      •  (Q,R,p) = QR(A)
      - returns the QR decomposition with column pivoting of a rectangular matrix A
        such that Q*R = A[:,p].
                        • 
 
-
                      •  (H,U) = hessenberg(A)
+
                      •  (H,U) = hessenberg(A)
      - returns the upper Hessenberg form H and the orthogonal transformation matrix U
        of a square matrix A such that H = U'*A*U.
                        • 
 
-
                      •  realSchur(A)
+
                      •  realSchur(A)
      - returns the real Schur form of a square matrix A.
                        • 
 
-
                      •  cholesky(A)
+
                      •  cholesky(A)
      - returns the cholesky factor H of a real symmetric positive definite matrix A so that A = H'*H.
                        • 
 
-
                      •  (D,Aimproved) = balance(A)
+
                      •  (D,Aimproved) = balance(A)
      - returns an improved form Aimproved of a square matrix A that has a smaller condition as A,
        with Aimproved = inv(diagonal(D))*A*diagonal(D).
                        • 
 
                      
 
 
                      Matrix Properties
                      
 
                        
-
                      •  trace(A)
+
                      •  trace(A)
      - returns the trace of square matrix A, i.e., the sum of the diagonal elements.
                        • 
 
-
                      •  det(A)
+
                      •  det(A)
      - returns the determinant of square matrix A (using LU decomposition; try to avoid det(..))
                        • 
 
-
                      •  inv(A)
+
                      •  inv(A)
      - returns the inverse of square matrix A (try to avoid, use instead \"solve2(..) with B=identity(..))
                        • 
 
-
                      •  rank(A)
+
                      •  rank(A)
      - returns the rank of square matrix A (computed with singular value decomposition)
                        • 
 
-
                      •  conditionNumber(A)
+
                      •  conditionNumber(A)
      - returns the condition number norm(A)*norm(inv(A)) of a square matrix A in the range 1..∞.
                        • 
 
-
                      •  rcond(A)
+
                      •  rcond(A)
      - returns the reciprocal condition number 1/conditionNumber(A) of a square matrix A in the range 0..1.
                        • 
 
-
                      •  norm(A)
+
                      •  norm(A)
      - returns the 1-, 2-, or infinity-norm of matrix A.
                        • 
 
-
                      •  frobeniusNorm(A)
+
                      •  frobeniusNorm(A)
      - returns the Frobenius norm of matrix A.
                        • 
 
-
                      •  nullSpace(A)
+
                      •  nullSpace(A)
      - returns the null space of matrix A.
                        • 
 
                      
 
 
                      Matrix Exponentials
                      
 
                        
-
                      •  exp(A)
+
                      •  exp(A)
      - returns the exponential e^A of a matrix A by adaptive Taylor series
        expansion with scaling and balancing
                        • 
 
-
                      •  (phi, gamma) = integralExp(A,B)
+
                      •  (phi, gamma) = integralExp(A,B)
      - returns the exponential phi=e^A and the integral gamma=integral(exp(A*t)*dt)*B as needed
        for a discretized system with zero order hold.
                        • 
 
-
                      •  (phi, gamma, gamma1) = integralExpT(A,B)
+
                      •  (phi, gamma, gamma1) = integralExpT(A,B)
      - returns the exponential phi=e^A, the integral gamma=integral(exp(A*t)*dt)*B,
        and the time-weighted integral gamma1 = integral((T-t)*exp(A*t)*dt)*B as needed
        for a discretized system with first order hold.
                        • 
@@ -10861,41 +10861,41 @@ Note: A' is a short hand notation of transpose(A):
 
 
                        Matrix Equations
                        
 
 
 
                        Matrix Manipulation
                        
 
                          
-
                        •  sort(M)
+
                        •  sort(M)
      - returns the sorted rows or columns of matrix M in ascending or descending order.
                          • 
 
-
                        •  flipLeftRight(M)
+
                        •  flipLeftRight(M)
      - returns matrix M so that the columns of M are flipped in left/right direction.
                          • 
 
-
                        •  flipUpDown(M)
+
                        •  flipUpDown(M)
      - returns matrix M so that the rows of M are flipped in up/down direction.
                          • 
 
                        
 
 
                        See also
                        
-Vectors
+Vectors
 
 "), Icon(graphics={
         Rectangle(
@@ -11017,9 +11017,9 @@ can be provided as third argument of the function. Default is \"eps = 0\".
 
 
                        See also
                        
 
                        
-Vectors.isEqual,
-Matrices.isEqual,
-Strings.isEqual
+Vectors.isEqual,
+Matrices.isEqual,
+Strings.isEqual
 
                        
 "));
 end isEqual;
@@ -11055,7 +11055,7 @@ This function returns y = sin(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end sin;
@@ -11091,7 +11091,7 @@ This function returns y = cos(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end cos;
@@ -11127,7 +11127,7 @@ This function returns y = tan(u), with -∞ < u < ∞
 
                        
 
 
                        
-
+
 
                        
 "));
 end tan;
@@ -11161,7 +11161,7 @@ This function returns y = asin(u), with -1 ≤ u ≤ +1:
 
                        
 
 
                        
-
+
 
                        
 "));
 end asin;
@@ -11195,7 +11195,7 @@ This function returns y = acos(u), with -1 ≤ u ≤ +1:
 
                        
 
 
                        
-
+
 
                        
 "));
 end acos;
@@ -11230,7 +11230,7 @@ This function returns y = atan(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end atan;
@@ -11272,7 +11272,7 @@ u1 = sin(y) and u2 = cos(y):
 
                        
 
 
                        
-
+
 
                        
 
 "));
@@ -11336,7 +11336,7 @@ shall be returned:
 
                        
 
 
                        
-
+
 
                        
 
 
                        
@@ -11376,7 +11376,7 @@ This function returns y = sinh(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end sinh;
@@ -11413,7 +11413,7 @@ This function returns y = cosh(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end cosh;
@@ -11448,7 +11448,7 @@ This function returns y = tanh(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end tanh;
@@ -11486,7 +11486,7 @@ asinh(u) (-∞ < u < ∞):
 
                        
 
 
                        
-
+
 
                        
 "));
 end asinh;
@@ -11535,7 +11535,7 @@ can become close to 1:
 
                        
 
 
                        
-
+
 
                        
 "));
 end acosh;
@@ -11569,7 +11569,7 @@ This function returns y = exp(u), with -∞ < u < ∞:
 
                        
 
 
                        
-
+
 
                        
 "));
 end exp;
@@ -11604,7 +11604,7 @@ with u > 0:
 
                        
 
 
                        
-
+
 
                        
 "));
 end log;
@@ -11639,7 +11639,7 @@ with u > 0:
 
                        
 
 
                        
-
+
 
                        
 "));
 end log10;
@@ -11654,10 +11654,10 @@ annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
 
                        
 This package contains basic mathematical functions (such as sin(..)),
 as well as functions operating on
-vectors,
-matrices,
-nonlinear functions, and
-Boolean vectors.
+vectors,
+matrices,
+nonlinear functions, and
+Boolean vectors.
 
                        
 
 
                        Main Authors
                        
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulum.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulum.mo
index b7844880e4..b5fae7012e 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulum.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulum.mo
@@ -53,7 +53,7 @@ object to false to switch off animation of all components.
 
                        
 
 
                        
-\"model
 
                        
 "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulumInitTip.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulumInitTip.mo
index f2a23d8689..26eeaacc5e 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulumInitTip.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/DoublePendulumInitTip.mo
@@ -61,7 +61,7 @@ This example demonstrates at hand of a double pendulum,
 how non-standard initialization can be defined:
 The absolute position of the pendulum tip, and its absolute speed
 shall be initially defined. This can be performed with the
-Joints.FreeMotionScalarInit
+Joints.FreeMotionScalarInit
 joint that allows to initialize individual elements of its relative vectors.
 In this case, the x-, and y-coordinates of the relative position vector
 (visualized by the yellow arrow in the figure below) and of its
@@ -85,7 +85,7 @@ To clearly indicate the preferred solution, guess initial angles can be addition
 In this example, it is simply done by revolute2.phi.start = Modelica.Constants.pi/2.
 
                        
 
                        
-
+
 
                        
 "));
 end DoublePendulumInitTip;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/ForceAndTorque.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/ForceAndTorque.mo
index 86bb5d32a7..02e17321d4 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/ForceAndTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/ForceAndTorque.mo
@@ -74,7 +74,7 @@ equation
     Documentation(info="
 
                        
 In this example the usage of the general force element
-\"ForceAndTorque\"
+\"ForceAndTorque\"
 is shown. A \"ForceAndTorque\" element is connected
 between a body and a fixed point in the world system. The force and torque
 is defined by the \"Constant\" block. The two vectors are resolved in the
@@ -91,6 +91,6 @@ are proportional to the lengths of the force and torque vectors
 (constant scaling factors are defined as parameters in the
 forceAndTorque component):
 
                        
-
                        
+
                        
 "), experiment(StopTime=1.01));
 end ForceAndTorque;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/FreeBody.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/FreeBody.mo
index 6785060fb1..17d7502eac 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/FreeBody.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/FreeBody.mo
@@ -78,7 +78,7 @@ This example demonstrates:
     body \"body1\" in the left part (click on \"Initialization\").
 
                      
 
-\"model
 "));
 end FreeBody;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/InitSpringConstant.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/InitSpringConstant.mo
index 5380696de1..98c24f1072 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/InitSpringConstant.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/InitSpringConstant.mo
@@ -80,7 +80,7 @@ The spring constant is computed as c = 49.05 N/m.
 An animation of this simulation is shown in the figure below.
 
                      
 
-\"model
 "), experiment(StopTime=1.01));
 end InitSpringConstant;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/LineForceWithTwoMasses.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/LineForceWithTwoMasses.mo
index 6c0c55f868..4473317920 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/LineForceWithTwoMasses.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/LineForceWithTwoMasses.mo
@@ -160,7 +160,7 @@ that shall have mass properties. Two alternative implementations
 are given:
 
                      
 
                        
-
                      •  With JointUPS:
                        
+
                      •  With JointUPS:
                        
      Modelica.Mechanics.MultiBody.Joints.Assemblies.JointUPS is an aggregation
      of a universal, a prismatic and a spherical joint that approximates
      a real force component, such as a hydraulic cylinder. At the two
@@ -170,7 +170,7 @@ are given:
      connecting frame_a and frame_b of the jointUPS component.
      Both bodies have the same mass and the inertia tensor is set to zero,
      i.e., the two bodies are treated as point masses.
                        • 
-
                      •  With LineForceWithTwoMasses:
                        
+
                      •  With LineForceWithTwoMasses:
                        
      Modelica.Mechanics.MultiBody.Forces.LineForceWithTwoMasses is a line force component
      with the built-in property that two point masses are located
      on the line on which the line force is acting.
@@ -197,7 +197,7 @@ side in the back is the animation with the JointUPS component.
 
                        
 
 
                        
-
+
 
                        
 "));
 end LineForceWithTwoMasses;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/Pendulum.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/Pendulum.mo
index d68cfad27b..a7be533f08 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/Pendulum.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/Pendulum.mo
@@ -32,7 +32,7 @@ default animation is defined that shows the structure of the
 assembled system.
 
                        
 
                        
-\"model
 
                        
 "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/PendulumWithSpringDamper.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/PendulumWithSpringDamper.mo
index 35775f7a8c..b44353930a 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/PendulumWithSpringDamper.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/PendulumWithSpringDamper.mo
@@ -82,7 +82,7 @@ A 3-dim. spring and a 3-dim. damper are connected between the body
 and a point fixed in the world frame:
 
                        
 
-\"model
 "));
 end PendulumWithSpringDamper;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravity.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravity.mo
index b6b66ab388..6c586dd5b9 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravity.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravity.mo
@@ -41,7 +41,7 @@ the other body rotates on an ellipse around the center of the
 point gravity field.
 
                        
 
-\"model
 "));
 end PointGravity;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses.mo
index ab741ddb79..33a3866c43 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses.mo
@@ -62,6 +62,6 @@ These are the two cases where the rotation is automatically set to
 a default value, when the physical system does not provide the equations.
 
                        
 
-
                        
+
                        
 "));
 end PointGravityWithPointMasses;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses2.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses2.mo
index a5bfb2f187..37fb73151e 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses2.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/PointGravityWithPointMasses2.mo
@@ -279,6 +279,6 @@ The two systems should move exactly in the same way. The system with the PointMa
 object visualizes the point masses in \"red\", whereas the \"referenceSystem\" shows
 its bodies in \"blue\".
 
-
+
 
                        "));
 end PointGravityWithPointMasses2;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringDamperSystem.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringDamperSystem.mo
index 574e0b4be6..2bcbf9cff4 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringDamperSystem.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringDamperSystem.mo
@@ -131,7 +131,7 @@ This example demonstrates:
     body \"body1\" in the left part (click on \"Initialization\").
                        • 
 
                      
 
-\"model
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringMassSystem.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringMassSystem.mo
index 96dfee7190..1a38b6539d 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringMassSystem.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringMassSystem.mo
@@ -121,7 +121,7 @@ can be utilized:
     This has the advantage to get a nice animation of the force component.
                      • 
 
                    
 
-\"model
 "));
 end SpringMassSystem;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringWithMass.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringWithMass.mo
index 715b7da7d7..3fd1e08533 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringWithMass.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/SpringWithMass.mo
@@ -42,7 +42,7 @@ In the animation, this point mass is represented by a small,
 light blue, sphere.
 
                    
 
-\"model
 "));
 end SpringWithMass;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo
index 6275f355e0..3eabcd5681 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo
@@ -100,21 +100,21 @@ equation
     Documentation(info="
 
                    
 This example demonstrates the use of the
-Surface
+Surface
 visualizer that visualizes a moving, parameterized surface.
 The \"sine-wave\" surface is a direct application of the surface model.
 Furthermore, the \"torus\" surface is an instance of
-Torus,
+Torus,
 the \"wheel\" surface is an instance of
-VoluminousWheel,
+VoluminousWheel,
 and the \"pipeWithScalarField surface is an instance of
-PipeWithScalarField.
+PipeWithScalarField.
 All latter visual shapes are constructed with the surface model.
 The following image shows a screen-shot of this example model:
 
                    
 
 
                    
-
+
 
                    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/ThreeSprings.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/ThreeSprings.mo
index 09735a44d1..5688c5b1e8 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/ThreeSprings.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/ThreeSprings.mo
@@ -102,13 +102,13 @@ a stiff spring and a small mass at the connection point.
 
                    
 
 
                    
-\"model
 
                    
 
 
                    
 For a more thorough explanation, see
-MultiBody.UsersGuide.Tutorial.ConnectionOfLineForces.
+MultiBody.UsersGuide.Tutorial.ConnectionOfLineForces.
 
                    
 "));
 end ThreeSprings;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/UserDefinedGravityField.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/UserDefinedGravityField.mo
index 1becd29f7c..1e20094cb1 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/UserDefinedGravityField.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/UserDefinedGravityField.mo
@@ -50,7 +50,7 @@ equation
 
                    
 This example demonstrates a user defined gravity field.
 Function \"world.gravityAcceleration\" is redeclared to function
-theoreticalNormalGravityWGS84
+theoreticalNormalGravityWGS84
 that computes the theoretical gravity of the
 WGS84 ellipsoid earth model at and close to
 the earth ellipsoid surface. In the gravity field, a large, single pendulum is present. Via parameter \"geodeticLatitude\", the geodetic latitude on the earth can be defined, where the pendulum is present. The world frame is located at the WGS84 earth ellipsoid at this latitude. The result variable
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/Utilities/sineSurface.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/Utilities/sineSurface.mo
index 3e5711d4d5..0eee3d9632 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/Utilities/sineSurface.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/Utilities/sineSurface.mo
@@ -29,7 +29,7 @@ algorithm
 
                    
 Function defining the characteristics of a moving sine in three dimensions.
 This function is used in example
-Elementary.Surfaces.
+Elementary.Surfaces.
 
                    
 "));
 end sineSurface;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Elementary/package.mo b/Modelica/Mechanics/MultiBody/Examples/Elementary/package.mo
index 0c4d10b826..eaad3a6abb 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Elementary/package.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Elementary/package.mo
@@ -9,114 +9,114 @@ the usage of the MultiBody library
 
                    Content
                    
 
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
 
-  
+  
 
-  
+  
 
-  
+  
 
-  
+  
-  
+  
-  
+  
-  
+  
 
-  
+  
 
-  
+  
 
-  
+  
 
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1a.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1a.mo
index 1fec4f723a..22f71b2281 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1a.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1a.mo
@@ -66,6 +66,6 @@ well-formed.
 
                    
 An animation of this example is shown in the figure below.
 
                    
-\"model
+\"model
 
                    "));
 end Engine1a;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b.mo
index 065c59e895..0a1b73098e 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b.mo
@@ -88,14 +88,14 @@ Loops.Engine1b_analytic"),
 
                    
 This is a model of the mechanical part of one cylinder of an engine.
 It is similar to
-Loops.Engine1a.
+Loops.Engine1a.
 The difference is that a simple
 model for the gas force in the cylinder is added and that the
 model is restructured in such a way, that the central part of
 the planar kinematic loop can be easily replaced by the
 assembly joint \"Modelica.Mechanics.MultiBody.Joints.Assemblies.JointRRP\".
 This exchange of the kinematic loop is shown in
-Loops.Engine1b_analytic.
+Loops.Engine1b_analytic.
 The advantage of using JointRRP is, that the
 non-linear algebraic equation of this loop is solved analytically, and
 not numerically as in this model (Engine1b).
@@ -103,6 +103,6 @@ not numerically as in this model (Engine1b).
 
                    
 An animation of this example is shown in the figure below.
 
                    
-\"model
+\"model
 
                    "));
 end Engine1b;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b_analytic.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b_analytic.mo
index 0476c829c9..94154e628c 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b_analytic.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Engine1b_analytic.mo
@@ -40,19 +40,19 @@ equation
   annotation (experiment(StopTime=0.5), Documentation(info="
                    
 This is the same model as
-Loops.Engine1b.
+Loops.Engine1b.
 The only difference is that the central part of
 the planar kinematic loop has been replaced by the
 assembly joint \"Modelica.Mechanics.MultiBody.Joints.Assemblies.JointRRP\".
 The advantage of using JointRRP is, that the
 non-linear algebraic equation of this loop is solved analytically, and
 not numerically as in
-Loops.Engine1b.
+Loops.Engine1b.
 
                    
 An animation of this example is shown in the figure below.
 
                    
-\"model
+\"model
 
                    "));
 end Engine1b_analytic;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6.mo
index b8ee518da2..e2234d1a1d 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6.mo
@@ -146,12 +146,12 @@ equation
 This is a V6 engine with 6 cylinders. It is hierarchically built
 up by using instances of one cylinder. For more details on the
 modeling of one cylinder, see example
-Engine1b.
+Engine1b.
 An animation of the engine is shown in the figure below.
 
                    
-\"model
+\"model
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6_analytic.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6_analytic.mo
index 42ce42fc4f..3c22a1f189 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6_analytic.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/EngineV6_analytic.mo
@@ -64,7 +64,7 @@ mass of the crank shaft:
 
                    
-
+
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar1.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar1.mo
index 2f4598f703..db1256beca 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar1.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar1.mo
@@ -121,6 +121,6 @@ to be determined. In this case, the initial condition of the angular velocity
 of revolute joint j1 is set to 300 deg/s in order to drive this loop.
 
                    
 
-
                    \"model
                    
+
                    \"model
                    "));
 end Fourbar1;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar2.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar2.mo
index 989bdabb48..b2efdbf531 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar2.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar2.mo
@@ -90,7 +90,7 @@ equation
 This is a second version of the \"four-bar\" mechanism, see figure:
 
                    
 
-
                    \"model
                    
+
                    \"model
                    
 In this case
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar_analytic.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar_analytic.mo
index cae7b6d769..3c62ea486f 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar_analytic.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Fourbar_analytic.mo
@@ -79,7 +79,7 @@ equation
 This is a third version of the \"four-bar\" mechanism, see figure:
 
                    
 
-
                    \"model
                    
+
                    \"model
                    
 In this case
@@ -91,7 +91,7 @@ Since JointSSP solves the non-linear constraint equation internally
 analytically, no non-linear equation appears any more and a Modelica
 translator can transform the system into state space
 form without solving a system of equations. For more details, see
-
+
 MultiBody.UsersGuide.Tutorial.LoopStructures.AnalyticLoopHandling.
 
                    "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarFourbar.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarFourbar.mo
index 3ee5550f9b..0fd3c9ebb4 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarFourbar.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarFourbar.mo
@@ -96,7 +96,7 @@ equation
     Documentation(info="
                    
 A planar four link mechanism demonstrating possible usage of the
-RevolutePlanarLoopConstraint.
+RevolutePlanarLoopConstraint.
 In this planar example, all the revolute joints rotate about axes perpendicular
 to the x-y plane, i.e. they all are parallel to each other.
 To enable a unique numerical solution in such a case,
@@ -108,11 +108,11 @@ instead of the common revolute joint.
 Another option is to use the assembly joint
 Joints.Assemblies.JointRRR instead of a part
 of the mechanism, as demonstrated in the example
-PlanarLoops_analytic.
+PlanarLoops_analytic.
 
                    
-\"model
+\"model
 
                    "),
     Diagram(graphics={Polygon(
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarLoops_analytic.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarLoops_analytic.mo
index aca23276fa..9e5905b7cd 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarLoops_analytic.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/PlanarLoops_analytic.mo
@@ -171,7 +171,7 @@ used to solve the non-linear equations of coupled planar loops analytically.
 In the mechanism below no non-linear equation occurs any more from the tool
 view, since these equations are solved analytically in the JointRRR joints.
 For more details, see
-
+
 MultiBody.UsersGuide.Tutorial.LoopStructures.AnalyticLoopHandling.
 
                    
 
@@ -180,7 +180,7 @@ In the following figure the parameter vectors of this example are visualized in
 animation view.
 
                    
 
-
                    \"model
                    
+
                    \"model
                    "),
     Diagram(coordinateSystem(extent={{-120,-100},{120,100}})),
     Icon(coordinateSystem(extent={{-120,-100},{120,100}})));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo
index 38007de5a8..d08a7e4e6e 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder.mo
@@ -240,7 +240,7 @@ equation
           thickness=1)}),   Documentation(info="
                    
 Cylinder with rod and crank of a combustion engine.
-Used as submodel in Loops.EngineV6.
+Used as submodel in Loops.EngineV6.
 
                    "));
 end Cylinder;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo
index 74fbf12aec..e112a88a43 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/CylinderBase.mo
@@ -81,7 +81,7 @@ model CylinderBase "One cylinder with analytic handling of kinematic loop"
     animation=animation,
     r={0,rodLength,0},
     r_CM={0,rodLength/2,0},
-    shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/rod.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/rod.dxf",
     lengthDirection={1,0,0},
     widthDirection={0,0,-1},
     length=rodLength/1.75,
@@ -102,7 +102,7 @@ model CylinderBase "One cylinder with analytic handling of kinematic loop"
     animation=animation,
     r={0,pistonLength,0},
     r_CM={0,pistonLength/2,0},
-    shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf",
     length=0.08,
     width=0.08,
     height=0.08,
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder_analytic_CAD.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder_analytic_CAD.mo
index 5d80b64b52..eead42723c 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder_analytic_CAD.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Cylinder_analytic_CAD.mo
@@ -4,7 +4,7 @@ model Cylinder_analytic_CAD
   extends CylinderBase;
   Visualizers.FixedShape crankShape(
     animation=animation,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/crank.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/crank.dxf",
     lengthDirection={1,0,0},
     extra=1,
     widthDirection={0,1,0},
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Engine1Base.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Engine1Base.mo
index 6d9887b4d1..8e2caf3c83 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Engine1Base.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/Engine1Base.mo
@@ -122,6 +122,6 @@ well-formed.
 
                    
 An animation of this example is shown in the figure below.
 
                    
-\"model
+\"model
 
                    "));
 end Engine1Base;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/EngineV6_analytic.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/EngineV6_analytic.mo
index c08deb6a30..ef21334683 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/EngineV6_analytic.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/EngineV6_analytic.mo
@@ -140,7 +140,7 @@ equation
           textColor={0,0,255},
           textString="%name"),
         Bitmap(extent={{-97,-39},{99,75}}, fileName=
-              "modelica://Modelica/Resources/Images/Mechanics/MultiBody/Examples/Loops/EngineV6_CAD.png")}),
+              "modelica:/Modelica/Resources/Images/Mechanics/MultiBody/Examples/Loops/EngineV6_CAD.png")}),
       Documentation(info="
                    
 Model of an engine with 6 cylinders where the algebraic loops of the slider crank mechanisms are
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo
index bbe9fd72db..1bb66eae2c 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo
@@ -127,7 +127,7 @@ the relative velocity v_rel = der(s_rel).
 
                    
-\"model
 
                    "));
diff --git a/Modelica/Mechanics/MultiBody/Examples/Loops/package.mo b/Modelica/Mechanics/MultiBody/Examples/Loops/package.mo
index 597c202cad..ce4a974466 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Loops/package.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Loops/package.mo
@@ -9,51 +9,51 @@ mechanical systems with kinematic loops can be modeled.
 
                    Content
                    
   
                    ModelDescription
                    DoublePendulum
                    
-          DoublePendulumInitTip
                    DoublePendulum
                    
+          DoublePendulumInitTip                    		
        Simple double pendulum with two revolute joints and two bodies. In DoublePendulumInitTip, the initial position of the pendulum tip is given
            instead of common initialization by pendulum angles.
                    
-      
+      
                           		
   
                    ForceAndTorque
                    ForceAndTorque
        Demonstrates usage of Forces.ForceAndTorque element.
                    
-      
+      
                           		
   
                    FreeBody
                    FreeBody
        Free flying body attached by two springs to environment.
                    
-      
+      
                           		
   
                    InitSpringConstant
                    InitSpringConstant
        Determine spring constant such that system is in steady state
            at given position.
                    
-      
+      
                           		
   
                    LineForceWithTwoMasses
                    LineForceWithTwoMasses
        Demonstrates a line force with two point masses using a
            Joints.Assemblies.JointUPS and alternatively a
            Forces.LineForceWithTwoMasses component.
                    
-      
+      
                           		
   
                    Pendulum
                    Pendulum
        Simple pendulum with one revolute joint and one body.
                    
-      
+      
                           		
   
                    PendulumWithSpringDamper
                    PendulumWithSpringDamper
        Simple spring/damper/mass system
                    
-      
+      
                           		
   
                    PointGravity
                    PointGravity
        Two bodies in a point gravity field
                    
-      
+      
                           		
   
                    PointGravityWithPointMasses
                    PointGravityWithPointMasses
        Two point masses in a point gravity field (rotation of bodies is neglected)
                    
-      
+      
                           		
   
                    PointGravityWithPointMasses2
                    PointGravityWithPointMasses2
        Rigidly connected point masses in a point gravity field
                    
-      
+      
                           		
   
                    RollingWheel
                    RollingWheel
        Single wheel rolling on ground starting from an initial speed
                    
-      
+      
                           		
   
                    RollingWheelSetDriving
                    RollingWheelSetDriving
        Rolling wheel set that is driven by torques driving the wheels
                    
-      
+      
                           		
   
                    RollingWheelSetPulling
                    RollingWheelSetPulling
        Rolling wheel set that is pulled by a force
                    
-      
+      
                           		
   
                    SpringDamperSystem
                    SpringDamperSystem
        Spring/damper system with a prismatic joint and
            attached on free flying body
                    
-      
+      
                           		
   
                    SpringMassSystem
                    SpringMassSystem
        Mass attached via a prismatic joint and a spring to the world frame
                    
-      
+      
                           		
   
                    SpringWithMass
                    SpringWithMass
        Point mass hanging on a spring
                    
-      
+      
                           		
   
                    ThreeSprings
                    ThreeSprings
        3-dimensional springs in series and parallel connection
                    
-      
+      
                           		
   
                    HeatLosses
                    HeatLosses
        Demonstrate the modeling of heat losses.  
   
                    UserDefinedGravityField 
                    UserDefinedGravityField 
        Demonstrate the modeling of a user-defined gravity field.  
   
                    Surfaces
                    Surfaces
        Demonstrate the visualization of a sine surface,
        as well as a torus and a wheel constructed from a surface
                    
-      
+      
                           		
   
                    
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
                    
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
                    
   
                    ModelDescription
                    Engine1a
                    
-             Engine1b
                    
-             Engine1b_analytic
                    Engine1a
                    
+             Engine1b
                    
+             Engine1b_analytic                    		
        Model of one cylinder engine (Engine1a: simple, without combustion; Engine1b: with combustion;
            Engine1b_analytic: same as Engine1b but analytic loop handling)
                    
-      
+      
                           		
   
                    EngineV6
                    
-EngineV6_analytic
                    EngineV6
                    
+EngineV6_analytic                    		
        V6 engine with 6 cylinders, 6 planar loops and 1 degree-of-freedom.
            Second version with analytic handling of kinematic loops and CAD data
            animation.
                    
-      
-      
+      
+      
                           		
   
                    Fourbar1
                    Fourbar1
        One kinematic loop with four bars (with only revolute joints;
            5 non-linear equations)
                    
-      
+      
                           		
   
                    Fourbar2
                    Fourbar2
        One kinematic loop with four bars (with UniversalSpherical
            joint; 1 non-linear equation)
                    
-      
+      
                           		
   
                    Fourbar_analytic
                    Fourbar_analytic
        One kinematic loop with four bars (with JointSSP joint;
            analytic solution of non-linear algebraic loop)
                    
-      
+      
                           		
   
                    PlanarFourbar
                    PlanarFourbar
        Planar four bars  with one kinematic loop (with RevolutePlanarLoopConstraint joint)
                    
-      
+      
                           		
   
                    PlanarLoops_analytic
                    PlanarLoops_analytic
        Mechanism with three planar kinematic loops and one
            degree-of-freedom with analytic loop handling
            (with JointRRR joints)
                    
-      
+      
                           		
   
                    
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/ActuatedDrive.mo b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/ActuatedDrive.mo
index c60d54db41..d3f72aba78 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/ActuatedDrive.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/ActuatedDrive.mo
@@ -66,8 +66,8 @@ equation
   annotation (experiment(StopTime=1.1), Documentation(info="
 
                    
 This example demonstrates how to utilize the
-Rotor1D
-and Mounting1D models and
+Rotor1D
+and Mounting1D models and
 compares the implementation with a standard multi-body implementation.
 Note, the solution with Rotor1D is much more efficient.
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/GearConstraint.mo b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/GearConstraint.mo
index 7bd34f707f..5fc73e267f 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/GearConstraint.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/GearConstraint.mo
@@ -73,10 +73,10 @@ equation
   annotation (experiment(StopTime=5), Documentation(info="
 
                    
 This model demonstrates the usage of the
-GearConstraint
+GearConstraint
 model to model a gearbox with multi-body elements. The formulation is compared with
 a one-dimensional model that is mounted with an
-Mounting1D element.
+Mounting1D element.
 
                    
 "));
 end GearConstraint;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/MovingActuatedDrive.mo b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/MovingActuatedDrive.mo
index 5a944cd654..70ff2c0910 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/MovingActuatedDrive.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Rotational3DEffects/MovingActuatedDrive.mo
@@ -112,7 +112,7 @@ equation
     Documentation(info="
 
                    
 This model demonstrates how a moving drive train modelled with 3-dim. multi-body elements
-(revolute, bodyCylinder) can alternatively be modeled with component rotor1D to speed up
+(revolute, bodyCylinder) can alternatively be modeled with component rotor1D to speed up
 simulation. The movement of the two systems is identical and also the cut-torques in the
 various frames (such as: r1.frame_b.t and r2.frame_b.t).
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/FullRobot.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/FullRobot.mo
index 291a09b58f..4a8cba9715 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/FullRobot.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/FullRobot.mo
@@ -236,9 +236,9 @@ equation
   annotation (
     experiment(StopTime=2),
     __Dymola_Commands(
-      file="modelica://Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/Run.mos"
+      file="modelica:/Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/Run.mos"
         "Simulate",
-      file="modelica://Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/fullRobotPlot.mos"
+      file="modelica:/Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/fullRobotPlot.mos"
         "Plot result of axis 3 + animate"),
     Documentation(info="
 
                    
@@ -257,7 +257,7 @@ For current settings, the termination condition should indeed be fulfilled right
 
                    
 
 
                    
-\"model
+\"model
 
                    
 "));
 end FullRobot;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis.mo
index 8bdbfa91cc..e3e4cd86f7 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/OneAxis.mo
@@ -63,6 +63,6 @@ The mechanical structure is replaced by a simple
 load inertia.
 
                    
 "),    experiment(StopTime=1.6),
-    __Dymola_Commands(file="modelica://Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/oneAxisPlot.mos"
+    __Dymola_Commands(file="modelica:/Modelica/Resources/Scripts/Dymola/Mechanics/MultiBody/Examples/Systems/oneAxisPlot.mos"
         "Plot result"));
 end OneAxis;
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/MechanicalStructure.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/MechanicalStructure.mo
index 1f90b3ccf6..a19aed7fd4 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/MechanicalStructure.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/Utilities/MechanicalStructure.mo
@@ -77,7 +77,7 @@ model MechanicalStructure
         rotation=90)));
   Modelica.Mechanics.MultiBody.Parts.BodyShape b0(
     r={0,0.351,0},
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b0.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b0.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -94,7 +94,7 @@ model MechanicalStructure
   Modelica.Mechanics.MultiBody.Parts.BodyShape b1(
     r={0,0.324,0.3},
     I_22=1.16,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b1.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b1.dxf",
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
     length=0.25,
@@ -116,7 +116,7 @@ model MechanicalStructure
     I_22=0.64,
     I_33=2.73,
     I_21=-0.46,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b2.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b2.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -137,7 +137,7 @@ model MechanicalStructure
     I_22=0.245,
     I_33=0.413,
     I_21=-0.070,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b3.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b3.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -157,7 +157,7 @@ model MechanicalStructure
     I_11=1.67,
     I_22=0.081,
     I_33=1.67,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b4.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b4.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -177,7 +177,7 @@ model MechanicalStructure
     I_11=1.25,
     I_22=0.81,
     I_33=1.53,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b5.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b5.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -194,7 +194,7 @@ model MechanicalStructure
     r={0,0,0},
     r_CM={0.05,0.05,0.05},
     m=0.5,
-    shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b6.dxf",
+    shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b6.dxf",
     r_shape={0,0,0},
     lengthDirection={1,0,0},
     widthDirection={0,1,0},
@@ -313,7 +313,7 @@ This model contains the mechanical components of the r3 robot
           textString="%name",
           textColor={0,0,255}),
         Bitmap(extent={{-130,-195},{195,195}},
-          fileName="modelica://Modelica/Resources/Images/Mechanics/MultiBody/Examples/Systems/RobotR3/robot_kr15.png"),
+          fileName="modelica:/Modelica/Resources/Images/Mechanics/MultiBody/Examples/Systems/RobotR3/robot_kr15.png"),
         Text(
           extent={{-190,-130},{-130,-170}},
           textString="1"),
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/package.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/package.mo
index 0c60f8eaba..cc625abbce 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/package.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Systems/RobotR3/package.mo
@@ -13,7 +13,7 @@ Furthermore, it is shown how CAD data can be used
 for animation.
 
                    
 
-\"model
 
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Examples/Systems/package.mo b/Modelica/Mechanics/MultiBody/Examples/Systems/package.mo
index da31d2b14f..2a9e38d970 100644
--- a/Modelica/Mechanics/MultiBody/Examples/Systems/package.mo
+++ b/Modelica/Mechanics/MultiBody/Examples/Systems/package.mo
@@ -9,14 +9,14 @@ from different domains are used, including 3-dimensional mechanics.
 
                    Content
                    
 
-  
+  
                    
   
                    ModelDescription
                    RobotR3
                    
-RobotR3.OneAxis
                    
-RobotR3.FullRobot
                    RobotR3
                    
+RobotR3.OneAxis
                    
+RobotR3.FullRobot                    		
        6 degree of freedom robot with path planning,
            controllers, motors, brakes, gears and mechanics.
            \"OneAxis\" models only one drive train. \"FullRobot\" is
            the complete, detailed robot model.
                    
-      
+      
                           		
   
                    
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Forces/Damper.mo b/Modelica/Mechanics/MultiBody/Forces/Damper.mo
index 9c59e97677..ad7411ebf0 100644
--- a/Modelica/Mechanics/MultiBody/Forces/Damper.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/Damper.mo
@@ -73,7 +73,7 @@ where a mass is hanging on a damper.
 
                    
 
 
                    
-
+
 
                    
 
 "),
diff --git a/Modelica/Mechanics/MultiBody/Forces/Force.mo b/Modelica/Mechanics/MultiBody/Forces/Force.mo
index e62762feb7..5f202ec7b8 100644
--- a/Modelica/Mechanics/MultiBody/Forces/Force.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/Force.mo
@@ -153,7 +153,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -165,7 +165,7 @@ clarity this is not shown in the animation):
 
                    
 
 
                    
-
+
 
                    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Forces/ForceAndTorque.mo b/Modelica/Mechanics/MultiBody/Forces/ForceAndTorque.mo
index 9b8a27b37e..0dc4c570e7 100644
--- a/Modelica/Mechanics/MultiBody/Forces/ForceAndTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/ForceAndTorque.mo
@@ -222,7 +222,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -235,7 +235,7 @@ clarity this is not shown in the animation):
 
                    
 
 
                    
-
+
 
                    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo
index eed991f7ef..277c8d39e5 100644
--- a/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/LineForceWithTwoMasses.mo
@@ -374,18 +374,18 @@ to frame_b, respectively.
 
                    
 
                    
 In example
-
+
 MultiBody.Examples.Elementary.LineForceWithTwoMasses the usage of this
 line force element is shown and is compared with an alternative
 implementation using a
-
+
 MultiBody.Joints.Assemblies.JointUPS component.
 The composition diagram of this example
 is displayed in the figure below.
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -398,7 +398,7 @@ with the LineForceWithTwoMasses component is simpler.
 
                    
 
 
                    
-
+
 
                    
 
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Forces/Spring.mo b/Modelica/Mechanics/MultiBody/Forces/Spring.mo
index a021495025..e900871b21 100644
--- a/Modelica/Mechanics/MultiBody/Forces/Spring.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/Spring.mo
@@ -155,7 +155,7 @@ spring characterizes the location of the point mass.
 
                    
 
 
                    
-\"model
 
                    
 
diff --git a/Modelica/Mechanics/MultiBody/Forces/Torque.mo b/Modelica/Mechanics/MultiBody/Forces/Torque.mo
index 176d64c2d1..25cb3a6fc4 100644
--- a/Modelica/Mechanics/MultiBody/Forces/Torque.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/Torque.mo
@@ -165,7 +165,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -177,7 +177,7 @@ clarity this is not shown in the animation):
 
                    
 
 
                    
-
+
 
                    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Forces/WorldForce.mo b/Modelica/Mechanics/MultiBody/Forces/WorldForce.mo
index 3901fa4ad2..78a869df5e 100644
--- a/Modelica/Mechanics/MultiBody/Forces/WorldForce.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/WorldForce.mo
@@ -130,7 +130,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -138,7 +138,7 @@ This leads to the following animation
 
                    
 
 
                    
-
+
 
                    
 "));
 end WorldForce;
diff --git a/Modelica/Mechanics/MultiBody/Forces/WorldForceAndTorque.mo b/Modelica/Mechanics/MultiBody/Forces/WorldForceAndTorque.mo
index 16c45070cd..63bd3c52ca 100644
--- a/Modelica/Mechanics/MultiBody/Forces/WorldForceAndTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/WorldForceAndTorque.mo
@@ -183,7 +183,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -191,7 +191,7 @@ This leads to the following animation
 
                    
 
 
                    
-
+
 
                    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Forces/WorldTorque.mo b/Modelica/Mechanics/MultiBody/Forces/WorldTorque.mo
index 3ae7426088..ee40673c4f 100644
--- a/Modelica/Mechanics/MultiBody/Forces/WorldTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/WorldTorque.mo
@@ -113,7 +113,7 @@ following figure:
 
                    
 
 
                    
-
+
 
                    
 
 
                    
@@ -121,7 +121,7 @@ This leads to the following animation
 
                    
 
 
                    
-
+
 
                    
 
 "),
diff --git a/Modelica/Mechanics/MultiBody/Forces/package.mo b/Modelica/Mechanics/MultiBody/Forces/package.mo
index 29c8007cd4..f69545e46f 100644
--- a/Modelica/Mechanics/MultiBody/Forces/package.mo
+++ b/Modelica/Mechanics/MultiBody/Forces/package.mo
@@ -10,68 +10,68 @@ between two frame connectors, e.g., between two parts.
 
                    Content
                    
 
-  
+  
+           
-  
+  
+           
-  
+  
-  
+  
+           
-  
+  
+           
-  
+  
+           
                    
+           
-  
+  
+           
-  
+  
+           
-  
+  
+           
-  
+  
+           
-  
+  
-  
+  
                    
   
                    ModelDescription
                    WorldForce
                    WorldForce
        External force acting at the frame to which this component
            is connected and defined by 3 input signals,
            that are interpreted as one vector resolved in frame world, frame_b or frame_resolve.
                    
-                               		
   
                    WorldTorque
                    WorldTorque
        External torque acting at the frame to which this component
            is connected and defined by 3 input signals,
            that are interpreted as one vector resolved in frame world, frame_b or frame_resolve.
                    
-                               		
   
                    WorldForceAndTorque
                    WorldForceAndTorque
        External force and external torque acting at the frame
            to which this component
            is connected and defined by 3+3 input signals,
            that are interpreted as a force and as a torque vector
            resolved in frame world, frame_b or frame_resolve.
                    
-           
                    
-           
+           
                    
+           
                           		
   
                    Force
                    Force
        Force acting between two frames defined by 3 input signals
            resolved in frame world, frame_a, frame_b or in frame_resolve.
                    
-                               		
   
                    Torque
                    Torque
        Torque acting between two frames defined by 3 input signals
            resolved in frame world, frame_a, frame_b or in frame_resolve.
                    
-                               		
   
                    ForceAndTorque
                    ForceAndTorque
        Force and torque acting between two frames defined by 3+3 input signals
            resolved in frame world, frame_a, frame_b or in frame_resolve.
                    
-           
                    
-                               		
   
                    LineForceWithMass
                    LineForceWithMass
         General line force component with an optional point mass
             on the connection line. The force law can be defined by a
             component of Modelica.Mechanics.Translational
                    
-                               		
   
                    LineForceWithTwoMasses
                    LineForceWithTwoMasses
         General line force component with two optional point masses
             on the connection line. The force law can be defined by a
             component of Modelica.Mechanics.Translational
                    
-                               		
   
                    Spring
                    Spring
        Linear translational spring with optional mass
                    
-                               		
   
                    Damper
                    Damper
        Linear (velocity dependent) damper
                    
-                               		
   
                    SpringDamperParallel
                    SpringDamperParallel
        Linear spring and damper in parallel connection 
   
                    SpringDamperSeries
                    SpringDamperSeries
        Linear spring and damper in series connection 
   
                    
 
                    
diff --git a/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_d.mo b/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_d.mo
index f68724e03e..85bc84d83b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_d.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_d.mo
@@ -16,7 +16,7 @@ algorithm
     Documentation(info="
 
                    
 This is a derivative of function
-maxWithoutEvent.
+maxWithoutEvent.
 
                    
 "));
 end maxWithoutEvent_d;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_dd.mo b/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_dd.mo
index 21f6482fdc..6438d7655b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_dd.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Internal/maxWithoutEvent_dd.mo
@@ -17,9 +17,9 @@ algorithm
     Documentation(info="
 
                    
 This is a derivative of function
-maxWithoutEvent_d,
+maxWithoutEvent_d,
 i.e. a second derivative of function
-maxWithoutEvent.
+maxWithoutEvent.
 
                    
 "));
 end maxWithoutEvent_dd;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Internal/resolve1_der.mo b/Modelica/Mechanics/MultiBody/Frames/Internal/resolve1_der.mo
index 8d9e73b10e..00aa62be34 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Internal/resolve1_der.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Internal/resolve1_der.mo
@@ -11,7 +11,7 @@ algorithm
   annotation(Inline=true, Documentation(info="
 
                    
 This is a derivative of function
-resolve1.
+resolve1.
 
                    
 "));
 end resolve1_der;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Internal/resolve2_der.mo b/Modelica/Mechanics/MultiBody/Frames/Internal/resolve2_der.mo
index a8c0ffe3be..9f6b64d7d9 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Internal/resolve2_der.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Internal/resolve2_der.mo
@@ -11,7 +11,7 @@ algorithm
   annotation(Inline=true, Documentation(info="
 
                    
 This is a derivative of function
-resolve2.
+resolve2.
 
                    
 "));
 end resolve2_der;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Internal/resolveRelative_der.mo b/Modelica/Mechanics/MultiBody/Frames/Internal/resolveRelative_der.mo
index 7c59fa9b1c..cc9f768924 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Internal/resolveRelative_der.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Internal/resolveRelative_der.mo
@@ -23,7 +23,7 @@ algorithm
   annotation(Inline=true, Documentation(info="
 
                    
 This is a derivative of function
-resolveRelative.
+resolveRelative.
 
                    
 "));
 end resolveRelative_der;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/absoluteRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/absoluteRotation.mo
index 5612f7f683..1f58c92b55 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/absoluteRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/absoluteRotation.mo
@@ -22,18 +22,18 @@ Q2 = Quaternions.absoluteRotation(Q1, Q_rel);
 
                    Description
                    
 
                    
 This function returns
-quaternions orientation Q2
+quaternions orientation Q2
 that describes the orientation frame 0 to frame 2 from the
-quaternions orientation Q1
+quaternions orientation Q1
 that describes the orientation to rotate from frame 0 to frame 1 and from the relative
-quaternions orientation Q_rel
+quaternions orientation Q_rel
 that describes the orientation to rotate from frame 1 to frame 2.
 
                    
 
 
                    See also
                    
 
                    
-Frames.absoluteRotation,
-TransformationMatrices.absoluteRotation.
+Frames.absoluteRotation,
+TransformationMatrices.absoluteRotation.
 
                    
 "));
 end absoluteRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity1.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity1.mo
index b865561920..eae5a61c85 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity1.mo
@@ -21,15 +21,15 @@ w = Quaternions.angularVelocity1(Q, der_Q);
 
                    
 This function returns the angular velocity w of frame 2 with
 respect to frame 1, resolved in frame 1, from the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2
 and from its first time derivative der_Q.
 
                    
 
 
                    See also
                    
 
                    
-Frames.angularVelocity1,
-TransformationMatrices.angularVelocity1.
+Frames.angularVelocity1,
+TransformationMatrices.angularVelocity1.
 
                    
 "));
 end angularVelocity1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity2.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity2.mo
index 8a376b9677..58a40c09c0 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/angularVelocity2.mo
@@ -21,15 +21,15 @@ w = Quaternions.angularVelocity2(Q, der_Q);
 
                    
 This function returns the angular velocity w of frame 2 with
 respect to frame 1, resolved in frame 2, from the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2
 and from its first time derivative der_Q.
 
                    
 
 
                    See also
                    
 
                    
-Frames.angularVelocity2,
-TransformationMatrices.angularVelocity2.
+Frames.angularVelocity2,
+TransformationMatrices.angularVelocity2.
 
                    
 "));
 end angularVelocity2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T.mo
index a79b8f095a..3e5e3d2eb9 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T.mo
@@ -55,20 +55,20 @@ Q = Quaternions.from_T(T, Q_guess);
 
                    Description
                    
 
                    
 This function returns a
-quaternions orientation Q.
+quaternions orientation Q.
 computed from a transformation matrix T
 and depending on the initial guess Q_guess.
 Generally, the transformation matrix T can be gained using a function from the
-TransformationMatrices
+TransformationMatrices
 package.
 
                    
 
 
                    See also
                    
 
                    
-to_T.
-from_T_inv,
-Frames.from_T,
-TransformationMatrices.from_T.
+to_T.
+from_T_inv,
+Frames.from_T,
+TransformationMatrices.from_T.
 
                    
 ", revisions="
 
                      
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T_inv.mo
index fdfe5bb302..e22b1bd5b3 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/from_T_inv.mo
@@ -20,19 +20,19 @@ Q = Quaternions.from_T_inv(T_inv, Q_guess);
 
                      Description
                      
 
                      
 This function returns a
-quaternions orientation Q.
+quaternions orientation Q.
 computed from an inverse transformation matrix T_inv
 and depending on the initial guess Q_guess.
 Generally, the transformation matrix T_inv can be gained using a function from the
-TransformationMatrices
-package, e.g. using T_inv = inverseRotation(T).
+TransformationMatrices
+package, e.g. using T_inv = inverseRotation(T).
 
                      
 
 
                      See also
                      
 
                      
-from_T,
-Frames.from_T_inv,
-TransformationMatrices.from_T_inv.
+from_T,
+Frames.from_T_inv,
+TransformationMatrices.from_T_inv.
 
                      
 "));
 end from_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/inverseRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/inverseRotation.mo
index bbf373e0c2..0e220570f9 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/inverseRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/inverseRotation.mo
@@ -16,17 +16,17 @@ Q_inv = Quaternions.inverseRotation(Q);
 
                      Description
                      
 
                      
 This function returns
-quaternions orientation Q_inv
+quaternions orientation Q_inv
 that describes the orientation to rotate from frame 2 to frame 1
 from the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate from frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.inverseRotation,
-TransformationMatrices.inverseRotation.
+Frames.inverseRotation,
+TransformationMatrices.inverseRotation.
 
 
                      
 "));
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve1.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve1.mo
index 4797c33566..55fdfef4af 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve1.mo
@@ -19,13 +19,13 @@ v1 = Quaternions.multipleResolve1(Q, v2);
 
                      
 This function returns vectors v resolved in frame 1 (=v1) from vectors v
 resolved in frame 2 (=v2) using the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-TransformationMatrices.multipleResolve1.
+TransformationMatrices.multipleResolve1.
 
                      
 "));
 end multipleResolve1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve2.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve2.mo
index 14a72a4de2..971945770d 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/multipleResolve2.mo
@@ -19,13 +19,13 @@ v2 = Quaternions.multipleResolve2(Q, v1);
 
                      
 This function returns vectors v resolved in frame 2 (=v2) from vectors v
 resolved in frame 1 (=v1) using the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-TransformationMatrices.multipleResolve2.
+TransformationMatrices.multipleResolve2.
 
                      
 "));
 end multipleResolve2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/nullRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/nullRotation.mo
index 09c88fba9c..3f95b01ed1 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/nullRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/nullRotation.mo
@@ -16,15 +16,15 @@ Q = Quaternions.nullRotation();
 
                      Description
                      
 
                      
 This function returns a
-quaternions orientation Q
+quaternions orientation Q
 describing the orientation object to rotate frame 1 into frame 2, if frame 1 and frame 2 are identical.
 (= transformation matrix is identity matrix and angular velocity is zero).
 
                      
 
 
                      See also
                      
 
                      
-Frames.nullRotation,
-TransformationMatrices.nullRotation.
+Frames.nullRotation,
+TransformationMatrices.nullRotation.
 
                      
 "));
 end nullRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/orientationConstraint.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/orientationConstraint.mo
index faf0268003..4b5da108fb 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/orientationConstraint.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/orientationConstraint.mo
@@ -17,13 +17,13 @@ residue = Quaternions.orientationConstraint(Q);
 
                      
 This function returns the Real residue vector with 1 element only that describes the constraints
 between the 4 elements of the
-quaternions orientation Q.
+quaternions orientation Q.
 
                      
 
 
                      See also
                      
 
                      
-Frames.orientationConstraint,
-TransformationMatrices.orientationConstraint.
+Frames.orientationConstraint,
+TransformationMatrices.orientationConstraint.
 
                      
 "));
 end orientationConstraint;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/planarRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/planarRotation.mo
index 77ac017e58..ae07f51088 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/planarRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/planarRotation.mo
@@ -20,7 +20,7 @@ Q = Quaternions.planarRotation(e, angle);
 
                      Description
                      
 
                      
 This function returns
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate in the plane along unit
 axis e from frame 1 into frame 2 with angle angle.
 Note, \"e\" must be a unit vector. However, this is not checked in this function and the function will
@@ -29,8 +29,8 @@ return a wrong result, if length(e) is not one.
 
 
                      See also
                      
 
                      
-Frames.planarRotation,
-TransformationMatrices.planarRotation.
+Frames.planarRotation,
+TransformationMatrices.planarRotation.
 
                      
 "));
 end planarRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/relativeRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/relativeRotation.mo
index b8e39d10a6..28c1c8efb8 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/relativeRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/relativeRotation.mo
@@ -21,18 +21,18 @@ Q_rel = Quaternions.relativeRotation(Q1, Q2);
 
                      Description
                      
 
                      
 This function returns
-quaternions orientation Q_rel
+quaternions orientation Q_rel
 that describes the orientation to rotate frame 1 to frame 2 from the
-quaternions orientation Q1
+quaternions orientation Q1
 that describes the orientation to rotate from frame 0 to frame 1 and from the
-quaternions orientation Q2
+quaternions orientation Q2
 that describes the orientation to rotate from frame 0 to frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.relativeRotation,
-TransformationMatrices.relativeRotation.
+Frames.relativeRotation,
+TransformationMatrices.relativeRotation.
 
                      
 "));
 end relativeRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve1.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve1.mo
index 91f13a5195..6102fb27e5 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve1.mo
@@ -18,15 +18,15 @@ v1 = Quaternions.resolve1(Q, v2);
 
                      
 This function returns vector v resolved in frame 1 (=v1) from vector v
 resolved in frame 2 (=v2) using the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-resolve2,
-Frames.resolve1,
-TransformationMatrices.resolve1.
+resolve2,
+Frames.resolve1,
+TransformationMatrices.resolve1.
 
                      
 "));
 end resolve1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve2.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve2.mo
index 7294891998..ede92a8a10 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/resolve2.mo
@@ -18,15 +18,15 @@ v2 = Quaternions.resolve2(Q, v1);
 
                      
 This function returns vector v resolved in frame 2 (=v2) from vector v
 resolved in frame 1 (=v1) using the
-quaternions orientation Q
+quaternions orientation Q
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-resolve1,
-Frames.resolve2,
-TransformationMatrices.resolve2.
+resolve1,
+Frames.resolve2,
+TransformationMatrices.resolve2.
 
                      
 "));
 end resolve2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/smallRotation.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/smallRotation.mo
index e61a75f850..56621b6904 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/smallRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/smallRotation.mo
@@ -20,8 +20,8 @@ This function returns rotation angles valid for a small rotation of x-y-z sequen
 
 
                      See also
                      
 
                      
-Frames.smallRotation,
-TransformationMatrices.smallRotation.
+Frames.smallRotation,
+TransformationMatrices.smallRotation.
 
                      
 "));
 end smallRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T.mo
index 08992c760b..aa7b623a5c 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T.mo
@@ -25,18 +25,18 @@ T = Quaternions.to_T(Q);
 
                      Description
                      
 
                      
 This function returns a real matrix T
-
+
 computed from a
-quaternions orientation Q.
+quaternions orientation Q.
 The matrix T is considered to be an object transformation matrix.
 
                      
 
 
                      See also
                      
 
                      
-from_T,
-to_T_inv,
-Frames.to_T,
-TransformationMatrices.to_T.
+from_T,
+to_T_inv,
+Frames.to_T,
+TransformationMatrices.to_T.
 
                      
 "));
 end to_T;
diff --git a/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T_inv.mo
index 72dc7362c8..a3e74ef6fe 100644
--- a/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/Quaternions/to_T_inv.mo
@@ -26,16 +26,16 @@ T_inv = Quaternions.to_T_inv(Q);
 
                      
 This function returns a real matrix T_inv
 computed from a
-quaternions orientation Q.
+quaternions orientation Q.
 The matrix T is considered to be an inverse transformation matrix.
 
                      
 
 
                      See also
                      
 
                      
-to_T,
-from_T_inv,
-Frames.to_T_inv,
-TransformationMatrices.to_T_inv.
+to_T,
+from_T_inv,
+Frames.to_T_inv,
+TransformationMatrices.to_T_inv.
 
                      
 "));
 end to_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/absoluteRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/absoluteRotation.mo
index 27357575e9..47a2ab02ad 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/absoluteRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/absoluteRotation.mo
@@ -20,18 +20,18 @@ T2 = TransformationMatrices.absoluteRotation(T1, T_rel);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T2
+transformation matrix T2
 that describes the orientation frame 0 to frame 2 from the
-transformation matrix T1
+transformation matrix T1
 that describes the orientation to rotate from frame 0 to frame 1 and from the relative
-transformation matrix T2_rel
+transformation matrix T2_rel
 that describes the orientation to rotate from frame 1 to frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.absoluteRotation,
-Quaternions.absoluteRotation.
+Frames.absoluteRotation,
+Quaternions.absoluteRotation.
 
                      
 "));
 end absoluteRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity1.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity1.mo
index 0049816862..acfe44b987 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity1.mo
@@ -38,7 +38,7 @@ w = TransformationMatrices.angularVelocity1(T, der_T);
 
                      
 This function returns the angular velocity w of frame 2 with
 respect to frame 1, resolved in frame 1, from the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2
 and from its first time derivative der_T:
 
                      
@@ -48,8 +48,8 @@ w = vec( der(transpose(T)) * T ).
 
 
                      See also
                      
 
                      
-Frames.angularVelocity1,
-Quaternions.angularVelocity1.
+Frames.angularVelocity1,
+Quaternions.angularVelocity1.
 
                      
 "));
 end angularVelocity1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity2.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity2.mo
index 51d881c05c..c16bfc1d5a 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/angularVelocity2.mo
@@ -38,7 +38,7 @@ w = TransformationMatrices.angularVelocity2(T, der_T);
 
                      
 This function returns the angular velocity w of frame 2 with
 respect to frame 1, resolved in frame 2, from the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2
 and from its first time derivative der_T:
 
                      
@@ -48,8 +48,8 @@ w = vec( T * der(transpose(T)) ).
 
 
                      See also
                      
 
                      
-Frames.angularVelocity2,
-Quaternions.angularVelocity2.
+Frames.angularVelocity2,
+Quaternions.angularVelocity2.
 
                      
 "));
 end angularVelocity2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotations.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotations.mo
index a860c19be7..326a581e11 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotations.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotations.mo
@@ -23,14 +23,14 @@ T = TransformationMatrices.axesRotations(sequence, angles);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T
+transformation matrix T
 that describes the orientation defined by three elementary rotations in
 a given sequence, each rotated by angles.
 
                      
 
 
                      See also
                      
 
                      
-Frames.axesRotations.
+Frames.axesRotations.
 
                      
 "));
 end axesRotations;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotationsAngles.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotationsAngles.mo
index 47dc51a75f..2728f52650 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotationsAngles.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axesRotationsAngles.mo
@@ -121,7 +121,7 @@ A call to this function of the form
 
                      
 computes the rotation angles \"angles[1:3]\" to rotate frame 1
 into frame 2 along axes sequence[1:3], given the
-transformation matrix T
+transformation matrix T
 from frame 1 to frame 2. Therefore, the result of
 this function fulfills the following equation:
 
                      
@@ -156,7 +156,7 @@ sequence = {1,2,3}  // Cardan angle sequence
 
 
                      See also
                      
 
                      
-Frames.axesRotationsAngles.
+Frames.axesRotationsAngles.
 
                      
 "));
 end axesRotationsAngles;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axisRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axisRotation.mo
index 3c57860da9..2ca4e418e5 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axisRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/axisRotation.mo
@@ -21,7 +21,7 @@ T = TransformationMatrices.axisRotation(axis, angle);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate along unit axis axis
 from frame 1 into frame 2 with angle angle.
 For example, TransformationMatrices.axisRotation(2, phi) returns the same orientation object as with the call
@@ -30,8 +30,8 @@ TransformationMatrices.planarRotation({0,1,0}, phi)
 
 
                      See also
                      
 
                      
-planarRotation,
-Frames.axisRotation.
+planarRotation,
+Frames.axisRotation.
 
                      
 "));
 end axisRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_Q.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_Q.mo
index d9c50ad6f8..c54d22cd28 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_Q.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_Q.mo
@@ -25,14 +25,14 @@ T = TransformationMatrices.from_Q(Q);
 
                      Description
                      
 
                      
 This function returns a
-transformation matrix T
-computed from a quaternion object Q
+transformation matrix T
+computed from a quaternion object Q
 
                      
 
 
                      See also
                      
 
                      
-to_Q.
-Frames.from_Q.
+to_Q.
+Frames.from_Q.
 
                      
 "));
 end from_Q;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T.mo
index b55d3eb9ff..ea96b85cc7 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T.mo
@@ -16,15 +16,15 @@ R = TransformationMatrices.from_T(T);
 
                      Description
                      
 
                      
 This function returns a
-transformation matrix R
+transformation matrix R
 which is equal to a real input matrix T.
 
                      
 
 
                      See also
                      
 
                      
-from_T_inv,
-to_T,
-Frames.from_T.
+from_T_inv,
+to_T,
+Frames.from_T.
 
                      
 "));
 end from_T;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T_inv.mo
index e4b82f549b..2bf4a26af4 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_T_inv.mo
@@ -18,15 +18,15 @@ R = TransformationMatrices.from_T_inv(T_inv);
 
                      Description
                      
 
                      
 This function returns a
-transformation matrix R
+transformation matrix R
 which is inverse to real input matrix T_inv.
 
                      
 
 
                      See also
                      
 
                      
-to_T_inv,
-from_T,
-Frames.from_T_inv.
+to_T_inv,
+from_T,
+Frames.from_T_inv.
 
                      
 "));
 end from_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxy.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxy.mo
index 78c187792d..7b88c49c13 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxy.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxy.mo
@@ -48,7 +48,7 @@ arbitrarily such that e_x and e_y are orthogonal to each other.
 
 
                      See also
                      
 
                      
-Frames.from_nxy.
+Frames.from_nxy.
 
                      
 "));
 end from_nxy;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxz.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxz.mo
index eef3a82f19..08beca34aa 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxz.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/from_nxz.mo
@@ -48,7 +48,7 @@ arbitrarily such that n_x and e_z are orthogonal to each other.
 
 
                      See also
                      
 
                      
-Frames.from_nxz.
+Frames.from_nxz.
 
                      
 "));
 end from_nxz;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/inverseRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/inverseRotation.mo
index ac8efcb5c2..eb29697ab2 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/inverseRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/inverseRotation.mo
@@ -16,17 +16,17 @@ T_inv = TransformationMatrices.inverseRotation(T);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T_inv
+transformation matrix T_inv
 that describes the orientation to rotate from frame 2 to frame 1
 from the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate from frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.inverseRotation,
-Quaternions.inverseRotation.
+Frames.inverseRotation,
+Quaternions.inverseRotation.
 
                      
 "));
 end inverseRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve1.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve1.mo
index 17d25bbe08..e21a75c5aa 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve1.mo
@@ -19,13 +19,13 @@ v1 = TransformationMatrices.multipleResolve1(T, v2);
 
                      
 This function returns vectors v resolved in frame 1 (=v1) from vectors v
 resolved in frame 2 (=v2) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Quaternions.multipleResolve1.
+Quaternions.multipleResolve1.
 
                      
 "));
 end multipleResolve1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve2.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve2.mo
index 74bab97e8f..82b52d2fbe 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/multipleResolve2.mo
@@ -19,13 +19,13 @@ v2 = TransformationMatrices.multipleResolve2(T, v1);
 
                      
 This function returns vectors v resolved in frame 2 (=v2) from vectors v
 resolved in frame 1 (=v1) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Quaternions.multipleResolve2.
+Quaternions.multipleResolve2.
 
                      
 "));
 end multipleResolve2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/nullRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/nullRotation.mo
index 5b7694750b..22b82806b8 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/nullRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/nullRotation.mo
@@ -15,15 +15,15 @@ T = TransformationMatrices.nullRotation();
 
                      Description
                      
 
                      
 This function returns a
-transformation matrix T
+transformation matrix T
 describing the orientation object to rotate frame 1 into frame 2, if frame 1 and frame 2 are identical.
 (= transformation matrix is identity matrix and angular velocity is zero).
 
                      
 
 
                      See also
                      
 
                      
-Frames.nullRotation,
-Quaternions.nullRotation.
+Frames.nullRotation,
+Quaternions.nullRotation.
 
                      
 "));
 end nullRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/orientationConstraint.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/orientationConstraint.mo
index 4d1c96a031..4a98014ac6 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/orientationConstraint.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/orientationConstraint.mo
@@ -19,13 +19,13 @@ residue = TransformationMatrices.orientationConstraint(T);
 
                      
 This function returns the Real residue vector with 6 elements that describes the constraints
 between the 9 elements of the
-transformation matrix T.
+transformation matrix T.
 
                      
 
 
                      See also
                      
 
                      
-Frames.orientationConstraint,
-Quaternions.orientationConstraint.
+Frames.orientationConstraint,
+Quaternions.orientationConstraint.
 
                      
 "));
 end orientationConstraint;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotation.mo
index 4174f318e6..4b2d244788 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotation.mo
@@ -20,7 +20,7 @@ T = TransformationMatrices.planarRotation(e, angle);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate in the plane along unit
 axis e from frame 1 into frame 2 with angle angle.
 Note, \"e\" must be a unit vector. However, this is not checked in this function and the function will
@@ -29,9 +29,9 @@ return a wrong result, if length(e) is not one.
 
 
                      See also
                      
 
                      
-planarRotationAngle,
-Frames.planarRotation,
-Quaternions.planarRotation.
+planarRotationAngle,
+Frames.planarRotation,
+Quaternions.planarRotation.
 
                      
 "));
 end planarRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotationAngle.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotationAngle.mo
index 143dd21999..f0f959adc9 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotationAngle.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/planarRotationAngle.mo
@@ -86,8 +86,8 @@ and/or a division by zero will occur.
 
 
                      See also
                      
 
                      
-planarRotation,
-Frames.planarRotationAngle.
+planarRotation,
+Frames.planarRotationAngle.
 
                      
 "));
 end planarRotationAngle;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/relativeRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/relativeRotation.mo
index 6f9f5c289c..44a125ca00 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/relativeRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/relativeRotation.mo
@@ -18,18 +18,18 @@ T_rel = TransformationMatrices.relativeRotation(T1, T2);
 
                      Description
                      
 
                      
 This function returns
-transformation matrix T_rel
+transformation matrix T_rel
 that describes the orientation to rotate frame 1 to frame 2 from the
-transformation matrix T1
+transformation matrix T1
 that describes the orientation to rotate from frame 0 to frame 1 and from the
-transformation matrix T2
+transformation matrix T2
 that describes the orientation to rotate from frame 0 to frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.relativeRotation,
-Quaternions.relativeRotation.
+Frames.relativeRotation,
+Quaternions.relativeRotation.
 
                      
 "));
 end relativeRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve1.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve1.mo
index 4f1c58a55f..490b23280f 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve1.mo
@@ -17,15 +17,15 @@ v1 = TransformationMatrices.resolve1(T, v2);
 
                      
 This function returns vector v resolved in frame 1 (=v1) from vector v
 resolved in frame 2 (=v2) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-resolve2,
-Frames.resolve1,
-Quaternions.resolve1.
+resolve2,
+Frames.resolve1,
+Quaternions.resolve1.
 
                      
 "));
 end resolve1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve2.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve2.mo
index 52dd56aba1..95955bb665 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolve2.mo
@@ -17,15 +17,15 @@ v2 = TransformationMatrices.resolve2(T, v1);
 
                      
 This function returns vector v resolved in frame 2 (=v2) from vector v
 resolved in frame 1 (=v1) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-resolve1,
-Frames.resolve2,
-Quaternions.resolve2.
+resolve1,
+Frames.resolve2,
+Quaternions.resolve2.
 
                      
 "));
 end resolve2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade1.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade1.mo
index aa8ffc9ecf..95073ed5e5 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade1.mo
@@ -18,13 +18,13 @@ D1 = TransformationMatrices.resolveDyade1(T, D2);
 
                      
 This function returns the second order tensor D
 resolved in frame 1 (= D1) from its representation in frame 2 (= D2) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.resolveDyade1.
+Frames.resolveDyade1.
 
                      
 "));
 end resolveDyade1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade2.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade2.mo
index d2fe49dff2..cb553f2647 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/resolveDyade2.mo
@@ -18,13 +18,13 @@ D2 = TransformationMatrices.resolveDyade2(T, D1);
 
                      
 This function returns the second order tensor D
 resolved in frame 2 (= D2) from its representation in frame 1 (= D1) using the
-transformation matrix T
+transformation matrix T
 that describes the orientation to rotate frame 1 into frame 2.
 
                      
 
 
                      See also
                      
 
                      
-Frames.resolveDyade2.
+Frames.resolveDyade2.
 
                      
 "));
 end resolveDyade2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/smallRotation.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/smallRotation.mo
index 45bc76c5b9..0f6ee739ea 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/smallRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/smallRotation.mo
@@ -36,8 +36,8 @@ Optionally, residues are returned as well if withResidues=true.
 
 
                      See also
                      
 
                      
-Frames.smallRotation,
-Quaternions.smallRotation.
+Frames.smallRotation,
+Quaternions.smallRotation.
 
                      
 "));
 end smallRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_Q.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_Q.mo
index 18824b5c52..53f04891d9 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_Q.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_Q.mo
@@ -19,15 +19,15 @@ Q = TransformationMatrices.to_Q(T, Q_guess);
 
 
                      Description
                      
 
                      
-This function returns a quaternion object Q
-computed from a transformation matrix T
+This function returns a quaternion object Q
+computed from a transformation matrix T
 and depending on the initial guess Q_guess.
 
                      
 
 
                      See also
                      
 
                      
-from_Q
-Frames.to_Q.
+from_Q
+Frames.to_Q.
 
                      
 "));
 end to_Q;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T.mo
index 8947ce6798..e7a0cc142f 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T.mo
@@ -16,15 +16,15 @@ T = TransformationMatrices.to_T(R);
 
                      Description
                      
 
                      
 This function returns a real matrix T which is equal to a
-transformation matrix R.
+transformation matrix R.
 
                      
 
 
                      See also
                      
 
                      
-from_T,
-to_T_inv,
-Frames.to_T,
-Quaternions.to_T.
+from_T,
+to_T_inv,
+Frames.to_T,
+Quaternions.to_T.
 
                      
 "));
 end to_T;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T_inv.mo
index be5bd80f1b..ce80fbee8f 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_T_inv.mo
@@ -19,15 +19,15 @@ T_inv = TransformationMatrices.to_T_inv(R);
 
                      
 This function returns a real matrix T_inv
 which is inverse to a
-transformation matrix R.
+transformation matrix R.
 
                      
 
 
                      See also
                      
 
                      
-from_T_inv,
-to_T,
-Frames.to_T_inv,
-Quaternions.to_T_inv.
+from_T_inv,
+to_T,
+Frames.to_T_inv,
+Quaternions.to_T_inv.
 
                      
 "));
 end to_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_exy.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_exy.mo
index 4c70ad18a1..b6916ec5cc 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_exy.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_exy.mo
@@ -18,15 +18,15 @@ exy = TransformationMatrices.to_exy(T);
 
                      Description
                      
 
                      
 This function returns unit vectors e_x and e_y which define axes of frame 2 resolved in frame 1,
-provided T is a transformation matrix
+provided T is a transformation matrix
 to rotate frame 1 into  2.
 
                      
 
 
                      See also
                      
 
                      
-from_nxy,
-from_nxz,
-Frames.to_exy.
+from_nxy,
+from_nxz,
+Frames.to_exy.
 
                      
 "));
 end to_exy;
diff --git a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_vector.mo b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_vector.mo
index 7fdc719a37..875dc78678 100644
--- a/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_vector.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/TransformationMatrices/to_vector.mo
@@ -16,13 +16,13 @@ vec = TransformationMatrices.to_vector(T);
 
                      Description
                      
 
                      
 This function returns a vector vec which contains elements of a
-transformation matrix T.
+transformation matrix T.
 
                      
 
 
                      See also
                      
 
                      
-to_T,
-Frames.to_vector.
+to_T,
+Frames.to_vector.
 
                      
 "));
 end to_vector;
diff --git a/Modelica/Mechanics/MultiBody/Frames/absoluteRotation.mo b/Modelica/Mechanics/MultiBody/Frames/absoluteRotation.mo
index c53d76b49c..e08bda7eab 100644
--- a/Modelica/Mechanics/MultiBody/Frames/absoluteRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/absoluteRotation.mo
@@ -24,8 +24,8 @@ from the relative orientation object R_rel that describes the orientation to rot
 
 
                      See also
                      
 
                      
-TransformationMatrices.absoluteRotation,
-Quaternions.absoluteRotation.
+TransformationMatrices.absoluteRotation,
+Quaternions.absoluteRotation.
 
                      
 "));
 end absoluteRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/angularVelocity1.mo b/Modelica/Mechanics/MultiBody/Frames/angularVelocity1.mo
index ed98042a1b..8a1935684a 100644
--- a/Modelica/Mechanics/MultiBody/Frames/angularVelocity1.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/angularVelocity1.mo
@@ -23,8 +23,8 @@ from the orientation object R12 that describes the orientation to rotate frame&n
 
 
                      See also
                      
 
                      
-TransformationMatrices.angularVelocity1,
-Quaternions.angularVelocity1.
+TransformationMatrices.angularVelocity1,
+Quaternions.angularVelocity1.
 
                      
 "));
 end angularVelocity1;
diff --git a/Modelica/Mechanics/MultiBody/Frames/angularVelocity2.mo b/Modelica/Mechanics/MultiBody/Frames/angularVelocity2.mo
index 47d60bb690..1fbd55997b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/angularVelocity2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/angularVelocity2.mo
@@ -23,8 +23,8 @@ from the orientation object R12 that describes the orientation to rotate frame&n
 
 
                      See also
                      
 
                      
-TransformationMatrices.angularVelocity2,
-Quaternions.angularVelocity2.
+TransformationMatrices.angularVelocity2,
+Quaternions.angularVelocity2.
 
                      
 "));
 end angularVelocity2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/axesRotations.mo b/Modelica/Mechanics/MultiBody/Frames/axesRotations.mo
index 8d1dac3c6e..2b13660ed4 100644
--- a/Modelica/Mechanics/MultiBody/Frames/axesRotations.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/axesRotations.mo
@@ -28,7 +28,7 @@ R = Frames.axesRotations(sequence, angles, der_angles);
 
                      Description
                      
 
                      
 This function returns
-orientation object R
+orientation object R
 that describes the orientation defined by three elementary rotations in
 a given sequence, each rotated by angles.
 The angular velocity vector R.w is calculated from the angle derivatives
@@ -37,7 +37,7 @@ The angular velocity vector R.w is calculated from the angle derivatives
 
 
                      See also
                      
 
                      
-TransformationMatrices.axesRotations.
+TransformationMatrices.axesRotations.
 
                      
 "));
 end axesRotations;
diff --git a/Modelica/Mechanics/MultiBody/Frames/axesRotationsAngles.mo b/Modelica/Mechanics/MultiBody/Frames/axesRotationsAngles.mo
index 2ef7c749be..be358dce5f 100644
--- a/Modelica/Mechanics/MultiBody/Frames/axesRotationsAngles.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/axesRotationsAngles.mo
@@ -154,7 +154,7 @@ sequence = {1,2,3}  // Cardan angle sequence
 
 
                      See also
                      
 
                      
-TransformationMatrices.axesRotationsAngles.
+TransformationMatrices.axesRotationsAngles.
 
                      
 "));
 end axesRotationsAngles;
diff --git a/Modelica/Mechanics/MultiBody/Frames/axisRotation.mo b/Modelica/Mechanics/MultiBody/Frames/axisRotation.mo
index 4aefdd9d3c..c2f778779f 100644
--- a/Modelica/Mechanics/MultiBody/Frames/axisRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/axisRotation.mo
@@ -23,7 +23,7 @@ R = Frames.axisRotation(axis, angle, der_angle);
 
                      Description
                      
 
                      
 The function call Frames.axisRotation(axis, angle, der_angle) returns
-orientation object R
+orientation object R
 that describes the orientation to rotate along unit axis axis
 from frame 1 into frame 2 with angle angle and derivative of angle der_angle.
 For example, Frames.axisRotation(2, phi, der_phi) returns the same orientation object as with the call
@@ -32,8 +32,8 @@ Frames.planarRotation({0,1,0}, phi, der_phi)
 
 
                      See also
                      
 
                      
-planarRotation,
-TransformationMatrices.axisRotation.
+planarRotation,
+TransformationMatrices.axisRotation.
 
                      
 "));
 end axisRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_Q.mo b/Modelica/Mechanics/MultiBody/Frames/from_Q.mo
index bc07ed12f8..d215a5d140 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_Q.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_Q.mo
@@ -25,15 +25,15 @@ R = Frames.from_Q(Q, w);
 
 
                      Description
                      
 
                      
-This function returns an orientation object R
-computed from a quaternion object Q
+This function returns an orientation object R
+computed from a quaternion object Q
 and an angular velocity vector w.
 
                      
 
 
                      See also
                      
 
                      
-to_Q.
-TransformationMatrices.from_Q.
+to_Q.
+TransformationMatrices.from_Q.
 
                      
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_T.mo b/Modelica/Mechanics/MultiBody/Frames/from_T.mo
index f66ee49739..8baf31118b 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_T.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_T.mo
@@ -17,19 +17,19 @@ R = Frames.from_T(T, w);
 
                      Description
                      
 
                      
 This function returns an
-orientation object R
+orientation object R
 assembled from a transformation matrix T and an angular velocity vector w.
 Generally, the transformation matrix T can be gained using a function from the
-TransformationMatrices
+TransformationMatrices
 package.
 
                      
 
 
                      See also
                      
 
                      
-to_T.
-from_T_inv,
-TransformationMatrices.from_T,
-Quaternions.from_T.
+to_T.
+from_T_inv,
+TransformationMatrices.from_T,
+Quaternions.from_T.
 
                      
 "));
 end from_T;
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_T2.mo b/Modelica/Mechanics/MultiBody/Frames/from_T2.mo
index b0fad0bb7c..ab06da3608 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_T2.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_T2.mo
@@ -26,7 +26,7 @@ is not possible or too difficult to compute, use function from_T2(…).
 
 
                      See also
                      
 
                      
-from_T.
+from_T.
 
                      
 "));
 end from_T2;
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_T_inv.mo b/Modelica/Mechanics/MultiBody/Frames/from_T_inv.mo
index c61ad9090b..0be43f04f0 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_T_inv.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_T_inv.mo
@@ -19,19 +19,19 @@ R = Frames.from_T_inv(T_inv, w);
 
                      Description
                      
 
                      
 This function returns an
-orientation object R
+orientation object R
 assembled from an inverse transformation matrix T_inv and a correspondent angular velocity vector w.
 Generally, the transformation matrix T_inv can be gained using a function from the
-TransformationMatrices
-package, e.g. using T_inv = inverseRotation(T).
+TransformationMatrices
+package, e.g. using T_inv = inverseRotation(T).
 Note that the velocity vector w has to be calculated accordingly.
 
                      
 
 
                      See also
                      
 
                      
-from_T,
-TransformationMatrices.from_T_inv,
-Quaternions.from_T_inv.
+from_T,
+TransformationMatrices.from_T_inv,
+Quaternions.from_T_inv.
 
                      
 "));
 end from_T_inv;
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_nxy.mo b/Modelica/Mechanics/MultiBody/Frames/from_nxy.mo
index 93abb6e690..8eb3b41869 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_nxy.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_nxy.mo
@@ -36,7 +36,7 @@ arbitrarily such that e_x and e_y are orthogonal to each other.
 
 
                      See also
                      
 
                      
-TransformationMatrices.from_nxy.
+TransformationMatrices.from_nxy.
 
                      
 "));
 end from_nxy;
diff --git a/Modelica/Mechanics/MultiBody/Frames/from_nxz.mo b/Modelica/Mechanics/MultiBody/Frames/from_nxz.mo
index 5f871a28e5..c334ce9889 100644
--- a/Modelica/Mechanics/MultiBody/Frames/from_nxz.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/from_nxz.mo
@@ -20,7 +20,7 @@ It is assumed that the two input vectors n_x and n_z are
 resolved in frame 1 and are directed along the x and z axis
 of frame 2 (i.e., n_x and n_z are orthogonal to each other).
 The function returns the
-orientation object R
+orientation object R
 to rotate from frame 1 to frame 2.
 
                      
 
                      
@@ -37,7 +37,7 @@ arbitrarily such that n_x and e_z are orthogonal to each other.
 
 
                      See also
                      
 
                      
-TransformationMatrices.from_nxz.
+TransformationMatrices.from_nxz.
 
                      
 "));
 end from_nxz;
diff --git a/Modelica/Mechanics/MultiBody/Frames/inverseRotation.mo b/Modelica/Mechanics/MultiBody/Frames/inverseRotation.mo
index c10ecdc4e6..16b1999b1d 100644
--- a/Modelica/Mechanics/MultiBody/Frames/inverseRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/inverseRotation.mo
@@ -21,8 +21,8 @@ from the orientation object R that describes the orientation to rotate from fram
 
 
                      See also
                      
 
                      
-TransformationMatrices.inverseRotation,
-Quaternions.inverseRotation.
+TransformationMatrices.inverseRotation,
+Quaternions.inverseRotation.
 
                      
 "));
 end inverseRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/nullRotation.mo b/Modelica/Mechanics/MultiBody/Frames/nullRotation.mo
index 8161d7e261..8402906c44 100644
--- a/Modelica/Mechanics/MultiBody/Frames/nullRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/nullRotation.mo
@@ -21,8 +21,8 @@ describing the orientation object to rotate frame 1 into frame 2, if f
 
 
                      See also
                      
 
                      
-TransformationMatrices.nullRotation,
-Quaternions.nullRotation.
+TransformationMatrices.nullRotation,
+Quaternions.nullRotation.
 
                      
 "));
 end nullRotation;
diff --git a/Modelica/Mechanics/MultiBody/Frames/orientationConstraint.mo b/Modelica/Mechanics/MultiBody/Frames/orientationConstraint.mo
index 520151bd85..b8cd485573 100644
--- a/Modelica/Mechanics/MultiBody/Frames/orientationConstraint.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/orientationConstraint.mo
@@ -22,8 +22,8 @@ with 6 elements that describes the constraints between the 9 elements
 
 
                      See also
                      
 
                      
-TransformationMatrices.orientationConstraint,
-Quaternions.orientationConstraint.
+TransformationMatrices.orientationConstraint,
+Quaternions.orientationConstraint.
 
                      
 "));
 end orientationConstraint;
diff --git a/Modelica/Mechanics/MultiBody/Frames/package.mo b/Modelica/Mechanics/MultiBody/Frames/package.mo
index ce88986d41..f135ff51d1 100644
--- a/Modelica/Mechanics/MultiBody/Frames/package.mo
+++ b/Modelica/Mechanics/MultiBody/Frames/package.mo
@@ -166,12 +166,12 @@ Real        L, angle;
       
    		Return unit vector e directed along axis i
       
   
    Quaternions
    Quaternions
       Package with functions to transform rotational frame quantities based
           on quaternions (also called Euler parameters).
       
   
    TransformationMatrices
    TransformationMatrices
       Package with functions to transform rotational frame quantities based
           on transformation matrices.
       
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
    
   
    ModelDescription
    JointUPS
    JointUPS
        Universal - prismatic - spherical joint aggregation
    
-     
+     
           		
   
    JointUSR
    JointUSR
        Universal - spherical - revolute joint aggregation
    
-     
+     
           		
   
    JointUSP
    JointUSP
        Universal - spherical - prismatic joint aggregation
    
-     
+     
           		
   
    JointSSR
    JointSSR
        Spherical - spherical - revolute joint aggregation
            with an optional mass point at the rod connecting
            the two spherical joints
    
-     
+     
           		
   
    JointSSP
    JointSSP
        Spherical - spherical - prismatic joint aggregation
            with an optional mass point at the rod connecting
            the two spherical joints
    
-     
+     
           		
   
    JointRRR
    JointRRR
        Revolute - revolute - revolute joint aggregation for planar loops
    
-     
+     
           		
   
    JointRRP
    JointRRP
        Revolute - revolute - prismatic joint aggregation for planar loops
    
-     
+     
           		
   
    
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo b/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo
index 834a085f4a..a88905f9a5 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Cylindrical.mo
@@ -109,7 +109,7 @@ vector \"n\" defining the cylinder axis
 
    
 
 
    
-
+
 
    
 "),
          Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Joints/FreeMotion.mo b/Modelica/Mechanics/MultiBody/Joints/FreeMotion.mo
index 7e00977c0e..ebcaa5431c 100644
--- a/Modelica/Mechanics/MultiBody/Joints/FreeMotion.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/FreeMotion.mo
@@ -274,7 +274,7 @@ frame_b of the joint.
 
    
 
 
    
-
+
 
    
 
 "),
diff --git a/Modelica/Mechanics/MultiBody/Joints/FreeMotionScalarInit.mo b/Modelica/Mechanics/MultiBody/Joints/FreeMotionScalarInit.mo
index e028a27667..4ccc24106f 100644
--- a/Modelica/Mechanics/MultiBody/Joints/FreeMotionScalarInit.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/FreeMotionScalarInit.mo
@@ -289,13 +289,13 @@ frame_b of the joint.
 
    
 
 
    
-
+
 
    
 
 
    
 A example to use this joint for the initialization of a planar double pendulum by providing
 its tip position, is shown in
-Examples.Elementary.DoublePendulumInitTip.
+Examples.Elementary.DoublePendulumInitTip.
 
    
 "),
          Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Joints/Internal/InitAngularVelocity.mo b/Modelica/Mechanics/MultiBody/Joints/Internal/InitAngularVelocity.mo
index 03a38d7217..f5894a7c93 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Internal/InitAngularVelocity.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Internal/InitAngularVelocity.mo
@@ -18,9 +18,9 @@ equation
          textString="w_rel_b")}), Documentation(info="
 
    
 Compute relative angular velocity w_rel_b of an
-orientation object R_b
+orientation object R_b
 relative to an
-orientation object R_a,
+orientation object R_a,
 resolved in orientation object R_b, i.e.
 
    
 
    diff --git a/Modelica/Mechanics/MultiBody/Joints/Internal/InitPosition.mo b/Modelica/Mechanics/MultiBody/Joints/Internal/InitPosition.mo
index e8e83d2515..16314c2398 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Internal/InitPosition.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Internal/InitPosition.mo
@@ -23,7 +23,7 @@ equation
 
    
 Compute relative position vector r_rel_a from a position vector r_a_0 to
 a position vector r_b_0, resolved in frame given by an
-orientation object R_a.
+orientation object R_a.
 
    
 "));
 end InitPosition;
diff --git a/Modelica/Mechanics/MultiBody/Joints/Planar.mo b/Modelica/Mechanics/MultiBody/Joints/Planar.mo
index e776584ba9..312c82df6e 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Planar.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Planar.mo
@@ -171,7 +171,7 @@ s_y.start = 0.5, phi.start = 45o).
 
    
 
 
    
-
+
 
    
 "),
          Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Joints/Prismatic.mo b/Modelica/Mechanics/MultiBody/Joints/Prismatic.mo
index 6e683d2096..c6af7ab229 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Prismatic.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Prismatic.mo
@@ -164,7 +164,7 @@ Optionally, two additional 1-dimensional mechanical flanges
 flange \"support\" represents the bearing) can be enabled via
 parameter useAxisFlange. The enabled axis flange can be
 driven with elements of the
-Modelica.Mechanics.Translational
+Modelica.Mechanics.Translational
 library.
 
 
    
@@ -189,7 +189,7 @@ vector \"n\" defining the translation axis
 
    
 
 
    
-
+
 
    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Joints/Revolute.mo b/Modelica/Mechanics/MultiBody/Joints/Revolute.mo
index 640f58178a..64632455b2 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Revolute.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Revolute.mo
@@ -221,7 +221,7 @@ Optionally, two additional 1-dimensional mechanical flanges
 flange \"support\" represents the bearing) can be enabled via
 parameter useAxisFlange. The enabled axis flange can be
 driven with elements of the
-Modelica.Mechanics.Rotational
+Modelica.Mechanics.Rotational
 library.
 
 
    
@@ -259,7 +259,7 @@ vector \"n\" defining the translation axis
 
    
 
 
    
-
+
 
    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo
index b223740b09..898e5f6d23 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Spherical.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Spherical.mo
@@ -232,7 +232,7 @@ frame_b of the joint.
 
    
 
 
    
-
+
 
    
 "),
     Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo
index 3279ee49c1..758ce98c67 100644
--- a/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/SphericalSpherical.mo
@@ -267,7 +267,7 @@ and the point mass in the middle of the rod by a light blue sphere:
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/Universal.mo b/Modelica/Mechanics/MultiBody/Joints/Universal.mo
index 1727e0fce8..06122e1e92 100644
--- a/Modelica/Mechanics/MultiBody/Joints/Universal.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/Universal.mo
@@ -109,7 +109,7 @@ phi_b.start = 45o).
 
    
 
 
    
-
+
 
    
 "),
     Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo
index 17bf8fe6cb..eb3d4d8c25 100644
--- a/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/UniversalSpherical.mo
@@ -318,7 +318,7 @@ part of the default animation):
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Joints/package.mo b/Modelica/Mechanics/MultiBody/Joints/package.mo
index 9042d9095a..782a9dcea2 100644
--- a/Modelica/Mechanics/MultiBody/Joints/package.mo
+++ b/Modelica/Mechanics/MultiBody/Joints/package.mo
@@ -15,64 +15,64 @@ solved, i.e., robustly and efficiently).
 
    Content
    
 
-  
+  
-  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
diff --git a/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo b/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo
index ded4b43496..3087412b88 100644
--- a/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/BevelGear1D.mo
@@ -197,7 +197,7 @@ correct support torque, as the axes of rotation of flange_a and
 are different in general.
    Note: The name BevelGear1D is kept only for simplicity. Regardless,
 this component could be used to model any kind of gearbox with non-parallel axes.
-For a usage example, see Examples.Rotational3DEffects.BevelGear1D.
    
+For a usage example, see Examples.Rotational3DEffects.BevelGear1D.
    Reference
    
 Schweiger, Christian ;
diff --git a/Modelica/Mechanics/MultiBody/Parts/Body.mo b/Modelica/Mechanics/MultiBody/Parts/Body.mo
index b18e6ff678..3b8b7ef168 100644
--- a/Modelica/Mechanics/MultiBody/Parts/Body.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/Body.mo
@@ -296,7 +296,7 @@ center of mass, the cylinder is not displayed. Note, that
 the animation may be switched off via parameter animation = false.
 
    
-\"Parts.Body\"
+\"Parts.Body\"
 
    
diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyBox.mo b/Modelica/Mechanics/MultiBody/Parts/BodyBox.mo
index 1d57175827..d883ac483e 100644
--- a/Modelica/Mechanics/MultiBody/Parts/BodyBox.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/BodyBox.mo
@@ -187,13 +187,13 @@ the animation may be switched off via parameter animation = false
 
 
    
-\"Parts.BodyBox\"
+\"Parts.BodyBox\"
 
    
 A BodyBox component has potential states. For details of these
 states and of the \"Advanced\" menu parameters, see model
-MultiBody.Parts.Body.
    
+MultiBody.Parts.Body.
    
 "),
          Icon(coordinateSystem(
         preserveAspectRatio=true,
diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo b/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo
index 3289482161..684e57fdc6 100644
--- a/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/BodyCylinder.mo
@@ -186,13 +186,13 @@ the animation may be switched off via parameter animation = false
 
 
    
-\"Parts.BodyCylinder\"
+\"Parts.BodyCylinder\"
 
    
 
 
    
 A BodyCylinder component has potential states. For details of these
 states and of the \"Advanced\" menu parameters, see model
-MultiBody.Parts.Body.
    "),
+MultiBody.Parts.Body.
    "),
       Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}), graphics={
diff --git a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo
index 9fc242a377..ffce446ebd 100644
--- a/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/BodyShape.mo
@@ -242,7 +242,7 @@ Note, that
 the animation may be switched off via parameter animation = false.
 
    
 
    
-\"Parts.BodyShape\"
+\"Parts.BodyShape\"
 
    
 
 
    
@@ -251,13 +251,13 @@ e.g., shapeType=\"cone\":
 
    
 
 
    
-\"Visualizers.FixedShape\"
+\"Visualizers.FixedShape\"
 
    
 
 
    
 A BodyShape component has potential states. For details of these
 states and of the \"Advanced\" menu parameters, see model
-MultiBody.Parts.Body.
+MultiBody.Parts.Body.
 
    
 "),
     Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/MultiBody/Parts/Fixed.mo b/Modelica/Mechanics/MultiBody/Parts/Fixed.mo
index 4c2b942f4e..543da34eba 100644
--- a/Modelica/Mechanics/MultiBody/Parts/Fixed.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/Fixed.mo
@@ -122,7 +122,7 @@ component animation and that the animation may be switched off via parameter
 animation = false.
 
    
 
    
-\"Parts.Fixed\"
+\"Parts.Fixed\"
 
    
 
 "));
diff --git a/Modelica/Mechanics/MultiBody/Parts/FixedRotation.mo b/Modelica/Mechanics/MultiBody/Parts/FixedRotation.mo
index 1d9971b303..17e2bd438f 100644
--- a/Modelica/Mechanics/MultiBody/Parts/FixedRotation.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/FixedRotation.mo
@@ -205,7 +205,7 @@ the animation may be switched off via parameter animation = false
 
 
    
-\"Parts.FixedRotation\"
+\"Parts.FixedRotation\"
 
    
 ",
         revisions="
    Release Notes:
    
diff --git a/Modelica/Mechanics/MultiBody/Parts/FixedTranslation.mo b/Modelica/Mechanics/MultiBody/Parts/FixedTranslation.mo
index 3055d86ae3..0d4154e1d9 100644
--- a/Modelica/Mechanics/MultiBody/Parts/FixedTranslation.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/FixedTranslation.mo
@@ -131,7 +131,7 @@ the animation may be switched off via parameter animation = false
 
 
    
-\"Parts.FixedTranslation\"
+\"Parts.FixedTranslation\"
 
    
 "));
 end FixedTranslation;
diff --git a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo
index 68eb8c2a09..19f3c4270e 100644
--- a/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/RollingWheel.mo
@@ -128,7 +128,7 @@ slip between the wheel and the ground.
 The wheel can not take off but it can incline toward the ground.
 The frame frame_a is placed in the wheel center point and rotates
 with the wheel itself. Therefore, a
-rotational joint
+rotational joint
 with rotation axis n={0,1,0} should be used to
 connect the wheel to a carrier.
 
    
diff --git a/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo b/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo
index 7fee209ed9..b66e37625a 100644
--- a/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/Rotor1D.mo
@@ -197,11 +197,11 @@ of frame_a. The default animation of this component is
 shown in the figure below.
    
 
 
    
-      \"model
+      \"model
 
    
 
 
    This component is a replacement for
-Modelica.Mechanics.Rotational.Components.Inertia
+Modelica.Mechanics.Rotational.Components.Inertia
 for the case, that a 1-dim.-rotational mechanical system should be attached with a 3-dim.
 carrier body.
    
 
    The Boolean parameter exact was introduced due to performance
@@ -316,10 +316,10 @@ the parameter n, which has to be given in the local coordinate syst
 of frame_a. The default animation of this component is
 shown in the figure below.
    
 
    
-      \"model
+      \"model
 
    
 
    This component is a replacement for
-Modelica.Mechanics.Rotational.Components.Inertia
+Modelica.Mechanics.Rotational.Components.Inertia
 for the case, that a 1-dim.-rotational mechanical system should be attached with a 3-dim.
 carrier body.
    
 
    The Boolean parameter exact was introduced due to performance
diff --git a/Modelica/Mechanics/MultiBody/Parts/package.mo b/Modelica/Mechanics/MultiBody/Parts/package.mo
index b093e51421..63774b6e53 100644
--- a/Modelica/Mechanics/MultiBody/Parts/package.mo
+++ b/Modelica/Mechanics/MultiBody/Parts/package.mo
@@ -12,69 +12,69 @@ a \"Body\" and of several \"FixedTranslation\" components.
 
    Content
    
 
    
   
    ModelDescription
    Prismatic
    Prismatic
       Prismatic joint and actuated prismatic joint
           (1 translational degree-of-freedom, 2 potential states)
    
-      
+      
           		
   
    Revolute
+  
    Revolute
  
       Revolute and actuated revolute joint
           (1 rotational degree-of-freedom, 2 potential states)
    
-      
+      
           		
   
    Cylindrical
    Cylindrical
       Cylindrical joint (2 degrees-of-freedom, 4 potential states)
    
-      
+      
           		
   
    Universal
    Universal
       Universal joint (2 degrees-of-freedom, 4 potential states)
    
-      
+      
           		
   
    Planar
    Planar
       Planar joint (3 degrees-of-freedom, 6 potential states)
    
-      
+      
           		
   
    Spherical
    Spherical
       Spherical joint (3 constraints and no potential states, or 3 degrees-of-freedom and 3 states)
    
-      
+      
           		
   
    FreeMotion
    FreeMotion
       Free motion joint (6 degrees-of-freedom, 12 potential states)
    
-      
+      
           		
   
    SphericalSpherical
    SphericalSpherical
       Spherical - spherical joint aggregation (1 constraint,
           no potential states) with an optional point mass in the middle
    
-      
+      
           		
   
    UniversalSpherical
    UniversalSpherical
       Universal - spherical joint aggregation (1 constraint, no potential states)
    
-      
+      
           		
   
    GearConstraint
    GearConstraint
       Ideal 3-dim. gearbox (arbitrary shaft directions)
       
   
    MultiBody.Joints.Assemblies
    MultiBody.Joints.Assemblies
       Package of joint aggregations for analytic loop handling.
       
   
    MultiBody.Joints.Constraints
    MultiBody.Joints.Constraints
       Package of components that define joints by constraints
       
   
    
 
 
 
 
 
 
 
 
    
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
@@ -84,11 +84,11 @@ Components Fixed, FixedTranslation, Fi
 and BodyShape are visualized according to parameter
 shapeType, that may have the following values (e.g., shapeType = \"box\"):
     
    
 
    
-
    \"model
    
+
    \"model
    
 
    
 All the details of the visualization shape parameters are
 given in
-Visualizers.FixedShape
+Visualizers.FixedShape
 
    
 
    
 Colors in all animation parts are defined via parameter color.
diff --git a/Modelica/Mechanics/MultiBody/Sensors/AbsoluteSensor.mo b/Modelica/Mechanics/MultiBody/Sensors/AbsoluteSensor.mo
index 9fd46bce55..2639b7952d 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/AbsoluteSensor.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/AbsoluteSensor.mo
@@ -370,7 +370,7 @@ frame_a and the yellow arrow is the animated sensor.
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Sensors/CutForce.mo b/Modelica/Mechanics/MultiBody/Sensors/CutForce.mo
index d71714fc31..2a0d9a5010 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/CutForce.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/CutForce.mo
@@ -106,7 +106,7 @@ with negative sign at frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end CutForce;
diff --git a/Modelica/Mechanics/MultiBody/Sensors/CutForceAndTorque.mo b/Modelica/Mechanics/MultiBody/Sensors/CutForceAndTorque.mo
index cfab6b026a..054660e698 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/CutForceAndTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/CutForceAndTorque.mo
@@ -151,7 +151,7 @@ with negative sign at frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end CutForceAndTorque;
diff --git a/Modelica/Mechanics/MultiBody/Sensors/CutTorque.mo b/Modelica/Mechanics/MultiBody/Sensors/CutTorque.mo
index b4f204e62d..f566c3b842 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/CutTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/CutTorque.mo
@@ -105,7 +105,7 @@ with negative sign at frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end CutTorque;
diff --git a/Modelica/Mechanics/MultiBody/Sensors/Distance.mo b/Modelica/Mechanics/MultiBody/Sensors/Distance.mo
index c45f860dfb..d880d36b5d 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/Distance.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/Distance.mo
@@ -66,7 +66,7 @@ output signal connector distance. This
 distance is always positive. Derivatives of this
 signal can be easily obtained by connecting the
 block
-Modelica.Blocks.Continuous.Der
+Modelica.Blocks.Continuous.Der
 to \"distance\" (this block performs analytic differentiation
 of the input signal using the der(…) operator).
 
    
@@ -78,7 +78,7 @@ the yellow arrow is the animated sensor.
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutForce.mo b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutForce.mo
index 1b31d73f9a..b981ebfbf2 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutForce.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutForce.mo
@@ -75,7 +75,7 @@ with negative sign at frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end BasicCutForce;
diff --git a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutTorque.mo b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutTorque.mo
index d44fcfe031..d8160c14f2 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutTorque.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicCutTorque.mo
@@ -78,7 +78,7 @@ with negative sign at frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end BasicCutTorque;
diff --git a/Modelica/Mechanics/MultiBody/Sensors/RelativeSensor.mo b/Modelica/Mechanics/MultiBody/Sensors/RelativeSensor.mo
index a01b400945..fe40e466ef 100644
--- a/Modelica/Mechanics/MultiBody/Sensors/RelativeSensor.mo
+++ b/Modelica/Mechanics/MultiBody/Sensors/RelativeSensor.mo
@@ -386,7 +386,7 @@ the yellow arrow is the animated sensor.
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Types/Axis.mo b/Modelica/Mechanics/MultiBody/Types/Axis.mo
index 7d406cb8a1..219de6d73a 100644
--- a/Modelica/Mechanics/MultiBody/Types/Axis.mo
+++ b/Modelica/Mechanics/MultiBody/Types/Axis.mo
@@ -15,6 +15,6 @@ type Axis = Modelica.Icons.TypeReal[3](each final unit="1")
 Type definition of an axis vector with scroll down menu that provides
 the most often used axes vectors along the coordinate axes of a frame.
 For an example see parameter \"n\" in model
-Joints.Revolute.
+Joints.Revolute.
 
    
 "));
diff --git a/Modelica/Mechanics/MultiBody/Types/ShapeType.mo b/Modelica/Mechanics/MultiBody/Types/ShapeType.mo
index c213269a0f..63660eb1a8 100644
--- a/Modelica/Mechanics/MultiBody/Types/ShapeType.mo
+++ b/Modelica/Mechanics/MultiBody/Types/ShapeType.mo
@@ -11,7 +11,7 @@ type ShapeType = Modelica.Icons.TypeString
     choice="beam" "\"beam\"",
     choice="gearwheel" "\"gearwheel\"",
     choice="spring" "\"spring\"",
-    choice="modelica://PackageName/PathName.dxf"),
+    choice="modelica:/PackageName/PathName.dxf"),
   Documentation(info="
 
    
 Type ShapeType is used to define the shape of the
@@ -21,7 +21,7 @@ values for shapeType are possible, e.g., shapeType=\"box\":
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
@@ -46,7 +46,7 @@ Additionally, external shapes can be specified as (not all options might be supp
 
  •  \"modelica://<Modelica-name>/<relative-path-file-name>\"
    
      characterizes the file that is stored under the location of the
      <Modelica-name> library path with the given relative file name.
-     Example:
     shapeType = \"modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    • 
+     Example:
     shapeType = \"modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    
 
 
  •  \"file:///<absolute-file-name>\"
    
      characterizes an absolute file name in the file system. Example:
    
diff --git a/Modelica/Mechanics/MultiBody/Types/SpecularCoefficient.mo b/Modelica/Mechanics/MultiBody/Types/SpecularCoefficient.mo
index 99de04a5cb..8131bf08e3 100644
--- a/Modelica/Mechanics/MultiBody/Types/SpecularCoefficient.mo
+++ b/Modelica/Mechanics/MultiBody/Types/SpecularCoefficient.mo
@@ -17,6 +17,6 @@ are shown for a cylinder:
 
    
 
 
    
-
+
 
    
 "));
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/ConnectionOfLineForces.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/ConnectionOfLineForces.mo
index 44926f5f65..ae5f9fc882 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/ConnectionOfLineForces.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/ConnectionOfLineForces.mo
@@ -4,7 +4,7 @@ class ConnectionOfLineForces "Connection of LineForces"
   annotation (Documentation(info="
 
    
 Line force elements, such as a
-Spring,
+Spring,
 are usually connected between two parts. In fact, this is the only possibility
 in most multi-body programs. In an equation based system like Modelica, more
 general connections are possible. In particular
@@ -13,11 +13,11 @@ in series without having a body with mass at the
 connection point. This is advantageous since stiff systems can be avoided, say, due to
 a stiff spring and a small mass at the connection point.
 For an example, see model
-ThreeSprings:
+ThreeSprings:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -43,7 +43,7 @@ This is shown in the next figure, where this option is selected for spring3.fram
 
    
 
 
    
-
+
 
    
 
 
    
@@ -65,7 +65,7 @@ A typical example is shown in the next figure:
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/FirstExample.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/FirstExample.mo
index bd1bd77002..417b61f354 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/FirstExample.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/FirstExample.mo
@@ -14,7 +14,7 @@ Modelica composition diagram, resulting in:
 
    
 
 
    
-\"Modelica
 
    
 
@@ -25,7 +25,7 @@ and connect them according to the figure:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -62,9 +62,9 @@ is shown in the parameter menus of the revolute joint and the body:
 
    
 
 
    
-
+
 
    
-
+
 
    
 
 
    
@@ -81,7 +81,7 @@ With default settings, the following animation is defined:
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/AnalyticLoopHandling.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/AnalyticLoopHandling.mo
index 9d3bee9c72..389e10759c 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/AnalyticLoopHandling.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/AnalyticLoopHandling.mo
@@ -23,7 +23,7 @@ In a series of papers and dissertations
 Prof. Hiller and his group in Duisburg, Germany,
 have developed systematic methods to handle mechanical
 loops analytically, see also
-MultiBody.UsersGuide.Literature.
+MultiBody.UsersGuide.Literature.
 The \"characteristic pair of joints\" method
 basically cuts a loop at two joints and uses geometric
 invariants to reduce the number of algebraic
@@ -41,7 +41,7 @@ method is usually manually applied which requires know-how and experience.
 In the MultiBody library, the \"characteristic pair of
 joints\" method is supported in a restricted form such that it can be applied
 also by non-specialists. The idea is to provide aggregations of joints in package
-
+
 MultiBody.Joints.Assemblies
 as one object that either have 6 degrees of freedom or
 3 degrees of freedom (for usage in planar loops).
@@ -52,7 +52,7 @@ the figure below.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -61,12 +61,12 @@ joints and one prismatic joint.
 In the figure below, the five revolute joints
 and the prismatic joint are collected together in an assembly object
 called \"jointSSP\" from
-
+
 MultiBody.Joints.Assemblies.JointSSP.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -180,7 +180,7 @@ MacPherson suspension in the next figure has three frame connectors.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -219,11 +219,11 @@ of one cylinder with elementary joints.
 
    
 
 
    
-
+
 
    
 
 
    
-
+
 
    
 
 
    
@@ -233,14 +233,14 @@ revolute and one prismatic joint, as can be seen in next figure.
 
    
 
 
    
-
+
 
    
 
 
    
 Since 6
 cylinders are connected together, 6 coupled loops with 6 JointRRP objects are
 present. This model is available as
-
+
 MultiBody.Examples.Loops.EngineV6_analytic.
 
    
 
    
@@ -249,7 +249,7 @@ shown in the next figure
 
    
 
 
    
-
+
 
    
 
    
 It can be seen that the revolute joint
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/Introduction.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/Introduction.mo
index a7b49206ad..1fb402b257 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/Introduction.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/Introduction.mo
@@ -7,12 +7,12 @@ class Introduction "Introduction"
 In principal, no special action is needed, if
 loop structures occur (contrary to the ModelicaAdditions.MultiBody library).
 An example is presented in the figure below. It is available as
-
+
 MultiBody.Examples.Loops.Fourbar1
 
    
 
 
    
-
+
 
    
 
 
    
@@ -25,7 +25,7 @@ red box on the lower right side.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -62,7 +62,7 @@ In many mechanisms it is possible to solve the non-linear algebraic
 equations analytically. For a certain class of systems this can
 be performed also with the MultiBody library. This technique
 is described in section
-\"Analytic loop handling\".
+\"Analytic loop handling\".
 
    
 "));
 end Introduction;
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/PlanarLoops.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/PlanarLoops.mo
index 894f9d180f..3bdc8bae7e 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/PlanarLoops.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/PlanarLoops.mo
@@ -6,12 +6,12 @@ class PlanarLoops "Planar loops"
 
    
 In the figure below, the model of a V6 engine is
 shown that has a simple combustion model. It is available as
-
+
 MultiBody.Examples.Loops.EngineV6.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -22,7 +22,7 @@ above.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -35,7 +35,7 @@ loops that have together 1 degree of freedom.
 
    
 
 
    
-
+
 
    
 
 
    
@@ -56,7 +56,7 @@ on pure structural information cannot distinguish these two cases.
 The usual remedy is to remove superfluous constraints,
 e.g., along the axis of rotation of one revolute joint. Since this is
 not easy for an inexperienced modeler, the special joint:
-
+
 RevolutePlanarLoopConstraint is provided that removes these constraints.
 Exactly one revolute joint in a every planar loop must be replaced by this
 joint type. In the engine example, this special joint is used for
@@ -88,7 +88,7 @@ Both cases are discussed in the error message.
 Note, that the non-linear algebraic equations occurring
 in planar loops can be solved analytically in most cases and therefore it is
 highly recommended to use the techniques discussed in section
-\"Analytic loop handling\"
+\"Analytic loop handling\"
 for such systems.
 
    
 "));
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/package.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/package.mo
index a0040a2154..82545a41e5 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/package.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/LoopStructures/package.mo
@@ -14,11 +14,11 @@ occurring non-linear algebraic equation systems are solved
 analytically. There are the following sub-chapters:
 
    
 
      
-
    1. Introduction
+
    2. Introduction
 
      3. 
-
    3. Planar loops.
+
    4. Planar loops.
 
      5. 
-
    5. Analytic loop handling.
+
    6. Analytic loop handling.
 
      7. 
 
    
 "));
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/OverView.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/OverView.mo
index 129ffb56cd..c14cab26b5 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/OverView.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/OverView.mo
@@ -14,9 +14,9 @@ with its schematic.
 
    
 
 
    
-
+
 
-\"double
+\"double
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/package.mo b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/package.mo
index 85f12cce0b..a0bada3604 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/package.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/Tutorial/package.mo
@@ -8,17 +8,17 @@ This tutorial provides an introduction into the
 MultiBody library.
 
    
 
      
-
    1. Overview of
+
    2. Overview of
 MultiBody library summarizes the most important aspects.
 
      3. 
-
    3. A first example
+
    4. A first example
   describes in detail all the steps to build a simple pendulum model.
 
      5. 
-
    5. Loop structures
+
    6. Loop structures
   explains how to model kinematic loops, especially by analytically
   solving non-linear equations.
 
      7. 
-
    7. ConnectionOfLineForces
+
    8. ConnectionOfLineForces
   explains how to connect line force components directly together.
 
      9. 
 
    
diff --git a/Modelica/Mechanics/MultiBody/UsersGuide/package.mo b/Modelica/Mechanics/MultiBody/UsersGuide/package.mo
index 7fb4356bec..549fa9859c 100644
--- a/Modelica/Mechanics/MultiBody/UsersGuide/package.mo
+++ b/Modelica/Mechanics/MultiBody/UsersGuide/package.mo
@@ -10,13 +10,13 @@ Library MultiBody is a free Modelica package p
 This package contains the User's Guide for the MultiBody library.
 
    
 
      
-
    1.  Tutorial
+
    2.  Tutorial
 gives an introduction into the most important aspects of the library.
 
      3. 
-
    3.  Literature provides
+
    4.  Literature provides
   references that have been used to design and implement this library.
 
      5. 
-
    5.  Contact provides
+
    6.  Contact provides
   information about the author of the library as well as acknowledgments.
 
      7. 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Arrow.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Arrow.mo
index d835a3d035..8cd982ff6e 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Arrow.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Arrow.mo
@@ -39,11 +39,11 @@ protected
 Model Arrow defines an arrow that is dynamically
 visualized at the defined location (see variables below).
 If you want an arrow representing something that is not a relative position, use
-Vector instead.
+Vector instead.
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
@@ -65,7 +65,7 @@ Variable color is an Integer vector with 3 elements,
 {r, g, b} are the "red", "green" and "blue" color parts.
 Note, r, g and b are given in the range 0 … 255.
 The predefined type
-MultiBody.Types.Color
+MultiBody.Types.Color
 contains a menu definition of the colors used in the MultiBody
 library together with a color editor.
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/DoubleArrow.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/DoubleArrow.mo
index 74129b664b..c4ba4173c2 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/DoubleArrow.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/DoubleArrow.mo
@@ -61,12 +61,12 @@ protected
 Model DoubleArrow defines a double arrow that is dynamically
 visualized at the defined location (see variables below).
 Nonetheless, visualizing physical vectors by means of
-Vector
+Vector
 can be better option in many cases.
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
@@ -88,7 +88,7 @@ Variable color is an Integer vector with 3 elements,
 {r, g, b} are the "red", "green" and "blue" color parts.
 Note, r, g and b are given in the range 0 … 255.
 The predefined type
-MultiBody.Types.Color
+MultiBody.Types.Color
 contains a menu definition of the colors used in the MultiBody
 library together with a color editor.
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo
index 0f4c79dfe8..5ee4613488 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/PipeWithScalarField.mo
@@ -107,11 +107,11 @@ at the perimeter associated with the corresponding axis location.
 Typically the scalar field value is a temperature, but might
 be also another quantity.
 Predefined color maps are available from
-MultiBody.Visualizers.Colors.ColorMaps
+MultiBody.Visualizers.Colors.ColorMaps
 and can be selected via parameter \"colorMap\".
 A color map with the corresponding scalar field values can be exported
 as vector-graphics in svg-format with function
-MultiBody.Visualizers.Colors.colorMapToSvg.
+MultiBody.Visualizers.Colors.colorMapToSvg.
 The position and orientation of the center of the
 circle at the left end of the pipe is defined via parameters
 \"r_0\" and \"R\", respectively. The pipe axis is oriented along
@@ -120,12 +120,12 @@ see figure below:
 
    
 
 
    
-
+
 
    
 
 
    
 The color coding is shown in the next figure. It was generated with
-MultiBody.Visualizers.Colors.colorMapToSvg
+MultiBody.Visualizers.Colors.colorMapToSvg
 using the following call:
 
    
 
@@ -135,7 +135,7 @@ colorMapToSvg(Modelica.Mechanics.MultiBody.Visualizers.Colors.ColorMaps.jet(),
 
 
 
    
-
+
 
    
 "));
 end PipeWithScalarField;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Shape.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Shape.mo
index ef29a9a31f..dad760b8b9 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Shape.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Shape.mo
@@ -48,7 +48,7 @@ parameter shapeType (e.g., shapeType=\"box\"):
     
 
    
 
 
    
-\"model
+\"model
 
    
 
 
     
    
@@ -73,7 +73,7 @@ Additionally, external shapes can be specified as (not all opti
 
  •  \"modelica://<Modelica-name>/<relative-path-file-name>\"
    
      characterizes the file that is stored under the location of the
      <Modelica-name> library path with the given relative file name.
-     Example:
     shapeType = \"modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    • 
+     Example:
     shapeType = \"modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    
 
 
  •  \"file:///<absolute-file-name>\"
    
      characterizes an absolute file name in the file system. Example:
    
@@ -140,7 +140,7 @@ Parameter color is a vector with 3 elements,
 {r, g, b} are the \"red\", \"green\" and \"blue\" color parts.
 Note, r, g, b are given as Integer[3] in the ranges 0 … 255,
 respectively. The predefined type
-MultiBody.Types.Color contains a menu
+MultiBody.Types.Color contains a menu
 definition of the colors used in the MultiBody library together with a color editor.
 
    
 
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Surface.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Surface.mo
index 4fc065e03d..fcff15b702 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Surface.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Surface.mo
@@ -33,7 +33,7 @@ that is used for animation. This object is specified by:
 The parameter values (u,v) are given by the ordinal numbers of the
 corresponding control point in u- or in v-direction, respectively.
 The surface is then defined by the replaceable function \"surfaceCharacteristic\" with the
-interface partialSurfaceCharacteristic
+interface partialSurfaceCharacteristic
 that returns the x-, y-, z- coordinate of every control point in form of 3 arrays X, Y, Z, and an optional color array C, if every control point shall have a different color:
 
    
 
@@ -46,16 +46,16 @@ An example of a parameterized surface with color coding is shown in the next fig
 
    
 
 
    
-
+
 
    
 
 
    
-Models Torus,
-VoluminousWheel,
-PipeWithScalarField,
+Models Torus,
+VoluminousWheel,
+PipeWithScalarField,
 demonstrate how new visualizer objects can be constructed with the Surface model.
    
 The direct usage of the Surface model, as well as of the Torus and the VoluminousWheel models, are demonstrated with example
-Examples.Elementary.Surfaces.
+Examples.Elementary.Surfaces.
 
    
 "));
 end Surface;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/package.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/package.mo
index 5e20b49f9e..c358004bb1 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/package.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/package.mo
@@ -6,7 +6,7 @@ package SurfaceCharacteristics "Functions returning surface descriptions"
 
    
 This package contains functions that are used to define
 parameterized surfaces for use with the
-Surface
+Surface
 model.
 
    
 "));
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/pipeWithScalarField.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/pipeWithScalarField.mo
index 9229e0d093..ea660a6839 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/pipeWithScalarField.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/pipeWithScalarField.mo
@@ -47,28 +47,28 @@ algorithm
 
    
 Function pipeWithScalarField computes the X, Y, Z and C arrays in order to
 visualize a pipe and a scalar field along the pipe axis with model
-PipeWithScalarField.
+PipeWithScalarField.
 The latter is shown by mapping scalar
 field to color values with a color map and utilizing this color
 at the perimeter associated with the corresponding axis location.
 Typically the scalar field value is a temperature, but might
 be also another quantity.
 Predefined color maps are available from
-MultiBody.Visualizers.Colors.ColorMaps
+MultiBody.Visualizers.Colors.ColorMaps
 and can be selected via input argument \"colorMap\".
 A color map with the corresponding scalar field values can be exported
 as vector-graphics in svg-format with function
-MultiBody.Visualizers.Colors.colorMapToSvg.
+MultiBody.Visualizers.Colors.colorMapToSvg.
 An example is shown in the next figure:
 
    
 
 
    
-
+
 
    
 
 
    
 The color coding is shown in the next figure. It was generated with
-Mechanics.MultiBody.Visualizers.Colors.colorMapToSvg
+Mechanics.MultiBody.Visualizers.Colors.colorMapToSvg
 using the following call:
 
    
 
@@ -78,7 +78,7 @@ colorMapToSvg(Modelica.Mechanics.MultiBody.Visualizers.Colors.ColorMaps.jet(),
 
 
 
    
-
+
 
    
 "));
 end pipeWithScalarField;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/rectangle.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/rectangle.mo
index afb2317b5f..abfe8fd5f2 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/rectangle.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/rectangle.mo
@@ -13,7 +13,7 @@ algorithm
   annotation (Documentation(info="
 
    
 Function rectangle computes the X, Y and Z arrays to visualize a rectangle
-with model Rectangle.
+with model Rectangle.
 The image below shows two rectangles of
 
    
 
    @@ -24,7 +24,7 @@ lv = 2.
 
    
 
 
    
-
+
 
    
 "));
 end rectangle;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/torus.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/torus.mo
index 443a3c1ea1..55231540f5 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/torus.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/SurfaceCharacteristics/torus.mo
@@ -31,7 +31,7 @@ algorithm
   annotation (Documentation(info="
 
    
 Function torus computes the X, Y and Z arrays to visualize a torus
-with model Torus.
+with model Torus.
 The left image below shows a torus with R = 0.5 m and
 r = 0.2 m.
 The right images below shows the torus with the additional parameter
@@ -44,7 +44,7 @@ stopAngle  =  135 degree
 
 
 
    
-
+
 
    
 "));
 end torus;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Vector.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Vector.mo
index 3d34488f6f..a9808ef590 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Vector.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/Vector.mo
@@ -13,7 +13,7 @@ location (see variables below). Thus, the arrow length does not represent
 a physical length (except, of course, for quantity = RelativePosition),
 but a different 3-dimensional quantity
 (such as force, torque, speed, …), defined by
-MultiBody.Types.VectorQuantity.
+MultiBody.Types.VectorQuantity.
 
 That allows the vectors of similar quantities to be scaled appropriately during post-processing.
 This is useful even for RelativePosition, and in that case to disable or
@@ -38,7 +38,7 @@ Variable color is an Integer vector with 3 elements,
 {r, g, b} are the "red", "green" and "blue" color parts.
 Note, r, g and b are given in the range 0 … 255.
 The predefined type
-MultiBody.Types.Color
+MultiBody.Types.Color
 contains a menu definition of the colors used in the MultiBody
 library together with a color editor.
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/package.mo b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/package.mo
index c9c88daf5d..2ea3d572fb 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Advanced/package.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Advanced/package.mo
@@ -17,37 +17,37 @@ since they all have frame connectors).
 
    
 
    Content
    
 
    • 
   
    ModelDescription
    Fixed
    Fixed
       Frame fixed in world frame at a given position.
           It is visualized with a shape, see shapeType below
          (the frames on the two
           sides do not belong to the component):
     
    
-      \"model
+      \"model
           		
   
    FixedTranslation
    FixedTranslation
       Fixed translation of frame_b with respect to frame_a.
           It is visualized with a shape, see shapeType below
           (the frames on the two sides do not belong to the component):
     
    
-      \"model
+      \"model
           		
   
    FixedRotation
    FixedRotation
       Fixed translation and fixed rotation of frame_b with respect to frame_a
           It is visualized with a shape, see shapeType  below
           (the frames on the two sides do not belong to the component):
     
    
-      \"model
+      \"model
           		
   
    Body
    Body
       Rigid body with mass, inertia tensor and one frame connector.
           It is visualized with a cylinder and a sphere at the
           center of mass:
     
    
-      \"model
+      \"model
           		
   
    BodyShape
    BodyShape
       Rigid body with mass, inertia tensor, different shapes
           (see shapeType below)
           for animation, and two frame connectors:
     
    
-      \"model
+      \"model
           		
   
    Fixed BodyBox
    Fixed BodyBox
       Rigid body with box shape (mass and animation properties are computed
           from box data and from density):
     
    
-      \"model
+      \"model
           		
   
    BodyCylinder
    BodyCylinder
       Rigid body with cylinder shape (mass and animation properties
           are computed from cylinder data and from density):
     
    
-      \"model
+      \"model
           		
   
    PointMass
    PointMass
       Rigid body where inertia tensor and rotation is neglected:
     
    
-      \"model
+      \"model
           		
   
    Mounting1D
    Mounting1D
        Propagate 1-dim. support torque to 3-dim. system
       
   
    Rotor1D
    Rotor1D
       1D inertia attachable on 3-dim. bodies (without neglecting dynamic effects)
    
-      \"model
+      \"model
           		
   
    BevelGear1D
    BevelGear1D
       1D gearbox with arbitrary shaft directions (3D bearing frame)
       
   
    
-  
+  
-  
+  
-  
+  
-  
+  
 
-  
+  
 
-  
+  
    Arrow
    Arrow
       Visualizing an arrow where all parts of the arrow can vary dynamically:
    
-      \"model
+      \"model
           		
   
    DoubleArrow
    DoubleArrow
       Visualizing a double arrow where all parts of the arrow can vary dynamically:
    
-      \"model
+      \"model
           		
   
    Vector
    Vector
       Visualizing a vector quantity. The following vector quantity types are supported:
    
       force, torque, velocity, acceleration, angular velocity, angular acceleration and relative position
           		
   
    Shape
    Shape
       Visualizing an elementary object with variable size.
       The following shape types are supported:
     
    
-      \"model
+      \"model
           		
   
    Surface
    Surface
       Visualizing a moveable parameterized surface:
    
-      
+      
           		
   
    PipeWithScalarField
    PipeWithScalarField
       Visualizing a pipe with a scalar field represented by a color coding:
    
-      
+      
           		
   
    
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/autumn.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/autumn.mo
index 3b565e1e2f..18c87082cf 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/autumn.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/autumn.mo
@@ -25,12 +25,12 @@ Image of the \"autumn\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end autumn;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/gray.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/gray.mo
index 4e1edc86d8..c68d7c1f2c 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/gray.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/gray.mo
@@ -25,12 +25,12 @@ Image of the \"gray\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end gray;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/hot.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/hot.mo
index 98774f99ab..7fb0c22366 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/hot.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/hot.mo
@@ -29,12 +29,12 @@ Image of the \"hot\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end hot;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/jet.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/jet.mo
index 338b31fc30..4b4313689f 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/jet.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/jet.mo
@@ -36,12 +36,12 @@ Image of the \"jet\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end jet;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/package.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/package.mo
index 3ccf649792..820306fbe2 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/package.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/package.mo
@@ -11,7 +11,7 @@ respective function:
 
    
 
 
    
-
+
 
    
 "));
 end ColorMaps;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/spring.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/spring.mo
index e6c1913f19..da6073babd 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/spring.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/spring.mo
@@ -25,12 +25,12 @@ Image of the \"spring\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end spring;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/summer.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/summer.mo
index cbaf3a6343..321c0f25c8 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/summer.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/summer.mo
@@ -25,12 +25,12 @@ Image of the \"summer\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end summer;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/winter.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/winter.mo
index d57bd17cc4..72df799818 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/winter.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/ColorMaps/winter.mo
@@ -25,12 +25,12 @@ Image of the \"winter\" color map:
 
    
 
 
    
-
+
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-scalarToColor.
+ColorMaps,
+colorMapToSvg,
+scalarToColor.
 "));
 end winter;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/colorMapToSvg.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/colorMapToSvg.mo
index 4e8a41ea7f..90cc47e04f 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/colorMapToSvg.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/colorMapToSvg.mo
@@ -159,7 +159,7 @@ generated file was loaded in Inkscape and exported in \"png\" format:
 
    
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/package.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/package.mo
index 36466405c0..1a426683ca 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/package.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/package.mo
@@ -19,7 +19,7 @@ Real color[3](each min=0, each max=255);
 
 
    
 This definition is also available as type
-Modelica.Mechanics.MultiBody.Types.RealColor.
+Modelica.Mechanics.MultiBody.Types.RealColor.
 
    
 "));
 end Colors;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Colors/scalarToColor.mo b/Modelica/Mechanics/MultiBody/Visualizers/Colors/scalarToColor.mo
index cb6db7c954..668b3d6639 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Colors/scalarToColor.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Colors/scalarToColor.mo
@@ -29,9 +29,9 @@ The color is selected from the colorMap by interpolation so that
 
    
 
 
    See also
    
-ColorMaps,
-colorMapToSvg,
-PipeWithScalarField.
+ColorMaps,
+colorMapToSvg,
+PipeWithScalarField.
 
 "));
 end scalarToColor;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/FixedArrow.mo b/Modelica/Mechanics/MultiBody/Visualizers/FixedArrow.mo
index 70dbeee432..435064cf8b 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/FixedArrow.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/FixedArrow.mo
@@ -63,7 +63,7 @@ shown at the location of its frame_a.
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/FixedFrame.mo b/Modelica/Mechanics/MultiBody/Visualizers/FixedFrame.mo
index 00246e8672..9139bff6f5 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/FixedFrame.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/FixedFrame.mo
@@ -194,7 +194,7 @@ labels. A typical example is shown in the following figure:
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/FixedShape.mo b/Modelica/Mechanics/MultiBody/Visualizers/FixedShape.mo
index 552f2e0cfa..0554ce854b 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/FixedShape.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/FixedShape.mo
@@ -64,7 +64,7 @@ parameter shapeType (e.g., shapeType=\"box\"):
     
 
    
 
 
    
-\"model
+\"model
 
    
 
 
    
@@ -89,7 +89,7 @@ Additionally, external shapes can be specified as (not all opti
 
  •  \"modelica://<Modelica-name>/<relative-path-file-name>\"
    
      characterizes the file that is stored under the location of the
      <Modelica-name> library path with the given relative file name.
-     Example:
     shapeType = \"modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    • 
+     Example:
     shapeType = \"modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    
 
 
  •  \"file:///<absolute-file-name>\"
    
      characterizes an absolute file name in the file system. Example:
    
@@ -155,7 +155,7 @@ Parameter color is a vector with 3 elements,
 {r, g, b} are the \"red\", \"green\" and \"blue\" color parts.
 Note, r, g and b are given as Integer[3] in the ranges 0 … 255,
 respectively. The predefined type
-MultiBody.Types.Color contains a menu
+MultiBody.Types.Color contains a menu
 definition of the colors used in the MultiBody library together with a color editor.
 
    
 "),
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/FixedShape2.mo b/Modelica/Mechanics/MultiBody/Visualizers/FixedShape2.mo
index cf05dba66b..5de0fb90cc 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/FixedShape2.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/FixedShape2.mo
@@ -117,7 +117,7 @@ parameter shapeType (e.g., shapeType=\"box\"):
     
 
    
 
 
    
-\"model
+\"model
 
    
 
 
     
    
@@ -142,7 +142,7 @@ Additionally, external shapes can be specified as (not all opti
 
  •  \"modelica://<Modelica-name>/<relative-path-file-name>\"
    
      characterizes the file that is stored under the location of the
      <Modelica-name> library path with the given relative file name.
-     Example:
     shapeType = \"modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    • 
+     Example:
     shapeType = \"modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf\".
    
 
 
  •  \"file:///<absolute-file-name>\"
    
      characterizes an absolute file name in the file system. Example:
    
@@ -209,7 +209,7 @@ Parameter color is a vector with 3 elements,
 {r, g, b} are the \"red\", \"green\" and \"blue\" color parts.
 Note, r, g, b are given as Integer[3] in the ranges 0 … 255,
 respectively. The predefined type
-MultiBody.Types.Color contains a menu
+MultiBody.Types.Color contains a menu
 definition of the colors used in the MultiBody library together with a color editor.
 
    
 
    
@@ -220,7 +220,7 @@ vector r.
 
    
 
 
    
-\"Parts.FixedTranslation\"
+\"Parts.FixedTranslation\"
 
    
 "));
 end FixedShape2;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Internal/FixedLines.mo b/Modelica/Mechanics/MultiBody/Visualizers/Internal/FixedLines.mo
index 5ad21e4fe1..5481bb51c5 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Internal/FixedLines.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Internal/FixedLines.mo
@@ -85,7 +85,7 @@ is represented by a cylinder. This allows to define simple shaped
 3-dimensional characters. An example is shown in the
 following figure:
     
 
    
-
    \"model
    
+
    \"model
    
 
     
    
 The two letters \"x\" and \"y\" are constructed with 4 lines
 by providing the following data for parameter lines
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Internal/Lines.mo b/Modelica/Mechanics/MultiBody/Visualizers/Internal/Lines.mo
index b55ad147a7..4cdbeb9b1a 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Internal/Lines.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Internal/Lines.mo
@@ -89,7 +89,7 @@ is represented by a cylinder. This allows, e.g., to define simple shaped
 it is more convenient to use model Visualizers.Internal.FixedLines.
 An example for dynamic lines is shown in the following figure:
     
 
    
-
    \"model
    
+
    \"model
    
 
     
    
 The two letters \"x\" and \"y\" are constructed with 4 lines
 by providing the following data for input variable lines
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo b/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo
index 03ac43e723..99a7355cd8 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/PipeWithScalarField.mo
@@ -108,11 +108,11 @@ at the perimeter associated with the corresponding axis location.
 Typically the scalar field value is a temperature, but might
 be also another quantity.
 Predefined color maps are available from
-MultiBody.Visualizers.Colors.ColorMaps
+MultiBody.Visualizers.Colors.ColorMaps
 and can be selected via parameter \"colorMap\".
 A color map with the corresponding scalar field values can be exported
 as vector-graphics in svg-format with function
-MultiBody.Visualizers.Colors.colorMapToSvg.
+MultiBody.Visualizers.Colors.colorMapToSvg.
 Connector frame_a of this component is located in the center of the
 circle at the left side of the pipe and the pipe axis is oriented
 along the x-axis of frame_a, see figure below in which frame_a is visualized
@@ -120,12 +120,12 @@ with a coordinate system:
 
    
 
 
    
-
+
 
    
 
 
    
 The color coding is shown in the next figure. It was generated with
-MultiBody.Visualizers.Colors.colorMapToSvg
+MultiBody.Visualizers.Colors.colorMapToSvg
 using the following call:
 
    
 
@@ -135,7 +135,7 @@ colorMapToSvg(Modelica.Mechanics.MultiBody.Visualizers.Colors.ColorMaps.jet(),
 
    • 
 
 
    
-
+
 
    
 ",
         revisions="
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
index 2902863e21..33c0245256 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
@@ -87,7 +87,7 @@ so that the rectangle is rotated about the z-axis of frame_a.
 
    
 
 
    
-
+
 
    
 "));
 end Rectangle;
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/SignalArrow.mo b/Modelica/Mechanics/MultiBody/Visualizers/SignalArrow.mo
index c7599bf0d2..d5e418e30f 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/SignalArrow.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/SignalArrow.mo
@@ -69,7 +69,7 @@ the connector r_head (Real r_head[3])
 
    
 
 
    
-\"model
+\"model
 
    
 
    
 The quantity parameter defines what the vector represents, allowing
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Torus.mo b/Modelica/Mechanics/MultiBody/Visualizers/Torus.mo
index 615adc5f02..4d02e8227b 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/Torus.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/Torus.mo
@@ -75,7 +75,7 @@ stopAngle  =  135 degree
 
 
 
    
-
+
 
    
 
 
    
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo
index 15f34cd53f..f7f947a954 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/VoluminousWheel.mo
@@ -74,7 +74,7 @@ connector frame_a (visualized by the red coordinate system in the figure below).
 
    
 
 
    
-
+
 
    
 ", revisions="
   
      
diff --git a/Modelica/Mechanics/MultiBody/Visualizers/package.mo b/Modelica/Mechanics/MultiBody/Visualizers/package.mo
index 61fb64bd5a..0c40a7ba26 100644
--- a/Modelica/Mechanics/MultiBody/Visualizers/package.mo
+++ b/Modelica/Mechanics/MultiBody/Visualizers/package.mo
@@ -10,50 +10,50 @@ animation features of the MultiBody library.
 
      
 
      Content
      
 
-  
+  
-  
+  
-  
+  
 
-  
+  
 
-  
+  
 
-  
+  
 
-
+
      FixedShape
      
-             FixedShape2
      FixedShape
      
+             FixedShape2      		
       Visualizing an elementary shape with dynamically varying shape attributes.
       FixedShape has one connector frame_a, whereas FixedShape2 has additionally
           a frame_b for easier connection to further visual objects.
           The following shape types are supported:
       
      
-      \"model
+      \"model
             		
   
      FixedFrame
      FixedFrame
       Visualizing a coordinate system including axes labels with fixed sizes:
      
-      \"model
             		
   
      FixedArrow,
      
-SignalArrow
      FixedArrow,
      
+SignalArrow      		
       Visualizing an arrow. Model \"FixedArrow\" provides
       a fixed sized arrow, model \"SignalArrow\" provides
       an arrow with dynamically varying length that is defined
       by an input signal vector:
      
-      
+      
             		
   
      Torus
      Torus
       Visualizing a torus:
      
-      
+      
             		
   
      VoluminousWheel
      VoluminousWheel
       Visualizing a wheel:
      
-      
+      
             		
   
      PipeWithScalarField
      PipeWithScalarField
       Visualizing a pipe with a scalar field represented by a color coding:
      
-      
+      
             		
   
      Advanced
      Advanced
        Package that contains components to visualize
           3-dimensional shapes where all parts of the shape
           can vary dynamically. Basic knowledge of Modelica is
diff --git a/Modelica/Mechanics/MultiBody/package.mo b/Modelica/Mechanics/MultiBody/package.mo
index bcb21b0624..cde1eafed7 100644
--- a/Modelica/Mechanics/MultiBody/package.mo
+++ b/Modelica/Mechanics/MultiBody/package.mo
@@ -154,11 +154,11 @@ model World
     Documentation(info="
 
      Replaceable function to define the gravity field.
    Default is function
-   standardGravityAcceleration
+   standardGravityAcceleration
    that provides some simple gravity fields (no gravity, constant parallel gravity field,
    point gravity field).
    By redeclaring this function, any type of gravity field can be defined, see example
-     Examples.Elementary.UserDefinedGravityField.
+     Examples.Elementary.UserDefinedGravityField.
 
      
 "));
 
@@ -417,7 +417,7 @@ ground. This model serves several purposes:
      gravity can be selected. Also, function gravityAcceleration can
      be redeclared to a user-defined function that computes the gravity
      acceleration, see example
-     Examples.Elementary.UserDefinedGravityField.
+     Examples.Elementary.UserDefinedGravityField.
      
 
    •  It is used to define default settings of animation properties
      (e.g., the diameter of a sphere representing by default
@@ -426,7 +426,7 @@ ground. This model serves several purposes:
 
    •  It is used to define a visual representation of the
      world model (= 3 coordinate axes with labels), of the defined
      gravity field and of a ground plane perpendicular to the gravity direction.
      
-    \"MultiBody.World\"
+    \"MultiBody.World\"
 
      • 
 
 
      
@@ -477,16 +477,16 @@ in the next figure:
 
      
 
 
      
-
+
 
      
 
 
      
 For an introduction, have especially a look at:
 
      
 
 
diff --git a/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo b/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo
index 98a76769da..cb04e50396 100644
--- a/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo
+++ b/Modelica/Mechanics/Rotational/Components/AngleToTorqueAdaptor.mo
@@ -243,7 +243,7 @@ This component is used to provide a pure signal interface around a Rotational mo
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Rotational.Examples.GenerationOfFMUs.
+Rotational.Examples.GenerationOfFMUs.
 This adaptor has angle, angular velocity and angular acceleration as input signals and
 torque as output signal. Note, the input signals must be consistent to each other
 (w=der(phi), a=der(w)).
diff --git a/Modelica/Mechanics/Rotational/Components/BearingFriction.mo b/Modelica/Mechanics/Rotational/Components/BearingFriction.mo
index c9bbf7d707..0804910761 100644
--- a/Modelica/Mechanics/Rotational/Components/BearingFriction.mo
+++ b/Modelica/Mechanics/Rotational/Components/BearingFriction.mo
@@ -122,7 +122,7 @@ This procedure is implemented in a \"clean\" way by state events and
 leads to continuous/discrete systems of equations if friction elements
 are dynamically coupled which have to be solved by appropriate
 numerical methods. The method is described in
-(see also a short sketch in UsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
      
 
      
 
      Otter M., Elmqvist H., and Mattsson S.E. (1999):
      
diff --git a/Modelica/Mechanics/Rotational/Components/Brake.mo b/Modelica/Mechanics/Rotational/Components/Brake.mo
index a22fae9783..721cb4b2e6 100644
--- a/Modelica/Mechanics/Rotational/Components/Brake.mo
+++ b/Modelica/Mechanics/Rotational/Components/Brake.mo
@@ -187,7 +187,7 @@ frictional_torque = peak * cgeo * muUsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
      
 
      
 
      Otter M., Elmqvist H., and Mattsson S.E. (1999):
      
@@ -219,7 +219,7 @@ following references, especially (Armstrong and Canudas de Wit 1996):
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "));
diff --git a/Modelica/Mechanics/Rotational/Components/Clutch.mo b/Modelica/Mechanics/Rotational/Components/Clutch.mo
index 9ac4d004b1..c2896a6b07 100644
--- a/Modelica/Mechanics/Rotational/Components/Clutch.mo
+++ b/Modelica/Mechanics/Rotational/Components/Clutch.mo
@@ -136,7 +136,7 @@ frictional_torque = peak * cgeo * muUsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
      
 
      
 
      Otter M., Elmqvist H., and Mattsson S.E. (1999):
      
@@ -168,7 +168,7 @@ following references, especially (Armstrong and Canudas de Wit 1996):
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "));
diff --git a/Modelica/Mechanics/Rotational/Components/Coupling.mo b/Modelica/Mechanics/Rotational/Components/Coupling.mo
index 1a21556fbc..eab517e2f9 100644
--- a/Modelica/Mechanics/Rotational/Components/Coupling.mo
+++ b/Modelica/Mechanics/Rotational/Components/Coupling.mo
@@ -64,7 +64,7 @@ i.e., the angular velocity if flange_b is exactly in opposite direc
 and the torque of both flanges is identical.
 
      
 
      
-The usage is demonstrated in an example in Modelica.Electrical.Machines.
+The usage is demonstrated in an example in Modelica.Electrical.Machines.
 
      
 
      
 Variable w represents the angular velocity of flange_a
diff --git a/Modelica/Mechanics/Rotational/Components/Damper.mo b/Modelica/Mechanics/Rotational/Components/Damper.mo
index ebb5fb8b04..4f5a0e9ebe 100644
--- a/Modelica/Mechanics/Rotational/Components/Damper.mo
+++ b/Modelica/Mechanics/Rotational/Components/Damper.mo
@@ -19,7 +19,7 @@ between two inertia/gear elements.
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Components/ElastoBacklash.mo b/Modelica/Mechanics/Rotational/Components/ElastoBacklash.mo
index f58beb6bee..24ebe09f3e 100644
--- a/Modelica/Mechanics/Rotational/Components/ElastoBacklash.mo
+++ b/Modelica/Mechanics/Rotational/Components/ElastoBacklash.mo
@@ -172,7 +172,7 @@ is always limited by the absolute value of the spring torque: |tau_d| ≤ |tau_
 
 
      
 In the next figure, a typical simulation with the ElastoBacklash model is shown
-(Examples.Backlash)
+(Examples.Backlash)
 where the different effects are visualized:
 
      
 
@@ -187,12 +187,12 @@ where the different effects are visualized:
 
 
 
      
-\"Results
+\"Results
 
      
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Components/ElastoBacklash2.mo b/Modelica/Mechanics/Rotational/Components/ElastoBacklash2.mo
index c7b6c423c6..91f72aa424 100644
--- a/Modelica/Mechanics/Rotational/Components/ElastoBacklash2.mo
+++ b/Modelica/Mechanics/Rotational/Components/ElastoBacklash2.mo
@@ -171,7 +171,7 @@ is explicitly set to zero.
 
 
      
 This model of backlash is slightly different to the
-ElastoBacklash
+ElastoBacklash
 component:
 
      
 
@@ -186,7 +186,7 @@ component:
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Components/LossyGear.mo b/Modelica/Mechanics/Rotational/Components/LossyGear.mo
index 283f722ef1..b2048711e5 100644
--- a/Modelica/Mechanics/Rotational/Components/LossyGear.mo
+++ b/Modelica/Mechanics/Rotational/Components/LossyGear.mo
@@ -406,7 +406,7 @@ pp. 257-266, The Modelica Association and Institute of Robotics and Mechatronics
 Deutsches Zentrum für Luft- und Raumfahrt e. V., March 18-19, 2002.
 
 
    • Bertsch C. (2009):
-"Problem
+"Problem
 with model LossyGear and a proposed solution",
 Ticket #108,
 Sept. 11, 2009.
      • 
diff --git a/Modelica/Mechanics/Rotational/Components/OneWayClutch.mo b/Modelica/Mechanics/Rotational/Components/OneWayClutch.mo
index d1f590cb6d..32019f8ccb 100644
--- a/Modelica/Mechanics/Rotational/Components/OneWayClutch.mo
+++ b/Modelica/Mechanics/Rotational/Components/OneWayClutch.mo
@@ -190,7 +190,7 @@ frictional_torque = peak * cgeo * muUsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
      
 
      
 
      Otter M., Elmqvist H., and Mattsson S.E. (1999):
      
@@ -200,7 +200,7 @@ are dynamically coupled. The method is described in
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "));
diff --git a/Modelica/Mechanics/Rotational/Components/RelativeStates.mo b/Modelica/Mechanics/Rotational/Components/RelativeStates.mo
index f3d97062d3..93add2eca6 100644
--- a/Modelica/Mechanics/Rotational/Components/RelativeStates.mo
+++ b/Modelica/Mechanics/Rotational/Components/RelativeStates.mo
@@ -42,7 +42,7 @@ An example is given in the next figure
 
      
 
 
      
-\"Model
+\"Model
 
      
 
 
      
@@ -54,7 +54,7 @@ velocity of model inertia1 or of model inertia2 as state variables.
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Components/SpringDamper.mo b/Modelica/Mechanics/Rotational/Components/SpringDamper.mo
index 1cd5ef2128..113367410c 100644
--- a/Modelica/Mechanics/Rotational/Components/SpringDamper.mo
+++ b/Modelica/Mechanics/Rotational/Components/SpringDamper.mo
@@ -29,7 +29,7 @@ to describe a coupling of the element with the housing via a spring/damper.
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo b/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo
index 1771d9267c..76041b4f15 100644
--- a/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo
+++ b/Modelica/Mechanics/Rotational/Components/TorqueToAngleAdaptor.mo
@@ -91,7 +91,7 @@ This component is used to provide a pure signal interface around a Rotational mo
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Rotational.Examples.GenerationOfFMUs.
+Rotational.Examples.GenerationOfFMUs.
 This adaptor has torque as input and angle, angular velocity and angular acceleration as output signals.
 
      
 "));
diff --git a/Modelica/Mechanics/Rotational/Examples/Backlash.mo b/Modelica/Mechanics/Rotational/Examples/Backlash.mo
index 0cfc008ce8..e1aecee71d 100644
--- a/Modelica/Mechanics/Rotational/Examples/Backlash.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Backlash.mo
@@ -67,8 +67,8 @@ This model demonstrates the effect of a backlash on eigenfrequency, and
 also that the damping torque does not lead to unphysical pulling torques
 (since the ElastoBacklash model takes care of it).
 Furthermore, it shows the differences of the
-ElastoBacklash and
-ElastoBacklash2 components
+ElastoBacklash and
+ElastoBacklash2 components
 (the ElastoBacklash2 component generates events when contact occurs and the torque changes discontinuously).
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Examples/CoupledClutches.mo b/Modelica/Mechanics/Rotational/Examples/CoupledClutches.mo
index b8916e765b..d3c6ecad65 100644
--- a/Modelica/Mechanics/Rotational/Examples/CoupledClutches.mo
+++ b/Modelica/Mechanics/Rotational/Examples/CoupledClutches.mo
@@ -104,7 +104,7 @@ locked, forward sliding.
      
 
 "),
     __Dymola_Commands(file=
-          "modelica://Modelica/Resources/Scripts/Dymola/Mechanics/Rotational/CoupledClutches.mos"
+          "modelica:/Modelica/Resources/Scripts/Dymola/Mechanics/Rotational/CoupledClutches.mos"
         "Simulate and Plot"),
     experiment(StopTime=1.5, Interval=0.001),
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-100},
diff --git a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo1.mo b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo1.mo
index d4f3d26534..ec3da0330a 100644
--- a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo1.mo
+++ b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo1.mo
@@ -75,9 +75,9 @@ Note, powerLoss (= sum of the power flows of the connectors) and
 gear.powerLoss (= gear.tau_loss*gear.w_a,
 where gear.tau_loss is determined in a non-trivial way
 from the stuck/sliding situation of the bearing and teeth friction;
-= equation (16) in [Pelchen2002])
+= equation (16) in [Pelchen2002])
 should be identical, or the difference should be close to zero, if model
-LossyGear
+LossyGear
 is correctly implemented.
 
      
 "),
diff --git a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2.mo b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2.mo
index d5ba21aa5b..23d04b9e3a 100644
--- a/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2.mo
+++ b/Modelica/Mechanics/Rotational/Examples/LossyGearDemo2.mo
@@ -88,9 +88,9 @@ Note, powerLoss (= sum of the power flows of the connectors) and
 gear.powerLoss (= gear.tau_loss*gear.w_a,
 where gear.tau_loss is determined in a non-trivial way
 from the stuck/sliding situation of the bearing and teeth friction;
-= equation (16) in [Pelchen2002])
+= equation (16) in [Pelchen2002])
 should be identical, or the difference should be close to zero, if model
-LossyGear
+LossyGear
 is correctly implemented.
 
      
 
diff --git a/Modelica/Mechanics/Rotational/Examples/Utilities/DirectInertia.mo b/Modelica/Mechanics/Rotational/Examples/Utilities/DirectInertia.mo
index d3868eeea5..53844d13f8 100644
--- a/Modelica/Mechanics/Rotational/Examples/Utilities/DirectInertia.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Utilities/DirectInertia.mo
@@ -59,7 +59,7 @@ equation
                 textString="a"),Text(
                 extent={{-150,-110},{150,-140}},
                 textString="J=%J"),Bitmap(extent={{-96,-42},{64,54}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/DirectInertia.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/DirectInertia.png"),
           Text( extent={{10,-60},{94,-90}},
                 horizontalAlignment=TextAlignment.Right,
           textString="tau")}), Documentation(info="
@@ -74,7 +74,7 @@ on the other side of it.
 
 
      See also
      
 
      
-InverseInertia.
+InverseInertia.
 
      
 "));
 end DirectInertia;
diff --git a/Modelica/Mechanics/Rotational/Examples/Utilities/InverseInertia.mo b/Modelica/Mechanics/Rotational/Examples/Utilities/InverseInertia.mo
index 4a81d4d909..14d656b073 100644
--- a/Modelica/Mechanics/Rotational/Examples/Utilities/InverseInertia.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Utilities/InverseInertia.mo
@@ -51,7 +51,7 @@ equation
                 textString="a"),Text(
                 extent={{-150,-110},{150,-140}},
                 textString="J=%J"),Bitmap(extent={{-58,-42},{98,48}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/InverseInertia.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/InverseInertia.png"),
           Text( extent={{-90,-64},{-6,-94}},
                 horizontalAlignment=TextAlignment.Left,
           textString="tau")}), Documentation(info="
@@ -65,7 +65,7 @@ the output torque tau is returned.
 
 
      See also
      
 
      
-DirectInertia.
+DirectInertia.
 
      
 "));
 end InverseInertia;
diff --git a/Modelica/Mechanics/Rotational/Examples/Utilities/Spring.mo b/Modelica/Mechanics/Rotational/Examples/Utilities/Spring.mo
index 9e08c1bdf7..ee0b6da6d8 100644
--- a/Modelica/Mechanics/Rotational/Examples/Utilities/Spring.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Utilities/Spring.mo
@@ -52,7 +52,7 @@ equation
           textString="phi1"),      Text(
                 extent={{-150,-114},{150,-144}},
                 textString="c=%c"),Bitmap(extent={{-88,-36},{92,56}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/Spring.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/Spring.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="phi2"),      Text(
diff --git a/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamper.mo b/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamper.mo
index e097afec39..54e1d87084 100644
--- a/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamper.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamper.mo
@@ -67,7 +67,7 @@ equation
                 extent={{-150,-118},{150,-148}},
                 textString="c=%c
 d=%d"),   Bitmap(extent={{-72,-44},{84,46}},
-             fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/SpringDamper.png"),
+             fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/SpringDamper.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="phi2"),      Text(
diff --git a/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamperNoRelativeStates.mo b/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamperNoRelativeStates.mo
index bd77069a21..daa85925f9 100644
--- a/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamperNoRelativeStates.mo
+++ b/Modelica/Mechanics/Rotational/Examples/Utilities/SpringDamperNoRelativeStates.mo
@@ -30,7 +30,7 @@ to describe a coupling of the element with the housing via a spring/damper.
 
      
 
 
      
-This is the same element as Rotational.Components.SpringDamper
+This is the same element as Rotational.Components.SpringDamper
 but with the only difference, that the relative quantities are not used as states. If the relative
 states are potentially used as states, \"a_rel = der(w_rel)\" is present, and then exporting this model
 as FMU requires to also have the accelerations in the flanges as inputs, which is usually not
diff --git a/Modelica/Mechanics/Rotational/Interfaces/Flange_a.mo b/Modelica/Mechanics/Rotational/Interfaces/Flange_a.mo
index 6ba51bf346..a931479c30 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/Flange_a.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/Flange_a.mo
@@ -18,13 +18,13 @@ tau: Cut-torque in the shaft flange in [Nm].
 
 
      
 There is a second connector for flanges:
-Flange_b.
+Flange_b.
 The connectors
 Flange_a and Flange_b are completely identical. There is only a difference
 in the icons, in order to easier identify a flange variable in a diagram.
 For a discussion on the actual direction of the cut-torque tau and
 of the rotation angle, see section
-Sign Conventions
+Sign Conventions
 in the user's guide of Rotational.
 
      
 
diff --git a/Modelica/Mechanics/Rotational/Interfaces/Flange_b.mo b/Modelica/Mechanics/Rotational/Interfaces/Flange_b.mo
index 60076c527e..52ba1dc3a5 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/Flange_b.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/Flange_b.mo
@@ -18,13 +18,13 @@ tau: Cut-torque in the shaft flange in [Nm].
 
 
      
 There is a second connector for flanges:
-Flange_a.
+Flange_a.
 The connectors
 Flange_a and Flange_b are completely identical. There is only a difference
 in the icons, in order to easier identify a flange variable in a diagram.
 For a discussion on the actual direction of the cut-torque tau and
 of the rotation angle, see section
-Sign Conventions
+Sign Conventions
 in the user's guide of Rotational.
 
      
 
diff --git a/Modelica/Mechanics/Rotational/Interfaces/InternalSupport.mo b/Modelica/Mechanics/Rotational/Interfaces/InternalSupport.mo
index d1098bf8a5..4d498c1601 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/InternalSupport.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/InternalSupport.mo
@@ -21,7 +21,7 @@ equation
               textString="%name")}), Documentation(info="
 
      
 This is an adapter model to utilize a conditional
-support connector
+support connector
 in a component. It could be applied to both textually (equations based) and graphically
 defined components:
 
      
@@ -41,9 +41,9 @@ This approach of internal support is utilized, e.g., via the following partial m
 
      
 
 
 
 
      
diff --git a/Modelica/Mechanics/Rotational/Interfaces/PartialCompliantWithRelativeStates.mo b/Modelica/Mechanics/Rotational/Interfaces/PartialCompliantWithRelativeStates.mo
index 50dfb16b4c..241ac5709b 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/PartialCompliantWithRelativeStates.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/PartialCompliantWithRelativeStates.mo
@@ -63,7 +63,7 @@ and c are more meaningful for the user.
 
 
      
 See also the discussion
-State Selection
+State Selection
 in the User's Guide of the Rotational library.
 
      
 "));
diff --git a/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo b/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo
index 176635fa6b..dc70e6b486 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/PartialFriction.mo
@@ -80,7 +80,7 @@ system of equations if friction elements are dynamically coupled
 which has to be solved by appropriate numerical methods.
 The method is described in [Otter1999]
 (see also a short sketch in
-UsersGuide.ModelingOfFriction).
+UsersGuide.ModelingOfFriction).
 
      
 
      
 The parameter w_small is introduced for particular
diff --git a/Modelica/Mechanics/Rotational/Interfaces/Support.mo b/Modelica/Mechanics/Rotational/Interfaces/Support.mo
index e425b2d337..281a3b9f8e 100644
--- a/Modelica/Mechanics/Rotational/Interfaces/Support.mo
+++ b/Modelica/Mechanics/Rotational/Interfaces/Support.mo
@@ -22,13 +22,13 @@ It is most convenient to utilize it
 
      
 "),
     Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/Rotational/Sensors/AccSensor.mo b/Modelica/Mechanics/Rotational/Sensors/AccSensor.mo
index bee4b07afb..516db5d3d1 100644
--- a/Modelica/Mechanics/Rotational/Sensors/AccSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/AccSensor.mo
@@ -18,7 +18,7 @@ Measures the absolute angular acceleration
 of a flange in an ideal way and provides the result as
 output signal a
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/Rotational/Sensors/AngleSensor.mo b/Modelica/Mechanics/Rotational/Sensors/AngleSensor.mo
index 421997ad1c..7fa1be2c4e 100644
--- a/Modelica/Mechanics/Rotational/Sensors/AngleSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/AngleSensor.mo
@@ -14,7 +14,7 @@ Measures the absolute angle
 of a flange in an ideal way and provides the result as
 output signal phi
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/Rotational/Sensors/PowerSensor.mo b/Modelica/Mechanics/Rotational/Sensors/PowerSensor.mo
index acf979b09f..53c5103abf 100644
--- a/Modelica/Mechanics/Rotational/Sensors/PowerSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/PowerSensor.mo
@@ -19,7 +19,7 @@ equation
 Measures the power between two flanges
 in an ideal way and provides the result as output signal power
 (to be further processed with blocks of the
-Modelica.Blocks library), i.e.
+Modelica.Blocks library), i.e.
 
      
 
       power = flange_a.tau * der(flange_a.phi)
diff --git a/Modelica/Mechanics/Rotational/Sensors/RelAccSensor.mo b/Modelica/Mechanics/Rotational/Sensors/RelAccSensor.mo
index 743f632949..5487005b15 100644
--- a/Modelica/Mechanics/Rotational/Sensors/RelAccSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/RelAccSensor.mo
@@ -25,7 +25,7 @@ equation
 Measures the relative angular acceleration between two flanges
 in an ideal way and provides the result as output signal a_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(
diff --git a/Modelica/Mechanics/Rotational/Sensors/RelAngleSensor.mo b/Modelica/Mechanics/Rotational/Sensors/RelAngleSensor.mo
index 32dec5a18a..7bc432956e 100644
--- a/Modelica/Mechanics/Rotational/Sensors/RelAngleSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/RelAngleSensor.mo
@@ -19,7 +19,7 @@ equation
 Measures the relative angle between two flanges
 in an ideal way and provides the result as output signal phi_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(
diff --git a/Modelica/Mechanics/Rotational/Sensors/RelSpeedSensor.mo b/Modelica/Mechanics/Rotational/Sensors/RelSpeedSensor.mo
index 66ebc8f7a9..a4fef30a13 100644
--- a/Modelica/Mechanics/Rotational/Sensors/RelSpeedSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/RelSpeedSensor.mo
@@ -23,7 +23,7 @@ equation
 Measures the relative angular velocity between two flanges
 in an ideal way and provides the result as output signal w_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(
diff --git a/Modelica/Mechanics/Rotational/Sensors/SpeedSensor.mo b/Modelica/Mechanics/Rotational/Sensors/SpeedSensor.mo
index 27fb246775..7b3adf7d31 100644
--- a/Modelica/Mechanics/Rotational/Sensors/SpeedSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/SpeedSensor.mo
@@ -16,7 +16,7 @@ Measures the absolute angular velocity
 of a flange in an ideal way and provides the result as
 output signal w
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(coordinateSystem(
diff --git a/Modelica/Mechanics/Rotational/Sensors/TorqueSensor.mo b/Modelica/Mechanics/Rotational/Sensors/TorqueSensor.mo
index 6393a126f5..24c2ef31d8 100644
--- a/Modelica/Mechanics/Rotational/Sensors/TorqueSensor.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/TorqueSensor.mo
@@ -19,7 +19,7 @@ equation
 Measures the cut-torque between two flanges
 in an ideal way and provides the result as output signal tau
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
      
 "),
        Icon(
diff --git a/Modelica/Mechanics/Rotational/Sensors/package.mo b/Modelica/Mechanics/Rotational/Sensors/package.mo
index a9b35251fb..457d8d7589 100644
--- a/Modelica/Mechanics/Rotational/Sensors/package.mo
+++ b/Modelica/Mechanics/Rotational/Sensors/package.mo
@@ -6,7 +6,7 @@ package Sensors "Sensors to measure variables in 1D rotational mechanical compon
 
      
 This package contains ideal sensor components that provide
 the connector variables as signals for further processing with the
-Modelica.Blocks library.
+Modelica.Blocks library.
 
      
 "));
 end Sensors;
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/Contact.mo b/Modelica/Mechanics/Rotational/UsersGuide/Contact.mo
index 5d384675ca..c03ed67fd9 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/Contact.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/Contact.mo
@@ -7,7 +7,7 @@ class Contact "Contact"
 
 
      
 For current information on library officers please refer to the main
-Contact section.
+Contact section.
 
      
 
 
      Main contributors
      
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/FlangeConnectors.mo b/Modelica/Mechanics/Rotational/UsersGuide/FlangeConnectors.mo
index 8b8885f4e4..8a49fe1b57 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/FlangeConnectors.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/FlangeConnectors.mo
@@ -5,9 +5,9 @@ class FlangeConnectors "Flange Connectors"
   annotation (DocumentationClass=true, Documentation(info="
 
      
 A flange is described by the connector class
-Flange_a
-or Flange_b.
-As already noted in section Overview,
+Flange_a
+or Flange_b.
+As already noted in section Overview,
 the two connector
 classes are completely identical. There is only a difference in the icons,
 in order to easier identify a flange variable in a diagram.
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/ModelingOfFriction.mo b/Modelica/Mechanics/Rotational/UsersGuide/ModelingOfFriction.mo
index 7873ce21bf..a31391df9c 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/ModelingOfFriction.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/ModelingOfFriction.mo
@@ -15,7 +15,7 @@ Several elements of this library model Coulomb friction with th
 
 
      
 The friction equations are defined in base model
-Interfaces.PartialFriction.
+Interfaces.PartialFriction.
 In the following, there are given explanations.
 
      
 
@@ -142,7 +142,7 @@ mode = if (pre(mode) == Forward  or startFor)  and v>0 then Forward  elseif
 
 
      
 The above approach to model a simplified friction element is slightly generalized in model
-Interfaces.PartialFriction:
+Interfaces.PartialFriction:
 
      
 
 
        
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/Overview.mo b/Modelica/Mechanics/Rotational/UsersGuide/Overview.mo
index bad8f1247e..6ac6e3d506 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/Overview.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/Overview.mo
@@ -10,7 +10,7 @@ mechanical systems, including different types of gearboxes,
 shafts with inertia, external torques, spring/damper elements,
 frictional elements, backlash, elements to measure angle, angular velocity,
 angular acceleration and the cut-torque of a flange. In sublibrary
-Examples
+Examples
 several examples are present to demonstrate the usage of
 the elements. Just open the corresponding example model and simulate
 the model according to the provided description.
@@ -31,7 +31,7 @@ systems are available in the simulation tool, the simulation of
 
        
 
 
        
-\"drive1\"
+\"drive1\"
 
        
 
 
        
@@ -64,8 +64,8 @@ together, see figure below.
 
        
 
 
        
-\"driveConnections1\"
        
-\"driveConnections2\"
+\"driveConnections1\"
        
+\"driveConnections2\"
 
        
 "));
 
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/RequirementsForSimulationTool.mo b/Modelica/Mechanics/Rotational/UsersGuide/RequirementsForSimulationTool.mo
index 099b226885..895383cb5c 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/RequirementsForSimulationTool.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/RequirementsForSimulationTool.mo
@@ -34,7 +34,7 @@ Coulomb friction elements such as
 when the elements become stuck:
 
        
 
        
-\"driveConnections3\"
+\"driveConnections3\"
 
        
 
        
 In the figure above, two typical situations are shown: In the upper part of
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/SignConventions.mo b/Modelica/Mechanics/Rotational/UsersGuide/SignConventions.mo
index a3ba157f0f..dbbd80c6d1 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/SignConventions.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/SignConventions.mo
@@ -13,7 +13,7 @@ at hand of the following figure:
 
        
 
 
        
-\"drive2\"
+\"drive2\"
 
        
 
 
        
@@ -37,7 +37,7 @@ vector direction displayed according to this rule:
 
        
 
 
        
-\"drive3\"
+\"drive3\"
 
        
 
        
 The cut-torques J2.flange_a.tau, J4.flange_a.tau and J6.flange_b.tau
@@ -50,7 +50,7 @@ cases are shown in the next figure:
 
        
 
 
        
-\"drive4\"
+\"drive4\"
 
        
 
 
        
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/StateSelection.mo b/Modelica/Mechanics/Rotational/UsersGuide/StateSelection.mo
index 5d396c9c73..1323d47d4b 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/StateSelection.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/StateSelection.mo
@@ -6,7 +6,7 @@ class StateSelection "State Selection"
 
        
 Only a few components of the Rotational library use the der(…) operator
 and are therefore candidates to have states. Most important, component
-Inertia
+Inertia
 defines the absolute rotation angle and the absolute angular velocity of this
 component as candidate for states. In the "Advanced" menu the built-in StateSelect
 enumeration can be set to define the priority to use these variables as states.
@@ -68,9 +68,9 @@ At the time of the library design, there was not yet a possibility to provide th
 In order to reduce this effect, it is advisable to not use absolute angles, but
 relative angles as states. A user can define relative variables as states
 explicitly with component
-RelativeStates.
+RelativeStates.
 Furthermore, all compliant components, such as
-SpringDamper are
+SpringDamper are
 defining the relative angle and the relative angular velocity as preferred states.
 Therefore, a tool will select in most cases relative angles as states.
 
        
@@ -84,7 +84,7 @@ explicitly a nominal value on the relative angle. This definition is provided in
 "Advanced" menu of the compliant components with parameter "phi_nominal".
 The default value is 1e-4 rad, to be in the order of a compliant deformation of a
 drive. For some components, like
-a Clutch,
+a Clutch,
 this might be too small and a value of phi_nominal = 1 rad might be more appropriate
 (a value of phi_nominal = 1e-4 rad does not hurt, but just makes the error control
 unnecessarily stringent).
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/SupportTorques.mo b/Modelica/Mechanics/Rotational/UsersGuide/SupportTorques.mo
index 499235dc31..5ad80ea1ec 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/SupportTorques.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/SupportTorques.mo
@@ -11,11 +11,11 @@ support flange is enabled or disabled. If it is enabled, it must be connected.
 If it is disabled, it needs not be connected.
 Enabled support flanges offer, e.g., the possibility to model gearboxes mounted on
 the ground via spring-damper-systems (cf. example
-ElasticBearing).
+ElasticBearing).
 
        
 
 
        
-\"bearing1\"
+\"bearing1\"
 
        
 
 
        
@@ -26,7 +26,7 @@ identical results.
 
        
 
 
        
-\"bearing2\"
+\"bearing2\"
 
        
 "));
 
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/UserDefinedComponents.mo b/Modelica/Mechanics/Rotational/UsersGuide/UserDefinedComponents.mo
index 2e655540f8..2d20a3832a 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/UserDefinedComponents.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/UserDefinedComponents.mo
@@ -10,21 +10,21 @@ elements of this package.
 It is convenient to define a new
 component by inheritance from one of the following base classes,
 which are defined in sublibrary Interfaces:
-Interfaces:
+Interfaces:
 
        
 
 
-    
-    
-    
-    
-    
-    
-    
@@ -87,7 +87,7 @@ for an inertia component and a planetary gearbox:
 
        
-\"driveAxis\"
+\"driveAxis\"
 
        
@@ -105,7 +105,7 @@ component. But this is not the case, as shown in the next figure:
 
        
-\"inertias\"
+\"inertias\"
 
        
@@ -122,7 +122,7 @@ the left figure it seems to be that the angular velocity vector of
 left to right as shown in the right part of the figure, where the
 local coordinate systems are drawn such that they are aligned.
 Note, that the simple rule stated in section
-Sign conventions
+Sign conventions
 also determines that
 the angular velocity of J2 in the left part of the
 figure is directed from left to right.
@@ -134,7 +134,7 @@ are expressed correctly. The selection of the coordinate system
 is arbitrary and has no influence on the usage of the component.
 Especially, the actual direction of, e.g., a cut-torque is most
 easily determined by the rule of section
-Sign conventions.
+Sign conventions.
 A more strict determination
 by aligning coordinate systems and then using the vector direction
 of the local coordinate systems, often requires a re-drawing of the
diff --git a/Modelica/Mechanics/Rotational/UsersGuide/package.mo b/Modelica/Mechanics/Rotational/UsersGuide/package.mo
index 2eaf376292..0601ff17ff 100644
--- a/Modelica/Mechanics/Rotational/UsersGuide/package.mo
+++ b/Modelica/Mechanics/Rotational/UsersGuide/package.mo
@@ -11,14 +11,14 @@ sub-sections:
 
        "));
diff --git a/Modelica/Mechanics/Rotational/package.mo b/Modelica/Mechanics/Rotational/package.mo
index ec53e4ca50..ca33b97723 100644
--- a/Modelica/Mechanics/Rotational/package.mo
+++ b/Modelica/Mechanics/Rotational/package.mo
@@ -11,15 +11,15 @@ drive trains with frictional losses. A typical, simple example is shown
 in the next figure:
 
        
 
-
        
+
        
 For an introduction, have especially a look at:
 
        
 
@@ -40,7 +40,7 @@ it must be connected, and if it is not enabled, it must not be connected.
 Independently, whether the heatPort is enabled or not,
 the dissipated power is available from the new variable \"lossPower\" (which is
 positive if heat is flowing out of the heatPort). For an example, see
-Examples.HeatLosses.
+Examples.HeatLosses.
 
        
diff --git a/Modelica/Mechanics/Translational/Components/ElastoGap.mo b/Modelica/Mechanics/Translational/Components/ElastoGap.mo
index 51f3d55dfd..e7e6988f7b 100644
--- a/Modelica/Mechanics/Translational/Components/ElastoGap.mo
+++ b/Modelica/Mechanics/Translational/Components/ElastoGap.mo
@@ -37,7 +37,7 @@ equation
 
        
 This component models a spring damper combination that can lift off.
 It can be connected between a sliding mass and the housing (model
-Fixed),
+Fixed),
 to describe the contact of a sliding mass with the housing.
 
        
 
@@ -118,7 +118,7 @@ is always continuous, especially around the start of the penetration at s_rel =
 
 
        
 In the next figure, a typical simulation with the ElastoGap model is shown
-(Examples.ElastoGap)
+(Examples.ElastoGap)
 where the different effects are visualized:
 
        
 
@@ -132,7 +132,7 @@ where the different effects are visualized:
 
        
-\"Elasto
+\"Elasto
 
        "),
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
diff --git a/Modelica/Mechanics/Translational/Components/GeneralForceToPositionAdaptor.mo b/Modelica/Mechanics/Translational/Components/GeneralForceToPositionAdaptor.mo
index 4ddbb459a4..3201dc316b 100644
--- a/Modelica/Mechanics/Translational/Components/GeneralForceToPositionAdaptor.mo
+++ b/Modelica/Mechanics/Translational/Components/GeneralForceToPositionAdaptor.mo
@@ -30,7 +30,7 @@ This component is used to provide a pure signal interface around a Translational
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Translational.Examples.GenerationOfFMUs.
+Translational.Examples.GenerationOfFMUs.
 This adaptor has force as input and position, velocity and acceleration as output signals.
 
        "), Icon(graphics={
diff --git a/Modelica/Mechanics/Translational/Components/GeneralPositionToForceAdaptor.mo b/Modelica/Mechanics/Translational/Components/GeneralPositionToForceAdaptor.mo
index 1c8ed51a64..4455ae656d 100644
--- a/Modelica/Mechanics/Translational/Components/GeneralPositionToForceAdaptor.mo
+++ b/Modelica/Mechanics/Translational/Components/GeneralPositionToForceAdaptor.mo
@@ -31,7 +31,7 @@ This component is used to provide a pure signal interface around a Translational
 and export this model in form of an input/output block,
 especially as FMU (Functional Mock-up Unit).
 Examples of the usage of this adaptor are provided in
-Translational.Examples.GenerationOfFMUs.
+Translational.Examples.GenerationOfFMUs.
 This adaptor has position, velocity and acceleration as input signals and
 force as output signal.
 
        
diff --git a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo
index 09b834ba54..36c1bd5016 100644
--- a/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo
+++ b/Modelica/Mechanics/Translational/Components/MassWithStopAndFriction.mo
@@ -191,7 +191,7 @@ f = F_Coulomb + F_prop * v + F_Stribeck * exp (-fexp * v)
 
        
-\"Stribeck
+\"Stribeck
 
        
@@ -222,7 +222,7 @@ to the Stop element, other sliding masses, dampers or hydraulic chambers must be
 
        The friction model is implemented in a \"clean\" way by state events and leads to
 continuous/discrete systems of equations which have to be solved by appropriate
 numerical methods. The method is described in
-(see also a short sketch in UsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
        
diff --git a/Modelica/Mechanics/Translational/Components/RelativeStates.mo b/Modelica/Mechanics/Translational/Components/RelativeStates.mo
index 1b3f67d6f4..1da9f9f353 100644
--- a/Modelica/Mechanics/Translational/Components/RelativeStates.mo
+++ b/Modelica/Mechanics/Translational/Components/RelativeStates.mo
@@ -35,7 +35,7 @@ An example is given in the next figure
 
        
 
 
        
-\"Relative
+\"Relative
 
        
 
 
        
diff --git a/Modelica/Mechanics/Translational/Components/SupportFriction.mo b/Modelica/Mechanics/Translational/Components/SupportFriction.mo
index b67740a809..6163f378b8 100644
--- a/Modelica/Mechanics/Translational/Components/SupportFriction.mo
+++ b/Modelica/Mechanics/Translational/Components/SupportFriction.mo
@@ -121,7 +121,7 @@ This procedure is implemented in a \"clean\" way by state events and
 leads to continuous/discrete systems of equations if friction elements
 are dynamically coupled which have to be solved by appropriate
 numerical methods. The method is described in
-(see also a short sketch in UsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
        
 
        
 
        Otter M., Elmqvist H., and Mattsson S.E. (1999):
        
diff --git a/Modelica/Mechanics/Translational/Examples/Accelerate.mo b/Modelica/Mechanics/Translational/Examples/Accelerate.mo
index 29bb73b9bf..4f1b088be2 100644
--- a/Modelica/Mechanics/Translational/Examples/Accelerate.mo
+++ b/Modelica/Mechanics/Translational/Examples/Accelerate.mo
@@ -16,7 +16,7 @@ equation
   annotation (Documentation(info="
 
        
 Demonstrate usage of component
-Sources.Accelerate
+Sources.Accelerate
 by moving a mass with a predefined acceleration.
 
        
 "),
diff --git a/Modelica/Mechanics/Translational/Examples/InitialConditions.mo b/Modelica/Mechanics/Translational/Examples/InitialConditions.mo
index 1aaa62d082..253afed126 100644
--- a/Modelica/Mechanics/Translational/Examples/InitialConditions.mo
+++ b/Modelica/Mechanics/Translational/Examples/InitialConditions.mo
@@ -94,7 +94,7 @@ combination). In this case the system is not at rest.
 
        
 
 
        
-\"Initial
+\"Initial
 
        
 "),
     experiment(StopTime=5.0, Interval=0.001),
diff --git a/Modelica/Mechanics/Translational/Examples/PreLoad.mo b/Modelica/Mechanics/Translational/Examples/PreLoad.mo
index 7f7386884b..9586bb66ae 100644
--- a/Modelica/Mechanics/Translational/Examples/PreLoad.mo
+++ b/Modelica/Mechanics/Translational/Examples/PreLoad.mo
@@ -119,9 +119,9 @@ Drawing of spool.
 
        
 
 
        
-\"Preload
        
-\"Preload
        
-\"Preload
        
+\"Preload
        
+\"Preload
        
+\"Preload
        
 
        
 
 
        
@@ -132,7 +132,7 @@ the start value spool.s.start influences the offset.
 
        
 
 
        
-\"Preload
+\"Preload
 
        
 "),
     experiment(StopTime=100, Interval=0.1));
diff --git a/Modelica/Mechanics/Translational/Examples/Utilities/DirectMass.mo b/Modelica/Mechanics/Translational/Examples/Utilities/DirectMass.mo
index 2786c95211..5b02aec268 100644
--- a/Modelica/Mechanics/Translational/Examples/Utilities/DirectMass.mo
+++ b/Modelica/Mechanics/Translational/Examples/Utilities/DirectMass.mo
@@ -58,7 +58,7 @@ equation
                 textString="a"),Text(
                 extent={{-150,-110},{150,-140}},
           textString="m=%m"),      Bitmap(extent={{-96,-42},{64,54}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Translational/DirectMass.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Translational/DirectMass.png"),
           Text( extent={{10,-60},{94,-90}},
                 horizontalAlignment=TextAlignment.Right,
           textString="f")}), Documentation(info="
@@ -73,7 +73,7 @@ on the other side of it.
 
 
        See also
        
 
        
-InverseMass.
+InverseMass.
 
        
 "));
 end DirectMass;
diff --git a/Modelica/Mechanics/Translational/Examples/Utilities/InverseMass.mo b/Modelica/Mechanics/Translational/Examples/Utilities/InverseMass.mo
index 186dbfc628..57ec5901d7 100644
--- a/Modelica/Mechanics/Translational/Examples/Utilities/InverseMass.mo
+++ b/Modelica/Mechanics/Translational/Examples/Utilities/InverseMass.mo
@@ -46,7 +46,7 @@ equation
                 textString="a"),Text(
                 extent={{-150,-110},{150,-140}},
           textString="m=%m"),      Bitmap(extent={{-58,-42},{98,48}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Translational/InverseMass.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Translational/InverseMass.png"),
           Text( extent={{-90,-64},{-6,-94}},
                 horizontalAlignment=TextAlignment.Left,
           textString="f")}), Documentation(info="
@@ -60,7 +60,7 @@ the output force f is returned.
 
 
        See also
        
 
        
-DirectMass.
+DirectMass.
 
        
 "));
 end InverseMass;
diff --git a/Modelica/Mechanics/Translational/Examples/Utilities/Spring.mo b/Modelica/Mechanics/Translational/Examples/Utilities/Spring.mo
index 43edb472de..7ff7ef4400 100644
--- a/Modelica/Mechanics/Translational/Examples/Utilities/Spring.mo
+++ b/Modelica/Mechanics/Translational/Examples/Utilities/Spring.mo
@@ -50,7 +50,7 @@ equation
           textString="s1"),      Text(
                 extent={{-150,-114},{150,-144}},
                 textString="c=%c"),Bitmap(extent={{-88,-36},{92,56}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Translational/Spring.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Translational/Spring.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="s2"),      Text(
diff --git a/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamper.mo b/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamper.mo
index 234bfc6507..d77d25a15b 100644
--- a/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamper.mo
+++ b/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamper.mo
@@ -66,7 +66,7 @@ equation
                 extent={{-150,-118},{150,-148}},
                 textString="c=%c
 d=%d"),   Bitmap(extent={{-72,-44},{84,46}},
-            fileName="modelica://Modelica/Resources/Images/Mechanics/Translational/SpringDamper.png"),
+            fileName="modelica:/Modelica/Resources/Images/Mechanics/Translational/SpringDamper.png"),
           Text( extent={{12,96},{96,66}},
                 horizontalAlignment=TextAlignment.Right,
           textString="s2"),      Text(
diff --git a/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamperNoRelativeStates.mo b/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamperNoRelativeStates.mo
index 991ff9cfd2..503132c7e1 100644
--- a/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamperNoRelativeStates.mo
+++ b/Modelica/Mechanics/Translational/Examples/Utilities/SpringDamperNoRelativeStates.mo
@@ -29,7 +29,7 @@ to describe a coupling of the element with the housing via a spring/damper.
 
        
 
 
        
-This is the same element as Translational.Components.SpringDamper
+This is the same element as Translational.Components.SpringDamper
 but with the only difference, that the relative quantities are not used as states. If the relative
 states are potentially used as states, \"a_rel = der(v_rel)\" is present, and then exporting this model
 as FMU requires to also have the accelerations in the flanges as inputs, which is usually not
diff --git a/Modelica/Mechanics/Translational/Interfaces/InternalSupport.mo b/Modelica/Mechanics/Translational/Interfaces/InternalSupport.mo
index ef88d17ba4..4414db53f3 100644
--- a/Modelica/Mechanics/Translational/Interfaces/InternalSupport.mo
+++ b/Modelica/Mechanics/Translational/Interfaces/InternalSupport.mo
@@ -21,7 +21,7 @@ equation
               fillPattern=FillPattern.Solid)}), Documentation(info="
 
        
 This is an adapter model to utilize a conditional
-support connector
+support connector
 in a component. It could be applied to both textually (equations based) and graphically
 defined components:
 
        
@@ -41,9 +41,9 @@ This approach of internal support is utilized, e.g., via the following partial m
 
        
 
 
 
 
        
diff --git a/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo b/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo
index b5e7d87e84..a76174f9c3 100644
--- a/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo
+++ b/Modelica/Mechanics/Translational/Interfaces/PartialFriction.mo
@@ -76,7 +76,7 @@ This procedure is implemented in a \"clean\" way by state events and
 leads to a mixed continuous/discrete systems of equations if friction elements
 are dynamically coupled which have to be solved by appropriate
 numerical methods. The method is described in
-(see also a short sketch in UsersGuide.ModelingOfFriction):
+(see also a short sketch in UsersGuide.ModelingOfFriction):
 
        
 
        
 
        Otter M., Elmqvist H., and Mattsson S.E. (1999):
        
diff --git a/Modelica/Mechanics/Translational/Interfaces/Support.mo b/Modelica/Mechanics/Translational/Interfaces/Support.mo
index 1fa5bb6b0b..7bc1f05cb1 100644
--- a/Modelica/Mechanics/Translational/Interfaces/Support.mo
+++ b/Modelica/Mechanics/Translational/Interfaces/Support.mo
@@ -48,12 +48,12 @@ The support connector is usually defined as conditional connector. It is most co
 
 "));
 end Support;
diff --git a/Modelica/Mechanics/Translational/Sensors/AccSensor.mo b/Modelica/Mechanics/Translational/Sensors/AccSensor.mo
index c45987db1e..1f8886f8e4 100644
--- a/Modelica/Mechanics/Translational/Sensors/AccSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/AccSensor.mo
@@ -16,7 +16,7 @@ Measures the absolute acceleration
 of a flange in an ideal way and provides the result as
 output signal a
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/ForceSensor.mo b/Modelica/Mechanics/Translational/Sensors/ForceSensor.mo
index 410643c14b..2128853879 100644
--- a/Modelica/Mechanics/Translational/Sensors/ForceSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/ForceSensor.mo
@@ -16,7 +16,7 @@ equation
 Measures the cut-force between two flanges
 in an ideal way and provides the result as output signal f
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/PositionSensor.mo b/Modelica/Mechanics/Translational/Sensors/PositionSensor.mo
index 92f472acfc..66e5cf8704 100644
--- a/Modelica/Mechanics/Translational/Sensors/PositionSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/PositionSensor.mo
@@ -15,7 +15,7 @@ Measures the absolute position
 of a flange in an ideal way and provides the result as
 output signal s
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/PowerSensor.mo b/Modelica/Mechanics/Translational/Sensors/PowerSensor.mo
index 8fec947091..5d64688acb 100644
--- a/Modelica/Mechanics/Translational/Sensors/PowerSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/PowerSensor.mo
@@ -17,7 +17,7 @@ equation
 Measures the power between two flanges
 in an ideal way and provides the result as output signal power
 (to be further processed with blocks of the
-Modelica.Blocks library), i.e.
+Modelica.Blocks library), i.e.
 
        
 
         power = flange_a.f * der(flange_a.s)
diff --git a/Modelica/Mechanics/Translational/Sensors/RelAccSensor.mo b/Modelica/Mechanics/Translational/Sensors/RelAccSensor.mo
index e7e274d57c..52ca20b3b0 100644
--- a/Modelica/Mechanics/Translational/Sensors/RelAccSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/RelAccSensor.mo
@@ -21,7 +21,7 @@ equation
 Measures the relative acceleration between two flanges
 in an ideal way and provides the result as output signal a_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/RelPositionSensor.mo b/Modelica/Mechanics/Translational/Sensors/RelPositionSensor.mo
index 79423c917a..ab2528c5d5 100644
--- a/Modelica/Mechanics/Translational/Sensors/RelPositionSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/RelPositionSensor.mo
@@ -17,7 +17,7 @@ equation
 Measures the relative position between two flanges
 in an ideal way and provides the result as output signal s_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/RelSpeedSensor.mo b/Modelica/Mechanics/Translational/Sensors/RelSpeedSensor.mo
index 13bc05a27f..d2e211ff4a 100644
--- a/Modelica/Mechanics/Translational/Sensors/RelSpeedSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/RelSpeedSensor.mo
@@ -19,7 +19,7 @@ equation
 Measures the relative velocity between two flanges
 in an ideal way and provides the result as output signal v_rel
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 ",
       revisions="
diff --git a/Modelica/Mechanics/Translational/Sensors/SpeedSensor.mo b/Modelica/Mechanics/Translational/Sensors/SpeedSensor.mo
index aa9aa31ad4..34ca73cffe 100644
--- a/Modelica/Mechanics/Translational/Sensors/SpeedSensor.mo
+++ b/Modelica/Mechanics/Translational/Sensors/SpeedSensor.mo
@@ -14,7 +14,7 @@ Measures the absolute velocity
 of a flange in an ideal way and provides the result as
 output signal v
 (to be further processed with blocks of the
-Modelica.Blocks library).
+Modelica.Blocks library).
 
        
 "),
        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
diff --git a/Modelica/Mechanics/Translational/Sensors/package.mo b/Modelica/Mechanics/Translational/Sensors/package.mo
index 3f143197a3..9ed20b9f5c 100644
--- a/Modelica/Mechanics/Translational/Sensors/package.mo
+++ b/Modelica/Mechanics/Translational/Sensors/package.mo
@@ -15,7 +15,7 @@ package Sensors "Sensors for 1-dim. translational mechanical quantities"
 
        
 This package contains ideal sensor components that provide
 the connector variables as signals for further processing with the
-Modelica.Blocks library.
+Modelica.Blocks library.
 
        
 "));
 end Sensors;
diff --git a/Modelica/Mechanics/Translational/UsersGuide/Contact.mo b/Modelica/Mechanics/Translational/UsersGuide/Contact.mo
index 6236626b8a..83b4642487 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/Contact.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/Contact.mo
@@ -7,7 +7,7 @@ class Contact "Contact"
 
 
        
 For current information on library officers please refer to the main
-Contact section.
+Contact section.
 
        
 
 
        Main contributors
        
diff --git a/Modelica/Mechanics/Translational/UsersGuide/FlangeConnectors.mo b/Modelica/Mechanics/Translational/UsersGuide/FlangeConnectors.mo
index 085b52f1aa..de952fdb03 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/FlangeConnectors.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/FlangeConnectors.mo
@@ -5,9 +5,9 @@ class FlangeConnectors "Flange Connectors"
   annotation (DocumentationClass=true, Documentation(info="
 
        
 A flange is described by the connector class
-Flange_a
-or Flange_b.
-As already noted in section Overview,
+Flange_a
+or Flange_b.
+As already noted in section Overview,
 the two connector
 classes are completely identical. There is only a difference in the icons,
 in order to easier identify a flange variable in a diagram.
diff --git a/Modelica/Mechanics/Translational/UsersGuide/Overview.mo b/Modelica/Mechanics/Translational/UsersGuide/Overview.mo
index 90a9aaeebc..7820f973bd 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/Overview.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/Overview.mo
@@ -10,7 +10,7 @@ mechanical systems, including different types of masses,
 external forces, spring/damper elements,
 frictional elements, elastogaps, elements to measure position, velocity,
 acceleration or the cut-force of a flange. In sublibrary
-Examples
+Examples
 several examples are present to demonstrate the usage of
 the elements. Just open the corresponding example model and simulate
 the model according to the provided description.
@@ -30,7 +30,7 @@ systems are available in the simulation tool, the simulation of
 
        
 
 
        
-\"drive1\"
+\"drive1\"
 
        
 
 
        
@@ -61,8 +61,8 @@ together, see figure below.
 
        
 
 
        
-\"driveConnections1\"
        
-\"driveConnections2\"
        
+\"driveConnections1\"
        
+\"driveConnections2\"
        
 
        
 "));
 
diff --git a/Modelica/Mechanics/Translational/UsersGuide/SignConventions.mo b/Modelica/Mechanics/Translational/UsersGuide/SignConventions.mo
index 0a1e553f9d..7f464f84f4 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/SignConventions.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/SignConventions.mo
@@ -13,7 +13,7 @@ at hand of the following figure:
 
        
 
 
        
-\"drive2\"
+\"drive2\"
 
        
 
 
        
@@ -30,7 +30,7 @@ vector direction displayed according to this rule:
 
        
 
 
        
-\"drive3\"
+\"drive3\"
 
        
 
        
 The cut-force mass2.flange_a.f
diff --git a/Modelica/Mechanics/Translational/UsersGuide/StateSelection.mo b/Modelica/Mechanics/Translational/UsersGuide/StateSelection.mo
index 04f5c8b6d4..b0f0f54a45 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/StateSelection.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/StateSelection.mo
@@ -6,7 +6,7 @@ class StateSelection "State Selection"
 
        
 Only a few components of the Translational library use the der(…) operator
 and are therefore candidates to have states. Most important, component
-Mass
+Mass
 defines the absolute position and the absolute velocity of this
 component as candidate for states. In the "Advanced" menu the built-in StateSelect
 enumeration can be set to define the priority to use these variables as states.
@@ -65,9 +65,9 @@ At the time of the library design, there was not yet a possibility to provide th
 In order to reduce this effect, it is advisable to not use absolute positions, but
 relative positions as states. A user can define relative variables as states
 explicitly with component
-RelativeStates.
+RelativeStates.
 Furthermore, all compliant components, such as
-SpringDamper are
+SpringDamper are
 defining the relative position and the relative velocity as preferred states.
 Therefore, a tool will select in most cases relative positions as states.
 
        
diff --git a/Modelica/Mechanics/Translational/UsersGuide/SupportForces.mo b/Modelica/Mechanics/Translational/UsersGuide/SupportForces.mo
index 91c53fd414..20090d9160 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/SupportForces.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/SupportForces.mo
@@ -13,7 +13,7 @@ If it is disabled, it needs not be connected.
 
        
 
 
        
-\"bearing\"
+\"bearing\"
 
        
 
 
        
@@ -24,7 +24,7 @@ identical results.
 
        
 
 
        
-\"bearing2\"
+\"bearing2\"
 
        
 "));
 
diff --git a/Modelica/Mechanics/Translational/UsersGuide/UserDefinedComponents.mo b/Modelica/Mechanics/Translational/UsersGuide/UserDefinedComponents.mo
index 218d9f3425..bf33acafa6 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/UserDefinedComponents.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/UserDefinedComponents.mo
@@ -10,21 +10,21 @@ elements of this package.
 It is convenient to define a new
 component by inheritance from one of the following base classes,
 which are defined in sublibrary
-Interfaces:
+Interfaces:
 
        
 
 
        
   List of common base classes for 1-dimensional rotational components
   
        NameDescription
        
   
        PartialCompliant
+    PartialCompliant
     
      Compliant connection of two rotational 1-dim. flanges
          (used for force laws such as a spring or a damper).
     
   
        
   
        PartialCompliantWithRelativeStates
+    PartialCompliantWithRelativeStates
     
      Same as "PartialCompliant", but relative angle and relative speed are
          defined as preferred states. Use this partial model if the force law
@@ -35,32 +35,32 @@ which are defined in sublibrary Interfaces:
     
   
        
   
        PartialElementaryTwoFlangesAndSupport2
+    PartialElementaryTwoFlangesAndSupport2
     
      Partial model for a 1-dim. rotational gear consisting of the flange of
          an input shaft, the flange of an output shaft and the support.
     
   
        
   
        PartialTorque
+    PartialTorque
     
      Partial model of a torque acting at the flange (accelerates the flange).
     
   
        
   
        PartialTwoFlanges
+    PartialTwoFlanges
     
      General connection of two rotational 1-dim. flanges.
     
   
        
   
        PartialAbsoluteSensor
+    PartialAbsoluteSensor
     
      Measure absolute flange variables.
     
   
        
   
        PartialRelativeSensor
+    PartialRelativeSensor
     
      Measure relative flange variables.
     
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
        
-    
-    
-    
-    
-    
-    
-    
@@ -86,7 +86,7 @@ for a mass component:
 
        
-\"driveAxis\"
+\"driveAxis\"
 
        
@@ -101,7 +101,7 @@ component. But this is not the case, as shown in the next figure:
 
        
-\"masses\"
+\"masses\"
 
        
@@ -118,7 +118,7 @@ the left figure it seems to be that the velocity vector of
 left to right as shown in the right part of the figure, where the
 local coordinate systems are drawn such that they are aligned.
 Note, that the simple rule stated in section
-Sign conventions
+Sign conventions
 also determines that
 the velocity of mass2 in the left part of the
 figure is directed from left to right.
@@ -130,7 +130,7 @@ are expressed correctly. The selection of the coordinate system
 is arbitrary and has no influence on the usage of the component.
 Especially, the actual direction of, e.g., a cut-force is most
 easily determined by the rule of section
-Sign conventions.
+Sign conventions.
 A more strict determination
 by aligning coordinate systems and then using the vector direction
 of the local coordinate systems, often requires a re-drawing of the
diff --git a/Modelica/Mechanics/Translational/UsersGuide/package.mo b/Modelica/Mechanics/Translational/UsersGuide/package.mo
index d730b5b01e..d711769df3 100644
--- a/Modelica/Mechanics/Translational/UsersGuide/package.mo
+++ b/Modelica/Mechanics/Translational/UsersGuide/package.mo
@@ -8,12 +8,12 @@ More details are given in the following sub-sections:
 
        "));
 end UsersGuide;
diff --git a/Modelica/Mechanics/Translational/package.mo b/Modelica/Mechanics/Translational/package.mo
index 31793186e0..5dcb42b39b 100644
--- a/Modelica/Mechanics/Translational/package.mo
+++ b/Modelica/Mechanics/Translational/package.mo
@@ -94,7 +94,7 @@ it must be connected, and if it is not enabled, it must not be connected.
 Independently, whether the heatPort is enabled or not,
 the dissipated power is available from the new variable \"lossPower\" (which is
 positive if heat is flowing out of the heatPort). For an example, see
-Examples.HeatLosses.
+Examples.HeatLosses.
 
        
diff --git a/Modelica/Media/Air/DryAirNasa.mo b/Modelica/Media/Air/DryAirNasa.mo
index 9713e5e8a2..18d45e7259 100644
--- a/Modelica/Media/Air/DryAirNasa.mo
+++ b/Modelica/Media/Air/DryAirNasa.mo
@@ -48,11 +48,11 @@ package DryAirNasa "Air: Detailed dry air model as ideal gas (200..6000 K)"
 
   annotation (Documentation(info="
 
        
-    
+    
 
        
-Ideal gas medium model for dry air based on the package IdealGases with additional functions for dynamic viscosity and thermal conductivity in a limited temperature range.
+Ideal gas medium model for dry air based on the package IdealGases with additional functions for dynamic viscosity and thermal conductivity in a limited temperature range.
 
        "));
 end DryAirNasa;
diff --git a/Modelica/Media/Air/MoistAir.mo b/Modelica/Media/Air/MoistAir.mo
index b698e1293e..f023c80450 100644
--- a/Modelica/Media/Air/MoistAir.mo
+++ b/Modelica/Media/Air/MoistAir.mo
@@ -96,7 +96,7 @@ required from medium model \""
     x_water = Xi[Water]/max(X_air, 100*Constants.eps);
     phi = p/p_steam_sat*Xi[Water]/(Xi[Water] + k_mair*X_air);
     annotation (Documentation(info="
-
        This model computes thermodynamic properties of moist air from three independent (thermodynamic or/and numerical) state variables. Preferred numerical states are temperature T, pressure p and the reduced composition vector Xi, which contains the water mass fraction only. As an EOS the ideal gas law is used and associated restrictions apply. The model can also be used in the fog region, when moisture is present in its liquid state. However, it is assumed that the liquid water volume is negligible compared to that of the gas phase. Computation of thermal properties is based on property data of  dry air and water (source: VDI-Wärmeatlas), respectively. Besides the standard thermodynamic variables absolute and relative humidity, x_water and phi, respectively, are given by the model. Upper case X denotes absolute humidity with respect to mass of moist air while absolute humidity with respect to mass of dry air only is denoted by a lower case x throughout the model. See package description for further information.
        
+
        This model computes thermodynamic properties of moist air from three independent (thermodynamic or/and numerical) state variables. Preferred numerical states are temperature T, pressure p and the reduced composition vector Xi, which contains the water mass fraction only. As an EOS the ideal gas law is used and associated restrictions apply. The model can also be used in the fog region, when moisture is present in its liquid state. However, it is assumed that the liquid water volume is negligible compared to that of the gas phase. Computation of thermal properties is based on property data of  dry air and water (source: VDI-Wärmeatlas), respectively. Besides the standard thermodynamic variables absolute and relative humidity, x_water and phi, respectively, are given by the model. Upper case X denotes absolute humidity with respect to mass of moist air while absolute humidity with respect to mass of dry air only is denoted by a lower case x throughout the model. See package description for further information.
        "));
   end BaseProperties;
 
@@ -119,7 +119,7 @@ required from medium model \""
             X,
             {1 - sum(X)}));
     annotation (smoothOrder=2, Documentation(info="
-The thermodynamic state record is computed from pressure p, temperature T and composition X.
+The thermodynamic state record is computed from pressure p, temperature T and composition X.
 "));
   end setState_pTX;
 
@@ -148,7 +148,7 @@ The thermo
             X,
             {1 - sum(X)}));
     annotation (smoothOrder=2, Documentation(info="
-The thermodynamic state record is computed from pressure p, specific enthalpy h and composition X.
+The thermodynamic state record is computed from pressure p, specific enthalpy h and composition X.
 "));
   end setState_phX;
 
@@ -174,7 +174,7 @@ The thermo
             X,
             {1 - sum(X)}));
     annotation (smoothOrder=2, Documentation(info="
-The thermodynamic state record is computed from density d, temperature T and composition X.
+The thermodynamic state record is computed from density d, temperature T and composition X.
 "));
   end setState_dTX;
 
@@ -309,7 +309,7 @@ Relative humidity is computed from the thermodynamic state record with 1.0 as th
   algorithm
     R_s := dryair.R_s*(1 - state.X[Water]) + steam.R_s*state.X[Water];
     annotation (smoothOrder=2, Documentation(info="
-The ideal gas constant for moist air is computed from thermodynamic state assuming that all water is in the gas phase.
+The ideal gas constant for moist air is computed from thermodynamic state assuming that all water is in the gas phase.
 "));
   end gasConstant;
 
@@ -451,7 +451,7 @@ The ideal gas constant for moist air is computed from the gas phase composition.
       derivative=saturationPressure_der,
       Documentation(info="
 Saturation pressure of water in the liquid and the solid region is computed using correlations. Functions for the
-solid and the  liquid region, respectively, are combined using the first derivative continuous spliceFunction. This functions range of validity is from 190 to 647.096 K. For more information on the type of correlation used, see the documentation of the linked functions.
+solid and the  liquid region, respectively, are combined using the first derivative continuous spliceFunction. This functions range of validity is from 190 to 647.096 K. For more information on the type of correlation used, see the documentation of the linked functions.
 "));
   end saturationPressure;
 
@@ -477,7 +477,7 @@ Saturation pressure of water in the liquid and the solid region is computed usin
       Inline=false,
       smoothOrder=5,
       Documentation(info="
-Derivative function of saturationPressure
+Derivative function of saturationPressure"));
   end saturationPressure_der;
 
@@ -501,7 +501,7 @@ Derivative function of saturationPressure. Therefore additional inputs are required (or the defaults are used) for upper and lower temperature bounds.
+Computes saturation temperature from (partial) pressure via numerical inversion of the function saturationPressure. Therefore additional inputs are required (or the defaults are used) for upper and lower temperature bounds.
 "));
   end saturationTemperature;
 
@@ -571,7 +571,7 @@ The specific heat capacity of water (liquid and solid) is calculated using a
       Inline=false,
       smoothOrder=5,
       Documentation(info="
-Specific enthalpy of liquid water is computed from temperature using a polynomial approach. Kept for compatibility reasons, better use enthalpyOfWater instead.
+Specific enthalpy of liquid water is computed from temperature using a polynomial approach. Kept for compatibility reasons, better use enthalpyOfWater instead.
 "));
   end enthalpyOfLiquid;
 
@@ -593,7 +593,7 @@ Specific enthalpy of liquid water is computed from temperature using a polynomia
       Inline=false,
       smoothOrder=5,
       Documentation(info="
-Specific enthalpy of moist air is computed from temperature, provided all water is in the gaseous state. The first entry in the composition vector X must be the mass fraction of steam. For a function that also covers the fog region please refer to h_pTX.
+Specific enthalpy of moist air is computed from temperature, provided all water is in the gaseous state. The first entry in the composition vector X must be the mass fraction of steam. For a function that also covers the fog region please refer to h_pTX.
 "));
   end enthalpyOfGas;
 
@@ -680,7 +680,7 @@ Pressure is assumed to be around 1 bar. This function is usually used to determi
           dT,
           0);
     annotation (Documentation(info="
-Derivative function for enthalpyOfWater.
+Derivative function for enthalpyOfWater.
 
 "));
   end enthalpyOfWater_der;
@@ -727,7 +727,7 @@ Temperature is returned from the thermodynamic state record input as a simple as
     T := Modelica.Math.Nonlinear.solveOneNonlinearEquation(
       function f_nonlinear(p=p, h=h, X=X[1:nXi]), 190, 647);
     annotation (Documentation(info="
-Temperature is computed from pressure, specific enthalpy and composition via numerical inversion of function h_pTX.
+Temperature is computed from pressure, specific enthalpy and composition via numerical inversion of function h_pTX.
 "));
   end T_phX;
 
@@ -871,7 +871,7 @@ Specific enthalpy of moist air is computed from pressure, temperature and compos
       Inline=false,
       smoothOrder=1,
       Documentation(info="
-Derivative function for h_pTX.
+Derivative function for h_pTX.
 "));
   end h_pTX_der;
 
@@ -1044,7 +1044,7 @@ Specific internal energy is determined from pressure p, temperature T and compos
           h_off=25104.684) + X_liquid*enthalpyOfWater_der(T=T, dT=dT) +
       dX_liq*enthalpyOfWater(T) - dR_gas*T - R_gas*dT;
     annotation (Documentation(info="
-Derivative function for specificInternalEnergy_pTX.
+Derivative function for specificInternalEnergy_pTX.
 "));
   end specificInternalEnergy_pTX_der;
 
@@ -1272,7 +1272,7 @@ end thermalConductivity;
     T := Modelica.Math.Nonlinear.solveOneNonlinearEquation(
       function f_nonlinear(p=p, s=s, X=X[1:nX]), 190, 647);
     annotation (Documentation(info="
-Temperature is computed from pressure, specific entropy and composition via numerical inversion of function s_pTX.
+Temperature is computed from pressure, specific entropy and composition via numerical inversion of function s_pTX.
 ",
         revisions="
        2012-01-12 Stefan Wischhusen: Initial Release.
        
@@ -1298,7 +1298,7 @@ Temperature is computed from pressure, specific entropy and composition via nume
             X,
             {1 - sum(X)}));
     annotation (smoothOrder=2, Documentation(info="
-The thermodynamic state record is computed from pressure p, specific enthalpy h and composition X.
+The thermodynamic state record is computed from pressure p, specific enthalpy h and composition X.
 ",
         revisions="
        2012-01-12 Stefan Wischhusen: Initial Release.
        
@@ -1550,11 +1550,11 @@ The thermodynamic model may be used for temperatures ranging fr
 
        Several additional functions that are not needed to describe the thermodynamic system, but are required to model transport processes, like heat and mass transfer, may be called. They usually neglect the moisture influence unless otherwise stated.
        Application
        
-
        The model's main area of application is all processes that involve moist air cooling under near atmospheric pressure with possible moisture condensation. This is the case in all domestic and industrial air conditioning applications. Another large domain of moist air applications covers all processes that deal with dehydration of bulk material using air as a transport medium. Engineering tasks involving moist air are often performed (or at least visualized) by using charts that contain all relevant thermodynamic data for a moist air system. These so called psychrometric charts can be generated from the medium properties in this package. The model PsychrometricData may be used for this purpose in order to obtain data for figures like those below (the plotting itself is not part of the model though).
        
+
        The model's main area of application is all processes that involve moist air cooling under near atmospheric pressure with possible moisture condensation. This is the case in all domestic and industrial air conditioning applications. Another large domain of moist air applications covers all processes that deal with dehydration of bulk material using air as a transport medium. Engineering tasks involving moist air are often performed (or at least visualized) by using charts that contain all relevant thermodynamic data for a moist air system. These so called psychrometric charts can be generated from the medium properties in this package. The model PsychrometricData may be used for this purpose in order to obtain data for figures like those below (the plotting itself is not part of the model though).
        
-
        
-
+
        
+
 
        
diff --git a/Modelica/Media/Air/ReferenceAir.mo b/Modelica/Media/Air/ReferenceAir.mo
index 89511e4b5f..ba62a9f026 100644
--- a/Modelica/Media/Air/ReferenceAir.mo
+++ b/Modelica/Media/Air/ReferenceAir.mo
@@ -56,7 +56,7 @@ within Modelica.Media.Air;
       annotation (Documentation(info="
 
        Usage
        
-The package Air_ph can be used as any other medium model (see User's Guide of Media Library for further information).
+The package Air_ph can be used as any other medium model (see User's Guide of Media Library for further information).
 
        "));
     end Air_ph;
@@ -74,7 +74,7 @@ The package Air_ph can be used as any other medium model (see User's Guide of Media Library for further information).
+The package Air_pT can be used as any other medium model (see User's Guide of Media Library for further information).
 
        "));
     end Air_pT;
@@ -93,7 +93,7 @@ The package Air_pT can be used as any other medium model (see User's Guide of Media Library for further information).
+The package Air_dT can be used as any other medium model (see User's Guide of Media Library for further information).
 
        "));
     end Air_dT;
@@ -565,9 +565,9 @@ The following quantities are always computed:
 In some cases additional medium properties are needed.
 A component that needs these optional properties has to call
 one of the functions listed in
-
+
 Modelica.Media.UsersGuide.MediumUsage.OptionalProperties and in
-
+
 Modelica.Media.UsersGuide.MediumUsage.TwoPhase.
 
        Many further properties can be computed. Using the well-known Bridgman's Tables, all first partial derivatives of the standard thermodynamic variables can be computed easily.
        
@@ -2099,9 +2099,9 @@ Modelica.Media.UsersGuide.MediumUsage.TwoPhase.
     end Air_Utilities;
     annotation (Documentation(info="
        
-Calculation of fluid properties of air in the fluid region of 130 Kelvin to 2000 Kelvin at pressures up to 2000 MPa. To use this package in your model, select 
-Air_dT, 
-Air_pT or Air_ph according to which variables you choose to determine your state.
+Calculation of fluid properties of air in the fluid region of 130 Kelvin to 2000 Kelvin at pressures up to 2000 MPa. To use this package in your model, select 
+Air_dT, 
+Air_pT or Air_ph according to which variables you choose to determine your state.
 
        Restriction
        
@@ -2133,7 +2133,7 @@ Nitrogen, Oxygen, Argon, and Air. International Journal of Thermophysic
 
        Verification
        
 The verification report for the development of this library is provided
-here.
+here.
 
        Acknowledgment
        
diff --git a/Modelica/Media/Air/ReferenceMoistAir.mo b/Modelica/Media/Air/ReferenceMoistAir.mo
index fa8ae0f1df..1fd36974f4 100644
--- a/Modelica/Media/Air/ReferenceMoistAir.mo
+++ b/Modelica/Media/Air/ReferenceMoistAir.mo
@@ -1862,9 +1862,9 @@ package ReferenceMoistAir
   annotation (Documentation(info="
        
 This is a makeshift package avoiding the region validity checks of the IF97 utility functions
-BaseIF97.Basic.g2,
-BaseIF97.Transport.cond_dTp and
-BaseIF97.Transport.visc_dTp
+BaseIF97.Basic.g2,
+BaseIF97.Transport.cond_dTp and
+BaseIF97.Transport.visc_dTp
 for region 2.
 
        ", revisions="
@@ -3967,7 +3967,7 @@ The functions provided by this package shall be used inside of the restricted li
 
 
        Usage
        
-The package MoistAir can be used as any other medium model (see User's Guide of Media Library for further information). The package defines two boolean constants useEnhancementFactor and useDissociation, which give the user fine grained control of the calculations.
+The package MoistAir can be used as any other medium model (see User's Guide of Media Library for further information). The package defines two boolean constants useEnhancementFactor and useDissociation, which give the user fine grained control of the calculations.
 
        
   List of common base classes for 1-dimensional translational components
   
        NameDescription
        
   
        PartialCompliant
+    PartialCompliant
     
      Compliant connection of two translational 1-dim. flanges
          (used for force laws such as a spring or a damper).
     
   
        
   
        PartialCompliantWithRelativeStates
+    PartialCompliantWithRelativeStates
     
      Same as "PartialCompliant", but relative position and relative speed are
          defined as preferred states. Use this partial model if the force law
@@ -34,32 +34,32 @@ which are defined in sublibrary
     
   
        
   
        PartialElementaryTwoFlangesAndSupport2
+    PartialElementaryTwoFlangesAndSupport2
     
      Partial model for a 1-dim. translational component consisting of the flange of
          an input shaft, the flange of an output shaft and the support.
     
   
        
   
        PartialForce
+    PartialForce
     
      Partial model of an external force acting at the flange (accelerates the flange).
     
   
        
   
        PartialTwoFlanges
+    PartialTwoFlanges
     
      General connection of two translational 1-dim. flanges.
     
   
        
   
        PartialAbsoluteSensor
+    PartialAbsoluteSensor
     
      Measure absolute flange variables.
     
   
        
   
        PartialRelativeSensor
+    PartialRelativeSensor
     
      Measure relative flange variables.
     
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
        
@@ -4139,7 +4139,7 @@ Nitrogen, Oxygen, Argon, and Air. International Journal of Thermophysic
 
        Verification
        
 The verification report for the development of this library is provided
-here.
+here.
 
        Acknowledgment
        
diff --git a/Modelica/Media/IdealGases/Common/FluidData.mo b/Modelica/Media/IdealGases/Common/FluidData.mo
index 19fbf39b48..53cffa757e 100644
--- a/Modelica/Media/IdealGases/Common/FluidData.mo
+++ b/Modelica/Media/IdealGases/Common/FluidData.mo
@@ -693,7 +693,7 @@ package FluidData "Critical data, dipole moments and related data"
 
        
 This package contains FluidConstants data records for the following 38 gases
 (see also the description in
-Modelica.Media.IdealGases):
+Modelica.Media.IdealGases):
 
         Argon         Methane           Methanol         Carbon Monoxide  Carbon Dioxide
diff --git a/Modelica/Media/IdealGases/Common/package.mo b/Modelica/Media/IdealGases/Common/package.mo
index 38f64cf045..6fb771fbf9 100644
--- a/Modelica/Media/IdealGases/Common/package.mo
+++ b/Modelica/Media/IdealGases/Common/package.mo
@@ -28,7 +28,7 @@ ideal gas equations according to:
 
        
 The equations have the following structure:
 
        
-
        
+
        
 
        
 The polynomials for h(T) and s0(T) are derived via integration from the one for cp(T)  and contain the integration constants b1, b2 that define the reference specific enthalpy and entropy. For entropy differences the reference pressure p0 is arbitrary, but not for absolute entropies. It is chosen as 1 standard atmosphere (101325 Pa).
 
        
diff --git a/Modelica/Media/IdealGases/SingleGases.mo b/Modelica/Media/IdealGases/SingleGases.mo
index 04e6bbe688..4c3dd4b55b 100644
--- a/Modelica/Media/IdealGases/SingleGases.mo
+++ b/Modelica/Media/IdealGases/SingleGases.mo
@@ -8,7 +8,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
      data=Common.SingleGasesData.Ar,
      fluidConstants={Common.FluidData.Ar});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end Ar;
 
   package CH4 "Ideal gas \"CH4\" from NASA Glenn coefficients"
@@ -17,7 +17,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.CH4,
        fluidConstants={Common.FluidData.CH4});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end CH4;
 
   package CH3OH "Ideal gas \"CH3OH\" from NASA Glenn coefficients"
@@ -26,7 +26,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.CH3OH,
        fluidConstants={Common.FluidData.CH3OH});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end CH3OH;
 
   package CO "Ideal gas \"CO\" from NASA Glenn coefficients"
@@ -35,7 +35,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.CO,
        fluidConstants={Common.FluidData.CO});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end CO;
 
   package CO2 "Ideal gas \"CO2\" from NASA Glenn coefficients"
@@ -44,7 +44,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.CO2,
        fluidConstants={Common.FluidData.CO2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end CO2;
 
   package C2H2_vinylidene
@@ -54,7 +54,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C2H2_vinylidene,
        fluidConstants={Common.FluidData.C2H2_vinylidene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C2H2_vinylidene;
 
   package C2H4 "Ideal gas \"C2H4\" from NASA Glenn coefficients"
@@ -63,7 +63,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C2H4,
        fluidConstants={Common.FluidData.C2H4});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C2H4;
 
   package C2H5OH "Ideal gas \"C2H5OH\" from NASA Glenn coefficients"
@@ -72,7 +72,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C2H5OH,
        fluidConstants={Common.FluidData.C2H5OH});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C2H5OH;
 
   package C2H6 "Ideal gas \"C2H6\" from NASA Glenn coefficients"
@@ -81,7 +81,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C2H6,
        fluidConstants={Common.FluidData.C2H6});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C2H6;
 
   package C3H6_propylene
@@ -91,7 +91,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C3H6_propylene,
        fluidConstants={Common.FluidData.C3H6_propylene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C3H6_propylene;
 
   package C3H8 "Ideal gas \"C3H8\" from NASA Glenn coefficients"
@@ -100,7 +100,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C3H8,
        fluidConstants={Common.FluidData.C3H8});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C3H8;
 
   package C3H8O_1propanol
@@ -110,7 +110,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C3H8O_1propanol,
        fluidConstants={Common.FluidData.C3H7OH});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C3H8O_1propanol;
 
   package C4H8_1_butene
@@ -120,7 +120,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C4H8_1_butene,
        fluidConstants={Common.FluidData.C4H8_1_butene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C4H8_1_butene;
 
   package C4H10_n_butane
@@ -130,7 +130,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C4H10_n_butane,
        fluidConstants={Common.FluidData.C4H10_n_butane});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C4H10_n_butane;
 
   package C5H10_1_pentene
@@ -140,7 +140,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C5H10_1_pentene,
        fluidConstants={Common.FluidData.C5H10_1_pentene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C5H10_1_pentene;
 
   package C5H12_n_pentane
@@ -150,7 +150,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C5H12_n_pentane,
        fluidConstants={Common.FluidData.C5H12_n_pentane});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C5H12_n_pentane;
 
   package C6H6 "Ideal gas \"C6H6\" from NASA Glenn coefficients"
@@ -159,7 +159,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C6H6,
        fluidConstants={Common.FluidData.C6H6});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C6H6;
 
   package C6H12_1_hexene
@@ -169,7 +169,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C6H12_1_hexene,
        fluidConstants={Common.FluidData.C6H12_1_hexene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C6H12_1_hexene;
 
   package C6H14_n_hexane
@@ -179,7 +179,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C6H14_n_hexane,
        fluidConstants={Common.FluidData.C6H14_n_hexane});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C6H14_n_hexane;
 
   package C7H14_1_heptene
@@ -189,7 +189,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C7H14_1_heptene,
        fluidConstants={Common.FluidData.C7H14_1_heptene});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C7H14_1_heptene;
 
   package C7H16_n_heptane
@@ -199,7 +199,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C7H16_n_heptane,
        fluidConstants={Common.FluidData.C7H16_n_heptane});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C7H16_n_heptane;
 
   package C8H10_ethylbenz
@@ -209,7 +209,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C8H10_ethylbenz,
        fluidConstants={Common.FluidData.C8H10_ethylbenz});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C8H10_ethylbenz;
 
   package C8H18_n_octane
@@ -219,7 +219,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.C8H18_n_octane,
        fluidConstants={Common.FluidData.C8H18_n_octane});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end C8H18_n_octane;
 
   package CL2 "Ideal gas \"Cl2\" from NASA Glenn coefficients"
@@ -228,7 +228,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.CL2,
        fluidConstants={Common.FluidData.CL2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end CL2;
 
   package F2 "Ideal gas \"F2\" from NASA Glenn coefficients"
@@ -237,7 +237,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.F2,
        fluidConstants={Common.FluidData.F2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end F2;
 
   package H2 "Ideal gas \"H2\" from NASA Glenn coefficients"
@@ -246,7 +246,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.H2,
        fluidConstants={Common.FluidData.H2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end H2;
 
   package H2O "Ideal gas \"H2O\" from NASA Glenn coefficients"
@@ -255,7 +255,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.H2O,
        fluidConstants={Common.FluidData.H2O});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end H2O;
 
   package He "Ideal gas \"He\" from NASA Glenn coefficients"
@@ -264,7 +264,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.He,
        fluidConstants={Common.FluidData.He});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end He;
 
   package NH3 "Ideal gas \"NH3\" from NASA Glenn coefficients"
@@ -273,7 +273,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.NH3,
        fluidConstants={Common.FluidData.NH3});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end NH3;
 
   package NO "Ideal gas \"NO\" from NASA Glenn coefficients"
@@ -282,7 +282,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.NO,
        fluidConstants={Common.FluidData.NO});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end NO;
 
   package NO2 "Ideal gas \"NO2\" from NASA Glenn coefficients"
@@ -291,7 +291,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.NO2,
        fluidConstants={Common.FluidData.NO2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end NO2;
 
   package N2 "Ideal gas \"N2\" from NASA Glenn coefficients"
@@ -300,7 +300,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.N2,
        fluidConstants={Common.FluidData.N2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end N2;
 
   package N2O "Ideal gas \"N2O\" from NASA Glenn coefficients"
@@ -309,7 +309,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.N2O,
        fluidConstants={Common.FluidData.N2O});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end N2O;
 
   package Ne "Ideal gas \"Ne\" from NASA Glenn coefficients"
@@ -318,7 +318,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.Ne,
        fluidConstants={Common.FluidData.Ne});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end Ne;
 
   package O2 "Ideal gas \"O2\" from NASA Glenn coefficients"
@@ -327,7 +327,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.O2,
        fluidConstants={Common.FluidData.O2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end O2;
 
   package SO2 "Ideal gas \"SO2\" from NASA Glenn coefficients"
@@ -336,7 +336,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.SO2,
        fluidConstants={Common.FluidData.SO2});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end SO2;
 
   package SO3 "Ideal gas \"SO3\" from NASA Glenn coefficients"
@@ -345,7 +345,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
        data=Common.SingleGasesData.SO3,
        fluidConstants={Common.FluidData.SO3});
     annotation (Documentation(info="
        
-      
        "));
+      "));
   end SO3;
 
   annotation (Documentation(
@@ -354,7 +354,7 @@ package SingleGases "Media models of ideal gases from NASA tables"
 This package contains medium
 models for the following 37 gases
 (see also the description in
-Modelica.Media.IdealGases):
+Modelica.Media.IdealGases):
 
        
 
         Argon             Methane          Methanol       Carbon Monoxide  Carbon Dioxide
diff --git a/Modelica/Media/IdealGases/package.mo b/Modelica/Media/IdealGases/package.mo
index b7fc7822cc..1ad510843b 100644
--- a/Modelica/Media/IdealGases/package.mo
+++ b/Modelica/Media/IdealGases/package.mo
@@ -9,33 +9,33 @@ package IdealGases "Data and models of ideal gases (single, fixed and dynamic mi
   report TP-2002-211556
        
 
        
 
        Medium models for some of these gases are available in package
-IdealGases.SingleGases
-and some examples for mixtures are available in package IdealGases.MixtureGases
+IdealGases.SingleGases
+and some examples for mixtures are available in package IdealGases.MixtureGases
 
        
 
        Using and Adapting Medium Models
        
 
        
 The data records allow computing the ideal gas specific enthalpy, specific entropy and heat capacity of the substances listed below. From them, even the Gibbs energy and equilibrium constants for reactions can be computed. Critical data that is needed for computing the viscosity and thermal conductivity is not included. In order to add mixtures or single substance medium packages that are
 subtypes of
-Interfaces.PartialMedium
+Interfaces.PartialMedium
 (i.e., can be utilized at all places where PartialMedium is defined),
 a few additional steps have to be performed:
 
        
 
          
 
        1. 
 All single gas media need to define a constant instance of record
-IdealGases.Common.SingleGasNasa.FluidConstants.
+IdealGases.Common.SingleGasNasa.FluidConstants.
 For 38 ideal gases such records are provided in package
-IdealGases.Common.FluidData.
+IdealGases.Common.FluidData.
 For the other gases, such a record instance has to be provided by the user, e.g., by getting
 the data from a commercial or public data base. A public source of the needed data is for example the NIST Chemistry WebBook.
          2. 
 
 
        2. When the data is available, and a user has an instance of a
-FluidConstants record filled with data, a medium package has to be written. Note that only the dipole moment, the acentric factor and critical data are necessary for the viscosity and thermal conductivity functions.
          3. 
+FluidConstants record filled with data, a medium package has to be written. Note that only the dipole moment, the acentric factor and critical data are necessary for the viscosity and thermal conductivity functions.
 
          3. 
 
          • For single components, a new package following the pattern in
-IdealGases.SingleGases has to be created, pointing both to a data record for cp and to a user-defined fluidConstants record.
            • 
+IdealGases.SingleGases has to be created, pointing both to a data record for cp and to a user-defined fluidConstants record.
 
          • For mixtures of several components, a new package following the pattern in
-IdealGases.MixtureGases has to be created, building an array of data records for cp and an array of (partly) user-defined fluidConstants records.
            • 
+IdealGases.MixtureGases has to be created, building an array of data records for cp and an array of (partly) user-defined fluidConstants records.
 
          4. 
 
        
 
        Note that many properties can computed for the full set of 1241 gases listed below, but due to the missing viscosity and thermal conductivity functions, no fully Modelica.Media-compliant media can be defined.
        
diff --git a/Modelica/Media/Incompressible.mo b/Modelica/Media/Incompressible.mo
index 4e3987129c..f657f3b309 100644
--- a/Modelica/Media/Incompressible.mo
+++ b/Modelica/Media/Incompressible.mo
@@ -599,7 +599,7 @@ energy, which makes all medium properties pure functions of temperature.
 The default setting for both these flags is true, which enables the simulation tool
 to choose temperature as the only medium state and avoids non-linear equation
 systems, see the section about
-Static
+Static
 state selection in the Modelica.Media User's Guide.
 
        
 
@@ -608,18 +608,18 @@ state selection in the Modelica.Media User's Guide.
 Currently, the package contains the following parts:
 
        
 
          
-
        1.  
+
        2.  
       Table based medium models
          3. 
-
        3.  
+
        4.  
       Example medium models
          5. 
 
        
 
 
        
 A few examples are given in the Examples package. The model
-
+
 Examples.Glycol47 shows how the medium models can be used. For more
 realistic examples of how to implement volume models with medium properties
-look in the Medium
+look in the Medium
 usage section of the User's Guide.
 
        
 
diff --git a/Modelica/Media/R134a.mo b/Modelica/Media/R134a.mo
index aa3ae0ef0f..0b57630fa8 100644
--- a/Modelica/Media/R134a.mo
+++ b/Modelica/Media/R134a.mo
@@ -533,7 +533,7 @@ eta_vap = Medium.DynamicViscosity(Medium.setBubbleState(Medium.setSat_p(p)));
       annotation (Inline=true, Documentation(info="
 
        This function calculates the density of R134a from the state variables p (absolute pressure) and h (specific enthalpy). The density is modelled by the fundamental equation of state of Tillner-Roth and Baehr (1994).
        
 
-
        
+
        
 
 "));
     end density_ph;
@@ -551,7 +551,7 @@ This function calculates the density of R134a from the state record
 by the fundamental equation of state of Tillner-Roth and Baehr (1994).
 
        
 
-
        
+
        
 "));
     end density;
 
@@ -575,7 +575,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
       annotation (Inline=true, Documentation(info="
 
        This function calculates the Kelvin temperature of R134a from the state variables p (absolute pressure) and h (specific enthalpy). The temperature is modelled by the fundamental equation of state of Tillner-Roth and Baehr (1994).
        
 
-
        
+
        
 
 "));
     end temperature_ph;
@@ -588,7 +588,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
 
       annotation (Inline=true, Documentation(info="
 
        This function calculates the Kelvin temperature of R134a from the state record (e.g., use setState_phX function for input). The temperature is modelled by the fundamental equation of state of Tillner-Roth and Baehr (1994).
        
-
        
+
        
 "));
     end temperature;
 
@@ -597,7 +597,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
       p := state.p;
       annotation (Inline=true, Documentation(info="
 
        This function is included for the sake of completeness.
        
-
        
+
        
 "));
     end pressure;
 
@@ -608,7 +608,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
 
       annotation (Inline=true, Documentation(info="
 
        This function calculates the specific internal energy of R134a from the state record (e.g., use setState_phX function for input). The specific internal energy is modelled by the fundamental equation of state of Tillner-Roth and Baehr (1994).
        
-
        
+
        
 
 "));
     end specificInternalEnergy;
@@ -621,7 +621,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
 
       annotation (Inline=true, Documentation(info="
 
        This function is included for the sake of completeness.
        
-
        
+
        
 "));
     end specificEnthalpy;
 
@@ -652,7 +652,7 @@ by the fundamental equation of state of Tillner-Roth and Baehr (1994).
 
       annotation (Documentation(info="
 
        This function calculates the specific entropy of R134a from the state record (e.g., use setState_phX function for input). The specific entropy is modelled by the fundamental equation of state of Tillner-Roth and Baehr (1994).
        
-
        
+
        
 "));
     end specificEntropy;
 
@@ -682,7 +682,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
 
        
-
        
+
        
 "));
     end saturationTemperature;
 
@@ -705,7 +705,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
       dTp := Common.CubicSplineDerEval(localx, T_coef[int, :])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of saturation temperature of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  saturatuionTemperature.
+
        This function calculates the derivative of saturation temperature of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  saturatuionTemperature.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -737,7 +737,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         *der_p;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of saturation temperature of R134a with regard to the time derivative of p. The non-derivative function is  saturatuionTemperature.
+
        This function calculates the time derivative of saturation temperature of R134a with regard to the time derivative of p. The non-derivative function is  saturatuionTemperature.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -796,7 +796,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of liquid density of R134a in the two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleDensity.
+
        This function calculates the derivative of liquid density of R134a in the two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleDensity.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -830,7 +830,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         dl_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of liquid density of R134a with regard to the time derivative of p. The non-derivative function is  bubbleDensity.
+
        This function calculates the time derivative of liquid density of R134a with regard to the time derivative of p. The non-derivative function is  bubbleDensity.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -888,7 +888,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of vapor density of R134a in two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  dewDensity.
+
        This function calculates the derivative of vapor density of R134a in two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  dewDensity.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -922,7 +922,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         dv_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of vapor density of R134a with regard to the time derivative of p. The non-derivative function is  dewDensity.
+
        This function calculates the time derivative of vapor density of R134a with regard to the time derivative of p. The non-derivative function is  dewDensity.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -981,7 +981,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of liquid enthalpy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleEnthalpy.
+
        This function calculates the derivative of liquid enthalpy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleEnthalpy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1015,7 +1015,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         hl_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of liquid specific enthalpy of R134a with regard to the time derivative of p. The non-derivative function is  bubbleEnthalpy.
+
        This function calculates the time derivative of liquid specific enthalpy of R134a with regard to the time derivative of p. The non-derivative function is  bubbleEnthalpy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1074,7 +1074,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of vapor enthalpy of R134a in the two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  dewEnthalpy.
+
        This function calculates the derivative of vapor enthalpy of R134a in the two-phase region with regard to the state variable p (absolute pressure). The non-derivative function is  dewEnthalpy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1108,7 +1108,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         hv_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of vapor enthalpy of R134a with regard to the time derivative of p. The non-derivative function is  dewEnthalpy.
+
        This function calculates the time derivative of vapor enthalpy of R134a with regard to the time derivative of p. The non-derivative function is  dewEnthalpy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1171,7 +1171,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of vapor entropy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  dewEntropy.
+
        This function calculates the derivative of vapor entropy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  dewEntropy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1205,7 +1205,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         sv_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of vapor specific entropy of R134a with regard to the time derivative of p. The non-derivative function is  dewEntropy.
+
        This function calculates the time derivative of vapor specific entropy of R134a with regard to the time derivative of p. The non-derivative function is  dewEntropy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1267,7 +1267,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         int, 1:4])/R134aData.data.FPCRIT;
 
       annotation (Documentation(info="
-
        This function calculates the derivative of liquid entropy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleEntropy.
+
        This function calculates the derivative of liquid entropy of R134a with regard to the state variable p (absolute pressure). The non-derivative function is  bubbleEntropy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1300,7 +1300,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
         sl_coef[int, 1:4])/R134aData.data.FPCRIT*der_sat.psat;
 
       annotation (Documentation(info="
-
        This function calculates the time derivative of liquid specific entropy of R134a with regard to the time derivative of p. The non-derivative function is  bubbleEntropy.
+
        This function calculates the time derivative of liquid specific entropy of R134a with regard to the time derivative of p. The non-derivative function is  bubbleEntropy.
 
        
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
@@ -1333,7 +1333,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
 
         Restrictions
        
 
        It is only valid in the two-phase region (i.e., ptriple ≤ p ≤ pcrit ).
 
        
-
        
+
        
 "));
     end saturationPressure;
 
@@ -1354,7 +1354,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
 
         Restrictions
        
 
        This property is only defined in one-phase region.
 
        
-
        
+
        
 "));
     end specificHeatCapacityCp;
 
@@ -1393,7 +1393,7 @@ the fundamental equation of state of Tillner-Roth and Baehr (1994) and the Maxwe
 
        
 Please note, that the function can also be called in the two-phase region, but the output is not continuous for a phase transition (see Tillner-Roth and Baehr, 1994). Values in two-phase region are considerably higher than in one-phase domain. The following figure just shows one-phase properties.
 
        
-
        
+
        
 "));
     end specificHeatCapacityCv;
 
@@ -1456,7 +1456,7 @@ Please note, that the function can also be called in the two-phase region, but t
 
        An improved extended corresponding states method for estimation of viscosity of pure refrigerants and mixtures.
 Int. J. Refrig., Vol. 20, No.3, pp. 208-217, 1997.
        
 
-
        
+
        
 "));
     end dynamicViscosity;
 
@@ -1542,7 +1542,7 @@ Int. J. Refrig., Vol. 20, No.3, pp. 208-217, 1997.
 of refrigerants and refrigerant mixtures.
 Int. J. Refrig., 23 (2000) 43-63.
 
-
        
+
        
 "));
     end thermalConductivity;
 
@@ -1576,7 +1576,7 @@ Int. J. Refrig., 23 (2000) 43-63.
 
        Surface tension correlation of HFC-134a and HCFC-123.
 Proceedings of the Joint Meeting of IIR Commissions B1, B2, E1, and E2, Padua, Italy, pp. 541-548, 1994.
        
 
-
        
+
        
 "));
     end surfaceTension;
 
@@ -1600,7 +1600,7 @@ Proceedings of the Joint Meeting of IIR Commissions B1, B2, E1, and E2, Padua, I
 
         Restrictions
        
 
        This property is only defined in one-phase region.
 
        
-
        
+
        
 "));
     end velocityOfSound;
 
@@ -1874,7 +1874,7 @@ The isentropic efficiency function should not be applied in liquid region.
 
        This function calculates the density and temperature of R134a from absolute pressure and specific enthalpy. In one-phase region the function calls the fundamental Helmholtz equation of Tillner-Roth (1994). In two-phase the density and temperature is computed from cubic splines for saturated pressure, liquid and vapor density.
 
        
 
        Restrictions
        
-The function cannot be inverted in a numerical way. Please use functions rho_props_ph and T_props_ph for this purpose.
+The function cannot be inverted in a numerical way. Please use functions rho_props_ph and T_props_ph for this purpose.
 "));
     end dt_ph;
 
@@ -2356,7 +2356,7 @@ This function computes the specific enthalpy in two-phase for R134a depending on
       end if;
 
       annotation (Documentation(info="
-This function calculates the derivative of density w.r.t. time. It is used as derivative function for  rho_props_ph.
+This function calculates the derivative of density w.r.t. time. It is used as derivative function for  rho_props_ph.
 "));
     end rho_ph_der;
 
@@ -2401,7 +2401,7 @@ This function integrates the derivative of density w.r.t. time in order to allow
       end if;
 
       annotation (Documentation(info="
-This function calculates the derivative of temperature w.r.t. time. It is used as derivative function for  T_props_ph.
+This function calculates the derivative of temperature w.r.t. time. It is used as derivative function for  T_props_ph.
 "));
     end T_ph_der;
 
@@ -2533,7 +2533,7 @@ This function integrates the derivative of temperature w.r.t. time in order to a
 
        This function calculates the density of R134a from absolute pressure and temperature. The function can only be executed in one-phase region. The safety margin to the phase boundary is 1[K] and 1000[Pa].
 
        
 
        Restrictions
        
-The function cannot be inverted in a numerical way. Please use functions rho_props_ph and T_props_ph for this purpose.
+The function cannot be inverted in a numerical way. Please use functions rho_props_ph and T_props_ph for this purpose.
 "));
     end dofpT;
 
@@ -9406,7 +9406,7 @@ Proceedings of the Joint Meeting of IIR Commissions B1, B2, E1, and E2, Padua, I
 
        Verification
        
 
        
 The verification report for the development of this library is provided
-here.
+here.
 
        
 
 
        Acknowledgment
        
diff --git a/Modelica/Media/Water/IF97_Utilities.mo b/Modelica/Media/Water/IF97_Utilities.mo
index 9e00afdf07..25f29437be 100644
--- a/Modelica/Media/Water/IF97_Utilities.mo
+++ b/Modelica/Media/Water/IF97_Utilities.mo
@@ -1574,7 +1574,7 @@ The main 4 functions in this package are the functions returning the appropriate
 
        
 In addition, functions of the boiling and condensation curves compute the specific enthalpy, specific entropy, or density on these
 curves. The functions for the saturation pressure and temperature are included in the package Basic because they are part of
-the original IAPWS/IF97 standards document.
+the original IAPWS/IF97 standards document.
 These functions are also aliased to be used directly from package Water.
 
        
 
          
@@ -3777,7 +3777,7 @@ the Thermodynamic Properties of
          
 
          Package description
          
 
          
 Package BaseIF97/Basic computes the fundamental functions for the 5 regions of the steam tables
-as described in the standards document IF97.pdf. The code of these
+as described in the standards document IF97.pdf. The code of these
 functions has been generated using Mathematica and the add-on packages \"Format\" and \"Optimize\"
 to generate highly efficient, expression-optimized C-code from a symbolic representation of the thermodynamic
 functions. The C-code has than been transformed into Modelica code. An important feature of this optimization was to
@@ -4326,19 +4326,19 @@ Ordinary Water Substance
          
   
        • 
     Function visc_dTp implements a function to compute the industrial formulation of the
     dynamic viscosity of water as a function of density and temperature.
-    The details are described in the document visc.pdf.
+    The details are described in the document visc.pdf.
   
          • 
   
        • 
     Function cond_dTp implements a function to compute  the industrial formulation of the thermal conductivity of water as
     a function of density, temperature and pressure. Important note: Obviously only two of the three
     inputs are really needed, but using three inputs speeds up the computation and the three variables are known in most models anyways.
     The inputs d,T and p have to be consistent.
-    The details are described in the document surf.pdf.
+    The details are described in the document surf.pdf.
   
          • 
   
        • 
     Function surfaceTension implements a function to compute the surface tension between vapour
     and liquid water as a function of temperature.
-    The details are described in the document thcond.pdf.
+    The details are described in the document thcond.pdf.
   
          • 
 
        
 
@@ -6200,11 +6200,11 @@ for this implementation. A mostly identical version has been published by the In
 Association for the Properties
 of Water and Steam (IAPWS) with permission granted to re-publish the
 information if credit is given to IAPWS. This document is distributed with this library as
-IF97.pdf.
+IF97.pdf.
 In addition, the equations published by IAPWS for
-the transport properties dynamic viscosity (standards document: visc.pdf)
-and thermal conductivity (standards document: thcond.pdf)
-and equations for the surface tension (standards document: surf.pdf)
+the transport properties dynamic viscosity (standards document: visc.pdf)
+and thermal conductivity (standards document: thcond.pdf)
+and equations for the surface tension (standards document: surf.pdf)
 are also implemented in this library and included for reference.
 
        
 
        
@@ -6218,7 +6218,7 @@ the most common thermophysical properties (thermodynamic and transport
 properties). The implementation requires part of the common medium
 property infrastructure of the Modelica.Thermal.Properties library in the file
 Common.mo. There are a few extensions from the version of IF97 as
-documented in IF97.pdf in order to improve performance for
+documented in IF97.pdf in order to improve performance for
 dynamic simulations. Input variables for calculating the properties are
 only implemented for a limited number of variable pairs which make sense as dynamic states: (p,h), (p,T), (p,s) and (d,T).
 
        
@@ -6260,7 +6260,7 @@ equations.
   
        
 
        
 
 
 
 
        Figure 1: Regions and equations of IAPWS-IF97
   
        
     
-      \"Regions
+      \"Regions
     
   
        
 
        
@@ -6281,10 +6281,10 @@ with regard to short computing times.
 
        
 
        
 The complete description of the individual equations of the new industrial
-formulation IAPWS-IF97 is given in IF97.pdf. Comprehensive information on
+formulation IAPWS-IF97 is given in IF97.pdf. Comprehensive information on
 IAPWS-IF97 (requirements, concept, accuracy, consistency along region boundaries,
 and the increase of computing speed in comparison with IFC-67, etc.) can
-be taken from IF97.pdf or [2].
+be taken from IF97.pdf or [2].
 
        
 
        
 [1]Wagner, W., Kruse, A. Properties of Water
@@ -8614,25 +8614,25 @@ properties library. The following documents are included
 
        
 
          
   
        • 
-    IF97.pdf The standards document for the main part of the IF97.
+    IF97.pdf The standards document for the main part of the IF97.
   
          • 
   
        • 
-    Back3.pdf The backwards equations for region 3.
+    Back3.pdf The backwards equations for region 3.
   
          • 
   
        • 
-    crits.pdf The critical point data.
+    crits.pdf The critical point data.
   
          • 
   
        • 
-    meltsub.pdf The melting- and sublimation line formulation (in IF97_Utilities.BaseIF97.IceBoundaries)
+    meltsub.pdf The melting- and sublimation line formulation (in IF97_Utilities.BaseIF97.IceBoundaries)
   
          • 
   
        • 
-    surf.pdf The surface tension standard definition
+    surf.pdf The surface tension standard definition
   
          • 
   
        • 
-    thcond.pdf The thermal conductivity standard definition
+    thcond.pdf The thermal conductivity standard definition
   
          • 
   
        • 
-    visc.pdf The viscosity standard definition
+    visc.pdf The viscosity standard definition
   
          • 
 
        
 
@@ -8640,8 +8640,8 @@ properties library. The following documents are included
 
          
   
        • 
     Package BaseIF97 contains the implementation of the IAPWS-IF97 as described in
-    IF97.pdf. The explicit backwards equations for region 3 from
-    Back3.pdf are implemented as initial values for an inverse iteration of the exact
+    IF97.pdf. The explicit backwards equations for region 3 from
+    Back3.pdf are implemented as initial values for an inverse iteration of the exact
     function in IF97 for the input pairs (p,h) and (p,s).
     The low-level functions in BaseIF97 are not needed for standard simulation usage,
     but can be useful for experts and some special purposes.
diff --git a/Modelica/Media/Water/package.mo b/Modelica/Media/Water/package.mo
index 0a98045bb9..3b499c43af 100644
--- a/Modelica/Media/Water/package.mo
+++ b/Modelica/Media/Water/package.mo
@@ -886,7 +886,7 @@ This model calculates medium properties
 for water in the liquid, gas and two phase regions
 according to the IAPWS/IF97 standard, i.e., the accepted industrial standard
 and best compromise between accuracy and computation time.
-For more details see 
+For more details see 
 Modelica.Media.Water.IF97_Utilities. Three variable pairs can be the
 independent variables of the model:
 
          
@@ -922,9 +922,9 @@ The following quantities are always computed:
 In some cases additional medium properties are needed.
 A component that needs these optional properties has to call
 one of the functions listed in
-
+
 Modelica.Media.UsersGuide.MediumUsage.OptionalProperties and in
-
+
 Modelica.Media.UsersGuide.MediumUsage.TwoPhase.
 
          
 
          Many further properties can be computed. Using the well-known Bridgman's Tables, all first partial derivatives of the standard thermodynamic variables can be computed easily.
@@ -1162,7 +1162,7 @@ one of the following functions:
       
      		molar mass
      
 
      
 
      More details are given in
-
+
 Modelica.Media.UsersGuide.MediumUsage.OptionalProperties.
 
 Many additional optional functions are defined to compute properties of
@@ -1220,7 +1220,7 @@ SaturationProperties record sat, the following functions are provided:
       
    		Surface tension between liquid and vapour phase
    
 
    
 
    Details on usage and some examples are given in:
-
+
 Modelica.Media.UsersGuide.MediumUsage.TwoPhase.
 
    
 
    Many further properties can be computed. Using the well-known Bridgman's Tables,
@@ -1232,13 +1232,13 @@ distributed with computer implementations and are included here
 (in directory Modelica/Resources/Documentation/Media/Water/IF97documentation):
 
    
 
      
-
    • IF97.pdf The standards document for the main part of the IF97.
      • 
-
    • Back3.pdf The backwards equations for region 3.
      • 
-
    • crits.pdf The critical point data.
      • 
-
    • meltsub.pdf The melting- and sublimation line formulation (not implemented)
      • 
-
    • surf.pdf The surface tension standard definition
      • 
-
    • thcond.pdf The thermal conductivity standard definition
      • 
-
    • visc.pdf The viscosity standard definition
      • 
+
    • IF97.pdf The standards document for the main part of the IF97.
      • 
+
    • Back3.pdf The backwards equations for region 3.
      • 
+
    • crits.pdf The critical point data.
      • 
+
    • meltsub.pdf The melting- and sublimation line formulation (not implemented)
      • 
+
    • surf.pdf The surface tension standard definition
      • 
+
    • thcond.pdf The thermal conductivity standard definition
      • 
+
    • visc.pdf The viscosity standard definition
      • 
 
    
 "));
 end Water;
diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo
index c6ac41c801..dee72af783 100644
--- a/Modelica/Media/package.mo
+++ b/Modelica/Media/package.mo
@@ -88,7 +88,7 @@ In a component, the most basic usage of a medium model is as follows
 
    
 The second way is to use the setState_XXX functions to compute the thermodynamic state
 record from which all other thermodynamic state variables can be computed (see
-
+
 Basic definition of medium for further details on ThermodynamicState). The setState_XXX functions
 accept either X or Xi (see explanation below) and will decide internally which of these two compositions
 is provided by the user. The four fundamental setState_XXX functions are provided in PartialMedium
@@ -134,7 +134,7 @@ is given in the next figure:
 
    
 
 
    
-\"medium
+\"medium
 
    
 
 
    
@@ -249,7 +249,7 @@ port that fulfill the mass and energy balance and on a different grid components
 fulfill the momentum balance. A balance volume component, called junction
 volume below, should be primarily implemented in the following way
 (see also the implementation in
-
+
 Modelica.Media.Examples.Utilities.PortVolume):
 
    
 
    @@ -364,7 +364,7 @@ other port. Since no mass or energy is stored, no differential
 equations for thermodynamic variables are present. A component model of this type
 has therefore usually the following structure
 (see also the implementation in
-
+
 Modelica.Media.Examples.Utilities.ShortPipe):
 
    
 
    @@ -417,7 +417,7 @@ semiLinear(m_flow, ha, hb) = if m_flow ≥ 0 then m_flow*ha else m_flow*hb;
 that is, it computes the enthalpy flow rate either from the port_a or
 from the port_b properties, depending on flow direction. The exact
 details of this operator are given in
-
+
 ModelicaReference.Operators.'semiLinear()'. Especially, rules
 are defined in the Modelica specification that m_flow = 0 can be treated
 in a \"meaningful way\". Especially, if n fluid components (such as pipes)
@@ -461,7 +461,7 @@ In some cases additional medium properties are needed.
 A component that needs these optional properties has to call
 one of the functions listed in the following table. They are
 defined as partial functions within package
-PartialMedium,
+PartialMedium,
 and then (optionally) implemented in actual medium packages.
 If a component calls such an optional function and the
 medium package does not provide a new implementation for this
@@ -826,7 +826,7 @@ elements
    
       annotation (Documentation(info="
 
    
 Models for media which can exist in one-phase or two-phase conditions inherit
-from 
+from 
 Modelica.Media.Interfaces.PartialTwoPhaseMedium
 (which inherits from PartialMedium). The basic usage of these
 media models is the same as described in the previous sections. However, additional
@@ -1106,19 +1106,19 @@ exist:
 Content:
 
    
 
      
-
    1. Basic usage of medium model
      2. 
-
    2. Medium model for a balance volume
      3. 
-
    3. Medium model for a pressure loss
      4. 
-
    4. Optional medium properties
      5. 
-
    5. Constants provided by medium model
      6. 
-
    6. Two-phase media
      7. 
-
    7. Initialization
      8. 
+
    8. Basic usage of medium model
      9. 
+
    9. Medium model for a balance volume
      10. 
+
    10. Medium model for a pressure loss
      11. 
+
    11. Optional medium properties
      12. 
+
    12. Constants provided by medium model
      13. 
+
    13. Two-phase media
      14. 
+
    14. Initialization
      15. 
 
    
 
 
    
 A good demonstration how to use the media from Modelica.Media is
 given in package ModelicaTest.Media.TestsWithFluid. Under
-
+
 Modelica.Media.Examples.Utilities the most basic components of a Fluid library
 are defined. Additional media models with some very simple piping networks can be found in the
 ModelicaTest library under
@@ -1383,7 +1383,7 @@ possible to connect connectors with different media models together.
    
       annotation (Documentation(info="
 
    
 Let's now walk through the definition of a new medium model. Please refer to
-
+
 Modelica.Media.Interfaces.TemplateMedium to obtain a template of the new
 medium model code. For the moment being, consider a single-substance medium
 model.
@@ -1507,9 +1507,9 @@ in the Modelica.Fluid library:
    
 
    
 
    
 For further details, refer to the implementation of
-
+
       MixtureGasNasa model and
-
+
       MoistAir model.
 
    
 "));
@@ -1562,7 +1562,7 @@ flow direction of a pipe:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -1572,7 +1572,7 @@ Usually, it is given as:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -1585,7 +1585,7 @@ of the energy balance:
 
    
 
 
    
-
+
 
    
 
 
    
@@ -1953,7 +1953,7 @@ properties. Of course, more tests should be performed.
     annotation (DocumentationClass=true, Documentation(info="
 
    
 If a new medium model shall be introduced, copy package
-
+
 Modelica.Media.Interfaces.TemplateMedium to the desired
 location, remove the
 \"partial\" keyword from the package and provide
@@ -1963,17 +1963,17 @@ A more detailed description for the different parts of the
 TemplateMedium package is given here:
 
    
 
      
-
    1.  
+
    2.  
       Basic structure of medium interface
      3. 
-
    3.  
+
    4.  
       Basic definition of medium model
      5. 
-
    5.  
+
    6.  
       Multiple Substances
      7. 
-
    7.  
+
    8.  
       Specific enthalpy as function
      9. 
-
    9.  
+
    10.  
       Static State Selection
      11. 
-
    11.  
+
    12.  
       Test of medium model
      13. 
 
    
 "));
@@ -2102,7 +2102,7 @@ main features:
      generate as efficient code as a traditional
      (coupled) definition. This feature is described in more
      detail in section
-     Static State Selection.
+     Static State Selection.
 
  •  Optional variables, such as dynamic viscosity, are only computed if
      needed in the corresponding component.
    • 
 
  •  The independent variables of a medium model do not
@@ -2126,15 +2126,15 @@ main features:
 This User's Guide has the following main parts:
 
    
 
@@ -2514,14 +2514,14 @@ is given to compare the approximation.
 It must be noted that the relationship of both axis variables is not right-angled, the absolute humidity follows a slope which equals the enthalpy of vaporization at 0 °C. For better reading and in order to reduce the fog region the humidity axis is rotated to obtain a right-angled plot. Both charts usually contain additional information as isochores or auxiliary scales for e.g., heat ratios. Those information are omitted in this model and the charts below. Other important features of psychrometric chart data are that all mass specific variables (like absolute humidity, specific enthalpy etc.) are expressed in terms of kg dry air and that their baseline of 0 enthalpy is found at 0 °C and zero humidity.
    
 
 
    
-
    
-
+
    
+
 
    
 
 
    
 Legend: blue - constant specific enthalpy, red - constant temperature, black - constant relative humidity
    
 
-
    The model provides data for lines of constant specific enthalpy, temperature and relative humidity in a Mollier Diagram or Psychrometric Chart as they were used for the figures above. For limitations and ranges of validity please refer to the MoistAir package description. Absolute humidity x is increased with time in this model. The specific enthalpies adjusted for plotting are then obtained from:
    
+
    The model provides data for lines of constant specific enthalpy, temperature and relative humidity in a Mollier Diagram or Psychrometric Chart as they were used for the figures above. For limitations and ranges of validity please refer to the MoistAir package description. Absolute humidity x is increased with time in this model. The specific enthalpies adjusted for plotting are then obtained from:
    
 
    		• 
 Version 3.2.1
    
 
    Rod
    		shapeType="2"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/rod.dxf"
    Piston
    		shapeType="3"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/piston.dxf"
    Rod
    		shapeType="2"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/rod.dxf"
    Piston
    		shapeType="3"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/piston.dxf"
    
 
    
 
 

    
@@ -10517,7 +10517,7 @@
     		
 Version 3.2.1
    
 
    CrankShape
    		shapeType="modelica://Modelica/Resources/Data/CAD/EngineV6/1.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/Engine/crank.dxf"
    CrankShape
    		shapeType="modelica:/Modelica/Resources/Data/CAD/EngineV6/1.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/Engine/crank.dxf"
    
 
    
 
 

    
@@ -10601,7 +10601,7 @@
     		
 Version 3.2.1
    
 
    b0
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/0.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b0.dxf"
    b1
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/1.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b1.dxf"
    b2
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/2.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b2.dxf"
    b3
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/3.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b3.dxf"
    b4
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/4.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b4.dxf"
    b5
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/5.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b5.dxf"
    b6
    		shapeType="modelica://Modelica/Resources/Data/CAD/RobotR3/6.dxf"
    		shapeType="modelica://Modelica/Resources/Data/Shapes/RobotR3/b6.dxf"
    load
    		lengthDirection=rLoad
    		lengthDirection=to_unit1(rLoad)
      
    		r={0,0,0}
    b0
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/0.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b0.dxf"
    b1
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/1.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b1.dxf"
    b2
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/2.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b2.dxf"
    b3
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/3.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b3.dxf"
    b4
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/4.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b4.dxf"
    b5
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/5.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b5.dxf"
    b6
    		shapeType="modelica:/Modelica/Resources/Data/CAD/RobotR3/6.dxf"
    		shapeType="modelica:/Modelica/Resources/Data/Shapes/RobotR3/b6.dxf"
    load
    		lengthDirection=rLoad
    		lengthDirection=to_unit1(rLoad)
      
    		r={0,0,0}
    
 
    
 
 

    
@@ -24677,7 +24677,7 @@
 
-
+
    
 
    Version 3.2.1
    
 
    file
    		="Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt"
    		=Modelica.Utilities.Files.loadResource("modelica://Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt")
    file
    		="Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt"
    		=Modelica.Utilities.Files.loadResource("modelica:/Modelica/Resources/Data/Utilities/Examples_readRealParameters.txt")
    
 
    
 
 

    
diff --git a/Modelica/Resources/ReleaseNotes/Modelica.UsersGuide.ReleaseNotes.Version_3_2.html b/Modelica/Resources/ReleaseNotes/Modelica.UsersGuide.ReleaseNotes.Version_3_2.html
index 3d3fd81e13..399ff6b3e2 100644
--- a/Modelica/Resources/ReleaseNotes/Modelica.UsersGuide.ReleaseNotes.Version_3_2.html
+++ b/Modelica/Resources/ReleaseNotes/Modelica.UsersGuide.ReleaseNotes.Version_3_2.html
@@ -25,7 +25,7 @@ 
    Information
    
 Furthermore, all file references are changed to URIs as introduced
 in Modelica 3.1 (e.g., a file with the file name
 "Modelica/Resources/Images/xxx" is referenced as
-"modelica://Modelica/Resources/Images/xxx").
+"modelica:/Modelica/Resources/Images/xxx").
 
  • All physical models that dissipate heat (such as electrical
 elements, electrical machines, bearings, dampers, etc.), have now
 an optional heat port to which the dissipated energy is flowing, if
@@ -1207,7 +1207,7 @@ 
    Information
    
 
    • 
 
    
 #218Replace `Modelica://`-URIs by `modelica://`-URIsReplace `Modelica://`-URIs by `modelica:/`-URIs
 
    
 
    
 #271
    
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
    
   
    Function/typeDescription
    list(name)
    list(name)
        List content of file or of directory.
   
    copy(oldName, newName)
    
-          copy(oldName, newName, replace=false)
    copy(oldName, newName)
    
+          copy(oldName, newName, replace=false)    		
        Generate a copy of a file or of a directory.
   
    move(oldName, newName)
    
-          move(oldName, newName, replace=false)
    move(oldName, newName)
    
+          move(oldName, newName, replace=false)    		
        Move a file or a directory to another place.
   
    remove(name)
    remove(name)
        Remove file or directory (ignore call, if it does not exist).
   
    removeFile(name)
    removeFile(name)
        Remove file (ignore call, if it does not exist)
   
    createDirectory(name)
    createDirectory(name)
        Create directory (if directory already exists, ignore call).
   
    result = exist(name)
    result = exist(name)
        Inquire whether file or directory exists.
   
    assertNew(name,message)
    assertNew(name,message)
        Trigger an assert, if a file or directory exists.
   
    fullName = fullPathName(name)
    fullName = fullPathName(name)
        Get full path name of file or directory name.
   
    (directory, name, extension) = splitPathName(name)
    (directory, name, extension) = splitPathName(name)
        Split path name in directory, file name kernel, file name extension.
   
    fileName = temporaryFileName()
    fileName = temporaryFileName()
        Return arbitrary name of a file that does not exist
    
            and is in a directory where access rights allow to
    
            write to this file (useful for temporary output of files).    		
   
    fileReference = loadResource(uri)
    fileReference = loadResource(uri)
       Return the absolute path name of a URI or local file name.
   
    
 
    
diff --git a/Modelica/Utilities/Internal.mo b/Modelica/Utilities/Internal.mo
index d3ad75276a..aa1a5b0e45 100644
--- a/Modelica/Utilities/Internal.mo
+++ b/Modelica/Utilities/Internal.mo
@@ -38,7 +38,7 @@ package PartialModelicaServices
       Documentation(info="
 
    
 This model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape.
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape.
 
    
 "));
 
@@ -66,7 +66,7 @@ This model is documented at
         Documentation(info="
 
    
 This model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector.
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector.
 
    
 "));
     end PartialVector;
@@ -104,7 +104,7 @@ This model is documented at
       annotation (Documentation(info="
 
    
 This model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface.
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface.
 
    
 "));
     end PartialSurface;
@@ -121,7 +121,7 @@ This model is documented at
 
    
 This partial function defines the function interface of a tool-specific implementation
 in package ModelicaServices. The interface is documented at
-Modelica.Utilities.Internal.FileSystem.loadResource.
+Modelica.Utilities.Internal.FileSystem.loadResource.
 
    
 
 "));
@@ -162,33 +162,33 @@ package FileSystem
   impure function mkdir "Make directory (POSIX: 'mkdir')"
     extends Modelica.Icons.Function;
     input String directoryName "Make a new directory";
-  external "C" ModelicaInternal_mkdir(directoryName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_mkdir(directoryName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end mkdir;
 
   impure function rmdir "Remove empty directory (POSIX function 'rmdir')"
     extends Modelica.Icons.Function;
     input String directoryName "Empty directory to be removed";
-  external "C" ModelicaInternal_rmdir(directoryName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_rmdir(directoryName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end rmdir;
 
   impure function stat "Inquire file information (POSIX function 'stat')"
     extends Modelica.Icons.Function;
     input String name "Name of file, directory, pipe etc.";
     output Types.FileType fileType "Type of file";
-  external "C" fileType = ModelicaInternal_stat(name) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" fileType = ModelicaInternal_stat(name) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end stat;
 
   impure function rename "Rename existing file or directory (C function 'rename')"
     extends Modelica.Icons.Function;
     input String oldName "Current name";
     input String newName "New name";
-  external "C" ModelicaInternal_rename(oldName, newName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_rename(oldName, newName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end rename;
 
   impure function removeFile "Remove existing file (C function 'remove')"
     extends Modelica.Icons.Function;
     input String fileName "File to be removed";
-  external "C" ModelicaInternal_removeFile(fileName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_removeFile(fileName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end removeFile;
 
   impure function copyFile
@@ -196,7 +196,7 @@ package FileSystem
     extends Modelica.Icons.Function;
     input String fromName "Name of file to be copied";
     input String toName "Name of copy of file";
-  external "C" ModelicaInternal_copyFile(fromName, toName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_copyFile(fromName, toName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end copyFile;
 
   impure function readDirectory
@@ -208,7 +208,7 @@ package FileSystem
         "Number of names that are returned (inquire with getNumberOfFiles)";
     output String names[nNames]
         "All file and directory names in any order from the desired directory";
-    external "C" ModelicaInternal_readDirectory(directory,nNames,names) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+    external "C" ModelicaInternal_readDirectory(directory,nNames,names) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
   end readDirectory;
 
 impure function getNumberOfFiles
@@ -217,7 +217,7 @@ impure function getNumberOfFiles
   input String directory "Directory name";
   output Integer result
         "Number of files and directories present in 'directory'";
-  external "C" result = ModelicaInternal_getNumberOfFiles(directory) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" result = ModelicaInternal_getNumberOfFiles(directory) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
 end getNumberOfFiles;
 
   annotation (
diff --git a/Modelica/Utilities/Streams.mo b/Modelica/Utilities/Streams.mo
index d6bac5d591..7239d95897 100644
--- a/Modelica/Utilities/Streams.mo
+++ b/Modelica/Utilities/Streams.mo
@@ -9,7 +9,7 @@ package Streams "Read from files and write to files"
       "File where to print (empty string is the terminal)"
                  annotation(Dialog(saveSelector(filter="Text files (*.txt)",
                         caption="Text file to store the output of print(..)")));
-  external "C" ModelicaInternal_print(string, fileName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_print(string, fileName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -35,9 +35,9 @@ Streams.print(\"x = \" + String(y), \"mytestfile.txt\");
 
    
 
    See also
    
 
    
-Streams,
-Streams.error,
-ModelicaReference.Operators.'String()'
+Streams,
+Streams.error,
+ModelicaReference.Operators.'String()'
 
    
 "));
   end print;
@@ -49,7 +49,7 @@ Streams.print(\"x = \" + String(y), \"mytestfile.txt\");
                  annotation(Dialog(loadSelector(filter="Text files (*.txt)",
                         caption="Open text file for reading")));
     output String stringVector[countLines(fileName)] "Content of file";
-    external "C" ModelicaInternal_readFile(fileName,stringVector,size(stringVector,1)) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+    external "C" ModelicaInternal_readFile(fileName,stringVector,size(stringVector,1)) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -60,7 +60,7 @@ stringVector = Streams.readFile(fileName)
 Function readFile(..) opens the given file, reads the complete
 content, closes the file and returns the content as a vector of strings. Lines are separated by LF or CR-LF; the returned strings do not contain the line separators.
 Note, a fileName can be defined as URI by using the helper function
-loadResource.
+loadResource.
 
    
 "));
   end readFile;
@@ -74,7 +74,7 @@ Note, a fileName can be defined as URI by using the helper function
     output String string "Line of text";
     output Boolean endOfFile
       "If true, end-of-file was reached when trying to read line";
-   external "C" string=  ModelicaInternal_readLine(fileName,lineNumber,endOfFile) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+   external "C" string=  ModelicaInternal_readLine(fileName,lineNumber,endOfFile) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -102,7 +102,7 @@ and endOfFile=true. Otherwise endOfFile=false.
                         caption="Open text file for counting lines")));
 
     output Integer numberOfLines "Number of lines in file";
-  external "C" numberOfLines=  ModelicaInternal_countLines(fileName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" numberOfLines=  ModelicaInternal_countLines(fileName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -139,10 +139,10 @@ Streams.error(\"x (= \" + String(x) + \")\\nhas to be in the range 0 .. 1\");
 
    
 
    See also
    
 
    
-Streams,
-Streams.print,
-ModelicaReference.Operators.'assert()'
-ModelicaReference.Operators.'String()'
+Streams,
+Streams.print,
+ModelicaReference.Operators.'assert()'
+ModelicaReference.Operators.'String()'
 
    
 "));
   end error;
@@ -152,7 +152,7 @@ Streams.error(\"x (= \" + String(x) + \")\\nhas to be in the range 0 .. 1\");
     input String fileName "Name of the file that shall be closed"
                  annotation(Dialog(loadSelector(filter="Text files (*.txt)",
                         caption="Close text file")));
-    external "C" ModelicaStreams_closeFile(fileName) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+    external "C" ModelicaStreams_closeFile(fileName) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -172,7 +172,7 @@ file is already closed or does not exist.
     input String matrixName "Name / identifier of the 2D Real array on the file";
     output Integer dim[2] "Number of rows and columns of the 2D Real array";
     external "C" ModelicaIO_readMatrixSizes(fileName, matrixName, dim)
-    annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
+    annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
     annotation(Documentation(info="
 
    Syntax
    
 
    @@ -189,13 +189,13 @@ These dimensions are returned in the Integer vector dim.
 
 
    Example
    
 
    
-See Examples.ReadRealMatrixFromFile.
+See Examples.ReadRealMatrixFromFile.
 
    
 
 
    See also
    
 
    
-readRealMatrix,
-writeRealMatrix
+readRealMatrix,
+writeRealMatrix
 
    
 "));
   end readMatrixSize;
@@ -210,7 +210,7 @@ See Ex
       "= true: Print info message; = false: No info message";
     output Real matrix[nrow, ncol] "2D Real array";
     external "C" ModelicaIO_readRealMatrix(fileName, matrixName, matrix, size(matrix, 1), size(matrix, 2), verboseRead)
-    annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
+    annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
     annotation(
 Documentation(info="
 
    Syntax
    
@@ -224,19 +224,19 @@ Function readRealMatrix(..) opens the given MATLAB MAT file
 (in format v4, v6, v7, and if HDF is supported in the Modelica tool, also v7.3),
 and reads the given matrix from this file. The dimensions of this matrix must first
 be inquired with function
-    readMatrixSize
+readMatrixSize
 and passed via arguments nrow and ncol to this function.
 
    
 
 
    Example
    
 
    
-See Examples.ReadRealMatrixFromFile.
+See Examples.ReadRealMatrixFromFile.
 
    
 
 
    See also
    
 
    
-readMatrixSize,
-writeRealMatrix
+readMatrixSize,
+writeRealMatrix
 
    
 "));
   end readRealMatrix;
@@ -253,7 +253,7 @@ See Ex
                          choice="7" "MATLAB v7 MAT file"));
     output Boolean success "true if successful";
     external "C" success = ModelicaIO_writeRealMatrix(fileName, matrixName, matrix, size(matrix, 1), size(matrix, 2), append, format)
-    annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
+    annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaIO.h\"", Library={"ModelicaIO", "ModelicaMatIO", "zlib"});
     annotation(Documentation(info="
 
 
    Syntax
    
@@ -294,13 +294,13 @@ to file. Otherwise, an error message is printed and the function returns with
 
 
    Example
    
 
    
-See Examples.WriteRealMatrixToFile.
+See Examples.WriteRealMatrixToFile.
 
    
 
 
    See also
    
 
    
-readMatrixSize,
-readRealMatrix
+readMatrixSize,
+readRealMatrix
 
    
 "));
   end writeRealMatrix;
@@ -327,48 +327,48 @@ In the table below an example call to every function is given:
 
    
 
-  
+  
+         readFile(fileName)
+         readLine(fileName, lineNumber)
+         countLines(fileName)
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
    
   
    Function/typeDescription
    print(string)
    
-          print(string,fileName)
    print(string)
    
+          print(string,fileName)    		
        Print string \"string\" or vector of strings to message window or on
            file \"fileName\".
   
    
   
    stringVector =
-         readFile(fileName)
        Read complete text file and return it as a vector of strings.
   
    
   
    (string, endOfFile) =
-         readLine(fileName, lineNumber)
       Returns from the file the content of line lineNumber.
   
    
   
    lines =
-         countLines(fileName)
       Returns the number of lines in a file.
   
    error(string)
    error(string)
        Print error message \"string\" to message window
            and cancel all actions
   
    close(fileName)
    close(fileName)
        Close file if it is still open. Ignore call if
            file is already closed or does not exist. 
   
    readMatrixSize(fileName, matrixName)
    readMatrixSize(fileName, matrixName)
        Read dimensions of a Real matrix from a MATLAB MAT file. 
    readRealMatrix(fileName, matrixName, nrow, ncol)
    readRealMatrix(fileName, matrixName, nrow, ncol)
        Read a Real matrix from a MATLAB MAT file. 
    writeRealMatrix(fileName, matrixName, matrix, append, format)
    writeRealMatrix(fileName, matrixName, matrix, append, format)
        Write Real matrix to a MATLAB MAT file. 
    
 
    
 
    
 Use functions scanXXX from package
-Strings
+Strings
 to parse a string.
 
    
 
    
 If Real, Integer or Boolean values shall be printed
 or used in an error message, they have to be first converted
 to strings with the builtin operator
-ModelicaReference.Operators.'String()'(...).
+ModelicaReference.Operators.'String()'(...).
 Example:
 
    
 
    diff --git a/Modelica/Utilities/Strings.mo b/Modelica/Utilities/Strings.mo
index 9c184fee84..4f7c20c1df 100644
--- a/Modelica/Utilities/Strings.mo
+++ b/Modelica/Utilities/Strings.mo
@@ -6,7 +6,7 @@ package Strings "Operations on strings"
     extends Modelica.Icons.Function;
     input String string;
     output Integer result "Number of characters of string";
-  external "C" result = ModelicaStrings_length(string) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+  external "C" result = ModelicaStrings_length(string) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -27,7 +27,7 @@ Returns the number of characters of \"string\".
     input Integer endIndex "Character position of substring end";
     output String result
       "String containing substring string[startIndex:endIndex]";
-  external "C" result = ModelicaStrings_substring(string,startIndex,endIndex) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+  external "C" result = ModelicaStrings_substring(string,startIndex,endIndex) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -91,7 +91,7 @@ defined by the optional argument \"string\".
     input String string2;
     input Boolean caseSensitive=true "= false, if case of letters is ignored";
     output Modelica.Utilities.Types.Compare result "Result of comparison";
-  external "C" result = ModelicaStrings_compare(string1, string2, caseSensitive) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+  external "C" result = ModelicaStrings_compare(string1, string2, caseSensitive) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -478,7 +478,7 @@ s2 = Strings.sort(s1);
     input String string "The string to create a hash from";
     output Integer hash "The hash value of string";
     external "C" hash=  ModelicaStrings_hashString(string)
-       annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+       annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
    Syntax
    
 
    @@ -504,7 +504,7 @@ hashString(\"Controller.noise1\")  // = -1025762750
 
 
    
 
    
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
    
@@ -1054,7 +1054,7 @@ part of the string is printed.
       output Integer nextIndex
         "Index after the found token (success=true) or index at which scanning failed (success=false)";
       output Real number "Value of Real number";
-      external "C" ModelicaStrings_scanReal(string, startIndex, unsigned, nextIndex, number) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+      external "C" ModelicaStrings_scanReal(string, startIndex, unsigned, nextIndex, number) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
       annotation (Documentation(info="
 
    Syntax
    
 
    @@ -1088,7 +1088,7 @@ If the optional argument \"unsigned\" is true, the number
 shall not start with '+' or '-'. The default of \"unsigned\" is false.
 
    
 
    See also
    
-Strings.Advanced.
+Strings.Advanced.
 "));
     end scanReal;
 
@@ -1101,7 +1101,7 @@ shall not start with '+' or '-'. The default of \"unsigned\" is falsetrue, the number
 shall not start with '+' or '-'. The default of \"unsigned\" is false.
 
    
 
    See also
    
-Strings.Advanced.
+Strings.Advanced.
 "));
     end scanInteger;
 
@@ -1145,7 +1145,7 @@ shall not start with '+' or '-'. The default of \"unsigned\" is falseStrings.Advanced.
+Strings.Advanced.
 "));
     end scanString;
 
@@ -1179,7 +1179,7 @@ the second output argument is an empty string.
       output Integer nextIndex
         "Index after the found token (success=true) or index at which scanning failed (success=false)";
       output String identifier "Value of identifier token";
-      external "C" ModelicaStrings_scanIdentifier(string, startIndex, nextIndex, identifier) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+      external "C" ModelicaStrings_scanIdentifier(string, startIndex, nextIndex, identifier) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
 
       annotation (Documentation(info="
 
    Syntax
    
@@ -1204,7 +1204,7 @@ If not successful, on return nextIndex = startIndex and
 the second output argument is an empty string.
 
    
 
    See also
    
-Strings.Advanced.
+Strings.Advanced.
 "));
     end scanIdentifier;
 
@@ -1213,7 +1213,7 @@ the second output argument is an empty string.
       input String string;
       input Integer startIndex(min=1)=1;
       output Integer nextIndex;
-      external "C" nextIndex = ModelicaStrings_skipWhiteSpace(string, startIndex) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
+      external "C" nextIndex = ModelicaStrings_skipWhiteSpace(string, startIndex) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStrings.h\"", Library="ModelicaExternalC");
       annotation (Documentation(info="
 
    Syntax
    
 
    @@ -1226,7 +1226,7 @@ skips white space. The function returns nextIndex = index of character
 of the first non white space character.
 
    
 
    See also
    
-Strings.Advanced.
+Strings.Advanced.
 "));
     end skipWhiteSpace;
 
@@ -1294,7 +1294,7 @@ directly after the found line comment.
 If not successful, on return nextIndex = startIndex.
 
    
 
    See also
    
-Strings.Advanced.
+Strings.Advanced.
 "));
     end skipLineComments;
     annotation (Documentation(info="
@@ -1311,12 +1311,12 @@ functions in package \"Strings\".
 Library \"Advanced\" provides the following functions:
 
    
 
    -(nextIndex, realNumber)    = scanReal        (string, startIndex, unsigned=false);
-(nextIndex, integerNumber) = scanInteger     (string, startIndex, unsigned=false);
-(nextIndex, string2)       = scanString      (string, startIndex);
-(nextIndex, identifier)    = scanIdentifier  (string, startIndex);
- nextIndex                 = skipWhiteSpace  (string, startIndex);
- nextIndex                 = skipLineComments(string, startIndex);
+(nextIndex, realNumber)    = scanReal        (string, startIndex, unsigned=false);
+(nextIndex, integerNumber) = scanInteger     (string, startIndex, unsigned=false);
+(nextIndex, string2)       = scanString      (string, startIndex);
+(nextIndex, identifier)    = scanIdentifier  (string, startIndex);
+ nextIndex                 = skipWhiteSpace  (string, startIndex);
+ nextIndex                 = skipLineComments(string, startIndex);
 
    
 
    
 All functions perform the following actions:
@@ -1336,25 +1336,25 @@ All functions perform the following actions:
 The following additional rules apply for the scanning:
 
    
 
      
-
    •  Function scanReal:
      
+
    •  Function scanReal:
      
      Scans a full number including one optional leading \"+\" or \"-\" (if unsigned=false)
      according to the Modelica grammar. For example, \"+1.23e-5\", \"0.123\" are
      Real numbers, but \".1\" is not.
      Note, an Integer number, such as \"123\" is also treated as a Real number.
       
      • 
-
    •  Function scanInteger:
      
+
    •  Function scanInteger:
      
      Scans an Integer number including one optional leading \"+\"
      or \"-\" (if unsigned=false) according to the Modelica (and C/C++) grammar.
      For example, \"+123\", \"20\" are Integer numbers.
      Note, a Real number, such as \"123.4\" is not an Integer and
      scanInteger returns nextIndex = startIndex.
       
      • 
-
    •  Function scanString:
      
+
    •  Function scanString:
      
      Scans a String according to the Modelica (and C/C++) grammar, e.g.,
      \"This is a \"string\"\" is a valid string token.
       
      • 
-
    •  Function scanIdentifier:
      
+
    •  Function scanIdentifier:
      
      Scans a Modelica identifier, i.e., the identifier starts either
      with a letter, followed by letters, digits or \"_\".
      For example, \"w_rel\", \"T12\".
       
      • 
-
    •  Function skipLineComments
      
+
    •  Function skipLineComments
      
      Skips white space and Modelica (C/C++) line comments iteratively.
      A line comment starts with \"//\" and ends either with an
      end-of-line (\"\\n\") or the end of the \"string\".
      • 
@@ -1373,51 +1373,51 @@ call to every function is given using the default options.
 
      
 
-  
+  
-  
-  
+  
-  
+  
+isEqual(string1,string2)
-  
+  
-
+
-
+
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
      
   
      FunctionDescription
      len = length(string)
      len = length(string)
       Returns length of string
      string2 = substring(string1,startIndex,endIndex)
+  
      string2 = substring(string1,startIndex,endIndex)
        
       Returns a substring defined by start and end index
      result = repeat(n)
      
- result = repeat(n,string)
      result = repeat(n)
      
+ result = repeat(n,string)      		
       Repeat a blank or a string n times.
      result = compare(string1, string2)
      result = compare(string1, string2)
       Compares two substrings with regards to alphabetical order
      
   
      identical =
-isEqual(string1,string2)
       Determine whether two strings are identical
      result = count(string,searchString)
      result = count(string,searchString)
       Count the number of occurrences of a string
      
   
      index = find(string,searchString)index = find(string,searchString)
       Find first occurrence of a string in another string
      
 
      index = findLast(string,searchString)index = findLast(string,searchString)
       Find last occurrence of a string in another string
      string2 = replace(string,searchString,replaceString)
      string2 = replace(string,searchString,replaceString)
       Replace one or all occurrences of a string
      stringVector2 = sort(stringVector1)
      stringVector2 = sort(stringVector1)
       Sort vector of strings in alphabetic order
      hash = hashString(string)
      hash = hashString(string)
       Create a hash value of a string
      (token, index) = scanToken(string,startIndex)
      (token, index) = scanToken(string,startIndex)
       Scan for a token (Real/Integer/Boolean/String/Identifier/Delimiter/NoToken)
      (number, index) = scanReal(string,startIndex)
      (number, index) = scanReal(string,startIndex)
       Scan for a Real constant
      (number, index) = scanInteger(string,startIndex)
      (number, index) = scanInteger(string,startIndex)
       Scan for an Integer constant
      (boolean, index) = scanBoolean(string,startIndex)
      (boolean, index) = scanBoolean(string,startIndex)
       Scan for a Boolean constant
      (string2, index) = scanString(string,startIndex)
      (string2, index) = scanString(string,startIndex)
       Scan for a String constant
      (identifier, index) = scanIdentifier(string,startIndex)
      (identifier, index) = scanIdentifier(string,startIndex)
       Scan for an identifier
      (delimiter, index) = scanDelimiter(string,startIndex)
      (delimiter, index) = scanDelimiter(string,startIndex)
       Scan for delimiters
      scanNoToken(string,startIndex)
      scanNoToken(string,startIndex)
       Check that remaining part of string consists solely of
      
           white space or line comments (\"// ...\\n\").
      syntaxError(string,index,message)
      syntaxError(string,index,message)
        Print a \"syntax error message\" as well as a string and the
      
            index at which scanning detected an error
      
 
      
diff --git a/Modelica/Utilities/System.mo b/Modelica/Utilities/System.mo
index 91a02c5a50..96fed34452 100644
--- a/Modelica/Utilities/System.mo
+++ b/Modelica/Utilities/System.mo
@@ -6,7 +6,7 @@ impure function getWorkDirectory "Get full path name of work directory"
   extends Modelica.Icons.Function;
   output String directory "Full path name of work directory";
 // POSIX function "getcwd"
-  external "C" directory = ModelicaInternal_getcwd(0) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" directory = ModelicaInternal_getcwd(0) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
 "));
@@ -16,7 +16,7 @@ impure function setWorkDirectory "Set work directory"
   extends Modelica.Icons.Function;
   input String directory "New work directory";
 // POSIX function "chdir"
-external "C" ModelicaInternal_chdir(directory) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+external "C" ModelicaInternal_chdir(directory) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
 "));
@@ -31,7 +31,7 @@ impure function getEnvironmentVariable "Get content of environment variable"
       "Content of environment variable (empty, if not existent)";
   output Boolean exist
       "= true, if environment variable exists; = false, if it does not exist";
-  external "C" ModelicaInternal_getenv(name, convertToSlash, content, exist) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+  external "C" ModelicaInternal_getenv(name, convertToSlash, content, exist) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
 "));
@@ -43,7 +43,7 @@ impure function setEnvironmentVariable "Set content of local environment variabl
   input String content "Value of the environment variable";
   input Boolean convertFromSlash =  false
       "True, if '/' in environment variable shall be changed to native directory separators";
-external "C" ModelicaInternal_setenv(name, content, convertFromSlash) annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+external "C" ModelicaInternal_setenv(name, content, convertFromSlash) annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
 "));
@@ -59,7 +59,7 @@ end setEnvironmentVariable;
     output Integer mon "Month";
     output Integer year "Year";
     external "C" ModelicaInternal_getTime(ms,sec,min,hour,day,mon,year)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
      Syntax
      
 
      @@ -116,7 +116,7 @@ All returned values are of type Integer and have the following meaning:
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -131,7 +131,7 @@ All returned values are of type Integer and have the following meaning:
   impure function getPid "Retrieve the current process id"
     extends Modelica.Icons.Function;
     output Integer pid "Process ID";
-    external "C" pid = ModelicaInternal_getpid() annotation(IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
+    external "C" pid = ModelicaInternal_getpid() annotation(IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaInternal.h\"", Library="ModelicaExternalC");
     annotation (Documentation(info="
 
      Syntax
      
 
      @@ -159,7 +159,7 @@ getPid()   // = 3044
 
 
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
+   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
-   
-   
+   
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
diff --git a/Modelica/Utilities/package.mo b/Modelica/Utilities/package.mo
index d0aa62180c..994f7bb889 100644
--- a/Modelica/Utilities/package.mo
+++ b/Modelica/Utilities/package.mo
@@ -152,17 +152,17 @@ The User's Guide has currently the following chapters:
 
      
 
        
 
      1. 
-Release Notes
+Release Notes
   summarizes the differences between different versions of this
   library.
 
        2. 
 
      2. 
-ImplementationNotes
+ImplementationNotes
   describes design decisions for this library especially for
   Modelica tool vendors.
 
        3. 
 
      3. 
-Contact provides
+Contact provides
   information about the authors of the library as well as acknowledgments.
 
        4. 
 
      
@@ -187,24 +187,24 @@ to file or copy, move and remove files.
 For an introduction, have especially a look at:
 
      
 
 
      
 The following main sublibraries are available:
 
      
 
        
-
      •  Files
+
      •  Files
      provides functions to operate on files and directories, e.g.,
      to copy, move, remove files.
        • 
-
      •  Streams
+
      •  Streams
      provides functions to read from files and write to files.
        • 
-
      •  Strings
+
      •  Strings
      provides functions to operate on strings. E.g.
      substring, find, replace, sort, scanToken.
        • 
-
      •  System
+
      •  System
      provides functions to interact with the environment.
      E.g., get or set the working directory or environment
      variables and to send a command to the default shell.
        • 
diff --git a/Modelica/package.mo b/Modelica/package.mo
index d967c3cb40..a6ffeb4982 100644
--- a/Modelica/package.mo
+++ b/Modelica/package.mo
@@ -18,10 +18,10 @@ main sub-libraries:
 
      Library Components Description
      
 
 
      
- 
+ 
  
  
- Analog
      
+ Analog
      
  Analog electric and electronic components, such as
  resistor, capacitor, transformers, diodes, transistors,
  transmission lines, switches, sources, sensors.
@@ -29,10 +29,10 @@ main sub-libraries:
 
      
 
 
      
- 
+ 
  
  
- Digital
      
+ Digital
      
  Digital electrical components based on the VHDL standard,
  like basic logic blocks with 9-value logic, delays, gates,
  sources, converters between 2-, 3-, 4-, and 9-valued logic.
@@ -40,39 +40,39 @@ main sub-libraries:
 
      
 
 
      
- 
+ 
  
  
- Machines
      
+ Machines
      
             Electrical asynchronous-, synchronous-, and DC-machines
  (motors and generators) as well as three-phase transformers.
        		
 
      
 
 
      
- 
+ 
  
  
- FluxTubes
      
+ FluxTubes
      
 Based on magnetic flux tubes concepts. Especially to model electromagnetic actuators. Nonlinear shape, force, leakage, and material models. Material data for steel, electric sheet, pure iron, Cobalt iron, Nickel iron, NdFeB, Sm2Co17, and more.
        		
 
      
 
 
      
- 
+ 
  
  
- Translational
      
+ Translational
      
  1-dim. mechanical, translational systems, e.g.,
  sliding mass, mass with stops, spring, damper.
        		
 
      
 
 
      
- 
+ 
  
  
- Rotational
      
+ Rotational
      
  1-dim. mechanical, rotational systems, e.g., inertias, gears,
  planetary gears, convenient definition of speed/torque dependent friction
  (clutches, brakes, bearings, ..)
@@ -80,11 +80,11 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
      
- 
+ 
      
+ 
        		
  
- MultiBody
+ MultiBody
  3-dim. mechanical systems consisting of joints, bodies, force and
  sensor elements. Joints can be driven by drive trains defined by
  1-dim. mechanical system library (Rotational).
@@ -94,10 +94,10 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
+ 
  
  
- Fluid
      
+ Fluid
      
         1-dim. thermo-fluid flow in networks of vessels, pipes,
         fluid machines, valves and fittings. All media from the
         Modelica.Media library can be used (so incompressible or compressible,
@@ -106,10 +106,10 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
+ 
  
  
- Media
      
+ Media
      
  Large media library providing models and functions
  to compute media properties, such as h = h(p,T), d = d(p,T),
  for the following media:
@@ -124,11 +124,11 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
+ 
  
  
- FluidHeatFlow,
- HeatTransfer
+ FluidHeatFlow,
+ HeatTransfer
  Simple thermo-fluid pipe flow, especially to model cooling of machines
  with air or water (pipes, pumps, valves, ambient, sensors, sources) and
  lumped heat transfer with heat capacitors, thermal conductors, convection,
@@ -137,11 +137,11 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
      
- 
+ 
      
+ 
        		
  
- Blocks
      
+ Blocks
      
  Input/output blocks to model block diagrams and logical networks, e.g.,
  integrator, PI, PID, transfer function, linear state space system,
  sampler, unit delay, discrete transfer function, and/or blocks,
@@ -150,10 +150,10 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
+ 
  
  
- Clocked
      
+ Clocked
      
  Blocks to precisely define and synchronize sampled data systems with different
  sampling rates. Continuous-time equations can be automatically discretized and
  utilized in a sampled data system. The library is based on the clocked
@@ -162,10 +162,10 @@ Based on magnetic flux tubes concepts. Especially to model electromagnetic actua
 
      
 
 
      
- 
+ 
  
  
- StateGraph
      
+ StateGraph
      
  Hierarchical state machines with a similar modeling power as Statecharts.
  Modelica is used as synchronous action language, i.e., deterministic
  behavior is guaranteed
@@ -183,8 +183,8 @@ Matrices.eigenValues(A);
  
        		
  
- Math,
- Utilities
      
+ Math,
+ Utilities
      
  Functions operating on vectors and matrices, such as for solving
  linear systems, eigen and singular values etc.,  and
  functions operating on strings, streams, files, e.g.,
@@ -225,80 +225,80 @@ variables is explained in section \"Connector Equations\" below):
          		electrical potential
    electrical current
    Modelica.Electrical.Analog.Interfaces
+   Modelica.Electrical.Analog.Interfaces
      
      Pin, PositivePin, NegativePin
      
 
 
      electrical
      polyphase      		
    vector of electrical pinsModelica.Electrical.Polyphase.Interfaces
+   Modelica.Electrical.Polyphase.Interfaces
      
      Plug, PositivePlug, NegativePlug
      
 
 
      electrical
      space phasor      		
    2 electrical potentials
    2 electrical currents
    Modelica.Electrical.Machines.Interfaces
+   Modelica.Electrical.Machines.Interfaces
      
      SpacePhasor
      
 
 
      quasi-static
      single-phase      		
    complex electrical potential
    complex electrical current
    
+   
                                        Modelica.Electrical.QuasiStatic.SinglePhase.Interfaces
      
      Pin, PositivePin, NegativePin
      
 
 
      quasi-static
      polyphase      		
    vector of quasi-static single-phase pinsModelica.Electrical.QuasiStatic.Polyphase.Interfaces
+   Modelica.Electrical.QuasiStatic.Polyphase.Interfaces
      
      Plug, PositivePlug, NegativePlug
      
 
 
      electrical
      digital      		
    Integer (1..9)
    
    Modelica.Electrical.Digital.Interfaces
+   Modelica.Electrical.Digital.Interfaces
      
      DigitalSignal, DigitalInput, DigitalOutput
      
 
 
      magnetic
      flux tubes      		
    magnetic potential
    magnetic flux
    
    
-Modelica.Magnetic.FluxTubes.Interfaces
+Modelica.Magnetic.FluxTubes.Interfaces
      
      MagneticPort, PositiveMagneticPort,
      NegativeMagneticPort
      
 
 
      magnetic
      fundamental
      wave      		
    complex magnetic potential
    complex magnetic flux
    
    
-Modelica.Magnetic.FundamentalWave.Interfaces
+Modelica.Magnetic.FundamentalWave.Interfaces
      
      MagneticPort, PositiveMagneticPort,
      NegativeMagneticPort
      
 
 
      translational
    distance
    cut-force
    Modelica.Mechanics.Translational.Interfaces
+   Modelica.Mechanics.Translational.Interfaces
      
      Flange_a, Flange_b
      
 
 
      rotational
    angle
    cut-torque
    Modelica.Mechanics.Rotational.Interfaces
+   Modelica.Mechanics.Rotational.Interfaces
      
      Flange_a, Flange_b
      
 
 
      3-dim.
      mechanics      		
    position vector
      
@@ -306,9 +306,9 @@ variables is explained in section \"Connector Equations\" below):
          		cut-force vector
      
     cut-torque vector      		
    Modelica.Mechanics.MultiBody.Interfaces
+   Modelica.Mechanics.MultiBody.Interfaces
      
      Frame, Frame_a, Frame_b, Frame_resolve
      
 
 
      simple
      fluid flow      		
    pressure
      
@@ -316,26 +316,26 @@ variables is explained in section \"Connector Equations\" below):
          		mass flow rate
      
     enthalpy flow rate      		
    Modelica.Thermal.FluidHeatFlow.Interfaces
+   Modelica.Thermal.FluidHeatFlow.Interfaces
      
      FlowPort, FlowPort_a, FlowPort_b
      
 
 
      thermo
      fluid flow      		
    pressure
    mass flow rate
    specific enthalpy
      mass fractions      		
    
-Modelica.Fluid.Interfaces
+Modelica.Fluid.Interfaces
      
      FluidPort, FluidPort_a, FluidPort_b
      
 
 
      heat
      transfer      		
    temperature
    heat flow rate
    Modelica.Thermal.HeatTransfer.Interfaces
+   Modelica.Thermal.HeatTransfer.Interfaces
      
      HeatPort, HeatPort_a, HeatPort_b
      
 
 
      blocks
    
@@ -344,21 +344,21 @@ variables is explained in section \"Connector Equations\" below):
     Boolean variable
    
    Modelica.Blocks.Interfaces
+   Modelica.Blocks.Interfaces
      
      
       RealSignal, RealInput, RealOutput
      
       IntegerSignal, IntegerInput, IntegerOutput
      
       BooleanSignal, BooleanInput, BooleanOutput
      
 
 
      complex
      blocks      		
    
     Complex variable
    
    Modelica.ComplexBlocks.Interfaces
+   Modelica.ComplexBlocks.Interfaces
      
      ComplexSignal, ComplexInput, ComplexOutput
      
 
 
      state
      machine      		
    Boolean variables
      
@@ -366,9 +366,9 @@ variables is explained in section \"Connector Equations\" below):
      available, reset)      		
    
    Modelica.StateGraph.Interfaces
+   Modelica.StateGraph.Interfaces
      
      Step_in, Step_out, Transition_in, Transition_out
      
 
      
 
 
      
@@ -550,15 +550,15 @@ In a more equation oriented case, additional equations or code segments can be a
 
        
   
      • if usePolar == true, assign magnitude and angle to output
        
 
-  \"y[i,1]
        
-  \"y[i,2]
   
        • 
   
      • if usePolar == false, assign cosine and sine to output
        
-  \"y[i,1]
        
-  \"
   
        • 
 
      
@@ -571,7 +571,7 @@ In a more equation oriented case, additional equations or code segments can be a
 
           annotation (Documentation(info="
 
      
-Modelica code conventions of class and instance names,
+Modelica code conventions of class and instance names,
 parameters and variables are specified separately. In this section it is summarized how to refer to
 Modelica code in the HTML documentation.
 
      
@@ -642,15 +642,15 @@ or codecogs can be u
 
      
 A typical equation, e.g., of a Fourier synthesis, could look like
      
 
      
+ src=\"modelica:/Modelica/Resources/Images/UsersGuide/Conventions/Documentation/Format/Equations/fourier.png\">
      
 or
      
 \"y=a_1+a_2\"
      
 In an alt tag the original equation should be stored, e.g.,
      
 
       <img
- src="modelica://Modelica/Resources/Images/UsersGuide/Conventions/Documentation/Format/Equations/sample.png"
+ src="modelica:/Modelica/Resources/Images/UsersGuide/Conventions/Documentation/Format/Equations/sample.png"
  alt="y=a_1+a_2">
 
      
 
@@ -676,7 +676,7 @@ Vector and array indices should be typeset as subscripts using the
 <table border="0" cellspacing="10" cellpadding="2">
   <tr>
     <td><img
-    src="modelica://Modelica/Resources/Images/UsersGuide/Conventions/Documentation/Format/Equations/sample.png"
+    src="modelica:/Modelica/Resources/Images/UsersGuide/Conventions/Documentation/Format/Equations/sample.png"
     alt="y=a_1+a_2"> </td>
     <td>(1)</td>
   </tr>
@@ -688,7 +688,7 @@ Vector and array indices should be typeset as subscripts using the
 
@@ -723,12 +723,12 @@ The PNG files should be placed in a folder which exactly represents
 
      Example 1
      This example shows how an illustration should be embedded in the Example
-PID_Controller of the
-Blocks package.
+PID_Controller of the
+Blocks package.
 
      -<img src="modelica://Modelica/Resources/Images/Blocks/PID_controller.png"
+<img src="modelica:/Modelica/Resources/Images/Blocks/PID_controller.png"
      alt="PID_controller.png">
 
      
 
@@ -741,7 +741,7 @@ The PNG files should be placed in a folder which exactly represents
   <caption>Caption starts with a capital letter</caption>
   <tr>
     <td>
-      <img src="modelica://Modelica/Resources/Images/Blocks/PID_controller.png"
+      <img src="modelica:/Modelica/Resources/Images/Blocks/PID_controller.png"
            alt="PID_controller.png">
     </td>
   </tr>
@@ -759,7 +759,7 @@ The PNG files should be placed in a folder which exactly represents
   <caption><strong>Fig. 2:</strong> Caption starts with a capital letter</caption>
   <tr>
     <td>
-      <img src="modelica://Modelica/Resources/Images/Blocks/PID_controller.png"
+      <img src="modelica:/Modelica/Resources/Images/Blocks/PID_controller.png"
            alt="PID_controller.png">
     </td>
   </tr>
@@ -776,7 +776,7 @@ The PNG files should be placed in a folder which exactly represents
 
    •  Hyperlinks should always be made when referring to a component or package.
    •  The hyperlink text in between <a href="..."> and </a> should include the full main package name.
    •  A link to an external component should include the full name of the package that it is referred to.
      • 
-
    •  Modelica hyperlinks have to use the scheme "modelica://..."
      • 
+
    •  Modelica hyperlinks have to use the scheme "modelica:/..."
    •  For hyperlinks referring to a Modelica component, see Example 1 and 2.
    •  No links to commercial web sites are allowed.
      • 
@@ -786,11 +786,11 @@ The PNG files should be placed in a folder which exactly represents
 
      Example 1
      -<a href="modelica://Modelica.Mechanics.MultiBody.UsersGuide.Tutorial.LoopStructures.PlanarLoops">
+<a href="modelica:/Modelica.Mechanics.MultiBody.UsersGuide.Tutorial.LoopStructures.PlanarLoops">
          Modelica.Mechanics.MultiBody.UsersGuide.Tutorial.LoopStructures.PlanarLoops</a>
 
      appears as
      
-
+
          Modelica.Mechanics.MultiBody.UsersGuide.Tutorial.LoopStructures.PlanarLoops
      Example 2
      
@@ -798,14 +798,14 @@ The PNG files should be placed in a folder which exactly represents
 
       <p>
   The feeder cables are connected to an
-  <a href="modelica://Modelica.Electrical.Machines.BasicMachines.InductionMachines.IM_SquirrelCage">
+  <a href="modelica:/Modelica.Electrical.Machines.BasicMachines.InductionMachines.IM_SquirrelCage">
   induction machine</a>.
 </p>
 
      appears as
      
   The feeder cables are connected to an
-  
+  
   induction machine.
 
      "));
@@ -866,7 +866,7 @@ The PNG files should be placed in a folder which exactly represents
           annotation (Documentation(info="
        
 
      1.  Refer to references by [1], [Andronov1973], etc. by hyperlink and summarize literature in the references subsection of
-     Conventions.UsersGuide.References.
        2. 
+     Conventions.UsersGuide.References.
 
      2.  There has to be made at least one citation to each reference.
        3. 
 
      
 
@@ -877,17 +877,17 @@ The PNG files should be placed in a folder which exactly represents
 
       <p>
 More details about electric machine modeling
-can be found in [<a href="modelica://Modelica.UsersGuide.Conventions.UsersGuide.References">Gao2008</a>]
+can be found in [<a href="modelica:/Modelica.UsersGuide.Conventions.UsersGuide.References">Gao2008</a>]
 and
-[<a href="modelica://Modelica.UsersGuide.Conventions.UsersGuide.References">Kral2018</a>, p. 149].
+[<a href="modelica:/Modelica.UsersGuide.Conventions.UsersGuide.References">Kral2018</a>, p. 149].
 </p>
 
      appears as
      
 More details about electric machine modeling
-can be found in [Gao2008]
+can be found in [Gao2008]
 and
-[Kral2018, p. 149].
+[Kral2018, p. 149].
 
      "));
         end References;
@@ -989,7 +989,7 @@ and enumeration should look like this: Tab. 1: Tables have to b
 
 
      
 In this section the format UsersGuide of the HTML documentation are specified.
-The structure of the documentation is specified separately.
+The structure of the documentation is specified separately.
 
      Paragraphs
      
@@ -1261,7 +1261,7 @@ For Boolean parameters, the description string should start with "= true, &
 
 
    •  A connector class has the instance
      name definition in the diagram layer and not in the
-     icon layer.
      • 
+     icon layer.
      Variable names
      
@@ -1554,7 +1554,7 @@ This class summarizes general information about the implementation which is not
 
    •  Technical report [Marlino2005]
      • 
 
-
      The citation is also explained.
      
+
      The citation is also explained.
      Example
      
 
@@ -1676,7 +1676,7 @@ This class summarizes contact information of the contributing persons.
 <p>
 Library officers responsible for the maintenance and for the
 organization of the development of this library are listed in
-<a href=\"modelica://Modelica.UsersGuide.Contact\">Modelica.UsersGuide.Contact</a>.
+<a href=\"modelica:/Modelica.UsersGuide.Contact\">Modelica.UsersGuide.Contact</a>.
 </p>
 
 <h4>Main authors</h4>
@@ -1728,7 +1728,7 @@ OR whatever
 
      
 Library officers responsible for the maintenance and for the
 organization of the development of this library are listed in
-Modelica.UsersGuide.Contact.
+Modelica.UsersGuide.Contact.
 
      Main authors
      
@@ -1832,7 +1832,7 @@ The authors would like to thank following persons for their support ...
       
-      
+      
@@ -1865,11 +1865,11 @@ The authors would like to thank following persons for their support ...
     annotation (Documentation(info="
      The UsersGuide of each package should consist of the following classes
        
-
      1.  Contact information of
+
      2.  Contact information of
      the library officer and the co-authors
        3. 
-
      3.  Optional Implementation Notes to give general information about the implementation
        4. 
-
      4.  References for summarizing the literature of the package
        5. 
-
      5.  Revision history  to summarize the most important changes and improvements of the package
        6. 
+
      6.  Optional Implementation Notes to give general information about the implementation
        7. 
+
      7.  References for summarizing the literature of the package
        8. 
+
      8.  Revision history  to summarize the most important changes and improvements of the package
        9. 
 
      "));
     end UsersGuide;
@@ -1896,87 +1896,87 @@ In the Modelica Standard Library the following color schemes apply:
      
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
-    
+    
@@ -1986,12 +1986,12 @@ In the Modelica Standard Library the following color schemes apply:
      
-    
+    
-    
+    
@@ -2039,11 +2039,11 @@ and the most significant parameter can be displayed within the vertical Diagram
   
@@ -2066,7 +2066,7 @@ the component name shall be placed above the icon with vertical 10 units of spac
   
@@ -2081,7 +2081,7 @@ the line shall be interrupted such that this line does not interfere with compon
   
@@ -2093,7 +2093,7 @@ the line shall be interrupted such that this line does not interfere with compon
   
@@ -2123,7 +2123,7 @@ Preferred connector locations are:
      
@@ -2138,19 +2138,19 @@ design of sensors apply:
 
 
        
 
      • The sensor outputs shall be indicated by its SI unit, not its quantity; the proper SI unit shall be compliant with the unit definitions of
-    Modelica.Units.SI,
+    Modelica.Units.SI,
     e.g. heat flow is indicated by W, torque is indicated by N.m
        • 
 
      • The text color of the SI units is {64,64,64} in RGB code
        • 
 
      • For a sensor with a single output signal the SI unit shall be placed within the sensor,
     see Fig. 6 and 7
     
          
-    
        • In a round sensor the text size shall be
+    
        • In a round sensor the text size shall be
         
            
         
          • either {{-30,-10},{30,-70}} (Fig. 6(a))
            • 
         
          • or {{-50,-12},{50,-48}} (Fig. 6(b)), depending on the better readability
            • 
         
          • 
 
-    
        • In a rectangular sensor the text size shall be
+    
        • In a rectangular sensor the text size shall be
         {{-24,20},{66,-40}} (Fig. 7)
          • 
     
        • 
 
      • For a sensor with multiple output signals the SI unit shall be placed next to the output signal;
@@ -2165,11 +2165,11 @@ design of sensors apply:
   
      
@@ -2179,7 +2179,7 @@ design of sensors apply:
   
@@ -2189,7 +2189,7 @@ design of sensors apply:
   
@@ -2205,11 +2205,11 @@ Graphical illustrations shall not be added in the diagram layer, but can be adde
     annotation (DocumentationClass=true,Documentation(info="
      A Modelica main package should be compliant with the UsersGuide stated in this documentation:
        
-
      1.  Conventions of the Modelica code
        2. 
-
      2.  Consistent HTML documentation
        3. 
+
      3.  Conventions of the Modelica code
        4. 
+
      4.  Consistent HTML documentation
        5. 
 
      5.  Structure to be provided by a main package
 
          
-     
        •  User's Guide
          • 
+     
        •  User's Guide
          • 
      
        •  Examples containing models demonstrating the usage of the library.
          • 
      
        •  Components -- in case of a complex library a more detailed structure can be established.
          • 
      
        •  Sensors
          • 
@@ -2399,12 +2399,12 @@ The following existing components h
         the comparison between dutyCycle and reference signal is either applied common or separated for both fire ports.
 
      
-    
+    
-    
+    
-    
+    
      
   
      
     \"y=a_1+a_2\"
     (1)
   
      
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
      1.0.5
       2010-03-11
       D. WinklerUpdated image links guide to new 'modelica://' URIs, added contact detailsUpdated image links guide to new 'modelica:/' URIs, added contact details
     
      
     
      
       1.0.4
 
 
 
   
      
     Modelica.Blocks
     {0,0,127}
   
      
   
      
     Modelica.ComplexBlocks
     {85,170,255}
   
      
   
      
     Modelica.Clocked
     {95,95,95}
   
      
   
      
     Modelica.StateGraph
     {0,0,0}
   
      
   
      
     Modelica.Electrical.Analog
     {0,0,255}
   
      
   
      
     Modelica.Electrical.Digital
     {128,0,128}
   
      
   
      
     Modelica.Electrical.Machines
     {0,0,255}
   
      
   
      
     Modelica.Electrical.Polyphase
     {0,0,255}
   
      
   
      
     Modelica.Electrical.QuasiStatic
     {85,170,255}
   
      
   
      
     Modelica.Electrical.Spice3
      {170,85,255}
   
      
   
      
     Modelica.Magnetic.FluxTubes
     {255,127,0}
   
      
   
      
     Modelica.Magnetic.FundamentalWave
     {255,127,0}
   
      
   
      
     Modelica.Magnetic.QuasiStatic
     {255,170,85}
   
      
   
      
     Modelica.Mechanics.MultiBody
     {192,192,192}
   
      
   
      
     Modelica.Mechanics.Rotational
     {95,95,95}
   
      
   
      
     Modelica.Mechanics.Translational
     {0,127,0}
   
      
   
      
     Modelica.Fluid
     {0,127,255}
   
      
   
      
     Modelica.Media
   
      
     Modelica.Thermal.FluidHeatFlow
     {0,0,255}
   
      
   
      
     Modelica.Thermal.HeatTransfer
     {191,0,0}
   
      
   
      
     Modelica.Math
      Fig. 1: (a) Typical icon, (b) including dimensions
   
      
      (a)
-      \"Typical
     
      (b)
-      \"Typical
     
   
      Fig. 2: Block component name
   
      
     
-      \"Placement
     
   
      Fig. 3: Component name between actual icon and connector
   
      
     
-      \"Component
     
   
      Fig. 4: Component name below actual icon
   
      
     
-      \"Icon
     
   
      
         Fig. 5: Connectors located at the four corners of the icon diagram
   
      
     
-      \"Icon
     
   
      Fig. 6: Round sensor with (a) short and (b) longer SI unit
   
      
      (a)
-      \"Icon
     
      (b)
-      \"Icon
     
   
      Fig. 7: Rectangular sensor 
   
      
     
-      \"Icon
     
   
      Fig. 8: Sensor with multiple signal outputs and SI units located next to the output connectors
   
      
     
-      \"Icon
     
   
      
 
 
      Mechanics.Rotational.Components
      
 
      BearingFrictionThe table interpolation in tau_pos utilizes the interpolation based on ExternalCombiTable1D.
      The table interpolation in tau_pos utilizes the interpolation based on ExternalCombiTable1D.
      
 
      LossyGearThe table interpolation in lossTable utilizes the interpolation based on ExternalCombiTable1D.
      The table interpolation in lossTable utilizes the interpolation based on ExternalCombiTable1D.
      
 
      Mechanics.Translational.Components
      
 
      SupportFrictionThe table interpolation in f_pos utilizes the interpolation based on ExternalCombiTable1D.
      The table interpolation in f_pos utilizes the interpolation based on ExternalCombiTable1D.
      
 
      
 
 

      
@@ -2414,10 +2414,10 @@ The following existing components h
 
-    
+    
-    
+    
      
 
      Mechanics.Rotational.Components
      
 
      Brake
      Clutch
      OneWayClutch      		The table interpolation in mu_pos utilizes the interpolation based on ExternalCombiTable1D.
      The public variable mu0 was changed to a protected final parameter.
      The table interpolation in mu_pos utilizes the interpolation based on ExternalCombiTable1D.
      The public variable mu0 was changed to a protected final parameter.
      
 
      Mechanics.Translational.Components
      
 
      BrakeThe table interpolation in mu_pos utilizes the interpolation based on ExternalCombiTable1D.
      The public variable mu0 was changed to a protected final parameter.
      The table interpolation in mu_pos utilizes the interpolation based on ExternalCombiTable1D.
      The public variable mu0 was changed to a protected final parameter.
      
 
      
 
 

      
@@ -2443,10 +2443,10 @@ A tested conversion script is provided to transform models and libraries of prev
 Short Overview:
 
      
 
        
-
      • About 649 issues (including 432 pull requests) have been addressed for this release.
        • 
+
      • About 649 issues (including 432 pull requests) have been addressed for this release.
        • 
 
      • This version is based on the recent Modelica language standard version 3.4.
        • 
 
      • The library version (i.e., \"4.0.0\") follows semantic versioning using the convention MAJOR.MINOR.BUGFIX
-(see Version Management for details)
+(see Version Management for details)
  and was decoupled from the version of the utilized version of the Modelica language standard.
        • 
 
      • Obsolete classes of previous versions 3.x.y have been replaced.
        • 
 
      • Obsolete classes, that could not be automatically converted to alternative implementations, have been moved to library ObsoleteModelica4.
        • 
@@ -2456,12 +2456,12 @@ Short Overview:
     
      • Modelica.Electrical.MultiPhase → Modelica.Electrical.Polyphase
        • 
     
      • Modelica.Electrical.QuasiStationary → Modelica.Electrical.QuasiStatic
        • 
   
-
      • The licenses of the utilized open-source third-party software components as well as the BSD 3-clause license of the Modelica Standard Library itself are available as separate resources.
        • 
+
      • The licenses of the utilized open-source third-party software components as well as the BSD 3-clause license of the Modelica Standard Library itself are available as separate resources.
        • 
 
      
 
 
      
 The exact difference between package Modelica version 4.0.0 and version 3.2.3 is
-summarized in a comparison table.
+summarized in a comparison table.
 
      
 
 
      
@@ -2614,12 +2614,12 @@ The following new libraries have be
 
      
 
 
-
+
-
+
@@ -2714,13 +2714,13 @@ The following existing components h
     
-    
+    
-    
+    
@@ -2823,7 +2823,7 @@ and will interpret it in the same way. Short Overview:
 
      Modelica.Clocked
      Modelica.Clocked
     This library can be used to precisely define and synchronize sampled data systems with different sampling rates.
      The library previously was
     available as separate package Modelica_Synchronous.
     (This library was developed by DLR in close cooperation with Dassault Systèmes Lund.)
     
      Modelica.Electrical.Batteries
      Modelica.Electrical.Batteries
     This library offers simple battery models.
      
     (This library was developed by Anton Haumer and Christian Kral.)
     
      The enumeration type has been converted to Types.Init with exception of the alternative InitPID.DoNotUse_InitialIntegratorState, that was converted to Init.InitialState leading to a different initialization behaviour.
      
 
      Modelica.Electrical.Machines.Utilities
      
 
      SwitchYDThe IdealCommutingSwitch is replaced by an IdealOpeningSwitch and an IdealClosingSwitch to allow a time delay between the two switching actions.
      The IdealCommutingSwitch is replaced by an IdealOpeningSwitch and an IdealClosingSwitch to allow a time delay between the two switching actions.
      
 
      Modelica.Electrical.Spice3
      
 
      Internal.MOS2
      Semiconductors.M_NMOS2
      Semiconductors.M_PMOS2      		
     The final parameter vp has been removed.
      The obsolete variables cc_obsolete, icqmGB, icqmGS, icqmGD, MOScapgd, MOScapgs, MOScapgb, qm and vDS have been removed.
      
 
      Modelica.Magnetic.QuasiStatic.FundamentalWave.Utilities
      
 
      SwitchYDThe IdealCommutingSwitch is replaced by an IdealOpeningSwitch and an IdealClosingSwitch to allow a time delay between the two switching actions.
      The IdealCommutingSwitch is replaced by an IdealOpeningSwitch and an IdealClosingSwitch to allow a time delay between the two switching actions.
      
 
      Modelica.Mechanics.MultiBody.Forces
      
 
      WorldForce
     The parameters diameter and N_to_m have been removed.
      
 
 
      
-
+
-
+
@@ -3152,21 +3152,21 @@ Modelica.Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction, see details b
 
    •  About 240 tickets have been fixed in this release and the previous maintenance releases:
      
        
      
      •  Version 3.2.1 Build.3 (July 30, 2015) with respect to 3.2.1 Build.2 (August 14, 2013):
        
-          About 103 tickets
+          About 103 tickets
           have been fixed for this maintenance release.
         
        • 
 
      
      •  Version 3.2.1 Build.4 (September 30, 2015) with respect to 3.2.1 Build.3 (July 30, 2015):
           
          
-            
        •  About 10 tickets
+            
        •  About 10 tickets
                  have been fixed for this maintenance release. Critical tickets:
          • 
 
             
        •  Ticket 1768
-                 fixes an issue with block CombiTimeTable
+                 fixes an issue with block CombiTimeTable
                  (wrong output when using fixed time step integrator with time step greater than table resolution).
          • 
 
             
        •  Ticket 1758
                  states that simulation of
-                 Modelica.Fluid.Examples.HeatingSystem
+                 Modelica.Fluid.Examples.HeatingSystem
                  fails in Dymola 2016 if option \"pedantic mode for checking Modelica semantics\" is set.
                  This issue was not fixed in the library due to the following reasons:
          
                  The Modelica.Fluid library uses a particular pattern to define some parameters resulting
@@ -3186,7 +3186,7 @@ Modelica.Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction, see details b
                  Modelica.Fluid library in version 3.2.1 build 4 and any previous version).
          • 
 
             
        •  In ticket 1757 it is (correctly) stated
-                 that the example model PsychrometricData
+                 that the example model PsychrometricData
                  was moved from Modelica.Media.Air.MoistAir.PsychrometricData and that this is a non-backwards compatible change.
                  This non-backwards compatible change is accepted, because it fixes a circular dependency (a model references
                  a package in which it resides), for details see ticket
@@ -3198,14 +3198,14 @@ Modelica.Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction, see details b
           
        
      
        • 
      
      •  Version 3.2.2 Build.2 (March 16, 2016) with respect to 3.2.1 Build.4 (September 30, 2015):
        
-          About 130 tickets
+          About 130 tickets
           have been fixed for this release.
        
           The ModelicaStandardTables object library (.lib, .dll, .a, .so, depending on tool) has
           been split into the libraries ModelicaStandardTables, ModelicaMatIO, zlib and the new
           object library ModelicaIO has been added.
        
           For a tool vendor this can be a non-backwards compatible change if the same object libraries have been used in the past
           for different releases of package Modelica.
-          In Resources/C-Sources/readme.txt
+          In Resources/C-Sources/readme.txt
           the issue is explained in detail and how to resolve it.
           For a user this might be a non-backwards compatible change if he/she implemented an
           own external C interface function to one of the functions in the ModelicaStandardTables,
@@ -3234,8 +3234,8 @@ The exact difference between package Modelica version 3.2.2 and version 3.2.1 is
 summarized in the following two comparison tables:
 
        
 
 
 
        
@@ -3297,34 +3297,34 @@ The following new libraries have be
 
        
 
 
      • Modelica.Magnetic.QuasiStatic.FluxTubes
      Modelica.Magnetic.QuasiStatic.FluxTubes
     
     This library provides models for the investigation of quasi-static electromagnetic devices with lumped magnetic networks
-    in a comparable way as Modelica.Magnetic.FluxTubes.
      
+    in a comparable way as Modelica.Magnetic.FluxTubes.
      
     (This library was developed by Christian Kral.)
     
      Modelica.Electrical.Machines.Examples.ControlledDCDrives
      Modelica.Electrical.Machines.Examples.ControlledDCDrives
     
     This library demonstrates the control of a permanent magnet dc machine: current control, speed control and position control
     along with the necessary components in sublibrary Utilities.
      
@@ -2941,7 +2941,7 @@ to existing libraries:
           		 Adaptors for the generation of FMUs, optionally taking first and second derivative into account.
      
          Note: These adaptors give the same results as:
      
          AngleToTorqueAdaptor
      TorqueToAngleAdaptor
      
-         but extend from Modelica.Blocks.Interfaces.Adaptors
+         but extend from Modelica.Blocks.Interfaces.Adaptors
          like adaptors in other domains.
      
 
      Modelica.Mechanics.Rotational.Sources
      
 
      EddyCurrentTorque
      
-
+
 
-
+
 
-
+
 
-
+
 
-
+
      Modelica.Electrical.PowerConverters
      Modelica.Electrical.PowerConverters
     
     This library offers models for rectifiers, inverters and DC/DC-converters.
      
     (This library was developed by Christian Kral and Anton Haumer.)
     
      Modelica.Magnetic.QuasiStatic.FundamentalWave
      Modelica.Magnetic.QuasiStatic.FundamentalWave
     
     This library provides quasi-static models of polyphase machines (induction machines, synchronous machines) in parallel (with the same parameters but different electric connectors)
-    to the transient models in Modelica.Magnetic.FundamentalWave.
      
+    to the transient models in Modelica.Magnetic.FundamentalWave.
      
     Quasistatic means that electric transients are neglected, voltages and currents are supposed to be sinusoidal. Mechanical and thermal transients are taken into account.
      
-    This library is especially useful in combination with the Modelica.Electrical.QuasiStatic
+    This library is especially useful in combination with the Modelica.Electrical.QuasiStatic
     library in order to build up very fast simulations of electrical circuits with sinusoidal currents and voltages.
      
     (This library was developed by Christian Kral and Anton Haumer.)
     
      Sublibraries of Modelica.Magnetic.FluxTubes
      Sublibraries of Modelica.Magnetic.FluxTubes
     
    New elements for modeling ferromagnetic (static) and eddy current (dynamic) hysteresis effects and permanent magnets have been added.
    The FluxTubes.Material package is also extended to provide hysteresis data for several magnetic materials. These data is partly based on own measurements.
    For modeling of ferromagnetic hysteresis, two different hysteresis models have been implemented: The simple Tellinen model and the considerably
    more detailed Preisach hysteresis model. The following packages have been added:
   
     (These extensions have been developed by Johannes Ziske and Thomas Bödrich as part of the Clean Sky JTI project;
      project number: 296369; Theme:
@@ -3338,29 +3338,29 @@ The following new libraries have be
    Several new sublibraries have been added allowing the modeling of reproducible noise.
    The most important new sublibraries are (for more details see below):
   
   (These extensions have been developed by Andreas Klöckner, Frans van der Linden, Dirk Zimmer, and Martin Otter from
   DLR Institute of System Dynamics and Control).
     
      Modelica.Utilities functions for matrix read/write
      Modelica.Utilities functions for matrix read/write
     
-   New functions are provided in the Modelica.Utilities.Streams
+   New functions are provided in the Modelica.Utilities.Streams
    sublibrary to write matrices in MATLAB MAT format on file and read matrices in this format from file.
    The MATLAB MAT formats v4, v6, v7 and v7.3 (in case the tool supports HDF5) are supported by these functions.
    Additionally, example models are provided under
-   Modelica.Utilities.Examples
+   Modelica.Utilities.Examples
    to demonstrate the usage of these functions in models. For more details see below.
      
    (These extensions have been developed by Thomas Beutlich from ITI GmbH).
     
      Modelica.Math sublibrary for FFT
      Modelica.Math sublibrary for FFT
     
-   The new sublibrary FastFourierTransform
+   The new sublibrary FastFourierTransform
    provides utility and convenience functions to compute the Fast Fourier Transform (FFT).
    Additionally two examples are present to demonstrate how to compute an FFT during continuous-time
    simulation and store the result on file. For more details see below.
      
@@ -3562,7 +3562,7 @@ and will interpret it in the same way. Short Overview:
      without relying on tool heuristics).
      
 
-
    •  About 400 tickets
+
    •  About 400 tickets
      have been fixed for this release, and
      especially all compliance issues and all relevant defect issues.
      
      • 
@@ -3675,12 +3675,12 @@ The new open source tables have been tested by T. Beutlich (ITI):
 
      
 The exact difference between package Modelica version 3.2 and version 3.2.1 is
 summarized in a
-comparison table.
+comparison table.
 
      
 
 
      
 About 400 trac tickets have been fixed for this release. An overview is given
-here.
+here.
 Clicking on a ticket gives all information about it.
 
      
 
@@ -3885,14 +3885,14 @@ This version is a major improvement:
 
    • 7 new libraries are included.
      • 
 
 
    •  The icons of the library are newly designed to provide a modern, unified view,
-     see Modelica.Icons.
      • 
+     see Modelica.Icons.
 
 
    •  All non-Modelica files, such as images, pdf-files, C-source files,
      scripts are moved to the new directory \"Modelica\\Resources\".
      Furthermore, all file references are changed to URIs as introduced in
      Modelica 3.1 (e.g., a file with the file name
      \"Modelica/Resources/Images/xxx\" is referenced as
-     \"modelica://Modelica/Resources/Images/xxx\").
      • 
+     \"modelica:/Modelica/Resources/Images/xxx\").
 
 
    •  All physical models that dissipate heat (such as electrical elements,
      electrical machines, bearings, dampers, etc.), have now an optional heat port
@@ -3901,13 +3901,13 @@ This version is a major improvement:
      of technical systems.
      • 
 
 
    •  All electrical machines in the
-     Machines
+     Machines
      library have now a \"Losses\" tab in the parameter menu to optionally
      model machines losses such as frictional losses, stator core losses
      or stray load losses, respectively.
      • 
 
 
    •  All electrical machines in the
-     Machines
+     Machines
      library have now a \"powerBalance\" result record,
      summarizing converted power and losses.
      • 
 
@@ -3937,7 +3937,7 @@ The following new libraries have be
 
      
 
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
@@ -4503,8 +4503,8 @@ to existing libraries:
                       ComplexAdmittance
      
                       ComplexPower
+                      Modelica.Electrical.QuasiStatic,
+                      Modelica.Magnetic.FundamentalWave
@@ -4540,7 +4540,7 @@ have been improved in a
                       To all electric machines (asynchronous and synchronous induction machines, DC machines)
                       and transformers conditional thermal ports have been added,
                       to which the dissipated losses are flowing, if activated.
-                      The thermal port contains a HeatPort
+                      The thermal port contains a HeatPort
                       for each loss source of the specific machine type.

      
                       To all electric machines (asynchronous and synchronous induction machines, DC machines)
                       a \"powerBalance\" result record has been added, summarizing converted power and losses.
@@ -4650,7 +4650,7 @@ that can lead to wrong simulation results):
                       (a detailed description is provided in ticket
                       #108
                       and in the
-                      attachment
+                      attachment
                       of this ticket).
@@ -4723,7 +4723,7 @@ The following trac tickets have been fixed:
 
 
-    
+    
      Complex
      Complex
     
     This is a top-level record outside of the Modelica Standard Library.
     It is used for complex numbers and contains overloaded operators.
@@ -3952,17 +3952,17 @@ The following new libraries have be
     (This library was developed by Marcus Baur, DLR.)
     
      Modelica.ComplexBlocks
      Modelica.ComplexBlocks
     
     Library of basic input/output control blocks with Complex signals.
      
     This library is especially useful in combination with the new
-    Modelica.Electrical.QuasiStatic
+    Modelica.Electrical.QuasiStatic
     library in order to build up very fast simulations of electrical circuits with periodic
     currents and voltages.
      
     (This library was developed by Anton Haumer.)
     
      Modelica.Electrical.QuasiStatic
      Modelica.Electrical.QuasiStatic
     
     Library for quasi-static electrical single-phase and polyphase AC simulation.
      
     This library allows very fast simulations of electrical circuits with sinusoidal
@@ -3971,7 +3971,7 @@ The following new libraries have be
     (This library was developed by Anton Haumer and Christian Kral.)
     
      Modelica.Electrical.Spice3
      Modelica.Electrical.Spice3
     
     Library with components of the Berkeley
     SPICE3
@@ -3990,7 +3990,7 @@ The following new libraries have be
     (This library was developed by Fraunhofer Gesellschaft, Dresden.)
     
      Modelica.Magnetic.FundamentalWave
      Modelica.Magnetic.FundamentalWave
     
      Library for magnetic fundamental wave effects in electric machines for the
      application in three phase electric machines.
@@ -4005,14 +4005,14 @@ The following new libraries have be
      ideas and source code of a library from Michael Beuschel from 2000.)
     
      Modelica.Fluid.Dissipation
      Modelica.Fluid.Dissipation
     
      Library with functions to compute convective heat transfer and pressure loss characteristics.
      
      (This library was developed by Thorben Vahlenkamp and Stefan Wischhusen from
      XRG Simulation GmbH.)
     
      Modelica.ComplexMath
      Modelica.ComplexMath
     
     Library of complex mathematical functions (e.g., sin, cos) and of functions operating
     on complex vectors.
      
@@ -4095,11 +4095,11 @@ to existing libraries:
                       OnDelay      		
      Mathematical blocks for Boolean signals.
                       Some of these blocks are available also in library
-                      Logical.
+                      Logical.
                       The new design is based on the connectorSizing annotation that allows
                       the convenient handling of an arbitrary number of input signals
                       (e.g., the \"And\" block has 1,2,...,N inputs, instead of only 2 inputs
-                      in the Logical library).
+                      in the Logical library).
                       Additionally, the icons are smaller so that the diagram area is
                       better utilized
      
     
       SIunits to be used in physical models using complex variables, e.g.,
      
-                      Modelica.Electrical.QuasiStatic,
-                      Modelica.Magnetic.FundamentalWave 
       
 
       ImpulseFlowRate
      
                       AngularImpulseFlowRate      		
      New SIunits for mechanics.
      
 
 
       Gearbox
      
     #218Replace `Modelica://`-URIs by `modelica://`-URIsReplace `Modelica://`-URIs by `modelica:/`-URIs
 
      
 
 
      
@@ -5144,7 +5144,7 @@ the following new language elements (compared to Modelica Specification 3.0):
 The following new libraries have been added:
 
      
 
-
+
 
-
+
 
-
+
      Modelica.Fluid
      Modelica.Fluid
     
      Components to model 1-dim. thermo-fluid flow in networks of vessels, pipes,
      fluid machines, valves and fittings. All media from the
@@ -5153,7 +5153,7 @@ The following new libraries have be
     The library is using the stream-concept from Modelica Specification 3.1.
     
      Modelica.Magnetic.FluxTubes
      Modelica.Magnetic.FluxTubes
     
      Components to model magnetic devices based on the magnetic flux tubes concepts.
      Especially to model
@@ -5162,7 +5162,7 @@ The following new libraries have be
      Cobalt iron, Nickel iron, NdFeB, Sm2Co17, and more.
     
      ModelicaServices
      ModelicaServices
     
      New top level package that shall contain functions and models to be used in the
      Modelica Standard Library that requires a tool specific implementation.
@@ -6445,7 +6445,7 @@ the following exceptions:
          to Modelica.Media.Interfaces.PartialMedium, because a FluidConstants
          record definition is missing,
          for details, see
-          Modelica.Media.IdealGases
+          Modelica.Media.IdealGases
          (this is seen as a bug fix).
 
 
@@ -6453,7 +6453,7 @@ the following exceptions:
 An overview of the differences between version 2.2.2 and the previous
 version 2.2.1 is given below. The exact differences (but without
 differences in the documentation) are available in
-Differences-Modelica-221-222.html.
+Differences-Modelica-221-222.html.
 This comparison file was generated automatically with Dymola's
 ModelManagement.compare function.
 
      
@@ -7802,7 +7802,7 @@ The following new libraries have been added:
 
      
 
 
-
+
-
+
      Modelica.Media
      Modelica.Media
            Property models of liquids and gases, especially
                    
        
                    
      • 1241 detailed gas models,
        • 
@@ -7827,7 +7827,7 @@ The following new libraries have been added:
                                 dynamic simulation.
                    
      
           
      Modelica.Thermal.FluidHeatFlow
      Modelica.Thermal.FluidHeatFlow
            Simple components for 1-dim., incompressible thermo-fluid flow
                    to model coolant flows, e.g., of electrical machines.
                    Components can be connected arbitrarily together (= ideal mixing
@@ -7898,27 +7898,27 @@ before automatic conversion is performed.
 The following new libraries have been added:
 
      
 
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
      Modelica.Electrical.Digital
      Modelica.Electrical.Digital
           Digital electrical components based on 2-,3-,4-, and 9-valued logic
      
                   according to the VHDL standard
      Modelica.Electrical.Machines
      Modelica.Electrical.Machines
           Asynchronous, synchronous and DC motor and generator models
      Modelica.Math.Matrices
      Modelica.Math.Matrices
           Functions operating on matrices such as solve() (A*x=b), leastSquares(),
      
                   norm(), LU(), QR(),  eigenValues(), singularValues(), exp(), ...
      Modelica.StateGraph
      Modelica.StateGraph
            Modeling of discrete event and reactive systems in a convenient way using
      
                    hierarchical state machines and Modelica as action language.
      
                    It is based on JGrafchart and Grafcet and  has a similar modeling power as
      
                    StateCharts. It avoids deficiencies of usually used action languages.
      
                    This library makes the ModelicaAdditions.PetriNets library obsolete.
      Modelica.Utilities.Files
      Modelica.Utilities.Files
           Functions to operate on files and directories (copy, move, remove files etc.)
      Modelica.Utilities.Streams
      Modelica.Utilities.Streams
           Read from files and write to files (print, readLine, readFile, error, ...)
      Modelica.Utilities.Strings
      Modelica.Utilities.Strings
           Operations on strings (substring, find, replace, sort, scanToken, ...)
      Modelica.Utilities.System
      Modelica.Utilities.System
           Get/set current directory, get/set environment variable, execute shell command, etc.
      
 
      
 
      
@@ -7928,22 +7928,22 @@ have been improved and added as new libraries
 to the new sublibraries inside package Modelica):
 
      
 
-
+
-
+
-
+
-
+
-
+
-
+
      Modelica.Blocks.Discrete
      Modelica.Blocks.Discrete
            Discrete input/output blocks with fixed sample period
      
                    (from ModelicaAdditions.Blocks.Discrete)
      Modelica.Blocks.Logical
      Modelica.Blocks.Logical
            Logical components with Boolean input and output signals
      
                    (from ModelicaAdditions.Blocks.Logical)
      Modelica.Blocks.Nonlinear
      Modelica.Blocks.Nonlinear
            Discontinuous or non-differentiable algebraic control blocks such as variable limiter,
      
                    fixed, variable and Pade delay etc. (from ModelicaAdditions.Blocks.Nonlinear)
      Modelica.Blocks.Routing
      Modelica.Blocks.Routing
            Blocks to combine and extract signals, such as multiplexer
      
                    (from ModelicaAdditions.Blocks.Multiplexer)
      Modelica.Blocks.Tables
      Modelica.Blocks.Tables
            One and two-dimensional interpolation in tables. CombiTimeTable is available
      
                    in Modelica.Blocks.Sources (from ModelicaAdditions.Tables)
      Modelica.Mechanics.MultiBody
      Modelica.Mechanics.MultiBody
            Components to model the movement of 3-dimensional mechanical systems. Contains
      
                    body, joint, force and sensor components, analytic handling of kinematic loops,
      
                    force elements with mass, series/parallel connection of 3D force elements etc.
      
@@ -8404,29 +8404,29 @@ end Version_1_4;
 
      
 This section summarizes the changes that have been performed
 on the Modelica standard library. Furthermore, it is explained in
-Modelica.UsersGuide.ReleaseNotes.VersionManagement
+Modelica.UsersGuide.ReleaseNotes.VersionManagement
 how the versions are managed.
 This is especially important for maintenance (bug fix) releases where the
 main version number is not changed.
 
      
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Version X.Y.0Month D, 20YY
      Version 4.0.0June 4, 2020
      Version 3.2.3January 23, 2019
      Version 3.2.2April 3, 2016
      Version 3.2.1August 14, 2013
      Version 3.2Oct. 25, 2010
      Version 3.1August 14, 2009
      Version 3.0.1Jan. 27, 2009
      Version 3.0March 1, 2008
      Version 2.2.2Aug. 31, 2007
      Version 2.2.1March 24, 2006
      Version 2.2April 6, 2005
      Version 2.1Nov. 11, 2004
      Version 1.6June 21, 2004
      Version 1.5Dec. 16, 2002
      Version 1.4June 28, 2001
      Version X.Y.0Month D, 20YY
      Version 4.0.0June 4, 2020
      Version 3.2.3January 23, 2019
      Version 3.2.2April 3, 2016
      Version 3.2.1August 14, 2013
      Version 3.2Oct. 25, 2010
      Version 3.1August 14, 2009
      Version 3.0.1Jan. 27, 2009
      Version 3.0March 1, 2008
      Version 2.2.2Aug. 31, 2007
      Version 2.2.1March 24, 2006
      Version 2.2April 6, 2005
      Version 2.1Nov. 11, 2004
      Version 1.6June 21, 2004
      Version 1.5Dec. 16, 2002
      Version 1.4June 28, 2001
      
 
      
 "));
 end ReleaseNotes;
@@ -8900,100 +8900,100 @@ User's Guides that can be accessed by the following links:
 
 
-  
+  
 
-
-  
+  
 
-
+
-  
+  
 
-
-  
+  
-  
+  
-  
+  
 
-
 
-
-  
+  
-  
+  
-  
+  
 
-
-  
+  
 
-
 
-
 
-
+
 
-
@@ -9010,7 +9010,7 @@ dateModified = "2020-06-04 11:00:00Z",
 revisionId="$Format:%h %ci$",
 uses(Complex(version="4.0.0"), ModelicaServices(version="4.0.0")),
 conversion(
- from(version={"3.0", "3.0.1", "3.1", "3.2", "3.2.1", "3.2.2", "3.2.3"}, script="modelica://Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos")),
+ from(version={"3.0", "3.0.1", "3.1", "3.2", "3.2.1", "3.2.2", "3.2.3"}, script="modelica:/Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos")),
 Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
   Polygon(
     origin={-6.9888,20.048},
@@ -9026,7 +9026,7 @@ Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
     extent={{-17.8562,-17.8563},{17.8563,17.8562}})}),
 Documentation(info="
      
-
+
 
      
@@ -9042,19 +9042,19 @@ in the next figure:
 
      
-
+
 
      
 For an introduction, have especially a look at:
 
        
-
      •  Overview
+
      •  Overview
   provides an overview of the Modelica Standard Library
-  inside the User's Guide.
        • 
-
      • Release Notes
+  inside the User's Guide.
        • 
+
      • Release Notes
  summarizes the changes of new versions of this package.
        • 
-
      •  Contact
+
      •  Contact
   lists the contributors of the Modelica Standard Library.
        • 
 
      •  The Examples packages in the various libraries, demonstrate
   how to use the components of the corresponding sublibrary.
        • 
@@ -9076,7 +9076,7 @@ and it has been tested with Modelica tools from different vendors.
 
 
        
 Licensed by the Modelica Association under the 3-Clause BSD License
        
-Copyright © 1998-2020, Modelica Association and contributors.
+Copyright © 1998-2020, Modelica Association and contributors.
 
        
 
 
        
diff --git a/ModelicaReference/package.mo b/ModelicaReference/package.mo
index f066dcd197..25062b9066 100644
--- a/ModelicaReference/package.mo
+++ b/ModelicaReference/package.mo
@@ -360,7 +360,7 @@ When converting between units (in the user-interface for plotting and entering p
 
 
        Example usage
        
 
        
-This annotation is used in the Modelica Standard Library for example in Modelica.Units.SI for the type definition TemperatureDifference.
+This annotation is used in the Modelica Standard Library for example in Modelica.Units.SI for the type definition TemperatureDifference.
 
        
 "));
   end absoluteValue;
@@ -472,10 +472,10 @@ This can be recommended by having annotation choicesAllMa
 
 
        Related annotations
        
 
 "));
   end dateModified;
@@ -759,7 +759,7 @@ Define graphical layout of the parameter menu.
                    group = \"Parameters\",
       showStartAttribute = false,
            colorSelector = false,
-              groupImage = \"modelica://MyPackage/Resources/Images/image.png\",
+              groupImage = \"modelica:/MyPackage/Resources/Images/image.png\",
          connectorSizing = false));
 
 
@@ -841,13 +841,13 @@ documentation_annotation:
 The \"Documentation\" annotation can contain the \"info\" annotation giving a textual description, the \"revisions\" annotation giving a list of revisions and other annotations defined by a tool [The \"revisions\" documentation may be omitted in printed documentation]. How the tool interprets the information in \"Documentation\" is unspecified. Within a string of the \"Documentation\" annotation, the tags <HTML> and </HTML> or <html> and </html> define the start and end of content that is HTML encoded. Links to Modelica classes may be defined with the HTML link command using scheme \"Modelica\", e.g.,
 
        
 
        -    <a href=\"modelica://ExamplePackage.Tutorial\">ExamplePackage.Tutorial</a>
+    <a href=\"modelica:/ExamplePackage.Tutorial\">ExamplePackage.Tutorial</a>
 
        
 
        
 Together with scheme \"Modelica\" the (URI)  fragment specifiers #diagram, #info, #text, #icon may be used to reference different layers. Example:
 
        
 
        -   <a href=\"modelica://ExamplePackage.SimpleModel#info\">SimpleModel</a>
+   <a href=\"modelica:/ExamplePackage.SimpleModel#info\">SimpleModel</a>
 
        
 "));
   end Documentation;
@@ -1048,7 +1048,7 @@ If \"Inline = false\", the model developer proposes to not inline the function.
 
        Example usage
        
 
 
        
-Inline = true is for example used in  Modelica.Mechanics.MultiBody.Frames and in functions of Modelica.Media to have no overhead for function calls such as resolving a vector in a different coordinate system and at the same time the function can be analytically differentiated, e.g., for index reduction needed for mechanical systems.
+Inline = true is for example used in  Modelica.Mechanics.MultiBody.Frames and in functions of Modelica.Media to have no overhead for function calls such as resolving a vector in a different coordinate system and at the same time the function can be analytically differentiated, e.g., for index reduction needed for mechanical systems.
 
        
 "));
   end Inline;
@@ -1074,12 +1074,12 @@ Has only an effect within a function declaration.
 If true, the model developer proposes to inline the function after the function is differentiated for index reduction, and before any other symbolic transformations are performed.
 
        
 
        
-This annotation cannot be combined with annotations Inline and LateInline!
+This annotation cannot be combined with annotations Inline and LateInline!
 
        
 
 
        Example usage
        
 
        
-InlineAfterIndexReduction = true is for example used in Modelica.Mechanics.Rotational.Components.AngleToTorqueAdaptor to define that an input signal is the derivative of another input signal.
+InlineAfterIndexReduction = true is for example used in Modelica.Mechanics.Rotational.Components.AngleToTorqueAdaptor to define that an input signal is the derivative of another input signal.
 
        
 "));
   end InlineAfterIndexReduction;
@@ -1156,7 +1156,7 @@ If \"LateInline = false\", the model developer proposes to not inline the functi
 
 
        Example usage
        
 
        
-This annotation is for example used in  Modelica.Media.Water.IF97_Utilities.T_props_ph to provide in combination with common subexpression elimination the automatic caching of function calls. Furthermore, it is used in order that a tool is able to propagate specific enthalpy over connectors in the Modelica.Fluid library.
+This annotation is for example used in  Modelica.Media.Water.IF97_Utilities.T_props_ph to provide in combination with common subexpression elimination the automatic caching of function calls. Furthermore, it is used in order that a tool is able to propagate specific enthalpy over connectors in the Modelica.Fluid library.
 
        
 "));
   end LateInline;
@@ -1265,9 +1265,9 @@ The preferredView annotation defines the default view when selecting the class.
   end Modelica;
 
        Related annotations
        
 
 "));
   end revisionId;
@@ -1305,7 +1305,7 @@ The optional argument normallyConstant of smoothOrder
 
 
        Examples
        
 
        
-This annotation is used by many functions of the Modelica.Fluid library, such as Modelica.Fluid.Dissipation.PressureLoss.StraightPipe.dp_laminar_DP, since geometric arguments to these functions are usually constant.
+This annotation is used by many functions of the Modelica.Fluid library, such as Modelica.Fluid.Dissipation.PressureLoss.StraightPipe.dp_laminar_DP, since geometric arguments to these functions are usually constant.
 
        
 
         function SpecialPolynomial
@@ -1398,10 +1398,10 @@ Defines that classes within this top-level class uses a specific version of anot
 
 
        Related annotations
        
 
 "));
   end uses;
@@ -1509,10 +1509,10 @@ This allows a tool to access multiple versions of the same package.
 
        
 
        Related annotations
        
 
 "));
   end version;
@@ -1552,11 +1552,11 @@ A “versionBuild” number A that is higher as “
        
 
        Related annotations
        
 
 "));
   end versionBuild;
@@ -1583,10 +1583,10 @@ A “versionBuild” number A that is higher as “end Modelica;
 
        Related annotations
        
 
 "));
   end versionDate;
@@ -1630,7 +1630,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
        
@@ -1674,7 +1674,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
@@ -1682,15 +1682,15 @@ class_specifier :
 The keyword class is used to define general classes (without any restrictions).
 It is identical to the keyword model.
 In most cases, it is recommended to use specialized classes as
-connector,
-model,
-block,
-package,
-record,
-function,
-type.
+connector,
+model,
+block,
+package,
+record,
+function,
+type.
 \"class\" should be used to define
-ExternalObjects,
+ExternalObjects,
 and can be used for classes merely containing documentation and/or graphics.
 
        
 "));
@@ -1719,12 +1719,12 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
        The keyword connector is used to define connectors, which are used
 in
-connect()
+connect()
 statements. In connectors, no equations are allowed in the
 definition or in any of its components.
 With respect to \"class\", it is enhanced to allow connect(..) to components
@@ -1733,13 +1733,13 @@ of connector classes.
 
 
        
 Variable declarations in a connector can have the additional prefixes
-flow or
-stream, besides
+flow or
+stream, besides
 the prefixes
-input and
-output, that are
+input and
+output, that are
 also allowed outside of a connector. Based on the prefix, a
-connect()
+connect()
 statement leads to specific connection equations, that describe the
 balance equations in the infinitesimal connection points.
 
        
@@ -2089,7 +2089,7 @@ Define specialized class function
 end si;
 
 
        
-\"Simulation
+\"Simulation
 
        
 
 
        Syntax
        
@@ -2102,7 +2102,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
@@ -2287,7 +2287,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
        
@@ -2329,7 +2329,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
        May only contain declarations of classes and constants.
@@ -2375,7 +2375,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
@@ -2413,7 +2413,7 @@ class_specifier :
    | \"=\" base_prefix name [ array_subscripts ] [ class_modification ] comment
    | \"=\" enumeration \"(\" ( [enum_list] | \":\" ) \")\" comment
 
-
        See Modelica Grammar for further details.
        
+
        See Modelica Grammar for further details.
        
 
 
        Description
        
 
        The keyword type is used to define types, which may only be extensions to the predefined types, enumerations, array of type, or classes extending from type.
@@ -2705,7 +2705,7 @@ The acos function can also be accessed as Modelica.Math.acos.
 
        
 
 
        
-\"acos\"
+\"acos\"
 
        
 
 
        Examples
        
@@ -2719,7 +2719,7 @@ The acos function can also be accessed as Modelica.Math.acos.
         ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-This operator returns true if state is active in a state machine.
+This operator returns true if state is active in a state machine.
 
        
 
        Syntax
        
 
        activeState(state)
        
@@ -2818,7 +2818,7 @@ The asin function can also be accessed as Modelica.Math.asin.
 
        
 
 
        
-\"asin\"
+\"asin\"
 
        
 
 
        Examples
        
@@ -2905,7 +2905,7 @@ The atan function can also be accessed as Modelica.Math.atan.
 
        
 
 
        
-\"atan\"
+\"atan\"
 
        
 
 
        Examples
        
@@ -2937,7 +2937,7 @@ The atan2 function can also be accessed as Modelica.Math.atan2.
 
        
 
 
        
-\"atan2\"
+\"atan2\"
 
        
 
 
        Examples
        
@@ -2950,7 +2950,7 @@ The atan2 function can also be accessed as Modelica.Math.atan2.
   extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Shifts a clocked expressions to undo a delay as part of the synchronous language elements.
+Shifts a clocked expressions to undo a delay as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        backSample(u, shiftCounter, resolution)
        
@@ -3092,7 +3092,7 @@ The same restrictions as for the pre() operator apply.
        
 end BothEdges;
 
 
        
-\"Simulation
+\"Simulation
 
        
 "));
   end 'change()';
@@ -3101,7 +3101,7 @@ The same restrictions as for the pre() operator apply.
        
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Generates clocks as part of the synchronous language elements.
+Generates clocks as part of the synchronous language elements.
 
        
 
        Examples
        
 
        @@ -3178,7 +3178,7 @@ Connect objects
 
 
        Syntax
        
 
-
        See section on connect_clause in the Modelica Grammar.
        
+
        See section on connect_clause in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -3245,7 +3245,7 @@ whereas connect-statements are optional for the spanning-tree (and generate diff
 
        
 
        Examples
        
 
        
-This function can be used at all places where a connect(...) statement is allowed.
+This function can be used at all places where a connect(...) statement is allowed.
 
        
 
        
 E.g., it is not allowed to use this function in a when-clause.
@@ -3293,7 +3293,7 @@ Connections.potentialRoot(A.R, priority = p);
 
        
 The overdetermined type or record instance R in connector instance A is a potential root node in a virtual connection graph with priority p (with p ≥ 0).
 If no second argument is provided, the priority is zero. p shall be a parameter expression of type Integer.
-In a virtual connection subgraph without a  Connections.root() definition, one of the potential roots with the lowest priority number is selected as root.
+In a virtual connection subgraph without a  Connections.root() definition, one of the potential roots with the lowest priority number is selected as root.
 
        
 
 
        Examples
        
@@ -3340,7 +3340,7 @@ In that case Connections.rooted(A.R) returns true, if 
 
        Examples
        
 
        
-This operator can be used to avoid equation systems by providing analytic inverses, see Modelica.Mechanics.MultiBody.Parts.FixedRotation.
+This operator can be used to avoid equation systems by providing analytic inverses, see Modelica.Mechanics.MultiBody.Parts.FixedRotation.
 
        
 "));
   end 'Connections.rooted()';
@@ -3362,7 +3362,7 @@ The cosine function can also be accessed as Modelica.Math.cos.
 
        
 
 
        
-\"cos\"
+\"cos\"
 
        
 
 
        Examples
        
@@ -3388,7 +3388,7 @@ The cosh function can also be accessed as Modelica.Math.cosh.
 
        
 
 
        
-\"cosh\"
+\"cosh\"
 
        
 
 
        Examples
        
@@ -3463,7 +3463,7 @@ time in order to avoid extrapolation in the delay buffer.]
        
 end Delay;
        
 
 
        
-\"Simulation
+\"Simulation
 
        
 "));
   end 'delay()';
@@ -3594,7 +3594,7 @@ classes).
        
 end RisingEdge;
 
 
        
-\"Simulation
+\"Simulation
 
        
 "));
   end 'edge()';
@@ -3616,7 +3616,7 @@ The exponential function can also be accessed as Modelica.Math.exp.
 
        
 
 
        
-\"exp\"
+\"exp\"
 
        
 
 
        Examples
        
@@ -3655,7 +3655,7 @@ Boolean vb[3]   = fill(true,3);  // = {true, true, true}
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Returns true for the first tick of the clock, part of the synchronous language elements.
+Returns true for the first tick of the clock, part of the synchronous language elements.
 
        
 
        Syntax
        
 
        firstTick(u)
        
@@ -3730,7 +3730,7 @@ returns Vehicle.engine.controller.
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Returns a piecewise constant signal based on a clocked variable as part of the synchronous language elements.
+Returns a piecewise constant signal based on a clocked variable as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        hold(u)
        
@@ -3946,7 +3946,7 @@ True during initialization
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Defines the initially active block instance of the state machine.
+Defines the initially active block instance of the state machine.
 
        
 
        Syntax
        
 
        initialState(state)
        
@@ -3966,7 +3966,7 @@ is used.
 
 
        
 For an introduction into stream variables and an example for the inStream(..) operator, see
-stream.
+stream.
 
        
 
 
        Syntax
        
@@ -3975,7 +3975,7 @@ For an introduction into stream variables and an example for the inStream(..) op
 
 
        
 where IDENT must be a variable reference in a connector component declared with the
-stream prefix.
+stream prefix.
 
        
 
 
        Description
        
@@ -4142,7 +4142,7 @@ when the return value changes discontinuously.]
        
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Part of the synchronous language elements.
+Part of the synchronous language elements.
 
        
 
        Syntax
        
 
        interval(u)
        
@@ -4198,7 +4198,7 @@ The natural logarithm can also be accessed as Modelica.Math.log.
 
        
 
 
        
-\"log\"
+\"log\"
 
        
 
 
        Examples
        
@@ -4224,7 +4224,7 @@ The base 10 logarithm can also be accessed as Modelica.Math.log10.
 
        
 
 
        
-\"log10\"
+\"log10\"
 
        
 
 
        Examples
        
@@ -4377,7 +4377,7 @@ Integer n = ndims(A);  // = 3
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Part of the synchronous language elements.
+Part of the synchronous language elements.
 
        
 
        Syntax
        
 
        noClock(u)
        
@@ -4512,7 +4512,7 @@ for continuous-time variables inside when-clauses.
 end Hysteresis;
 
 
        
-\"Simulation
+\"Simulation
 
        
 "));
   end 'pre()';
@@ -4521,7 +4521,7 @@ for continuous-time variables inside when-clauses.
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Gives the previous value of a clocked expression as part of the synchronous language elements.
+Gives the previous value of a clocked expression as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        previous(u)
        
@@ -4529,7 +4529,7 @@ Gives the previous value of a clocked expression as part of the 
 The return argument has the same type as the input argument.
 Input and return arguments are on the same clock.
-At the first tick of the clock of u or after a reset transition,
+At the first tick of the clock of u or after a reset transition,
 the start value of u  is returned.
 At subsequent activations of the clock of u, the value of u from the previous clock activation is returned.
 
        
@@ -4660,7 +4660,7 @@ the return value changes discontinuously.]
        
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Deprecated operator, see Connections.rooted() instead.
+Deprecated operator, see Connections.rooted() instead.
 
        
 "));
   end 'rooted()';
@@ -4691,7 +4691,7 @@ expressions and need to be a subtype of Real or Integer.
 end Sampling;
 
 
        
-\"Simulation
+\"Simulation
 
        
 "));
   end 'sample()';
@@ -4700,7 +4700,7 @@ expressions and need to be a subtype of Real or Integer.
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Samples a value according to a clock as part of the synchronous language elements.
+Samples a value according to a clock as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        sample(u)
        
@@ -4826,7 +4826,7 @@ flow direction.]
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Shifts a clocked expressions to delay it as part of the synchronous language elements.
+Shifts a clocked expressions to delay it as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        shiftSample(u, shiftCounter, resolution)
        
@@ -4882,7 +4882,7 @@ The sine function can also be accessed as Modelica.Math.sin.
 
        
 
 
        
-\"sin\"
+\"sin\"
 
        
 
 
        Examples
        
@@ -4908,7 +4908,7 @@ The sinh function can also be accessed as Modelica.Math.sinh.
 
        
 
 
        
-\"sinh\"
+\"sinh\"
 
        
 
 
        Examples
        
@@ -5011,7 +5011,7 @@ discontinuously.]
        
 The operator spatialDistribution allows the infinite-dimensional problem below to be solved efficiently with good accuracy
 
        
 
        
-\"spatialdistribution.png\"
 
        
 where z(x, t) is the transported quantity, x is the
@@ -5152,7 +5152,7 @@ String(123, minimumLength=6, leftJustified=false)  // = \"   123\"
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Subsamples a clocked expressions as part of the synchronous language elements.
+Subsamples a clocked expressions as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        subSample(u, factor)
        
@@ -5207,7 +5207,7 @@ u, ..., j in v) is the same as the type of e(i,...j).
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-Supersamples a clocked expressions as part of the synchronous language elements.
+Supersamples a clocked expressions as part of the synchronous language elements.
 
        
 
        Syntax
        
 
        superSample(u, factor)
        
@@ -5263,7 +5263,7 @@ The tangent function can also be accessed as Modelica.Math.tan.
 
        
 
 
        
-\"tan\"
+\"tan\"
 
        
 
 
        Examples
        
@@ -5290,7 +5290,7 @@ The tanh function can also be accessed as Modelica.Math.tanh.
 
        
 
 
        
-\"tanh\"
+\"tanh\"
 
        
 
 
        Examples
        
@@ -5348,7 +5348,7 @@ end ThrowingBall;
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-This operator returns the number of ticks since a transition was made to the active state in a state machine.
+This operator returns the number of ticks since a transition was made to the active state in a state machine.
 
        
 
        Syntax
        
 
        ticksInState()
        
@@ -5363,7 +5363,7 @@ Returns the number of ticks of the clock of the state machine since a transition
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-This operator returns the time (in seconds) since a transition was made to the active state in a state machine.
+This operator returns the time (in seconds) since a transition was made to the active state in a state machine.
 
        
 
        Syntax
        
 
        timeInState()
        
@@ -5378,7 +5378,7 @@ Returns the time duration as Real in [s] since a transition was made to the curr
     extends ModelicaReference.Icons.Information;
     annotation (Documentation(info="
 
        
-This operator defines a transition in a state machine.
+This operator defines a transition in a state machine.
 
        
 
        Syntax
        
 
        transition(from, to, condition, immediate, reset, synchronize, priority)
        
@@ -5461,7 +5461,7 @@ In this chapter operators of Modelica are documented.
 Elementary operators, such as \"+\" or \"-\" are overloaded and
 operate on scalar and array variables. Other operators
 have the same syntax as a
-Modelica function
+Modelica function
 call. However, they do not behave as a Modelica function,
 either because the result depends not only on the input arguments but
 also on the status of the simulation (such as \"pre(..)\"), or
@@ -5891,7 +5891,7 @@ Break lookup in hierarchy
 
 
        Syntax
        
 
-
        See section on class_definition in the Modelica Grammar.
        
+
        See section on class_definition in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -5947,7 +5947,7 @@ classes A and B defined above,
        
 
 
        Syntax
        
 
-
        See section on extends_clause in the Modelica Grammar.
        
+
        See section on extends_clause in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6200,7 +6200,7 @@ a.p.i + b.p.i + c.p.i = 0;
 
 
        Syntax
        
 
-
        See section on type_prefix in the Modelica Grammar.
        
+
        See section on type_prefix in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6418,7 +6418,7 @@ Import classes
 
 
        Syntax
        
 
-
        See section on import_clause in the Modelica Grammar.
        
+
        See section on import_clause in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6459,7 +6459,7 @@ Define causality and/or block diagram connection semantic
 
 
        Syntax
        
 
-
        See section on type_prefix in the Modelica Grammar.
        
+
        See section on type_prefix in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6543,7 +6543,7 @@ Define causality and/or block diagram connection semantic
 
 
        Syntax
        
 
-
        See section on type_prefix in the Modelica Grammar.
        
+
        See section on type_prefix in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6640,7 +6640,7 @@ Prohibit instantiation of components of the class
 
 
        Syntax
        
 
-
        See section on class_definition in the Modelica Grammar.
        
+
        See section on class_definition in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6663,7 +6663,7 @@ class StateMachines "State Machines"
   extends ModelicaReference.Icons.Information;
   annotation (Documentation(info="
 
        
-The state machines defined in the Modelica Language are based on the synchronous language elements.
+The state machines defined in the Modelica Language are based on the synchronous language elements.
 Note that the state machines defined in the Modelica Standard Library are not based on this.
 
        
 
        Examples
        
@@ -6717,9 +6717,9 @@ The stream variable h_outflow is the stream property inside the component
 close to the boundary, when fluid flows out of the component into
 the connection point. The stream properties for the other flow direction
 can be inquired with the built-in operator
-'inStream()'. The value of the
+'inStream()'. The value of the
 stream variable corresponding to the actual flow direction can be
-inquired through the built-in operator 'actualStream()'.
+inquired through the built-in operator 'actualStream()'.
 
        
 
 
        model IsenthalpicFlow \"No energy storage/losses, e.g., pressure drop, valve, ...\"
@@ -6783,7 +6783,7 @@ operators inside the components provide the \"ideal mixing\" equations:
 
 
        Syntax
        
 
-
        See section on type_prefix in the Modelica Grammar.
        
+
        See section on type_prefix in the Modelica Grammar.
        
 
 
        Description
        
 
@@ -6793,7 +6793,7 @@ in Chapter 15 (Str
 and Appendix D (Derivation of Stream Equations)
 of the Modelica 3.4 specification.
 An overview and a rational is provided in a
-slide set.
+slide set.
 
        
 
 
        
@@ -6893,7 +6893,7 @@ is called stream connector and the corresponding variable is ca
 
 
        
 For further details, see the definition of the
-'inStream()' operator.
+'inStream()' operator.
 
        
 
 "));
@@ -6903,7 +6903,7 @@ class Synchronous "Synchronous Language Elements"
   extends ModelicaReference.Icons.Information;
   annotation (Documentation(info="
 
        
-Synchronous language elements are added to Modelica as an alternative to normal when-clauses to
+Synchronous language elements are added to Modelica as an alternative to normal when-clauses to
 making modeling of complex sampled systems safer and easier.
 
        
 
        Examples
        
@@ -7316,8 +7316,8 @@ annotation (
   Documentation(info="
 
        
 This package is a reference to Modelica keywords,
-Modelica builtin operators,
-and the Modelica grammar.
+Modelica builtin operators,
+and the Modelica grammar.
 It is based on the
 Modelica Language Specification version 3.4 from 10th April 2017. Currently, not the whole Modelica language is documented in ModelicaReference (but a large subset).
 
        
@@ -7436,14 +7436,14 @@ Copyright © 2003-2020, Modelica Association and contributors
       
      
-      
-      
diff --git a/ModelicaServices/package.mo b/ModelicaServices/package.mo
index 59a4674db5..089a8d999e 100644
--- a/ModelicaServices/package.mo
+++ b/ModelicaServices/package.mo
@@ -13,7 +13,7 @@ package ModelicaServices "ModelicaServices (Default implementation) - Models and
 
 
        
 
      •  New animation visualizer
-     Vector
+     Vector
      for 3D animation of a vector quantity (force, torque etc), see #1891.
      
        • 
 
      
@@ -22,7 +22,7 @@ package ModelicaServices "ModelicaServices (Default implementation) - Models and
 
 
        
 
      •  New function
-     exit
+     exit
      to terminate the Modelica environment, see #2211.
      
        • 
 
      
@@ -33,25 +33,25 @@ package ModelicaServices "ModelicaServices (Default implementation) - Models and
 
    •  Version numbering adapted to the corresponding version number of
      package Modelica (= Modelica Standard Library).
      • 
 
    •  New function
-     loadResource
+     loadResource
      to determine the absolute, local file name from an URI path name.
      
      • 
 
    •  New String type with tool dependent choices
-     SolverMethod
+     SolverMethod
      to define the integration method to solve differential equations in a
      clocked discretized continuous-time partition.
      
      • 
 
    •  New package
-     Machine
+     Machine
      to define the processor dependent constants as used in
-     Modelica.Constants.
+     Modelica.Constants.
      
      • 
 
 
 
      Version 1.1, 2010-07-30
      
 
 
        
-
      •  New model Surface
+
      •  New model Surface
      to describe movable, parameterized surfaces.
        • 
 
      •  New string constant ModelicaServices.target to define the
      target of the corresponding ModelicaServices implementation
        • 
@@ -122,7 +122,7 @@ The design of the Animation.Shape component is from Hilding Elmqvist, previously
             textString="default")}), Documentation(info="
 
        
 The interface of this model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape.
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape.
 
        
 
 "));
@@ -135,9 +135,9 @@ The interface of this model is documented at
       annotation (Documentation(info="
 
        
 The interface of this model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface.
        
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface.
        
 The interface of this model is defined at
-Modelica.Utilities.Internal.PartialModelicaServices.Animation.PartialSurface.
+Modelica.Utilities.Internal.PartialModelicaServices.Animation.PartialSurface.
 
        
 
 "));
@@ -149,9 +149,9 @@ The interface of this model is defined at
   annotation (Documentation(info="
 
        
 The interface of this model is documented at
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector.
        
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector.
        
 The interface of this model is defined at
-Modelica.Utilities.Internal.PartialModelicaServices.Animation.PartialVector.
+Modelica.Utilities.Internal.PartialModelicaServices.Animation.PartialVector.
 
        
 
 "));
@@ -170,7 +170,7 @@ The interface of this model is defined at
       annotation (Documentation(info="
 
        
 The interface of this model is documented at
-Modelica.Utilities.Files.loadResource.
+Modelica.Utilities.Files.loadResource.
 
        
 "));
     end loadResource;
@@ -190,7 +190,7 @@ The interface of this model is documented at
 Package in which processor specific constants are defined that are needed
 by numerical algorithms. Typically these constants are not directly used,
 but indirectly via the alias definition in
-Modelica.Constants.
+Modelica.Constants.
 
        
 "));
   end Machine;
@@ -202,7 +202,7 @@ but indirectly via the alias definition in
       external "C" exit(status) annotation(Include="#include ", Library="ModelicaExternalC");
       annotation(Documentation(info="
 
        
-Tool-specific implementation of Modelica.Utilities.System.exit.
+Tool-specific implementation of Modelica.Utilities.System.exit.
 
        
 "));
     end exit;
@@ -252,35 +252,35 @@ These are:
 
        
 
 
          
-
        •  Animation.Shape
+
        •  Animation.Shape
      provides a 3-dim. visualization of elementary
      mechanical objects. It is used in
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Shape
      via inheritance.
          • 
 
-
        •  Animation.Surface
+
        •  Animation.Surface
      provides a 3-dim. visualization of
      moveable parameterized surface. It is used in
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface
      via inheritance.
          • 
 
-
        •  Animation.Vector
+
        •  Animation.Vector
      provides a 3-dim. visualization of vector quantities. It is used in
-Modelica.Mechanics.MultiBody.Visualizers.Advanced.Arrow, Modelica.Mechanics.MultiBody.Visualizers.Advanced.DoubleArrow and Modelica.Mechanics.MultiBody.Visualizers.FixedArrow
+Modelica.Mechanics.MultiBody.Visualizers.Advanced.Arrow, Modelica.Mechanics.MultiBody.Visualizers.Advanced.DoubleArrow and Modelica.Mechanics.MultiBody.Visualizers.FixedArrow
      via inheritance.
          • 
 
-
        •  ExternalReferences.loadResource
+
        •  ExternalReferences.loadResource
      provides a function to return the absolute path name of an URI or a local file name. It is used in
-Modelica.Utilities.Files.loadResource
+Modelica.Utilities.Files.loadResource
      via inheritance.
          • 
 
-
        •  Machine
+
        •  Machine
      provides a package of machine constants. It is used in
-Modelica.Constants.
          • 
+Modelica.Constants.
 
-
        •  System.exit provides a function to terminate the execution of the Modelica environment. It is used in Modelica.Utilities.System.exit via inheritance.
          • 
+
        •  System.exit provides a function to terminate the execution of the Modelica environment. It is used in Modelica.Utilities.System.exit via inheritance.
          • 
 
-
        •  Types.SolverMethod
+
        •  Types.SolverMethod
      provides a string defining the integration method to solve differential equations in
      a clocked discretized continuous-time partition
      (see Section 16.8.2 (Solver Methods) of the Modelica 3.4 specification).
          • 
diff --git a/ModelicaTest/Electrical/Analog/Ideal/IdealTwoWaySwitches.mo b/ModelicaTest/Electrical/Analog/Ideal/IdealTwoWaySwitches.mo
index 3fbd415cf2..9126c5cf79 100644
--- a/ModelicaTest/Electrical/Analog/Ideal/IdealTwoWaySwitches.mo
+++ b/ModelicaTest/Electrical/Analog/Ideal/IdealTwoWaySwitches.mo
@@ -42,8 +42,8 @@ equation
   connect(r4.n, constantVoltage.n) annotation (Line(points={{80,-30},{80,-80},{-80,-80},{-80,-10}}, color={0,0,255}));
   annotation(experiment(StopTime=1), Documentation(info="
 
          
-A test example for the two switches IdealTwoWaySwitch
-and ControlledIdealTwoWaySwitch
+A test example for the two switches IdealTwoWaySwitch
+and ControlledIdealTwoWaySwitch
 
          
 "));
 end IdealTwoWaySwitches;
diff --git a/ModelicaTest/Electrical/Machines.mo b/ModelicaTest/Electrical/Machines.mo
index f85f0d59e9..aa9bff1278 100644
--- a/ModelicaTest/Electrical/Machines.mo
+++ b/ModelicaTest/Electrical/Machines.mo
@@ -203,7 +203,7 @@ The rms values of d- and q-current in rotor fixed coordinate system are controll
 and the output voltages fed to the machine. The result shows that the torque is influenced by the q-current,
 whereas the stator voltage is influenced by the d-current.
          
 
          
-Default machine parameters of model SM_PermanentMagnet are used.
+Default machine parameters of model SM_PermanentMagnet are used.
 
          
 "));
   end SMPM_VoltageSourceWithLosses;
diff --git a/ModelicaTest/Electrical/PowerConverters.mo b/ModelicaTest/Electrical/PowerConverters.mo
index 3f22e6a521..61f2913b17 100644
--- a/ModelicaTest/Electrical/PowerConverters.mo
+++ b/ModelicaTest/Electrical/PowerConverters.mo
@@ -112,7 +112,7 @@ package PowerConverters
         Interval=0.0002),
       Documentation(info="
 
          This example shows a half controlled 2*m pulse bridge rectifier with resistive load, where m is the number of phases. In case of resistive load the half controlled bridge shows the same output voltage as the
-full controlled bridge.
          
+full controlled bridge.
          
 
 
          Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
          
 
@@ -146,7 +146,7 @@ package PowerConverters
         Interval=0.0002),
       Documentation(info="
 
          This example shows a full controlled 2*m pulse bridge rectifier with resistive load, where m is the number of phases. In case of resistive load the full controlled bridge shows the same output voltage as the
-half controlled bridge.
          
+half controlled bridge.
          
 
 
          Plot current currentSensor.i, average current meanCurrent.y, voltage voltageSensor.v and average voltage meanVoltage.v.
          
 "));
@@ -246,7 +246,7 @@ package PowerConverters
       annotation (
         Documentation(info="
 
          Template of
-
+
 2*m pulse bridge rectifiers, where m is the number of phases; load is not yet included.
          
 "));
     end ThyristorBridge2mPulse;
diff --git a/ModelicaTest/Fluid/BaseClasses.mo b/ModelicaTest/Fluid/BaseClasses.mo
index 8fcfcc8c3c..e1cb965168 100644
--- a/ModelicaTest/Fluid/BaseClasses.mo
+++ b/ModelicaTest/Fluid/BaseClasses.mo
@@ -352,7 +352,7 @@ It is assumed that no mass or energy is stored in the pipe.
 Correlations of different complexity and validity can be
 selected via the replaceable package WallFriction (see parameter menu below).
 The details of the pipe wall friction model are described in the
-UsersGuide.
+UsersGuide.
 Basically, different variants of the equation
 
          
 
@@ -366,7 +366,7 @@ in the next figure:
 
          
 
 
          
-\"PipeFriction1.png\"
 
          
 
diff --git a/ModelicaTest/Fluid/Dissipation.mo b/ModelicaTest/Fluid/Dissipation.mo
index d36dff61a3..c85dda1d2b 100644
--- a/ModelicaTest/Fluid/Dissipation.mo
+++ b/ModelicaTest/Fluid/Dissipation.mo
@@ -159,7 +159,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapLaminar.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapLaminar.mos"
                 "Verification of kc_evenGapLaminar"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -350,7 +350,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_4[i], m_flow_IN_var_4[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapLaminar_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapLaminar_KC.mos"
                 "Verification of kc_evenGapLaminar_KC"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -561,7 +561,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapOverall.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapOverall.mos"
                 "Verification of kc_evenGapOverall"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -773,7 +773,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_4[i], m_flow_IN_var_4[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapOverall_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapOverall_KC.mos"
                 "Verification of kc_evenGapOverall_KC"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -905,7 +905,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapTurbulent.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapTurbulent.mos"
                 "Verification of kc_evenGapTurbulent"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -994,7 +994,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_1[i], m_flow_IN_var_1[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapTurbulent_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/channel/kc_evenGapTurbulent_KC.mos"
                 "Verification of kc_evenGapTurbulent_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -1134,7 +1134,7 @@ extends Modelica.Icons.ExamplesPackage;
               m_flow_IN_con_3[i], m_flow_IN_var_3[i]);
           end for;
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/general/kc_approxForcedConvection.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/general/kc_approxForcedConvection.mos"
                 "Verification of kc_approxForcedConvection"),Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -1277,7 +1277,7 @@ extends Modelica.Icons.ExamplesPackage;
              m_flow_IN_con_3[i], m_flow_IN_var_3[i]) for i in 1:n};
 
            annotation (__Dymola_Commands(file=
-                   "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/general/kc_approxForcedConvection_KC.mos"
+                   "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/general/kc_approxForcedConvection_KC.mos"
                 "Verification of kc_approxForcedConvection_KC"), Diagram(
                  coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
                     {100,100}}),
@@ -1421,7 +1421,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_2, m_flow_IN_var_2);
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_flatTube.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_flatTube.mos"
                 "Verification of kc_flatTube"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                 Text(
@@ -1560,7 +1560,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_2, m_flow_IN_var_2);
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_flatTube_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_flatTube_KC.mos"
                 "Verification of kc_flatTube_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                 Text(
@@ -1688,7 +1688,7 @@ extends Modelica.Icons.ExamplesPackage;
           m_flow[3] = 0; Nu[3] = 0;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_roundTube.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_roundTube.mos"
                 "Verification of kc_roundTube"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                 Text(
@@ -1896,7 +1896,7 @@ extends Modelica.Icons.ExamplesPackage;
           m_flow[3] = 1;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_roundTube_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/heatExchanger/kc_roundTube_KC.mos"
                 "Verification of kc_roundTube_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2055,7 +2055,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_laminar.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_laminar.mos"
                 "Verification of kc_laminar"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2193,7 +2193,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_3[i], m_flow_IN_var_3[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_laminar_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_laminar_KC.mos"
                 "Verification of kc_laminar_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2359,7 +2359,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (
-            __Dymola_Commands(file="modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_overall.mos"
+            __Dymola_Commands(file="modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_overall.mos"
                 "Verification of kc_overall"),
             Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
                     100}}), graphics={Text(
@@ -2485,7 +2485,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_3[i], m_flow_IN_var_3[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_overall_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_overall_KC.mos"
                 "Verification of kc_overall_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2645,7 +2645,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_turbulent.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_turbulent.mos"
                 "Verification of kc_turbulent"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2783,7 +2783,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_3[i], m_flow_IN_var_3[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_turbulent_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/helicalPipe/kc_turbulent_KC.mos"
                 "Verification of kc_turbulent_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -2889,7 +2889,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_laminar.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_laminar.mos"
                 "Verification of kc_laminar"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -2961,7 +2961,7 @@ extends Modelica.Icons.ExamplesPackage;
             IN_con[i], IN_var[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_laminar_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_laminar_KC.mos"
                 "Verification of kc_laminar_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -3058,7 +3058,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (
-            __Dymola_Commands(file="modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_overall.mos"
+            __Dymola_Commands(file="modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_overall.mos"
                 "Verification of kc_overall"),
             Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
                     100,100}}), graphics={Text(
@@ -3129,7 +3129,7 @@ extends Modelica.Icons.ExamplesPackage;
             IN_con[i], IN_var[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_overall_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_overall_KC.mos"
                 "Verification of kc_overall_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -3225,7 +3225,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_turbulent.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_turbulent.mos"
                 "Verification of kc_turbulent"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -3297,7 +3297,7 @@ extends Modelica.Icons.ExamplesPackage;
             IN_con[i], IN_var[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_turbulent_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/plate/kc_turbulent_KC.mos"
                 "Verification of kc_turbulent_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -3480,7 +3480,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_laminar.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_laminar.mos"
                 "Verification of kc_laminar"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -3642,7 +3642,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_4[i], m_flow_IN_var_4[i]) for i in 1:n};
           annotation (
             __Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_laminar_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_laminar_KC.mos"
                 "Verification of kc_laminar_KC"),
             Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
                     100}}), graphics={Text(
@@ -3835,7 +3835,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_overall.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_overall.mos"
                 "Verification of kc_overall"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -4000,7 +4000,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_4[i], m_flow_IN_var_4[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_overall_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_overall_KC.mos"
                 "Verification of kc_overall_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -4141,7 +4141,7 @@ extends Modelica.Icons.ExamplesPackage;
           end for;
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_turbulent.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_turbulent.mos"
                 "Verification of kc_turbulent"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -4240,7 +4240,7 @@ extends Modelica.Icons.ExamplesPackage;
             m_flow_IN_con_2[i], m_flow_IN_var_2[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_turbulent_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_turbulent_KC.mos"
                 "Verification of kc_turbulent_KC"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -4466,7 +4466,7 @@ extends Modelica.Icons.ExamplesPackage;
             Modelica.Fluid.Dissipation.HeatTransfer.StraightPipe.kc_twoPhaseOverall_KC(
             IN_con_3[i], IN_var_3[i]) for i in 1:m};
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_twoPhaseOverall_KC.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/heatTransfer/straightPipe/kc_twoPhaseOverall_KC.mos"
                 "Verification of kc_twoPhaseOverall_KC"),
               Diagram(graphics={Text(
                   extent={{-100,52},{100,77}},
@@ -4650,7 +4650,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp_2[i]) for i in 1:m};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/bend/dp_curvedOverall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/bend/dp_curvedOverall_DPMFLOW.mos"
                 "Verification of dp_overall_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -4771,7 +4771,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (experiment(StopTime=1.0), __Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/bend/dp_edgedOverall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/bend/dp_edgedOverall_DPMFLOW.mos"
                 "Verification of dp_edgedOverall_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -4949,7 +4949,7 @@ extends Modelica.Icons.ExamplesPackage;
 
           annotation (
             __Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/channel/dp_internalFlowOverall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/channel/dp_internalFlowOverall_DPMFLOW.mos"
                 "Verification of dp_internalFlowOverall_DP and dp_internalFlowOverall_MFLOW (inverse)"),
             Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
                     100,100}}), graphics={Text(
@@ -5073,7 +5073,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_idealGas_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_idealGas_DPMFLOW.mos"
                 "Verification of dp_idealGas_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -5204,7 +5204,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_nominalDensityViscosity_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_nominalDensityViscosity_DPMFLOW.mos"
                 "Verification of dp_nominalDensityViscosity_DPMFLOW"), Diagram(
                 coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
                     100}}), graphics={Text(
@@ -5340,7 +5340,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_nominalPressureLossLawDensity_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_nominalPressureLossLawDensity_DPMFLOW.mos"
                 "Verification of dp_nominalPressureLossLawDensity_DPMFLOW"), Diagram(
                 coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}}),
                 graphics={Text(
@@ -5438,7 +5438,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_pressureLossCoefficient_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_pressureLossCoefficient_DPMFLOW.mos"
                 "Verification of dp_pressureLossCoefficient_DP and dp_pressureLossCoefficient_MFLOW"),
               Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
                     100,100}}), graphics={Text(
@@ -5542,7 +5542,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_volumeFlowRate_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/general/dp_volumeFlowRate_DPMFLOW.mos"
                 "Verification of dp_volumeFlowRate_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -5677,7 +5677,7 @@ extends Modelica.Icons.ExamplesPackage;
 
           annotation (
             __Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/orifice/dp_suddenChange_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/orifice/dp_suddenChange_DPMFLOW.mos"
                 "Verification of dp_suddenChange_DPMFLOW"),
             Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
                     100}}), graphics={Text(
@@ -5808,7 +5808,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/orifice/dp_thickEdgedOverall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/orifice/dp_thickEdgedOverall_DPMFLOW.mos"
                 "Verification of dp_thickEdgedOverall_DP and dp_thickEdgedOverall_MFLOW"),
               Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
                     100,100}}), graphics={Text(
@@ -5936,7 +5936,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_laminar_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_laminar_DPMFLOW.mos"
                 "Verification of dp_laminar_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -6060,7 +6060,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_overall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_overall_DPMFLOW.mos"
                 "Verification of dp_overall_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -6190,7 +6190,7 @@ extends Modelica.Icons.ExamplesPackage;
                     input_dp[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_turbulent_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_turbulent_DPMFLOW.mos"
                 "Verification of dp_turbulent_DPMFLOW"), Diagram(coordinateSystem(
                   preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
                   Text(
@@ -6355,7 +6355,7 @@ extends Modelica.Icons.ExamplesPackage;
                     m_flow[i]) for i in 1:n};
 
           annotation (__Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_twoPhaseOverall_DP.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/straightPipe/dp_twoPhaseOverall_DP.mos"
                 "Verification of dp_twoPhaseOverall_DP"), Diagram(coordinateSystem(
                   preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={
                    Text(
@@ -6595,7 +6595,7 @@ extends Modelica.Icons.ExamplesPackage;
 
           annotation (
             __Dymola_Commands(file=
-                  "modelica://ModelicaTest/Resources/Scripts/Dymola/pressureLoss/valve/dp_severalGeometryOverall_DPMFLOW.mos"
+                  "modelica:/ModelicaTest/Resources/Scripts/Dymola/pressureLoss/valve/dp_severalGeometryOverall_DPMFLOW.mos"
                 "Verification of dp_severalGeometryOverall_DP and dp_severalGeometryOverall_MFLOW (inverse)"),
             Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
                     100,100}}), graphics={Text(
diff --git a/ModelicaTest/Fluid/TestComponents/Fittings/TestSuddenExpansion.mo b/ModelicaTest/Fluid/TestComponents/Fittings/TestSuddenExpansion.mo
index 909fb77ee3..57057b84cd 100644
--- a/ModelicaTest/Fluid/TestComponents/Fittings/TestSuddenExpansion.mo
+++ b/ModelicaTest/Fluid/TestComponents/Fittings/TestSuddenExpansion.mo
@@ -72,7 +72,7 @@ equation
 This example shows the use of a sudden expansion / contraction model, which is connected to two boundary conditions prescribing static pressure. Notice that the prescribed static pressure on the right boundary is higher than on the left one. Still, the fluid flows from left to right.
 
          
 
          
-The reason for this is that the boundary conditions model infinite reservoirs with an infinite diameter and thus zero flow velocity. The sudden expansion model does however have two ends with finite diameters, and, as explained in the Overview of the Users' Guide, the momentum balance is not fulfilled exactly for this type of connections. Using a simple connect()-statement, the difference of the kinetic terms is neglected, which is not reasonable in the present model: At the left boundary condition it is zero, and on the left side of the sudden expansion it has a non-zero value. It is not reasonable to neglect it in the shown model, because there is little friction and therefore these kinetic effects dominate. Consequently, only modelling these effects explicitly leads to the correct results.
+The reason for this is that the boundary conditions model infinite reservoirs with an infinite diameter and thus zero flow velocity. The sudden expansion model does however have two ends with finite diameters, and, as explained in the Overview of the Users' Guide, the momentum balance is not fulfilled exactly for this type of connections. Using a simple connect()-statement, the difference of the kinetic terms is neglected, which is not reasonable in the present model: At the left boundary condition it is zero, and on the left side of the sudden expansion it has a non-zero value. It is not reasonable to neglect it in the shown model, because there is little friction and therefore these kinetic effects dominate. Consequently, only modelling these effects explicitly leads to the correct results.
 
          
 
          
 To do so, two additional sudden expansions / contractions are included in the model. The diameter is set to a large value (1e60) close to the boundaries and the proper values close to the original model. These additional components now introduce exact momentum balances and the results are as expected.
diff --git a/ModelicaTest/Math.mo b/ModelicaTest/Math.mo
index dce3dc1d95..b5a33602bd 100644
--- a/ModelicaTest/Math.mo
+++ b/ModelicaTest/Math.mo
@@ -913,7 +913,7 @@ extends Modelica.Icons.ExamplesPackage;
 
 
      
 
      ComplexBlocksComplexBlocks
   Library of basic input/output control blocks with Complex signals
 
      Digital
+
      Digital
    
    Library for digital electrical components based on the VHDL standard
    (2-,3-,4-,9-valued logic)
 
      
 
 
      DissipationDissipation
   Library of functions for convective heat transfer and pressure loss characteristics
 
      Fluid
      Fluid
     Library of 1-dim. thermo-fluid flow models using the Modelica.Media media description
 
      
 
 
      FluidHeatFlowFluidHeatFlow
   Library of simple components for 1-dimensional incompressible thermo-fluid flow models
 
      FluxTubes
+
      FluxTubes
     
    Library for modelling of electromagnetic devices with lumped magnetic networks
 
      
 
 
      FundamentalWaveFundamentalWave
   Library for magnetic fundamental wave effects in electric machines
 
      
 
 
      FundamentalWaveFundamentalWave
   Library for quasi-static fundamental wave electric machines
 
      
 
 
      MachinesMachines
   Library for electric machines
 
      Media
+
      Media
     
    Library of media property models
 
      MultiBody
+
      MultiBody
     
    Library to model 3-dimensional mechanical systems
 
      
 
 
      PolyphasePolyphase
   Library for electrical components of one or more phases
 
      
 
 
      PowerConvertersPowerConverters
   Library for rectifiers, inverters and DC/DC converters
 
      
 
 
      QuasiStaticQuasiStatic
   Library for quasi-static electrical single-phase and polyphase AC simulation
 
      Rotational
+
      Rotational
     
    Library to model 1-dimensional, rotational mechanical systems
 
      
 
 
      Spice3Spice3
   Library for components of the Berkeley SPICE3 simulator
 
      StateGraph
+
      StateGraph
     
    Library to model discrete event and reactive systems by hierarchical state machines
 
      Translational
+
      Translational
     
    Library to model 1-dimensional, translational mechanical systems
 
      Units 
      Units 
    Library of type definitions
 
      Utilities
+
      Utilities
     
    Library of utility functions especially for scripting (Files, Streams, Strings, System)
 
      
 
 
 
 
 
 
 
 
      r4145
       2010-09-07
       Dietmar WinklerAdded an update of the Modelica 3.2 grammar
+      Added an update of the Modelica 3.2 grammar
                        from Stefan Vorkoetter (Maplesoft).
     
      
     
      
       r3742
       2010-04-13
       Martin OtterAdded the Modelica 3.2 grammar
+      Added the Modelica 3.2 grammar
                        from Stefan Vorkoetter (Maplesoft).
      
                        Introduced a \"Contact\" subpackage with updated contact and
                        acknowledgment information.
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -998,7 +998,7 @@ extends Modelica.Icons.ExamplesPackage;
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1083,7 +1083,7 @@ extends Modelica.Icons.ExamplesPackage;
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1181,7 +1181,7 @@ extends Modelica.Icons.ExamplesPackage;
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1342,7 +1342,7 @@ Implementation is according to Abramowitz and Stegun
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1415,7 +1415,7 @@ The relative error is less than 1e-9.
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1444,7 +1444,7 @@ The relative error is less than 1e-9.
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1495,7 +1495,7 @@ For more details of this distribution see
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1534,7 +1534,7 @@ For more details of this distribution see
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1572,7 +1572,7 @@ For more details of this distribution see
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
@@ -1592,7 +1592,7 @@ For more details of this distribution see
 
 
      
 
      
-         \"DLR
+         \"DLR
 
          Initial version implemented by
          A. Klöckner, F. v.d. Linden, D. Zimmer, M. Otter.
      
diff --git a/ModelicaTest/MultiBody.mo b/ModelicaTest/MultiBody.mo
index a194907e29..22164756e2 100644
--- a/ModelicaTest/MultiBody.mo
+++ b/ModelicaTest/MultiBody.mo
@@ -263,7 +263,7 @@ to false or by setting enableAnimation in the
 object to false to switch off animation of all components.
 
      
 
      
-\"model
 
      
 "));
@@ -378,7 +378,7 @@ This is a second version of the \"four-bar\" mechanism, see figure:
 
      
 
 
      
-\"model
+\"model
 
      
 
 
      
@@ -2597,7 +2597,7 @@ component):
 
      
 
 
      
-\"model
 
      
 
@@ -2769,7 +2769,7 @@ component):
 
      
 
 
      
-\"model
 
      
 
@@ -4505,7 +4505,7 @@ a linear damper is connected here.
       annotation (experiment(StopTime=1), Documentation(info="
 
      
 Simple model to test gasForce element used in some multi-body examples,
-see MultiBody.Examples.Loops.
+see MultiBody.Examples.Loops.
 
      
 
      
 To generate the pressure-stroke diagram, simulate the example for 1 s
diff --git a/ModelicaTest/Rotational.mo b/ModelicaTest/Rotational.mo
index f2b4211f05..6179abf34e 100644
--- a/ModelicaTest/Rotational.mo
+++ b/ModelicaTest/Rotational.mo
@@ -1907,7 +1907,7 @@ force law in a target system between two inertias.
                     textString="a"),Text(
                     extent={{-150,-110},{150,-140}},
                     textString="J=%J"),Bitmap(extent={{-96,-42},{64,54}},
-                fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/DirectInertia.png"),
+                fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/DirectInertia.png"),
               Text( extent={{10,-60},{94,-90}},
                     horizontalAlignment=TextAlignment.Right,
               textString="tau")}), Documentation(info="
@@ -1922,7 +1922,7 @@ on the other side of it.
 
 
      See also
      
 
      
-InverseInertia.
+InverseInertia.
 
      
 "));
     end DirectInertia;
@@ -1979,7 +1979,7 @@ on the other side of it.
                     textString="a"),Text(
                     extent={{-150,-110},{150,-140}},
                     textString="J=%J"),Bitmap(extent={{-58,-42},{98,48}},
-                fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/InverseInertia.png"),
+                fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/InverseInertia.png"),
               Text( extent={{-90,-64},{-6,-94}},
                     horizontalAlignment=TextAlignment.Left,
               textString="tau")}), Documentation(info="
@@ -1993,7 +1993,7 @@ the output torque tau is returned.
 
 
      See also
      
 
      
-DirectInertia.
+DirectInertia.
 
      
 "));
     end InverseInertia;
@@ -2067,7 +2067,7 @@ the output torque tau is returned.
                     extent={{-150,-118},{150,-148}},
                     textString="c=%c
 d=%d"),       Bitmap(extent={{-72,-44},{84,46}},
-                 fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/SpringDamper.png"),
+                 fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/SpringDamper.png"),
               Text( extent={{12,96},{96,66}},
                     horizontalAlignment=TextAlignment.Right,
               textString="phi2"),      Text(
@@ -2145,7 +2145,7 @@ exchange.
               textString="phi1"),      Text(
                     extent={{-150,-114},{150,-144}},
                     textString="c=%c"),Bitmap(extent={{-88,-36},{92,56}},
-                fileName="modelica://Modelica/Resources/Images/Mechanics/Rotational/Spring.png"),
+                fileName="modelica:/Modelica/Resources/Images/Mechanics/Rotational/Spring.png"),
               Text( extent={{12,96},{96,66}},
                     horizontalAlignment=TextAlignment.Right,
               textString="phi2"),      Text(
diff --git a/ModelicaTest/Tables/CombiTable1Ds.mo b/ModelicaTest/Tables/CombiTable1Ds.mo
index fca16aa72f..1186364242 100644
--- a/ModelicaTest/Tables/CombiTable1Ds.mo
+++ b/ModelicaTest/Tables/CombiTable1Ds.mo
@@ -156,7 +156,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="longLine",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt"),
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt"),
         columns={2,2500}));
     Modelica.Blocks.Continuous.Der d_t_new2 annotation(Placement(transformation(extent={{0,-30},{20,-10}})));
   equation
@@ -169,7 +169,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v4.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v4.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test19;
 
@@ -178,7 +178,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test20;
 
@@ -187,7 +187,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test21;
 
@@ -197,7 +197,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test22;
 */
@@ -206,7 +206,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test23;
 
@@ -215,7 +215,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a_tab",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test24;
 
@@ -233,7 +233,7 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
       input Real dummy_u[:];
       output Real dummy_y;
       external "C" dummy_y = mydummyfunc(dummy_u)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/Data/Tables",
              Include = "#include \"usertab.c\"
 double mydummyfunc(double* dummy_in) {
     return 0.;
@@ -311,7 +311,7 @@ double mydummyfunc(double* dummy_in) {
     extends TestDer(t_new(
       tableOnFile=true,
       tableName="a",
-      fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
+      fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test33;
 
@@ -329,7 +329,7 @@ double mydummyfunc(double* dummy_in) {
       tableOnFile=true,
       delimiter=",",
       nHeaderLines=1,
-      fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test1D.csv")));
+      fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test1D.csv")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test35;
 end CombiTable1Ds;
diff --git a/ModelicaTest/Tables/CombiTable1Dv.mo b/ModelicaTest/Tables/CombiTable1Dv.mo
index 0c53100ee6..30f8d5910a 100644
--- a/ModelicaTest/Tables/CombiTable1Dv.mo
+++ b/ModelicaTest/Tables/CombiTable1Dv.mo
@@ -158,7 +158,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="longLine",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt"),
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt"),
         columns={2,2500}));
     Modelica.Blocks.Continuous.Der d_t_new2 annotation(Placement(transformation(extent={{0,-30},{20,-10}})));
   equation
@@ -172,7 +172,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v4.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v4.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test19;
 
@@ -181,7 +181,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test20;
 
@@ -190,7 +190,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test21;
 
@@ -200,7 +200,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test22;
 */
@@ -209,7 +209,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test23;
 
@@ -218,7 +218,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a_tab",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test24;
 
@@ -233,7 +233,7 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
       input Real dummy_u[:];
       output Real dummy_y;
       external "C" dummy_y = mydummyfunc(dummy_u)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/Data/Tables",
              Include = "#include \"usertab.c\"
 double mydummyfunc(double* dummy_in) {
     return 0.;
@@ -312,7 +312,7 @@ double mydummyfunc(double* dummy_in) {
     extends TestDer(t_new(
       tableOnFile=true,
       tableName="a",
-      fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
+      fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test33;
 
@@ -330,7 +330,7 @@ double mydummyfunc(double* dummy_in) {
       tableOnFile=true,
       delimiter=",",
       nHeaderLines=1,
-      fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test1D.csv")));
+      fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test1D.csv")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test35;
 end CombiTable1Dv;
diff --git a/ModelicaTest/Tables/CombiTable2Ds.mo b/ModelicaTest/Tables/CombiTable2Ds.mo
index 043309a21d..456cf01437 100644
--- a/ModelicaTest/Tables/CombiTable2Ds.mo
+++ b/ModelicaTest/Tables/CombiTable2Ds.mo
@@ -230,7 +230,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v4.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v4.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -248,7 +248,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -266,7 +266,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -285,7 +285,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")));
   equation
     t_new.u1 = time;
     t_new.u2 = time;
@@ -297,7 +297,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -314,7 +314,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends Modelica.Icons.Example;
   protected
     parameter String fileName=loadResource(
-        "modelica://Modelica/Resources/Data/Tables/test_v4.mat");
+        "modelica:/Modelica/Resources/Data/Tables/test_v4.mat");
     parameter Modelica.Blocks.Types.ExternalCombiTable2D tableID=
         Modelica.Blocks.Types.ExternalCombiTable2D(
           "akima2D",
@@ -364,7 +364,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends Modelica.Icons.Example;
   protected
     parameter String fileName=loadResource(
-        "modelica://Modelica/Resources/Data/Tables/test_v4.mat");
+        "modelica:/Modelica/Resources/Data/Tables/test_v4.mat");
     parameter Modelica.Blocks.Types.ExternalCombiTable2D tableID=
         Modelica.Blocks.Types.ExternalCombiTable2D(
           "akima2D",
@@ -414,7 +414,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
     extends Modelica.Icons.Example;
   protected
     parameter String fileName=loadResource(
-        "modelica://Modelica/Resources/Data/Tables/test_v4.mat");
+        "modelica:/Modelica/Resources/Data/Tables/test_v4.mat");
     parameter Modelica.Blocks.Types.ExternalCombiTable2D tableID=
         Modelica.Blocks.Types.ExternalCombiTable2D(
           "akima2D",
@@ -500,7 +500,7 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
       input Real dummy_u;
       output Real dummy_y;
       external "C" dummy_y = mydummyfunc(dummy_u)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/Data/Tables",
              Include = "#include \"usertab.c\"
 double mydummyfunc(double dummy_in) {
     return 0.;
@@ -1064,7 +1064,7 @@ double mydummyfunc(double dummy_in) {
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -1083,7 +1083,7 @@ double mydummyfunc(double dummy_in) {
         tableOnFile=true,
         delimiter=";",
         nHeaderLines=0,
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test2D.csv")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test2D.csv")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
diff --git a/ModelicaTest/Tables/CombiTable2Dv.mo b/ModelicaTest/Tables/CombiTable2Dv.mo
index 82b9255e6e..081e5d4527 100644
--- a/ModelicaTest/Tables/CombiTable2Dv.mo
+++ b/ModelicaTest/Tables/CombiTable2Dv.mo
@@ -230,7 +230,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v4.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v4.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -248,7 +248,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -266,7 +266,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -285,7 +285,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")));
   equation
     t_new.u1[1] = time;
     t_new.u2[1] = time;
@@ -297,7 +297,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -325,7 +325,7 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
       input Real dummy_u;
       output Real dummy_y;
       external "C" dummy_y = mydummyfunc(dummy_u)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/Data/Tables",
              Include = "#include \"usertab.c\"
 double mydummyfunc(double dummy_in) {
     return 0.;
@@ -889,7 +889,7 @@ double mydummyfunc(double dummy_in) {
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="akima2D",
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
@@ -908,7 +908,7 @@ double mydummyfunc(double dummy_in) {
         tableOnFile=true,
         delimiter=";",
         nHeaderLines=0,
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test2D.csv")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test2D.csv")));
     Modelica.Blocks.Sources.ContinuousClock clock1
       annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
     Modelica.Blocks.Sources.ContinuousClock clock2
diff --git a/ModelicaTest/Tables/CombiTimeTable.mo b/ModelicaTest/Tables/CombiTimeTable.mo
index 5840540f22..dde454725c 100644
--- a/ModelicaTest/Tables/CombiTimeTable.mo
+++ b/ModelicaTest/Tables/CombiTimeTable.mo
@@ -594,7 +594,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="longLine",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt"),
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt"),
         columns={2,2500}));
     annotation (experiment(StartTime=0, StopTime=1));
   end Test50;
@@ -638,7 +638,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v4.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v4.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test55;
 
@@ -647,7 +647,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test56;
 
@@ -656,7 +656,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test57;
 
@@ -666,7 +666,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test58;
 */
@@ -676,7 +676,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test59;
 
@@ -685,7 +685,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a_tab",
-        fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test.txt")));
+        fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test60;
 
@@ -750,7 +750,7 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
       input Real dummy_u[:];
       output Real dummy_y;
       external "C" dummy_y = mydummyfunc(dummy_u)
-      annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
+      annotation(IncludeDirectory="modelica:/Modelica/Resources/Data/Tables",
              Include = "#include \"usertab.c\"
 double mydummyfunc(double* dummy_in) {
     return 0.;
@@ -1026,11 +1026,11 @@ double mydummyfunc(double* dummy_in) {
     Modelica.Blocks.Sources.CombiTimeTable t_new(
       tableOnFile=true,
       tableName="s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
     Modelica.Blocks.Sources.CombiTimeTable t_new_2(
       tableOnFile=true,
       tableName="s.s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v6.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v6.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
     annotation (experiment(StartTime=0, StopTime=4));
   end Test80;
 
@@ -1039,11 +1039,11 @@ double mydummyfunc(double* dummy_in) {
     Modelica.Blocks.Sources.CombiTimeTable t_new(
       tableOnFile=true,
       tableName="s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
     Modelica.Blocks.Sources.CombiTimeTable t_new_2(
       tableOnFile=true,
       tableName="s.s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
     annotation (experiment(StartTime=0, StopTime=4));
   end Test81;
 
@@ -1053,11 +1053,11 @@ double mydummyfunc(double* dummy_in) {
     Modelica.Blocks.Sources.CombiTimeTable t_new(
       tableOnFile=true,
       tableName="s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")) annotation(Placement(transformation(extent={{-40,0},{-20,20}})));
     Modelica.Blocks.Sources.CombiTimeTable t_new_2(
       tableOnFile=true,
       tableName="s.s.tab1",
-      fileName=loadResource("modelica://Modelica/Resources/Data/Tables/test_v7.3.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
+      fileName=loadResource("modelica:/Modelica/Resources/Data/Tables/test_v7.3.mat")) annotation(Placement(transformation(extent={{-40,-30},{-20,-10}})));
     annotation (experiment(StartTime=0, StopTime=4));
   end Test82;
 */
@@ -1077,7 +1077,7 @@ double mydummyfunc(double* dummy_in) {
     extends TestDer(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test_utf8.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test84;
 
@@ -1165,7 +1165,7 @@ double mydummyfunc(double* dummy_in) {
         tableOnFile=true,
         delimiter=",",
         nHeaderLines=1,
-        fileName=loadResource("modelica://ModelicaTest/Resources/Data/Tables/test1D.csv")));
+        fileName=loadResource("modelica:/ModelicaTest/Resources/Data/Tables/test1D.csv")));
     annotation (experiment(StartTime=0, StopTime=100));
   end Test89;
 end CombiTimeTable;
diff --git a/ModelicaTest/Utilities.mo b/ModelicaTest/Utilities.mo
index 9d1bb972ec..35deabd92c 100644
--- a/ModelicaTest/Utilities.mo
+++ b/ModelicaTest/Utilities.mo
@@ -323,7 +323,7 @@ extends Modelica.Icons.ExamplesPackage;
     extends Modelica.Icons.Function;
     import Modelica.Utilities.Streams;
     import Modelica.Utilities.Files;
-    input String file1 = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
+    input String file1 = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
     input String logFile = "ModelicaTestLog.txt"
       "Filename where the log is stored";
     output Boolean ok;
@@ -459,8 +459,8 @@ extends Modelica.Icons.ExamplesPackage;
 
     input String logFile="ModelicaTestLog.txt"
       "Filename where the log is stored";
-    input String dirPath = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data");
-    input String filePath = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
+    input String dirPath = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data");
+    input String filePath = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
 
     output Boolean ok;
   protected
@@ -538,7 +538,7 @@ extends Modelica.Icons.ExamplesPackage;
 
   model TestReadFile
     extends Modelica.Icons.Example;
-    parameter String file = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
+    parameter String file = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
     Boolean result;
   algorithm
     when initial() then
@@ -563,8 +563,8 @@ extends Modelica.Icons.ExamplesPackage;
   model TestFiles
     extends Modelica.Icons.Example;
 
-    parameter String dirPath = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data");
-    parameter String filePath = Modelica.Utilities.Files.loadResource("modelica://ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
+    parameter String dirPath = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data");
+    parameter String filePath = Modelica.Utilities.Files.loadResource("modelica:/ModelicaTest/Resources/Data/ReadStreamTestFile.txt");
 
     Boolean result;
   algorithm
diff --git a/ModelicaTestConversion4.mo b/ModelicaTestConversion4.mo
index f650b40782..997fb52c8b 100644
--- a/ModelicaTestConversion4.mo
+++ b/ModelicaTestConversion4.mo
@@ -2168,7 +2168,7 @@ Conversion test for DoublePendulum.
+based on DoublePendulum.
 "));
         end DoublePendulum;
 
diff --git a/ModelicaTestOverdetermined.mo b/ModelicaTestOverdetermined.mo
index a55bab5b77..9cbd28ed52 100644
--- a/ModelicaTestOverdetermined.mo
+++ b/ModelicaTestOverdetermined.mo
@@ -620,9 +620,9 @@ This library provides models and functions to test components of
 All test models in this package define more equations during initialization,
 as necessary. These test models are especially provided for tool vendors
 to improve their tools so that models with consistently overdetermined initialization
-(= models in subpackage ConsistentInitialization)
+(= models in subpackage ConsistentInitialization)
 can be handled automatically and models with inconsistently overdetermined initialization
-(= models in subpackage InconsistentInitialization)
+(= models in subpackage InconsistentInitialization)
 fail during translation but give useful error messages.
 
      
 
diff --git a/ObsoleteModelica4.mo b/ObsoleteModelica4.mo
index e68b959a7d..9a8062faeb 100644
--- a/ObsoleteModelica4.mo
+++ b/ObsoleteModelica4.mo
@@ -36,7 +36,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -68,7 +68,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -100,7 +100,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -132,7 +132,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -164,7 +164,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -196,7 +196,7 @@ backward compatibility.
 
      
 It is much more convenient and more powerful to use \"expandable connectors\"
 for signal buses, see example
-BusUsage.
+BusUsage.
 
      
 "),
           obsolete = "Obsolete block - use expandable connectors instead");
@@ -218,7 +218,7 @@ for signal buses, see example
           input Boolean verboseRead = true
             "= true: Print info message; = false: No info message";
           external "C" readSuccess = ModelicaStandardTables_CombiTimeTable_read(tableID, forceRead, verboseRead)
-            annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
+            annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
           annotation(__ModelicaAssociation_Impure=true);
         end readTimeTableData;
 
@@ -232,7 +232,7 @@ for signal buses, see example
             "= true: Print info message; = false: No info message";
           output Real readSuccess "Table read success";
           external "C" readSuccess = ModelicaStandardTables_CombiTable1D_read(tableID, forceRead, verboseRead)
-            annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
+            annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
           annotation(__ModelicaAssociation_Impure=true);
         end readTable1DData;
 
@@ -246,7 +246,7 @@ for signal buses, see example
             "= true: Print info message; = false: No info message";
           output Real readSuccess "Table read success";
           external "C" readSuccess = ModelicaStandardTables_CombiTable2D_read(tableID, forceRead, verboseRead)
-            annotation (IncludeDirectory="modelica://Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
+            annotation (IncludeDirectory="modelica:/Modelica/Resources/C-Sources", Include="#include \"ModelicaStandardTables.h\"", Library={"ModelicaStandardTables", "ModelicaIO", "ModelicaMatIO", "zlib"});
           annotation(__ModelicaAssociation_Impure=true);
         end readTable2DData;
       end Internal;
@@ -347,7 +347,7 @@ for signal buses, see example
 This model linearly transforms the input voltage signal into a duty cycle. For the unipolar case the input voltage range is between zero and vMax. In case of bipolar input the input voltage is in the range between -vMax and vMax.
 
      
 
      
-Note: This block is replaced by the improved Voltage2DutyCycle block.
+Note: This block is replaced by the improved Voltage2DutyCycle block.
 
      
 "));
           end VoltageToDutyCycle;
@@ -390,18 +390,18 @@ Note: This block is replaced by the improved OnePort to measure the complex voltage or current. Additionally this model contains a proper icon and a definition of the angular velocity.
+OnePort to measure the complex voltage or current. Additionally this model contains a proper icon and a definition of the angular velocity.
 
      
 
 
      See also
      
 
 
      
-AbsoluteSensor,
-VoltageSensor,
-CurrentSensor,
-PowerSensor,
-Polyphase.Interfaces.AbsoluteSensor,
-Polyphase.Interfaces.RelativeSensorElementary
+AbsoluteSensor,
+VoltageSensor,
+CurrentSensor,
+PowerSensor,
+Polyphase.Interfaces.AbsoluteSensor,
+Polyphase.Interfaces.RelativeSensorElementary
 
      
 
 "));
@@ -436,15 +436,15 @@ The relative sensor partial model relies on the
                     textString="%name")}), Documentation(info="
 
      
 The relative sensor partial model relies on the
-TwoPlug to measure the complex voltages and currents. Additionally this model contains a proper icon and a definition of the angular velocity.
+TwoPlug to measure the complex voltages and currents. Additionally this model contains a proper icon and a definition of the angular velocity.
 
      
 
 
      See also
      
 
 
      
-AbsoluteSensor,
-SinglePhase.Interfaces.AbsoluteSensor,
-SinglePhase.Interfaces.RelativeSensorElementary
+AbsoluteSensor,
+SinglePhase.Interfaces.AbsoluteSensor,
+SinglePhase.Interfaces.RelativeSensorElementary
 
      
 
 "));
@@ -653,7 +653,7 @@ Optionally, two additional 1-dimensional mechanical flanges
 flange \"support\" represents the bearing) can be enabled via
 parameter useAxisFlange. The enabled axis flange can be
 driven with elements of the
-Modelica.Mechanics.Translational
+Modelica.Mechanics.Translational
 library.
 
 
      
@@ -678,7 +678,7 @@ vector \"n\" defining the translation axis
 
      
 
 
      
-
+
 
      
 
 "));
@@ -907,7 +907,7 @@ Optionally, two additional 1-dimensional mechanical flanges
 flange \"support\" represents the bearing) can be enabled via
 parameter useAxisFlange. The enabled axis flange can be
 driven with elements of the
-Modelica.Mechanics.Rotational
+Modelica.Mechanics.Rotational
 library.
 
      
 
@@ -945,7 +945,7 @@ vector \"n\" defining the translation axis
 
      
 
 
      
-
+
 
      
 
 "));
@@ -1000,7 +1000,7 @@ This shape visualizes the x-y plane by a box.
 
      
 
 
      
-
+
 
      
 "));
         end Ground;
@@ -1502,7 +1502,7 @@ connector is not connected).
           Documentation(info="
 
      
 This package was used in Modelica.Media of MSL ≤ 3.2.3 and was replaced by
-the function 
+the function 
 Modelica.Math.Nonlinear.solveOneNonlinearEquation.
 
      
 
@@ -1632,9 +1632,9 @@ with scalar c, |c| = ||a|| / ||b||. Q<
                                // {-5, 0, 0, 0} = -5*b
 
 
      See also
      
-Vectors.Utilities.householderReflection
      
-Matrices.Utilities.householderReflection
      
-Matrices.Utilities.householderSimilarityTransformation
+Vectors.Utilities.householderReflection
      
+Matrices.Utilities.householderReflection
      
+Matrices.Utilities.householderSimilarityTransformation
 ", revisions="