doc: 342740: Tutorial Hello World

https://bugs.eclipse.org/bugs/show_bug.cgi?id=342740

integrated contribution and generated documentation

64 files changed, 197 insertions, 159 deletions

diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.textile b/plugins/org.eclipse.etrice.doc/build/etrice.textile
index e6bcba43a..140860654 100644
--- a/plugins/org.eclipse.etrice.doc/build/etrice.textile
+++ b/plugins/org.eclipse.etrice.doc/build/etrice.textile
@@ -102,18 +102,18 @@ In this tutorial you will build your first very simple etrice model. The goal is
 h2. Create a new model from scratch

 

 The goal of eTrice is to describe distributed systems on a logical level. In the current version not all elements will be supported. But as prerequisite for further versions the following elements are mandatory for an eTrice model:

-* the __LogicalSystem__ 

-* at least one __SubSystemClass__

-* at least one __ActorClass__

+* the ??LogicalSystem?? 

+* at least one ??SubSystemClass??

+* at least one ??ActorClass??

 

-The __LogicalSystem__ represents the complete distributed system and contains at least one __SubSystemRef__. The __SubSystemClass__ represents an address space and contains at least one __ActorRef__. The __ActorClass__ is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

+The ??LogicalSystem?? represents the complete distributed system and contains at least one ??SubSystemRef??. The ??SubSystemClass?? represents an address space and contains at least one ??ActorRef??. The ??ActorClass?? is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

 

 The resulting model code looks like this:

 

 bc.. 

 RoomModel HelloWorld {

 

-	LogicalSystem System_Blinky {

+	LogicalSystem System_HelloWorld {

 		SubSystemRef subsystem : SubSystem_HelloWorld

 	}

 

@@ -124,60 +124,64 @@ RoomModel HelloWorld {
 	ActorClass HelloWorldTop {

 	}

 } 

-bc. 

-

 

 h3. Create a new model file 

 

-Create a new file in your org.eclipse.etrice.doc.tutorials.scratch.model directory and name it __HelloWorld.room__ and select finish.

+Create a new file in your model directory and name it ??HelloWorld.room?? and select finish.

+

 

-!images/OpenFile2.PNG!

+!images/015-HelloWorld01.PNG!

 

-The file ending must be __.room__ for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

+The file ending must be ??.room?? for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

 

-!images/HelloWorld1.PNG!

+!images/015-HelloWorld02.PNG!

 

 

 h3. Create a state machine

 

-We will implement the Hello World code on the initial transition of the __HelloWorldTop__ actor. Therefore open the state machine editor by right clicking the __HelloWorldTop__ actor in the outline view and select __Edit Behavior__.

+We will implement the Hello World code on the initial transition of the ??HelloWorldTop?? actor. Therefore open the state machine editor by right clicking the ??HelloWorldTop?? actor in the outline view and select ??Edit Behavior??.

 

-!images/HelloWorld2.PNG!

+!images/015-HelloWorld03.PNG!

 

-The state machine editor will be opened. Create the state machine as follow. Put the action code to the initial transition.

+The state machine editor will be opened. Drag and drop an ??Initial Point?? from the tool box to the diagram into the top level state. Drag and drop a ??State?? from the tool box to the diagram. Confirm the dialogue with ??ok??. Select the ??Transition?? in the tool box and draw the transition from the ??Initial Point?? to the State. Open the transition dialogue by double clicking the caption of the transition and fill in the action code.

 

-!images/HelloWorld3.PNG!

+bc. System.out.println("Hello World !");

+ 

+The result should look like this:

+

+!images/015-HelloWorld04.PNG!

 

 Save the diagram and inspect the model file. Note that the textual representation was created after saving the diagram.

 

-!images/HelloWorld4.PNG!

+!images/015-HelloWorld05.PNG!

 

 

 h3. Build and run the model

 

-Now the model is finshed and source code can be generated. 

+Now the model is finished and source code can be generated. 

 From org.eclipse.etrice.doc.tutorials.scratch.workflow select genAllModells.mwe2 and run it as MWE2Workflow. Currently all models in the directory will be generated.

 

-!images/HelloWorld6.PNG!

+!images/015-HelloWorld06.PNG!

 

-The code will be generated to the src-gen directory. The main class will be contained in __SubSystem_HelloWorldRunner.java__. Select this file and run it as Java application.

+The code will be generated to the src-gen directory. The main class will be contained in ??SubSystem_HelloWorldRunner.java??. Select this file and run it as Java application.

 

-!images/HelloWorld7.PNG!

+!images/015-HelloWorld07.PNG!

 

 

-The Hello World application starts and the string will be printed on the console window. To stop the application the user must type __quit__ in the console window.

+The Hello World application starts and the string will be printed on the console window. To stop the application the user must type ??quit?? in the console window.

 

-!images/HelloWorld8.PNG!

+!images/015-HelloWorld08.PNG!

 

 h3. Open the Message Sequence Chart

 

 During runtime the application produces a MSC and wrote it to a file. Open /org.eclipse.etrice.doc.tutorials/tmp/log/SubSystem_HelloWorld_Async.seq. You should see something like this:

 

-!images/HelloWorld9.PNG!

+!images/015-HelloWorld09.PNG!

 

 

 h2. Summary

 

-Know you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

+Now you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

 You should take a look at the generated source files to understand how the state machine is generated and the life cycle of the application. The next tutorials deals with more complex state machines hierarchies in structure and behavior.

  

+

diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.xml b/plugins/org.eclipse.etrice.doc/build/etrice.xml
index c22b6765e..a566ea96b 100644
--- a/plugins/org.eclipse.etrice.doc/build/etrice.xml
+++ b/plugins/org.eclipse.etrice.doc/build/etrice.xml
@@ -119,31 +119,31 @@
 			<itemizedlist>
 				<listitem>
 					<para>the 
-						<emphasis role="italic">LogicalSystem</emphasis> 
+						<citation>LogicalSystem</citation> 
 					</para>
 				</listitem>
 				<listitem>
 					<para>at least one 
-						<emphasis role="italic">SubSystemClass</emphasis>
+						<citation>SubSystemClass</citation>
 					</para>
 				</listitem>
 				<listitem>
 					<para>at least one 
-						<emphasis role="italic">ActorClass</emphasis>
+						<citation>ActorClass</citation>
 					</para>
 				</listitem>
 			</itemizedlist>
 			<para>The 
-				<emphasis role="italic">LogicalSystem</emphasis> represents the complete distributed system and contains at least one 
-				<emphasis role="italic">SubSystemRef</emphasis>. The 
-				<emphasis role="italic">SubSystemClass</emphasis> represents an address space and contains at least one 
-				<emphasis role="italic">ActorRef</emphasis>. The 
-				<emphasis role="italic">ActorClass</emphasis> is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.
+				<citation>LogicalSystem</citation> represents the complete distributed system and contains at least one 
+				<citation>SubSystemRef</citation>. The 
+				<citation>SubSystemClass</citation> represents an address space and contains at least one 
+				<citation>ActorRef</citation>. The 
+				<citation>ActorClass</citation> is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.
 			</para>
 			<para>The resulting model code looks like this:</para>
 			<literallayout><code>RoomModel HelloWorld {
 
-	LogicalSystem System_Blinky {
+	LogicalSystem System_HelloWorld {
 		SubSystemRef subsystem : SubSystem_HelloWorld
 	}
 
@@ -154,27 +154,27 @@
 	ActorClass HelloWorldTop {
 	}
 } 
+
 </code></literallayout>
-			<literallayout><code></code></literallayout>
 			<section id="Createanewmodelfile">
 				<title>Create a new model file </title>
-				<para>Create a new file in your org.eclipse.etrice.doc.tutorials.scratch.model directory and name it 
-					<emphasis role="italic">HelloWorld.room</emphasis> and select finish.
+				<para>Create a new file in your model directory and name it 
+					<citation>HelloWorld.room</citation> and select finish.
 				</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/OpenFile2.PNG"/>
+							<imagedata fileref="images/015-HelloWorld01.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
 				<para>The file ending must be 
-					<emphasis role="italic">.room</emphasis> for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:
+					<citation>.room</citation> for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:
 				</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld1.PNG"/>
+							<imagedata fileref="images/015-HelloWorld02.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
@@ -182,22 +182,31 @@
 			<section id="Createastatemachine">
 				<title>Create a state machine</title>
 				<para>We will implement the Hello World code on the initial transition of the 
-					<emphasis role="italic">HelloWorldTop</emphasis> actor. Therefore open the state machine editor by right clicking the 
-					<emphasis role="italic">HelloWorldTop</emphasis> actor in the outline view and select 
-					<emphasis role="italic">Edit Behavior</emphasis>.
+					<citation>HelloWorldTop</citation> actor. Therefore open the state machine editor by right clicking the 
+					<citation>HelloWorldTop</citation> actor in the outline view and select 
+					<citation>Edit Behavior</citation>.
 				</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld2.PNG"/>
+							<imagedata fileref="images/015-HelloWorld03.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
-				<para>The state machine editor will be opened. Create the state machine as follow. Put the action code to the initial transition.</para>
+				<para>The state machine editor will be opened. Drag and drop an 
+					<citation>Initial Point</citation> from the tool box to the diagram into the top level state. Drag and drop a 
+					<citation>State</citation> from the tool box to the diagram. Confirm the dialogue with 
+					<citation>ok</citation>. Select the 
+					<citation>Transition</citation> in the tool box and draw the transition from the 
+					<citation>Initial Point</citation> to the State. Open the transition dialogue by double clicking the caption of the transition and fill in the action code.
+				</para>
+				<literallayout><code>System.out.println("Hello World !");
+</code></literallayout>
+				<para>The result should look like this:</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld3.PNG"/>
+							<imagedata fileref="images/015-HelloWorld04.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
@@ -205,37 +214,39 @@
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld4.PNG"/>
+							<imagedata fileref="images/015-HelloWorld05.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
 			</section>
 			<section id="Buildandrunthemodel">
 				<title>Build and run the model</title>
-				<para>Now the model is finshed and source code can be generated. 
+				<para>Now the model is finished and source code can be generated. 
 					From org.eclipse.etrice.doc.tutorials.scratch.workflow select genAllModells.mwe2 and run it as MWE2Workflow. Currently all models in the directory will be generated.</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld6.PNG"/>
+							<imagedata fileref="images/015-HelloWorld06.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
-				<para>The code will be generated to the src-gen directory. The main class will be contained in __SubSystem_HelloWorldRunner.java__. Select this file and run it as Java application.</para>
+				<para>The code will be generated to the src-gen directory. The main class will be contained in 
+					<citation>SubSystem_HelloWorldRunner.java</citation>. Select this file and run it as Java application.
+				</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld7.PNG"/>
+							<imagedata fileref="images/015-HelloWorld07.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
 				<para>The Hello World application starts and the string will be printed on the console window. To stop the application the user must type 
-					<emphasis role="italic">quit</emphasis> in the console window.
+					<citation>quit</citation> in the console window.
 				</para>
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld8.PNG"/>
+							<imagedata fileref="images/015-HelloWorld08.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
@@ -246,7 +257,7 @@
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/HelloWorld9.PNG"/>
+							<imagedata fileref="images/015-HelloWorld09.PNG"/>
 						</imageobject>
 					</mediaobject>
 				</para>
@@ -254,7 +265,7 @@
 		</section>
 		<section id="Summary">
 			<title>Summary</title>
-			<para>Know you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 
+			<para>Now you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 
 				You should take a look at the generated source files to understand how the state machine is generated and the life cycle of the application. The next tutorials deals with more complex state machines hierarchies in structure and behavior.</para>
 		</section>
 	</chapter>
diff --git a/plugins/org.eclipse.etrice.doc/doc/015-getting-started.textile b/plugins/org.eclipse.etrice.doc/doc/015-getting-started.textile
index a10d856d7..131e4d9e6 100644
--- a/plugins/org.eclipse.etrice.doc/doc/015-getting-started.textile
+++ b/plugins/org.eclipse.etrice.doc/doc/015-getting-started.textile
@@ -13,18 +13,18 @@ In this tutorial you will build your first very simple etrice model. The goal is
 h2. Create a new model from scratch

 

 The goal of eTrice is to describe distributed systems on a logical level. In the current version not all elements will be supported. But as prerequisite for further versions the following elements are mandatory for an eTrice model:

-* the __LogicalSystem__ 

-* at least one __SubSystemClass__

-* at least one __ActorClass__

+* the ??LogicalSystem?? 

+* at least one ??SubSystemClass??

+* at least one ??ActorClass??

 

-The __LogicalSystem__ represents the complete distributed system and contains at least one __SubSystemRef__. The __SubSystemClass__ represents an address space and contains at least one __ActorRef__. The __ActorClass__ is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

+The ??LogicalSystem?? represents the complete distributed system and contains at least one ??SubSystemRef??. The ??SubSystemClass?? represents an address space and contains at least one ??ActorRef??. The ??ActorClass?? is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

 

 The resulting model code looks like this:

 

 bc.. 

 RoomModel HelloWorld {

 

-	LogicalSystem System_Blinky {

+	LogicalSystem System_HelloWorld {

 		SubSystemRef subsystem : SubSystem_HelloWorld

 	}

 

@@ -35,60 +35,63 @@ RoomModel HelloWorld {
 	ActorClass HelloWorldTop {

 	}

 } 

-bc. 

-

 

 h3. Create a new model file 

 

-Create a new file in your org.eclipse.etrice.doc.tutorials.scratch.model directory and name it __HelloWorld.room__ and select finish.

+Create a new file in your model directory and name it ??HelloWorld.room?? and select finish.

+

 

-!images/OpenFile2.PNG!

+!images/015-HelloWorld01.PNG!

 

-The file ending must be __.room__ for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

+The file ending must be ??.room?? for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

 

-!images/HelloWorld1.PNG!

+!images/015-HelloWorld02.PNG!

 

 

 h3. Create a state machine

 

-We will implement the Hello World code on the initial transition of the __HelloWorldTop__ actor. Therefore open the state machine editor by right clicking the __HelloWorldTop__ actor in the outline view and select __Edit Behavior__.

+We will implement the Hello World code on the initial transition of the ??HelloWorldTop?? actor. Therefore open the state machine editor by right clicking the ??HelloWorldTop?? actor in the outline view and select ??Edit Behavior??.

+

+!images/015-HelloWorld03.PNG!

 

-!images/HelloWorld2.PNG!

+The state machine editor will be opened. Drag and drop an ??Initial Point?? from the tool box to the diagram into the top level state. Drag and drop a ??State?? from the tool box to the diagram. Confirm the dialogue with ??ok??. Select the ??Transition?? in the tool box and draw the transition from the ??Initial Point?? to the State. Open the transition dialogue by double clicking the caption of the transition and fill in the action code.

 

-The state machine editor will be opened. Create the state machine as follow. Put the action code to the initial transition.

+bc. System.out.println("Hello World !");

+ 

+The result should look like this:

 

-!images/HelloWorld3.PNG!

+!images/015-HelloWorld04.PNG!

 

 Save the diagram and inspect the model file. Note that the textual representation was created after saving the diagram.

 

-!images/HelloWorld4.PNG!

+!images/015-HelloWorld05.PNG!

 

 

 h3. Build and run the model

 

-Now the model is finshed and source code can be generated. 

+Now the model is finished and source code can be generated. 

 From org.eclipse.etrice.doc.tutorials.scratch.workflow select genAllModells.mwe2 and run it as MWE2Workflow. Currently all models in the directory will be generated.

 

-!images/HelloWorld6.PNG!

+!images/015-HelloWorld06.PNG!

 

-The code will be generated to the src-gen directory. The main class will be contained in __SubSystem_HelloWorldRunner.java__. Select this file and run it as Java application.

+The code will be generated to the src-gen directory. The main class will be contained in ??SubSystem_HelloWorldRunner.java??. Select this file and run it as Java application.

 

-!images/HelloWorld7.PNG!

+!images/015-HelloWorld07.PNG!

 

 

-The Hello World application starts and the string will be printed on the console window. To stop the application the user must type __quit__ in the console window.

+The Hello World application starts and the string will be printed on the console window. To stop the application the user must type ??quit?? in the console window.

 

-!images/HelloWorld8.PNG!

+!images/015-HelloWorld08.PNG!

 

 h3. Open the Message Sequence Chart

 

 During runtime the application produces a MSC and wrote it to a file. Open /org.eclipse.etrice.doc.tutorials/tmp/log/SubSystem_HelloWorld_Async.seq. You should see something like this:

 

-!images/HelloWorld9.PNG!

+!images/015-HelloWorld09.PNG!

 

 

 h2. Summary

 

-Know you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

+Now you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

 You should take a look at the generated source files to understand how the state machine is generated and the life cycle of the application. The next tutorials deals with more complex state machines hierarchies in structure and behavior.

- 
\ No newline at end of file
+ 

diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld01.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld01.png
new file mode 100644
index 000000000..0b0cc1364
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld01.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld02.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld02.png
new file mode 100644
index 000000000..da3c224fb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld02.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld03.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld03.png
new file mode 100644
index 000000000..ce9f4a032
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld03.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld04.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld04.png
new file mode 100644
index 000000000..0134a30b6
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld04.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld05.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld05.png
new file mode 100644
index 000000000..32187df8c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld05.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld06.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld06.png
new file mode 100644
index 000000000..f8738cdf7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld06.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld07.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld07.png
new file mode 100644
index 000000000..ff9a810e9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld07.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld08.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld08.png
new file mode 100644
index 000000000..7f79e00ba
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld08.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld09.png b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld09.png
new file mode 100644
index 000000000..ede3852a5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/doc/images/015-HelloWorld09.png
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld1.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld1.PNG
deleted file mode 100644
index 58bdc763a..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld2.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld2.PNG
deleted file mode 100644
index a2f20e683..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld3.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld3.PNG
deleted file mode 100644
index 6aa2aa834..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld3.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld4.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld4.PNG
deleted file mode 100644
index a52c3586f..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld4.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld6.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld6.PNG
deleted file mode 100644
index 2c8a0af39..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld6.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld7.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld7.PNG
deleted file mode 100644
index 37b725bb3..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld7.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld8.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld8.PNG
deleted file mode 100644
index f390c7b15..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld8.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld9.PNG b/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld9.PNG
deleted file mode 100644
index 020a52b5f..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/HelloWorld9.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/OpenFile1.PNG b/plugins/org.eclipse.etrice.doc/doc/images/OpenFile1.PNG
deleted file mode 100644
index 32e67cefd..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/OpenFile1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/OpenFile2.PNG b/plugins/org.eclipse.etrice.doc/doc/images/OpenFile2.PNG
deleted file mode 100644
index 3ba33c77d..000000000
--- a/plugins/org.eclipse.etrice.doc/doc/images/OpenFile2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/Createanewmodelfromscratch.html b/plugins/org.eclipse.etrice.doc/help/Createanewmodelfromscratch.html
index a83050fcd..b3b396713 100644
--- a/plugins/org.eclipse.etrice.doc/help/Createanewmodelfromscratch.html
+++ b/plugins/org.eclipse.etrice.doc/help/Createanewmodelfromscratch.html
@@ -25,30 +25,27 @@
 <ul class="itemizedlist" type="disc">

 <li class="listitem">

 <p>the 

-						<span class="italic">LogicalSystem</span> 

-					

-</p>

+						[<span class="citation">LogicalSystem</span>] 

+					</p>

 </li>

 <li class="listitem">

 <p>at least one 

-						<span class="italic">SubSystemClass</span>

-					

-</p>

+						[<span class="citation">SubSystemClass</span>]

+					</p>

 </li>

 <li class="listitem">

 <p>at least one 

-						<span class="italic">ActorClass</span>

-					

-</p>

+						[<span class="citation">ActorClass</span>]

+					</p>

 </li>

 </ul>

 </div>

 <p>The 

-				<span class="italic">LogicalSystem</span> represents the complete distributed system and contains at least one 

-				<span class="italic">SubSystemRef</span>. The 

-				<span class="italic">SubSystemClass</span> represents an address space and contains at least one 

-				<span class="italic">ActorRef</span>. The 

-				<span class="italic">ActorClass</span> is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

+				[<span class="citation">LogicalSystem</span>] represents the complete distributed system and contains at least one 

+				[<span class="citation">SubSystemRef</span>]. The 

+				[<span class="citation">SubSystemClass</span>] represents an address space and contains at least one 

+				[<span class="citation">ActorRef</span>]. The 

+				[<span class="citation">ActorClass</span>] is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

 			</p>

 <p>The resulting model code looks like this:</p>

 <div class="literallayout">

@@ -56,7 +53,7 @@
 <code class="code">RoomModel&nbsp;HelloWorld&nbsp;{<br>

 

 <br>

-	LogicalSystem&nbsp;System_Blinky&nbsp;{<br>

+	LogicalSystem&nbsp;System_HelloWorld&nbsp;{<br>

 		SubSystemRef&nbsp;subsystem&nbsp;:&nbsp;SubSystem_HelloWorld<br>

 	}<br>

 

@@ -70,14 +67,11 @@
 	}<br>

 }&nbsp;<br>

 

+<br>

+

 </code>

 </p>

 </div>

-<div class="literallayout">

-<p>

-<code class="code"></code>

-</p>

-</div>

 <div class="section" title="Create a new model file">

 <div class="titlepage">

 <div>

@@ -87,25 +81,25 @@
 </div>

 </div>

 </div>

-<p>Create a new file in your org.eclipse.etrice.doc.tutorials.scratch.model directory and name it 

-					<span class="italic">HelloWorld.room</span> and select finish.

+<p>Create a new file in your model directory and name it 

+					[<span class="citation">HelloWorld.room</span>] and select finish.

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/OpenFile2.PNG"></div>

+<img src="images/015-HelloWorld01.PNG"></div>

 <p>

 				

 </p>

 <p>The file ending must be 

-					<span class="italic">.room</span> for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

+					[<span class="citation">.room</span>] for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld1.PNG"></div>

+<img src="images/015-HelloWorld02.PNG"></div>

 <p>

 				

 </p>

@@ -120,24 +114,38 @@
 </div>

 </div>

 <p>We will implement the Hello World code on the initial transition of the 

-					<span class="italic">HelloWorldTop</span> actor. Therefore open the state machine editor by right clicking the 

-					<span class="italic">HelloWorldTop</span> actor in the outline view and select 

-					<span class="italic">Edit Behavior</span>.

+					[<span class="citation">HelloWorldTop</span>] actor. Therefore open the state machine editor by right clicking the 

+					[<span class="citation">HelloWorldTop</span>] actor in the outline view and select 

+					[<span class="citation">Edit Behavior</span>].

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld2.PNG"></div>

+<img src="images/015-HelloWorld03.PNG"></div>

 <p>

 				

 </p>

-<p>The state machine editor will be opened. Create the state machine as follow. Put the action code to the initial transition.</p>

+<p>The state machine editor will be opened. Drag and drop an 

+					[<span class="citation">Initial Point</span>] from the tool box to the diagram into the top level state. Drag and drop a 

+					[<span class="citation">State</span>] from the tool box to the diagram. Confirm the dialogue with 

+					[<span class="citation">ok</span>]. Select the 

+					[<span class="citation">Transition</span>] in the tool box and draw the transition from the 

+					[<span class="citation">Initial Point</span>] to the State. Open the transition dialogue by double clicking the caption of the transition and fill in the action code.

+				</p>

+<div class="literallayout">

+<p>

+<code class="code">System.out.println("Hello&nbsp;World&nbsp;!");<br>

+

+</code>

+</p>

+</div>

+<p>The result should look like this:</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld3.PNG"></div>

+<img src="images/015-HelloWorld04.PNG"></div>

 <p>

 				

 </p>

@@ -146,7 +154,7 @@
 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld4.PNG"></div>

+<img src="images/015-HelloWorld05.PNG"></div>

 <p>

 				

 </p>

@@ -160,33 +168,35 @@
 </div>

 </div>

 </div>

-<p>Now the model is finshed and source code can be generated. 

+<p>Now the model is finished and source code can be generated. 

 					From org.eclipse.etrice.doc.tutorials.scratch.workflow select genAllModells.mwe2 and run it as MWE2Workflow. Currently all models in the directory will be generated.</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld6.PNG"></div>

+<img src="images/015-HelloWorld06.PNG"></div>

 <p>

 				

 </p>

-<p>The code will be generated to the src-gen directory. The main class will be contained in __SubSystem_HelloWorldRunner.java__. Select this file and run it as Java application.</p>

+<p>The code will be generated to the src-gen directory. The main class will be contained in 

+					[<span class="citation">SubSystem_HelloWorldRunner.java</span>]. Select this file and run it as Java application.

+				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld7.PNG"></div>

+<img src="images/015-HelloWorld07.PNG"></div>

 <p>

 				

 </p>

 <p>The Hello World application starts and the string will be printed on the console window. To stop the application the user must type 

-					<span class="italic">quit</span> in the console window.

+					[<span class="citation">quit</span>] in the console window.

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld8.PNG"></div>

+<img src="images/015-HelloWorld08.PNG"></div>

 <p>

 				

 </p>

@@ -205,7 +215,7 @@
 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld9.PNG"></div>

+<img src="images/015-HelloWorld09.PNG"></div>

 <p>

 				

 </p>

diff --git a/plugins/org.eclipse.etrice.doc/help/Summary.html b/plugins/org.eclipse.etrice.doc/help/Summary.html
index 2f6ce3db6..f7a7f651a 100644
--- a/plugins/org.eclipse.etrice.doc/help/Summary.html
+++ b/plugins/org.eclipse.etrice.doc/help/Summary.html
@@ -19,7 +19,7 @@
 </div>

 </div>

 </div>

-<p>Know you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

+<p>Now you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

 				You should take a look at the generated source files to understand how the state machine is generated and the life cycle of the application. The next tutorials deals with more complex state machines hierarchies in structure and behavior.</p>

 </div>

 </body>

diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld01.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld01.png
new file mode 100644
index 000000000..0b0cc1364
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld01.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld02.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld02.png
new file mode 100644
index 000000000..da3c224fb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld02.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld03.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld03.png
new file mode 100644
index 000000000..ce9f4a032
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld03.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld04.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld04.png
new file mode 100644
index 000000000..0134a30b6
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld04.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld05.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld05.png
new file mode 100644
index 000000000..32187df8c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld05.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld06.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld06.png
new file mode 100644
index 000000000..f8738cdf7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld06.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld07.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld07.png
new file mode 100644
index 000000000..ff9a810e9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld07.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld08.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld08.png
new file mode 100644
index 000000000..7f79e00ba
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld08.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld09.png b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld09.png
new file mode 100644
index 000000000..ede3852a5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/help/images/015-HelloWorld09.png
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld1.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld1.PNG
deleted file mode 100644
index 58bdc763a..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld2.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld2.PNG
deleted file mode 100644
index a2f20e683..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld3.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld3.PNG
deleted file mode 100644
index 6aa2aa834..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld3.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld4.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld4.PNG
deleted file mode 100644
index a52c3586f..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld4.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld6.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld6.PNG
deleted file mode 100644
index 2c8a0af39..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld6.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld7.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld7.PNG
deleted file mode 100644
index 37b725bb3..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld7.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld8.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld8.PNG
deleted file mode 100644
index f390c7b15..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld8.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld9.PNG b/plugins/org.eclipse.etrice.doc/help/images/HelloWorld9.PNG
deleted file mode 100644
index 020a52b5f..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/HelloWorld9.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/OpenFile1.PNG b/plugins/org.eclipse.etrice.doc/help/images/OpenFile1.PNG
deleted file mode 100644
index 32e67cefd..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/OpenFile1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/help/images/OpenFile2.PNG b/plugins/org.eclipse.etrice.doc/help/images/OpenFile2.PNG
deleted file mode 100644
index 3ba33c77d..000000000
--- a/plugins/org.eclipse.etrice.doc/help/images/OpenFile2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/etrice.html b/plugins/org.eclipse.etrice.doc/html/etrice.html
index 8a7d973a1..60df8ae20 100644
--- a/plugins/org.eclipse.etrice.doc/html/etrice.html
+++ b/plugins/org.eclipse.etrice.doc/html/etrice.html
@@ -255,30 +255,27 @@
 <ul class="itemizedlist" type="disc">

 <li class="listitem">

 <p>the 

-						<span class="italic">LogicalSystem</span> 

-					

-</p>

+						[<span class="citation">LogicalSystem</span>] 

+					</p>

 </li>

 <li class="listitem">

 <p>at least one 

-						<span class="italic">SubSystemClass</span>

-					

-</p>

+						[<span class="citation">SubSystemClass</span>]

+					</p>

 </li>

 <li class="listitem">

 <p>at least one 

-						<span class="italic">ActorClass</span>

-					

-</p>

+						[<span class="citation">ActorClass</span>]

+					</p>

 </li>

 </ul>

 </div>

 <p>The 

-				<span class="italic">LogicalSystem</span> represents the complete distributed system and contains at least one 

-				<span class="italic">SubSystemRef</span>. The 

-				<span class="italic">SubSystemClass</span> represents an address space and contains at least one 

-				<span class="italic">ActorRef</span>. The 

-				<span class="italic">ActorClass</span> is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

+				[<span class="citation">LogicalSystem</span>] represents the complete distributed system and contains at least one 

+				[<span class="citation">SubSystemRef</span>]. The 

+				[<span class="citation">SubSystemClass</span>] represents an address space and contains at least one 

+				[<span class="citation">ActorRef</span>]. The 

+				[<span class="citation">ActorClass</span>] is the building block of which an application will be build of. It is a good idea to define a top level actor that can be used as reference within the subsystem.

 			</p>

 <p>The resulting model code looks like this:</p>

 <div class="literallayout">

@@ -286,7 +283,7 @@
 <code class="code">RoomModel&nbsp;HelloWorld&nbsp;{<br>

 

 <br>

-	LogicalSystem&nbsp;System_Blinky&nbsp;{<br>

+	LogicalSystem&nbsp;System_HelloWorld&nbsp;{<br>

 		SubSystemRef&nbsp;subsystem&nbsp;:&nbsp;SubSystem_HelloWorld<br>

 	}<br>

 

@@ -300,14 +297,11 @@
 	}<br>

 }&nbsp;<br>

 

+<br>

+

 </code>

 </p>

 </div>

-<div class="literallayout">

-<p>

-<code class="code"></code>

-</p>

-</div>

 <div class="section" title="Create a new model file">

 <div class="titlepage">

 <div>

@@ -317,25 +311,25 @@
 </div>

 </div>

 </div>

-<p>Create a new file in your org.eclipse.etrice.doc.tutorials.scratch.model directory and name it 

-					<span class="italic">HelloWorld.room</span> and select finish.

+<p>Create a new file in your model directory and name it 

+					[<span class="citation">HelloWorld.room</span>] and select finish.

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/OpenFile2.PNG"></div>

+<img src="images/015-HelloWorld01.PNG"></div>

 <p>

 				

 </p>

 <p>The file ending must be 

-					<span class="italic">.room</span> for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

+					[<span class="citation">.room</span>] for selecting the correct editor. Open the file and copy the above code into the editor window. You should see something like this:

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld1.PNG"></div>

+<img src="images/015-HelloWorld02.PNG"></div>

 <p>

 				

 </p>

@@ -350,24 +344,38 @@
 </div>

 </div>

 <p>We will implement the Hello World code on the initial transition of the 

-					<span class="italic">HelloWorldTop</span> actor. Therefore open the state machine editor by right clicking the 

-					<span class="italic">HelloWorldTop</span> actor in the outline view and select 

-					<span class="italic">Edit Behavior</span>.

+					[<span class="citation">HelloWorldTop</span>] actor. Therefore open the state machine editor by right clicking the 

+					[<span class="citation">HelloWorldTop</span>] actor in the outline view and select 

+					[<span class="citation">Edit Behavior</span>].

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld2.PNG"></div>

+<img src="images/015-HelloWorld03.PNG"></div>

 <p>

 				

 </p>

-<p>The state machine editor will be opened. Create the state machine as follow. Put the action code to the initial transition.</p>

+<p>The state machine editor will be opened. Drag and drop an 

+					[<span class="citation">Initial Point</span>] from the tool box to the diagram into the top level state. Drag and drop a 

+					[<span class="citation">State</span>] from the tool box to the diagram. Confirm the dialogue with 

+					[<span class="citation">ok</span>]. Select the 

+					[<span class="citation">Transition</span>] in the tool box and draw the transition from the 

+					[<span class="citation">Initial Point</span>] to the State. Open the transition dialogue by double clicking the caption of the transition and fill in the action code.

+				</p>

+<div class="literallayout">

+<p>

+<code class="code">System.out.println("Hello&nbsp;World&nbsp;!");<br>

+

+</code>

+</p>

+</div>

+<p>The result should look like this:</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld3.PNG"></div>

+<img src="images/015-HelloWorld04.PNG"></div>

 <p>

 				

 </p>

@@ -376,7 +384,7 @@
 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld4.PNG"></div>

+<img src="images/015-HelloWorld05.PNG"></div>

 <p>

 				

 </p>

@@ -390,33 +398,35 @@
 </div>

 </div>

 </div>

-<p>Now the model is finshed and source code can be generated. 

+<p>Now the model is finished and source code can be generated. 

 					From org.eclipse.etrice.doc.tutorials.scratch.workflow select genAllModells.mwe2 and run it as MWE2Workflow. Currently all models in the directory will be generated.</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld6.PNG"></div>

+<img src="images/015-HelloWorld06.PNG"></div>

 <p>

 				

 </p>

-<p>The code will be generated to the src-gen directory. The main class will be contained in __SubSystem_HelloWorldRunner.java__. Select this file and run it as Java application.</p>

+<p>The code will be generated to the src-gen directory. The main class will be contained in 

+					[<span class="citation">SubSystem_HelloWorldRunner.java</span>]. Select this file and run it as Java application.

+				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld7.PNG"></div>

+<img src="images/015-HelloWorld07.PNG"></div>

 <p>

 				

 </p>

 <p>The Hello World application starts and the string will be printed on the console window. To stop the application the user must type 

-					<span class="italic">quit</span> in the console window.

+					[<span class="citation">quit</span>] in the console window.

 				</p>

 <p>

 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld8.PNG"></div>

+<img src="images/015-HelloWorld08.PNG"></div>

 <p>

 				

 </p>

@@ -435,7 +445,7 @@
 					

 </p>

 <div class="mediaobject">

-<img src="images/HelloWorld9.PNG"></div>

+<img src="images/015-HelloWorld09.PNG"></div>

 <p>

 				

 </p>

@@ -450,7 +460,7 @@
 </div>

 </div>

 </div>

-<p>Know you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

+<p>Now you have generated your first eTrice model from scratch. You can switch between diagram editor and model (.room file) and you can see what will be generated during editing and saving the diagram files. 

 				You should take a look at the generated source files to understand how the state machine is generated and the life cycle of the application. The next tutorials deals with more complex state machines hierarchies in structure and behavior.</p>

 </div>

 </div>

diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld01.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld01.png
new file mode 100644
index 000000000..0b0cc1364
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld01.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld02.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld02.png
new file mode 100644
index 000000000..da3c224fb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld02.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld03.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld03.png
new file mode 100644
index 000000000..ce9f4a032
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld03.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld04.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld04.png
new file mode 100644
index 000000000..0134a30b6
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld04.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld05.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld05.png
new file mode 100644
index 000000000..32187df8c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld05.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld06.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld06.png
new file mode 100644
index 000000000..f8738cdf7
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld06.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld07.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld07.png
new file mode 100644
index 000000000..ff9a810e9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld07.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld08.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld08.png
new file mode 100644
index 000000000..7f79e00ba
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld08.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld09.png b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld09.png
new file mode 100644
index 000000000..ede3852a5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/html/images/015-HelloWorld09.png
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld1.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld1.PNG
deleted file mode 100644
index 58bdc763a..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld2.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld2.PNG
deleted file mode 100644
index a2f20e683..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld3.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld3.PNG
deleted file mode 100644
index 6aa2aa834..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld3.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld4.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld4.PNG
deleted file mode 100644
index a52c3586f..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld4.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld6.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld6.PNG
deleted file mode 100644
index 2c8a0af39..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld6.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld7.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld7.PNG
deleted file mode 100644
index 37b725bb3..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld7.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld8.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld8.PNG
deleted file mode 100644
index f390c7b15..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld8.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld9.PNG b/plugins/org.eclipse.etrice.doc/html/images/HelloWorld9.PNG
deleted file mode 100644
index 020a52b5f..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/HelloWorld9.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/OpenFile1.PNG b/plugins/org.eclipse.etrice.doc/html/images/OpenFile1.PNG
deleted file mode 100644
index 32e67cefd..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/OpenFile1.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/html/images/OpenFile2.PNG b/plugins/org.eclipse.etrice.doc/html/images/OpenFile2.PNG
deleted file mode 100644
index 3ba33c77d..000000000
--- a/plugins/org.eclipse.etrice.doc/html/images/OpenFile2.PNG
+++ /dev/null
diff --git a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf
index df34f462c..e9da9755d 100644
--- a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf
+++ b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf